11月8日库存管理

conf/app.conf

@@ -127,11 +127,6 @@ redispasswrod = 1Q2W3e4r!@#$
 redisdb = 1
 
 
-
-
-
-
-
 niprocart =  63
 jms = 58
 fistula_needle_set = 65

controllers/drug_stock_api_contorller.go

@@ -1499,6 +1499,17 @@ func (c *StockDrugApiController) DeleteDrugWarehouseOut() {
 
 	idArray := strings.Split(ids, ",")
 	err := service.DeleteDrugWarehouseOut(idArray)
+
+	list, _ := service.GetDrugWarhouseOutByIds(idArray)
+	for _, item := range list {
+		medical, _ := service.GetBaseDrugMedical(item.DrugId)
+		if item.CountUnit == medical.MaxUnit {
+			service.UpdateDrugInfoByIds(item.WarehouseInfoId, item.Count)
+		}
+		if medical.MaxUnit != medical.MinUnit && item.CountUnit == medical.MinUnit {
+			service.UpdateDrugInfoByIdsOne(item.WarehouseInfoId, item.Count)
+		}
+	}
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -741,17 +741,18 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 							if prescribing_number_total <= total {
 								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "1",
-									"advice": advice,
-									"ids":    ids,
-								})
-								return
+
 							}
 
 						}
 					}
 				}
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "1",
+					"advice": advice,
+					"ids":    ids,
+				})
+				return
 			} else {
 
 				advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
@@ -781,7 +782,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 								//转化为最小单位
 								total = list.Count*medical.MinNumber + list.StockMinNumber
-								fmt.Println("美国疫情2332323233232323232332323232233232323232", total)
+
 								prescribing_number_total = count * medical.MinNumber
 							}
 
@@ -920,6 +921,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 					}
 				}
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "1",
+					"advice": advice,
+					"ids":    ids,
+				})
+				return
 			}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1042,12 +1049,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 					if prescribing_number_total <= total {
 						service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "1",
-							"advice": advice,
-							"ids":    ids,
-						})
-						return
+
 					}
 				}
 			}
@@ -1063,6 +1065,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		}
+
 	}
 }
 

controllers/stock_in_api_controller.go

@@ -1432,7 +1432,13 @@ func (c *StockManagerApiController) DeleteWarehouseOut() {
 	}
 
 	idArray := strings.Split(ids, ",")
+
 	err := service.DeleteWarehouseOut(idArray)
+	list, _ := service.GetWarehouseOutInfoByIds(idArray)
+	for _, item := range list {
+		//添加库存
+		service.UpdateWarehouseInfoById(item.WarehouseInfotId, item.Count)
+	}
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {

service/stock_service.go

@@ -2220,6 +2220,33 @@ func DeleteWarehouseOut(ids []string) (err error) {
 	return
 }
 
+func GetWarehouseOutInfoByIds(ids []string) (info []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id in(?) and status = 0", ids).Find(&info).Error
+	return info, err
+}
+
+func UpdateWarehouseInfoById(id int64, count int64) error {
+	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+	return err
+}
+
+func GetDrugWarhouseOutByIds(ids []string) (info []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id in(?) and status = 0", ids).Find(&info).Error
+	return info, err
+}
+
+func UpdateDrugInfoByIds(id int64, count int64) error {
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	return err
+}
+
+func UpdateDrugInfoByIdsOne(id int64, count int64) error {
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	return err
+}
+
 func DeleteDrugWarehouseOut(ids []string) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Model(&models.DrugWarehouseOut{}).Where("id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error