库存调拨修改

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,7 +269,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3384,7 +3384,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		ScheduleRemark:         schedule_remark,
 	}
 
-	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 {
+	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10445 {
 
 		if tempDialysisRecord.BedID != bedID {
 			service.UpdateDeviceInformation(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate)
@@ -3709,7 +3709,7 @@ func (c *DialysisAPIController) GetLongAdviceOne() {
 		//开启推送提醒逻辑    提交长期处方的时候，弹起长期医嘱推送
 		var advice_three []*models.DoctorAdvice
 
-		fmt.Println("theStartTime23434343433434433443434343434334", theStartTime)
+		//fmt.Println("theStartTime23434343433434433443434343434334", theStartTime)
 		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.Org.Id, patient_id, theStartTime)
 		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.Org.Id, patient_id, theStartTime)
 		for _, advice := range advices {
@@ -6269,7 +6269,7 @@ func (c *DialysisAPIController) UpdateStockGoods() {
 	return
 }
 
-//当前数据比上一次出库数据少
+// 当前数据比上一次出库数据少
 func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time int64, goods []*models.DialysisBeforePrepareGoods, creater int64, count int64) (err error) {
 
 	//查询该患者当天已经出库的耗材信息
@@ -6322,7 +6322,7 @@ func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time in
 	return nil
 }
 
-//耗材出库删除
+// 耗材出库删除
 func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut, patient_id int64, creater int64, count int64) (err error) {
 
 	// 先根据相关信息查询当天该耗材的出库信息
@@ -6667,7 +6667,7 @@ func ConsumablesDeliveryTotalSix(orgID int64, patient_id int64, record_time int6
 	return nil
 }
 
-//耗材出库删除
+// 耗材出库删除
 func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut) (err error) {
 	// 先根据相关信息查询当天该耗材的出库信息
 	warehouseOutInfos, err := service.FindStockOutInfoByStockOne(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time)

controllers/secondary_order_api_contorller.go

@@ -54,7 +54,7 @@ func SecondaryOrderApiRegistRouters() {
 	beego.Router("/api/second/deletesecondorderinfo", &SecondaryOrderApiController{}, "Get:DeleteSecondOrderInfo")
 }
 
-//获取仓库编码
+// 获取仓库编码
 func (this *SecondaryOrderApiController) GetStoreCode() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	var code string
@@ -72,7 +72,7 @@ func (this *SecondaryOrderApiController) GetStoreCode() {
 	return
 }
 
-//修改仓库状态
+// 修改仓库状态
 func (this *SecondaryOrderApiController) UpdateStatus() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	check := map[string][]string{
@@ -108,7 +108,7 @@ func (this *SecondaryOrderApiController) UpdateStatus() {
 	return
 }
 
-//删除仓库
+// 删除仓库
 func (this *SecondaryOrderApiController) DeleteStorehouse() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	check := map[string][]string{
@@ -143,7 +143,7 @@ func (this *SecondaryOrderApiController) DeleteStorehouse() {
 	return
 }
 
-//仓库名称是否重复
+// 仓库名称是否重复
 func (this *SecondaryOrderApiController) IsStorehouseName() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	storehouse_name := this.GetString("storehouse_name")
@@ -168,7 +168,7 @@ func (this *SecondaryOrderApiController) IsStorehouseName() {
 
 }
 
-//仓库地址是否重复
+// 仓库地址是否重复
 func (this *SecondaryOrderApiController) IsStorehouseAddress() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	storehouse_address := this.GetString("storehouse_address")
@@ -193,7 +193,7 @@ func (this *SecondaryOrderApiController) IsStorehouseAddress() {
 
 }
 
-//分页
+// 分页
 func (this *SecondaryOrderApiController) StorehouseList() {
 	adminUserInfo := this.GetAdminUserInfo()
 	page, _ := this.GetInt64("page")   //页码
@@ -267,7 +267,7 @@ func (this *SecondaryOrderApiController) StorehouseList() {
 	})
 }
 
-//新增仓库
+// 新增仓库
 func (this *SecondaryOrderApiController) AddStorehouse() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	dataBody := make(map[string]interface{}, 0)
@@ -358,7 +358,7 @@ func (this *SecondaryOrderApiController) AddStorehouse() {
 
 }
 
-//修改仓库
+// 修改仓库
 func (this *SecondaryOrderApiController) UpdateStorehouse() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	dataBody := make(map[string]interface{}, 0)
@@ -1321,11 +1321,12 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 					}
 					//查询该调拨单是否有生成入库单
 					_, errcodess := service.GetWarehouseBySecondWarehouseId(12, item.WarehouseId, orgId, record_date)
+					fmt.Println("ERRCODESSS-------------------", errcodess)
 					if errcodess == gorm.ErrRecordNotFound {
 						service.AddSigleWarehouse(&warehousing)
 					}
 					infoObj, _ := service.GetLastWarehouseById(12, item.WarehouseId, orgId, record_date)
-
+					fmt.Println("INFOR----------------------", infoObj.ID)
 					warehouseInfo := &models.WarehousingInfo{
 						WarehousingOrder:      infoObj.WarehousingOrder,
 						WarehousingId:         infoObj.ID,
@@ -2125,7 +2126,7 @@ func (this *SecondaryOrderApiController) DeleteSecondOrderInfo() {
 	}
 }
 
-//查询一条仓库信息
+// 查询一条仓库信息
 func (this *SecondaryOrderApiController) GetOneStorehouse() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	check := map[string][]string{
@@ -2149,7 +2150,7 @@ func (this *SecondaryOrderApiController) GetOneStorehouse() {
 	return
 }
 
-//获取当前机构所有可用仓库的名字
+// 获取当前机构所有可用仓库的名字
 func (this *SecondaryOrderApiController) GetAllStorehouseName() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, err := service.GetAllStorehouseName(orgId)
@@ -2163,7 +2164,7 @@ func (this *SecondaryOrderApiController) GetAllStorehouseName() {
 
 }
 
-//根据机构id查询仓库配置
+// 根据机构id查询仓库配置
 func (this *SecondaryOrderApiController) FindStorehouseConfig() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	storehouse, err := service.FindStorehouseConfig(orgId)
@@ -2214,7 +2215,7 @@ func (this *SecondaryOrderApiController) FindStorehouseConfig() {
 	return
 }
 
-//更改耗材自动入库仓库
+// 更改耗材自动入库仓库
 func (this *SecondaryOrderApiController) UpdateInfo() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	check := map[string][]string{
@@ -2254,7 +2255,7 @@ func (this *SecondaryOrderApiController) UpdateInfo() {
 
 }
 
-//更改耗材自动出库仓库
+// 更改耗材自动出库仓库
 func (this *SecondaryOrderApiController) UpdateOutInfo() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	check := map[string][]string{
@@ -2294,7 +2295,7 @@ func (this *SecondaryOrderApiController) UpdateOutInfo() {
 
 }
 
-//更改药品自动入库仓库
+// 更改药品自动入库仓库
 func (this *SecondaryOrderApiController) UpdateDrugInfo() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	check := map[string][]string{
@@ -2341,7 +2342,7 @@ func (this *SecondaryOrderApiController) UpdateDrugInfo() {
 
 }
 
-//更改药品自动出库仓库
+// 更改药品自动出库仓库
 func (this *SecondaryOrderApiController) UpdateDrugOut() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	check := map[string][]string{
@@ -2387,7 +2388,7 @@ func (this *SecondaryOrderApiController) UpdateDrugOut() {
 
 }
 
-//判断前端参数是否为空
+// 判断前端参数是否为空
 func checkParams(this *SecondaryOrderApiController, m *map[string][]string) (map[string]string, error) {
 	tmp := make(map[string]string)
 	for k, v := range *m {
@@ -2400,7 +2401,7 @@ func checkParams(this *SecondaryOrderApiController, m *map[string][]string) (map
 	return tmp, nil
 }
 
-//兼容旧数据
+// 兼容旧数据
 func (this *SecondaryOrderApiController) Byliinit() {
 	err := service.Byliinit()
 	if err != nil {
@@ -2413,7 +2414,7 @@ func (this *SecondaryOrderApiController) Byliinit() {
 	return
 }
 
-//查询机构所属管理员
+// 查询机构所属管理员
 func (this *SecondaryOrderApiController) GetuserName() {
 	adminUserInfo := this.GetAdminUserInfo()
 	viewModels, _, _ := service.GetAdminUsersAndLoginInfo(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, 1, 100)

service/mobile_dialysis_service.go

@@ -795,7 +795,7 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":doctor_advices"
-	fmt.Println("key23233232323323wi", key)
+	//fmt.Println("key23233232323323wi", key)
 	doctor_advices_str, _ := redis.Get(key).Result()
 	redis.Set(doctor_advices_str, "", time.Second)
 	redis.Set(doctor_advices_str, "", time.Second)

service/warhouse_service.go

@@ -7457,7 +7457,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 	return nil
 }
 
-//耗材出库
+// 耗材出库
 func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
 
 	//开事务
@@ -7918,7 +7918,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 	return nil
 }
 
-//耗材出库删除
+// 耗材出库删除
 func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64, good_yc *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut) (err error) {
 
 	// 先根据相关信息查询当天该耗材的出库信息
@@ -8049,7 +8049,7 @@ func GetWarehouseById(id int64) (models.WarehouseOut, error) {
 	return out, err
 }
 
-//耗材出库
+// 耗材出库
 func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.WarehouseOutInfo, warehouseOut *models.WarehouseOut, count int64, creator int64) (err error) {
 
 	////开事务
@@ -8298,7 +8298,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 	return nil
 }
 
-//退库逻辑
+// 退库逻辑
 func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count int64) (err error) {
 
 	////开事务
@@ -9354,7 +9354,7 @@ func HisAuToReduce(orgID int64, prescribingNumber float64, warehouseout *models.
 	return
 }
 
-//采购管理耗材出库逻辑
+// 采购管理耗材出库逻辑
 func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.WarehouseOutInfo, warehouseOut *models.WarehouseOut, count int64, creator int64, warehouse_out_id int64, cancel_out_id int64) (err error) {
 
 	var deliver_number int64 = 0
@@ -9858,7 +9858,7 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 	return
 }
 
-//调拨出库逻辑
+// 调拨出库逻辑
 func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.WarehouseOutInfo, warehouseOut *models.WarehouseOut, count int64, creator int64, warehouseInfo *models.WarehousingInfo) (err error) {
 
 	var deliver_number int64 = 0
@@ -9880,11 +9880,16 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 
 	maxNumber = goods.Count
 
-	if warehouse.StockCount < maxNumber {
-		return errors.New("库存数量不足")
+	//if warehouse.StockCount < maxNumber {
+	//	return errors.New("库存数量不足")
+	//}
+
+	if warehouse.StockCount-maxNumber > 0 {
+		warehouse.StockCount = warehouse.StockCount - maxNumber
+	} else {
+		warehouse.StockCount = warehouse.StockCount
 	}
 
-	warehouse.StockCount = warehouse.StockCount - maxNumber
 	warehouse.Mtime = time.Now().Unix()
 
 	//扣减库存
@@ -10090,7 +10095,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			IsCheck:                 1,
 			OverCount:               sum_count,
 		}
-		warehouseOutInfo.Count = warehouse.StockCount
+		warehouseOutInfo.Count = stock_number
 
 		//查询是否已经生成出库单
 		info, errcodes := GetStockInRecoredByGoodIdOne(goods.GoodId, goods.GoodTypeId, goods.SysRecordTime, goods.OrgId)
@@ -10111,7 +10116,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			GoodId:                  goods.GoodId,
 			Number:                  warehouse.Number,
 			LicenseNumber:           goods.LicenseNumber,
-			Count:                   warehouse.StockCount,
+			Count:                   stock_number,
 			UserOrgId:               goods.OrgId,
 			PatientId:               0,
 			SystemTime:              record_time,
@@ -10154,7 +10159,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			GoodTypeId:            warehouse.GoodTypeId,
 			ProductDate:           warehouse.ProductDate,
 			ExpiryDate:            warehouse.ExpiryDate,
-			WarehousingCount:      warehouse.StockCount,
+			WarehousingCount:      stock_number,
 			Price:                 warehouse.Price,
 			TotalPrice:            0,
 			Status:                1,
@@ -10163,7 +10168,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			OrgId:                 warehouse.OrgId,
 			Type:                  1,
 			Manufacturer:          warehouse.Manufacturer,
-			StockCount:            warehouse.StockCount,
+			StockCount:            stock_number,
 			Dealer:                warehouse.Dealer,
 			LicenseNumber:         "",
 			PackingPrice:          warehouse.PackingPrice,
@@ -10179,7 +10184,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			GoodId:                  goods.GoodId,
 			Number:                  warehouse.Number,
 			LicenseNumber:           goods.LicenseNumber,
-			Count:                   warehouse.StockCount,
+			Count:                   stock_number,
 			UserOrgId:               goods.OrgId,
 			PatientId:               goods.PatientId,
 			SystemTime:              record_time,
@@ -10283,12 +10288,16 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 
 	//fmt.Println("warehouse.StockMaxNumber",warehouse.StockMaxNumber)
 	//fmt.Println("maxNumber9899923323232wo",maxNumber)
-	if warehouse.StockMaxNumber < maxNumber {
 
-		return errors.New("库存数量不足")
+	//if warehouse.StockMaxNumber < maxNumber {
+	//
+	//	return errors.New("库存数量不足")
+	//}
+
+	if warehouse.StockMaxNumber-maxNumber > 0 {
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 	}
 
-	warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 	warehouse.Mtime = time.Now().Unix()
 
 	if warehouse.StockMinNumber < minNumber {
@@ -11286,7 +11295,7 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 	return
 }
 
-//耗材手动出库
+// 耗材手动出库
 func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.WarehouseOutInfo, warehouseOut *models.WarehouseOut, count int64, creator int64) (err error) {
 
 	var deliver_number int64 = 0
@@ -12205,7 +12214,7 @@ func FindDrugWarehouseInfoFlushCountByStorehouse(drug_id int64, orgid int64, sto
 	return info, err
 }
 
-//结算出库
+// 结算出库
 func HisSettleDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo, order_id int64) (err error) {
 
 	// 1.判断药品是否来自专用字典的药品库
@@ -12286,7 +12295,7 @@ func HisSettleDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctor
 	return
 }
 
-//耗材结算出库
+// 耗材结算出库
 func ConsumableSettleDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, creator int64, order_id int64) (err error) {
 
 	var deliver_number int64 = 0
@@ -12713,7 +12722,7 @@ func ConsumableSettleDelivery(orgID int64, patient_id int64, record_time int64,
 	return nil
 }
 
-//保存处方出库
+// 保存处方出库
 func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, creator int64, count int64) (err error) {
 
 	var deliver_number int64 = 0