11月9日库存管理

controllers/his_api_controller.go

@@ -1157,7 +1157,7 @@ func (c *HisApiController) CreateHisPrescription() {
 										}
 										//修改处方
 										if advicelist.ID > 0 {
-											fmt.Println("232323232323232332323o2323o23o23o23o3o")
+
 											//查询最新批次库存
 											info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
 											var batch_number_count int64
@@ -1185,8 +1185,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 												number_count = prescribingNumberInt
 											}
-											fmt.Println("number-count23323232233223", number_count)
-											fmt.Println("device_number232323322323233223", device_number)
+
 											//如果修改的数量大于之前修改的数量
 											if (number_count - device_number) > 0 {
 												//如果修改的差数量 大于库存数量
@@ -1195,8 +1194,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													fmt.Println("(number_count - device_number3232323232332", number_count-device_number)
-													fmt.Println("(number_count - device_number3232323232332", batch_number_count)
+
 													if (number_count - device_number) > batch_number_count {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 														return
@@ -1231,49 +1229,52 @@ func (c *HisApiController) CreateHisPrescription() {
 												}
 
 											}
+											pharmacyConfig, _ := service.FindPharmacyConfig(adminInfo.CurrentOrgId)
+											if pharmacyConfig.IsOpen != 1 {
+												if device_number != number_count {
 
-											if device_number != number_count {
+													// 查询该药品最后一次出库记录
+													druginfo, _ := service.GetLastDrugWarehouseOutByDrugId(drug_id, patient_id, recordDateTime, adviceId)
 
-												// 查询该药品最后一次出库记录
-												druginfo, _ := service.GetLastDrugWarehouseOutByDrugId(drug_id, patient_id, recordDateTime, adviceId)
+													//回退库存
+													if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
-												//回退库存
-												if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+														service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, number_count)
+													}
+													if druginfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+														var stock_max_number int64
+														var stock_min_number int64
 
-													service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, number_count)
-												}
-												if druginfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-													var stock_max_number int64
-													var stock_min_number int64
+														if number_count >= drug.MinNumber {
 
-													if number_count >= drug.MinNumber {
+															stock_max_number = device_number / drug.MinNumber
+															service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
+															stock_min_number = device_number % drug.MinNumber
+															service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
 
-														stock_max_number = device_number / drug.MinNumber
-														service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
-														stock_min_number = device_number % drug.MinNumber
-														service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
+														} else {
 
-													} else {
+															service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, device_number)
+														}
+													}
 
-														service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, device_number)
+													if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
+														service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, device_number)
 													}
-												}
+													//删除记录
+													service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
+
+													//查询默认仓库剩余多少库存
+													var sum_count int64
+													stockInfo, _ := service.GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
+													for _, its := range stockInfo {
+														sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
+													}
+													service.UpdateBaseDrugSumTwo(drug_id, sum_count, druginfo.OrgId)
 
-												if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
-													service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, device_number)
 												}
-												//删除记录
-												service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
-
-												//查询默认仓库剩余多少库存
-												var sum_count int64
-												stockInfo, _ := service.GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
-												for _, its := range stockInfo {
-													sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
-												}
-												service.UpdateBaseDrugSumTwo(drug_id, sum_count, druginfo.OrgId)
-
 											}
+
 										}
 									}
 								}
@@ -1424,9 +1425,7 @@ func (c *HisApiController) CreateHisPrescription() {
 															in_count = warehouseInfoList.WarehousingCount
 														}
 													}
-													//fmt.Println("out_count23323232233233223",out_count)
-													//fmt.Println("+(number_count - device_number)",(number_count - device_number))
-													//fmt.Println("in_count23322323222222",in_count)
+
 													if (out_count + (number_count - device_number)) > in_count {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(stock_max_number, 10) + drug.MaxUnit + strconv.FormatInt(stock_min_number, 10) + drug.MinUnit)
 														return

controllers/mobile_api_controllers/patient_api_controller.go

@@ -757,8 +757,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								if adviceSetting.IsAdviceOpen == 1 {
 									//查询是否出库按钮开启
 									prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+									pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
 									if prescriptionConfig.IsOpen == 1 {
-										if medical.IsUse == 2 && medical.IsPharmacy != 1 {
+										if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 
 											//更新字典里面的库存
@@ -771,7 +772,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										}
 									}
 								} else {
-									if medical.IsUse == 2 && medical.IsPharmacy != 1 {
+									pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+									if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
 										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 
 										stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
@@ -861,7 +863,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 
 							if prescribing_number_total <= total {
-								if medical.IsUse == 2 && medical.IsPharmacy != 1 {
+								pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+								if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
 									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 
 									//更新字典里面的库存
@@ -1165,7 +1168,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 
 						if prescribing_number_total <= total {
-							if medical.IsUse == 2 && medical.IsPharmacy != 1 {
+							pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
+							if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
 
 								if config.IsOpen != 1 {
 									service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)

controllers/patient_api_controller.go

@@ -1710,7 +1710,8 @@ func (c *PatientApiController) ExecGroupAdvice() {
 				return
 			}
 			if prescribing_number_total <= total {
-				if medical.IsUse == 2 && medical.IsPharmacy != 1 {
+				pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
+				if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
 					service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
 					//查询默认仓库
 					storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
@@ -1933,8 +1934,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if adviceSetting.IsAdviceOpen == 1 {
 						//查询是否出库按钮开启
 						prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+						pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
 						if prescriptionConfig.IsOpen == 1 {
-							if medical.IsUse == 2 && medical.IsPharmacy != 1 {
+							if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
 								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 								//查询默认仓库
 								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
@@ -1971,7 +1973,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 
 					} else {
-						if medical.IsUse == 2 && medical.IsPharmacy != 1 {
+						pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+						if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
 							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 							//更新字典里面的库存
 							var sum_count int64
@@ -2251,9 +2254,11 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 					if prescribing_number_total <= total {
-						if medical.IsUse == 2 && medical.IsPharmacy != 1 {
+						pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+						if medical.IsUse == 2 && pharmacyConfig.IsOpen != 1 {
 
 							if config.IsOpen != 1 {
+
 								service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
 								//查询默认仓库
 								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)

service/drug_pharmacy_management_service.go

@@ -1620,7 +1620,7 @@ func CreatePharmacyConfig(config *models.PharmacyConfig) error {
 
 func UpdatePharmacyConfig(orgid int64, config *models.PharmacyConfig) error {
 
-	err := XTWriteDB().Model(&models.PharmacyConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"is_open": config.IsOpen,"mtime": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(&models.PharmacyConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"is_open": config.IsOpen, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1631,15 +1631,15 @@ func GetPharmacyConfig(orgid int64) (models.PharmacyConfig, error) {
 	if err == gorm.ErrRecordNotFound {
 		tmp := models.PharmacyConfig{
 			UserOrgId: orgid,
-			IsOpen: 2,
-			Status: 1,
-			Ctime: time.Now().Unix(),
-			Mtime: time.Now().Unix(),
+			IsOpen:    2,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
 		}
 		errs := XTWriteDB().Create(&tmp).Error
-		if errs != nil{
+		if errs != nil {
 			err = errs
-		}else {
+		} else {
 			err = nil
 		}
 		return tmp, err