Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/base_api_controller.go

@@ -2,8 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
-
 	//"XT_New/models"
 
 	//"XT_New/models"
@@ -69,36 +67,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 3877
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
@@ -315,35 +313,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 3877
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/data_api_controller.go

@@ -400,7 +400,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

controllers/drug_stock_api_contorller.go

@@ -87,9 +87,11 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 	}
 	timeStr := time.Now().Format("2006-01-02")
 	timeArr := strings.Split(timeStr, "-")
-	total, _ := service.FindAllWarehouseTotal(adminUserInfo.CurrentOrgId)
+	total, _ := service.FindAllWarehouseTotalOne(adminUserInfo.CurrentOrgId)
 	total = total + 1
+	fmt.Println("total2323232323232", total)
 	warehousing_order := "YPRKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+	fmt.Println("r入库单据好  2323232322223", warehousing_order)
 	operation_time := time.Now().Unix()
 	creater := adminUserInfo.AdminUser.Id
 	warehousing := models.DrugWarehouse{
@@ -1235,12 +1237,42 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 			}
 		}
 	}
-
+	var total_count int64
+	var prescribing_number_total int64
 	//调用出库逻辑
 	for _, item := range warehousingOutInfo {
 		//获取药品库存
 		info, _ := service.GetDrugTotalCount(item.DrugId, item.OrgId)
-		if item.Count > info.Count {
+		//查询改药品信息
+		medical, _ := service.GetBaseDrugMedical(item.DrugId)
+		//判断单位是否相等
+		if medical.MaxUnit == item.CountUnit {
+			//转化为最小单位
+			total_count = info.Count * medical.MinNumber
+			prescribing_number_total = item.Count * medical.MinNumber
+		}
+		if medical.MinUnit == item.CountUnit {
+			total_count = info.Count
+			prescribing_number_total = item.Count
+		}
+
+		fmt.Println("数量一", prescribing_number_total)
+		fmt.Println("数量二", total_count)
+		//判断单位
+		if total_count == 0 {
+			goodObj, _ := service.GetDrugByGoodId(item.DrugId)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":        "1",
+				"drug_name":  goodObj.DrugName,
+				"dose":       goodObj.Dose,
+				"dose_unit":  goodObj.DoseUnit,
+				"min_number": goodObj.MinNumber,
+				"min_unit":   goodObj.MinUnit,
+				"max_unit":   goodObj.MaxUnit,
+			})
+			return
+		}
+		if prescribing_number_total > total_count {
 
 			goodObj, _ := service.GetDrugByGoodId(item.DrugId)
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -1267,14 +1299,6 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 	}
 
-	//errs := service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
-	//info, _ := service.FindLastDrugWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
-	//if errs != nil {
-	//	utils.ErrorLog(errs.Error())
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
-	//	return
-	//}
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":        "2",
 		"drug_name":  "",
@@ -1440,7 +1464,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 	var warehousingOutInfo []*models.DrugWarehouseOutInfo
 	var upDateWarehouseOutInfos []*models.DrugWarehouseOutInfo
-	//var drugFlow  []*models.DrugFlow
+
+	var drugFlow []*models.DrugFlow
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
 		thisStockOut, _ := dataBody["stockOut"].([]interface{})
 		if len(thisStockOut) > 0 {
@@ -1495,6 +1520,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 				batch_number := items["batch_number"].(string)
 				number := items["number"].(string)
+				max_unit := items["count_unit"].(string)
 
 				var productDates int64
 				var expiryDates int64
@@ -1525,6 +1551,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					}
 
 				}
+				fmt.Println("生产日期22222222222222222222222222", expiryDates)
+				fmt.Println("生产日期22222222222222222222222222", productDates)
 				if id == 0 {
 					warehouseOutInfo := &models.DrugWarehouseOutInfo{
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1552,30 +1580,31 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
-					//drugflow := &models.DrugFlow{
-					//  WarehousingOrder: warehousing.WarehousingOrder,
-					//  WarehousingId:    warehousing.ID,
-					//  DrugId:           drug_id,
-					//  Number:           number,
-					//  ProductDate:      productDates,
-					//  ExpireDate:       expiryDates,
-					//  Count:            warehousing_count,
-					//  Price:            last_price,
-					//  Status:           1,
-					//  Ctime:            ctime,
-					//  UserOrgId:        adminUserInfo.CurrentOrgId,
-					//  Manufacturer:     manufacturer,
-					//  Dealer:           dealer,
-					//  BatchNumber:      batch_number,
-					//  MaxUnit:          max_unit,
-					//  MinUnit:          min_unit,
-					//  ConsumableType:   1,
-					//  IsEdit:           1,
-					//  Creator:          adminUserInfo.AdminUser.Id,
-					//  IsSys:0,
-					//}
-					//
-					//drugFlow = append(drugFlow,drugflow)
+					drugflow := &models.DrugFlow{
+						WarehousingOrder:        "",
+						WarehousingId:           0,
+						DrugId:                  drug_id,
+						Number:                  number,
+						ProductDate:             productDates,
+						ExpireDate:              expiryDates,
+						Count:                   count,
+						Price:                   price,
+						Status:                  1,
+						Ctime:                   ctime,
+						UserOrgId:               adminUserInfo.CurrentOrgId,
+						Manufacturer:            manufacturer,
+						Dealer:                  dealer,
+						BatchNumber:             batch_number,
+						MaxUnit:                 max_unit,
+						ConsumableType:          1,
+						IsEdit:                  1,
+						Creator:                 adminUserInfo.AdminUser.Id,
+						IsSys:                   0,
+						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+						WarehouseOutId:          warehouseOut.ID,
+					}
+
+					drugFlow = append(drugFlow, drugflow)
 
 				} else {
 					if items["is_sys"] == nil || reflect.TypeOf(items["is_sys"]).String() != "float64" {
@@ -1619,18 +1648,286 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						CountUnit:               count_unit,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
+
+					drugflow := &models.DrugFlow{
+						WarehousingOrder:        "",
+						WarehousingId:           0,
+						DrugId:                  drug_id,
+						Number:                  number,
+						ProductDate:             productDates,
+						ExpireDate:              expiryDates,
+						Count:                   count,
+						Price:                   price,
+						Status:                  1,
+						Ctime:                   ctime,
+						UserOrgId:               adminUserInfo.CurrentOrgId,
+						Manufacturer:            manufacturer,
+						Dealer:                  dealer,
+						BatchNumber:             batch_number,
+						MaxUnit:                 max_unit,
+						ConsumableType:          1,
+						IsEdit:                  1,
+						Creator:                 adminUserInfo.AdminUser.Id,
+						IsSys:                   0,
+						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+						WarehouseOutId:          warehouseOut.ID,
+					}
+
+					drugFlow = append(drugFlow, drugflow)
 				}
 			}
 		}
 	}
 	var errs error
 	if len(warehousingOutInfo) > 0 {
-		errs = service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
+
+		var total_count int64
+		var prescribing_number_total int64
+		//调用出库逻辑
+		for _, item := range warehousingOutInfo {
+			//获取药品库存
+			info, _ := service.GetDrugTotalCount(item.DrugId, item.OrgId)
+			//查询改药品信息
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			//判断单位是否相等
+			if medical.MaxUnit == item.CountUnit {
+				//转化为最小单位
+				total_count = info.Count * medical.MinNumber
+				prescribing_number_total = item.Count * medical.MinNumber
+			}
+			if medical.MinUnit == item.CountUnit {
+				total_count = info.Count
+				prescribing_number_total = item.Count
+			}
+
+			fmt.Println("数量一", prescribing_number_total)
+			fmt.Println("数量二", total_count)
+			//判断单位
+			if total_count == 0 {
+				goodObj, _ := service.GetDrugByGoodId(item.DrugId)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":        "1",
+					"drug_name":  goodObj.DrugName,
+					"dose":       goodObj.Dose,
+					"dose_unit":  goodObj.DoseUnit,
+					"min_number": goodObj.MinNumber,
+					"min_unit":   goodObj.MinUnit,
+					"max_unit":   goodObj.MaxUnit,
+				})
+				return
+			}
+			if prescribing_number_total > total_count {
+
+				goodObj, _ := service.GetDrugByGoodId(item.DrugId)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":        "1",
+					"drug_name":  goodObj.DrugName,
+					"dose":       goodObj.Dose,
+					"dose_unit":  goodObj.DoseUnit,
+					"min_number": goodObj.MinNumber,
+					"min_unit":   goodObj.MinUnit,
+					"max_unit":   goodObj.MaxUnit,
+				})
+				return
+			} else {
+				errs = service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
+				service.CreateDrugFlow(drugFlow)
+				// 出库流程
+				// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+				drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
+				if drup.ID > 0 {
+					prescribingNumber := item.Count
+					service.AutoDrugDeliverInfo(item.OrgId, prescribingNumber, &tempWarehouseOut, &drup, item)
+				}
+			}
+
+		}
 	}
 
 	if len(upDateWarehouseOutInfos) > 0 {
 		for _, item := range upDateWarehouseOutInfos {
-			errs = service.UpDateDrugWarehouseOutInfo(item)
+			//获取药品库存
+			info, _ := service.GetDrugTotalCount(item.DrugId, item.OrgId)
+			//查询改药品信息
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			//查询最后一次出库记录
+			outInfo, _ := service.GetLastDrugWarehouseOutInfo(item.DrugId, item.WarehouseOutId, item.OrgId)
+			var min_number int64 //最后一次库存
+			var max_number int64 //当前库存
+			var all_number int64 //总库存
+			var cha_number int64 //库存差
+			var maxNumber int64
+			var minNumber int64
+
+			if medical.MaxUnit == outInfo.CountUnit {
+				//转为最小单位
+				min_number = outInfo.Count * medical.MinNumber
+			}
+
+			if medical.MinUnit == outInfo.CountUnit {
+				min_number = outInfo.Count
+			}
+
+			fmt.Println("单位1", medical.MaxUnit)
+			fmt.Println("单位2", item.CountUnit)
+			if medical.MaxUnit == item.CountUnit {
+				max_number = item.Count * medical.MinNumber
+			}
+
+			if medical.MinUnit == item.CountUnit {
+				max_number = item.Count
+			}
+
+			all_number = info.Count*medical.MinNumber + info.StockMinNumber
+			fmt.Println("总库存223232", all_number)
+			fmt.Println("当前库存00000000000000000000000000000000000000000", max_number)
+			////比较当前出库数量 和 最后一次出库数量,正常出库
+			if max_number <= min_number {
+				errs = service.UpDateDrugWarehouseOutInfo(item)
+				cha_number = min_number - max_number
+				fmt.Println("差库存", cha_number)
+				fmt.Println("最后一次库存0000000000000000000000000000000000000000", min_number)
+				if item.CountUnit == medical.MaxUnit {
+					maxNumber = cha_number / medical.MinNumber
+					parseDateErr := service.UpdateWarehouseInfo(maxNumber, item.DrugId, item.OrgId)
+					if parseDateErr != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+						return
+					}
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":        "2",
+						"drug_name":  "",
+						"dose":       "",
+						"dose_unit":  "",
+						"min_number": "",
+						"min_unit":   "",
+						"max_unit":   "",
+					})
+					minNumber = cha_number % medical.MinNumber
+					parseDateErr = service.UpdateWarehouseInfoOne(minNumber, item.DrugId, item.OrgId)
+					if parseDateErr != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+						return
+					}
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":        "2",
+						"drug_name":  "",
+						"dose":       "",
+						"dose_unit":  "",
+						"min_number": "",
+						"min_unit":   "",
+						"max_unit":   "",
+					})
+				}
+				if item.CountUnit == medical.MinUnit {
+					parseDateErr := service.UpdateWarehouseInfoOne(cha_number, item.DrugId, item.OrgId)
+					if parseDateErr != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+						return
+					}
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":        "2",
+						"drug_name":  "",
+						"dose":       "",
+						"dose_unit":  "",
+						"min_number": "",
+						"min_unit":   "",
+						"max_unit":   "",
+					})
+				}
+
+			}
+
+			fmt.Println("当前出库", max_number)
+			fmt.Println("最后一次232233", min_number)
+			//退库操作
+			if max_number > min_number {
+
+				cha_number = min_number - max_number
+				//如果总库存大于差,正常出库
+				if all_number >= cha_number {
+
+					errs = service.UpDateDrugWarehouseOutInfo(item)
+					fmt.Println("232322332233232", item.CountUnit, medical.MaxUnit)
+					if item.CountUnit == medical.MaxUnit {
+						maxNumber = cha_number / medical.MinNumber
+						fmt.Println("maxNumber232323232323232232", maxNumber)
+						parseDateErr := service.UpdateWarehouseInfo(maxNumber, item.DrugId, item.OrgId)
+						fmt.Println("parseDateErr9999999999999999999999", parseDateErr)
+						if parseDateErr != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+							return
+						}
+
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":        "2",
+							"drug_name":  "",
+							"dose":       "",
+							"dose_unit":  "",
+							"min_number": "",
+							"min_unit":   "",
+							"max_unit":   "",
+						})
+						minNumber = cha_number % medical.MinNumber
+						parseDateErr = service.UpdateWarehouseInfoOne(minNumber, item.DrugId, item.OrgId)
+						if parseDateErr != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+							return
+						}
+
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":        "2",
+							"drug_name":  "",
+							"dose":       "",
+							"dose_unit":  "",
+							"min_number": "",
+							"min_unit":   "",
+							"max_unit":   "",
+						})
+					}
+					if item.CountUnit == medical.MinUnit {
+						parseDateErr := service.UpdateWarehouseInfoOne(cha_number, item.DrugId, item.OrgId)
+						if parseDateErr != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+							return
+						}
+
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":        "2",
+							"drug_name":  "",
+							"dose":       "",
+							"dose_unit":  "",
+							"min_number": "",
+							"min_unit":   "",
+							"max_unit":   "",
+						})
+					}
+				}
+
+				if all_number < cha_number {
+					goodObj, _ := service.GetDrugByGoodId(item.DrugId)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":        "1",
+						"drug_name":  goodObj.DrugName,
+						"dose":       goodObj.Dose,
+						"dose_unit":  goodObj.DoseUnit,
+						"min_number": goodObj.MinNumber,
+						"min_unit":   goodObj.MinUnit,
+						"max_unit":   goodObj.MaxUnit,
+					})
+					return
+				}
+			}
+
 		}
 	}
 
@@ -1641,7 +1938,13 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "编辑成功",
+		"msg":        "2",
+		"drug_name":  "",
+		"dose":       "",
+		"dose_unit":  "",
+		"min_number": "",
+		"min_unit":   "",
+		"max_unit":   "",
 	})
 
 }
@@ -1658,6 +1961,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	fmt.Println("cancelStockDate232323223233223", cancelStockDate.Unix())
 
 	adminUserInfo := c.GetAdminUserInfo()
 	operation_time := time.Now().Unix()
@@ -1683,6 +1987,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		Type:         types,
 	}
 	service.AddSigleDrugCancelStock(&cancelStock)
+	fmt.Println("hh232323232323232323232323232322332", parseDateErr)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -1692,6 +1997,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 	}
 
 	var cancelStockInfos []*models.DrugCancelStockInfo
+	var drugFlow []*models.DrugFlow
 
 	if dataBody["cancelStock"] != nil && reflect.TypeOf(dataBody["cancelStock"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["cancelStock"].([]interface{})
@@ -1773,6 +2079,9 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 
 				batch_number := items["batch_number"].(string)
 				max_unit := items["max_unit"].(string)
+				batch_number_id := int64(items["batch_number_id"].(float64))
+
+				fmt.Println("99999999999999999999", batch_number_id)
 				cancelStockInfo := &models.DrugCancelStockInfo{
 					OrderNumber:      cancelStock.OrderNumber,
 					CancelStockId:    cancelStock.ID,
@@ -1794,31 +2103,138 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 					MaxUnit:          max_unit,
 					ProductDate:      productDates,
 					ExpiryDate:       expiryDates,
+					BatchNumberId:    batch_number_id,
 				}
 				cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
+				flow := &models.DrugFlow{
+					WarehousingId:           0,
+					DrugId:                  drug_id,
+					Number:                  "",
+					BatchNumber:             batch_number,
+					Count:                   count,
+					UserOrgId:               adminUserInfo.CurrentOrgId,
+					PatientId:               0,
+					SystemTime:              ctime,
+					ConsumableType:          4,
+					IsSys:                   0,
+					WarehousingOrder:        "",
+					WarehouseOutId:          0,
+					WarehouseOutOrderNumber: "",
+					IsEdit:                  0,
+					CancelStockId:           cancelStock.ID,
+					CancelOrderNumber:       cancelStock.OrderNumber,
+					Manufacturer:            0,
+					Dealer:                  0,
+					Creator:                 adminUserInfo.AdminUser.Id,
+					UpdateCreator:           0,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Mtime:                   0,
+					Price:                   price,
+					WarehousingDetailId:     0,
+					WarehouseOutDetailId:    0,
+					CancelOutDetailId:       0,
+					ExpireDate:              expiryDates,
+					ProductDate:             productDates,
+					MaxUnit:                 max_unit,
+					MinUnit:                 "",
+				}
+				drugFlow = append(drugFlow, flow)
 			}
 		}
 	}
-	errs := service.CreateDrugCancelStockInfo(cancelStockInfos)
-	if errs != nil {
-		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
-		return
-	}
+	//扣减库存逻辑
+	for _, item := range cancelStockInfos {
+		var total_number int64
+		medical, _ := service.GetBaseDrugMedical(item.DrugId)
+		//将当前退库数转为最小单位
+		if item.MaxUnit == medical.MaxUnit {
+			total_number = item.Count * medical.MinNumber
+		}
+		if item.MaxUnit == medical.MinUnit {
+			total_number = item.Count
+		}
+		fmt.Println("当前库存", total_number)
+		//查询当前药品退库的批次号的总入库数
+		infoWareInfo, _ := service.GetDrugWarehouseInfo(item.BatchNumberId)
+		fmt.Println("hhh2h3h2hh3233", item.MaxUnit, medical.MaxUnit, infoWareInfo.StockMaxNumber, infoWareInfo.StockMinNumber)
+		var total_count int64
+		total_count = infoWareInfo.StockMaxNumber*medical.MinNumber + infoWareInfo.StockMinNumber
+		fmt.Println("当前批次总库存", total_count)
+
+		//判断退库数量是否大于总入库数量
+		if total_number > total_count {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "2",
+			})
+			return
+		}
+		//正常退库
+		if total_number <= total_count {
+			//创建退库详情
+			errs := service.CreateDrugCancelStockInfo(cancelStockInfos)
+			//创建库存明细
+			errs = service.CreateDrugFlow(drugFlow)
+
+			var total int64
+			////退库到当前批次,获取当前退库批次的库存
+			//info, _ := service.GetDrugWarehouseInfoById(item.BatchNumberId)
+
+			if medical.MaxUnit == item.MaxUnit {
+				total = item.Count
+
+				warehouseInfo := models.XtDrugWarehouseInfo{
+					StockMaxNumber: total,
+				}
+				errs = service.UpdateDrugWarehouseInfo(&warehouseInfo, item.BatchNumberId)
+				if errs != nil {
+					utils.ErrorLog(errs.Error())
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+					return
+				}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "退库成功",
-	})
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "1",
+				})
+			}
+			if medical.MinUnit == item.MaxUnit {
+				fmt.Println("hhhhhh2323323232322332232332999999999进来", item.Count)
+				total = item.Count
+				warehouseInfo := models.XtDrugWarehouseInfo{
+					StockMinNumber: total,
+				}
+
+				errs = service.UpdateDrugWarehouseInfoOne(&warehouseInfo, item.BatchNumberId)
+				if errs != nil {
+					utils.ErrorLog(errs.Error())
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+					return
+				}
+
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "1",
+				})
+			}
+			if errs != nil {
+				utils.ErrorLog(errs.Error())
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+				return
+			}
 
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "1",
+			})
+		}
+	}
 }
 func (c *StockDrugApiController) GetDrugCancelStockInfoList() {
 	id, _ := c.GetInt64("id", 0)
 	adminUserInfo := c.GetAdminUserInfo()
 
 	cancelStockInfoList, _ := service.FindDrugCancelStockInfoById(id, adminUserInfo.CurrentOrgId)
-	info, _ := service.FindCancelStockById(id, adminUserInfo.CurrentOrgId)
 
+	info, _ := service.FindCancelDrugById(id, adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list": cancelStockInfoList,
 		"info": info,
@@ -1948,7 +2364,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 
 	var cancelStockInfos []*models.DrugCancelStockInfo
 	var upDateCancelStockInfos []*models.DrugCancelStockInfo
-
+	var drugFlow []*models.DrugFlow
 	if dataBody["cancelStock"] != nil && reflect.TypeOf(dataBody["cancelStock"]).String() == "[]interface {}" {
 		thisCancelStock, _ := dataBody["cancelStock"].([]interface{})
 		if len(thisCancelStock) > 0 {
@@ -2035,6 +2451,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 
 				}
 
+				batch_number_id := int64(items["batch_number_id"].(float64))
 				if id == 0 {
 					cancelStockInfo := &models.DrugCancelStockInfo{
 						DrugId:           drug_id,
@@ -2058,6 +2475,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 						Remark:           remark,
 						ProductDate:      productDates,
 						ExpiryDate:       expiryDates,
+						BatchNumberId:    batch_number_id,
 					}
 					cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
@@ -2085,20 +2503,180 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 						Remark:           remark,
 						ProductDate:      productDates,
 						ExpiryDate:       expiryDates,
+						BatchNumberId:    batch_number_id,
 					}
 					upDateCancelStockInfos = append(upDateCancelStockInfos, cancelStockInfo)
 				}
+
+				flow := &models.DrugFlow{
+					WarehousingId:           0,
+					DrugId:                  drug_id,
+					Number:                  "",
+					BatchNumber:             batch_number,
+					Count:                   count,
+					UserOrgId:               adminUserInfo.CurrentOrgId,
+					PatientId:               0,
+					SystemTime:              time.Now().Unix(),
+					ConsumableType:          4,
+					IsSys:                   0,
+					WarehousingOrder:        "",
+					WarehouseOutId:          0,
+					WarehouseOutOrderNumber: "",
+					IsEdit:                  0,
+					CancelStockId:           cancelStock.ID,
+					CancelOrderNumber:       cancelStock.OrderNumber,
+					Manufacturer:            0,
+					Dealer:                  0,
+					Creator:                 adminUserInfo.AdminUser.Id,
+					UpdateCreator:           adminUserInfo.AdminUser.Id,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Mtime:                   0,
+					Price:                   price,
+					WarehousingDetailId:     0,
+					WarehouseOutDetailId:    0,
+					CancelOutDetailId:       0,
+					ExpireDate:              expiryDates,
+					ProductDate:             productDates,
+					MaxUnit:                 max_unit,
+					MinUnit:                 "",
+				}
+				drugFlow = append(drugFlow, flow)
 			}
 		}
 	}
+	fmt.Println("cancelStockInfos232323223323223322323223", cancelStockInfos)
+	fmt.Println("cancelStockInfos232323223323223322323223", upDateCancelStockInfos)
+
 	var errs error
 	if len(cancelStockInfos) > 0 {
-		errs = service.CreateDrugCancelStockInfo(cancelStockInfos)
+
+		//扣减库存逻辑
+		for _, item := range cancelStockInfos {
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			//查询当前药品退库的批次号的总入库数
+			infoWareInfo, _ := service.GetDrugWarehouseInfo(item.BatchNumberId)
+			fmt.Println("hhh2h3h2hh3233", item.MaxUnit, medical.MaxUnit)
+			var total_count int64
+			total_count = infoWareInfo.StockMaxNumber*medical.MinNumber + infoWareInfo.StockMinNumber
+			//转化为最小单位
+			var total_number int64
+			if item.MaxUnit == medical.MaxUnit {
+				total_number = item.Count * medical.MinNumber
+			}
+			if item.MaxUnit == medical.MinUnit {
+				total_number = item.Count
+			}
+			//if item.MaxUnit == medical.MaxUnit {
+			//	total_count = infoWareInfo.WarehousingCount
+			//}
+			////转化为最小库存
+			//if item.MaxUnit == medical.MinUnit {
+			//	total_count = infoWareInfo.WarehousingCount * medical.MinNumber
+			//}
+			//判断退库数量是否大于总入库数量
+			if total_number > total_count {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "2",
+				})
+				return
+			}
+
+			//正常退库
+			if total_number <= total_count {
+				//创建退库详情
+				errs := service.CreateDrugCancelStockInfo(cancelStockInfos)
+				//创建库存明细
+				errs = service.CreateDrugFlow(drugFlow)
+
+				//获取该批次最后一条退库详情
+				lastCancel, _ := service.GetLastCancelStockInfo(id)
+				var cancel_number int64
+				if lastCancel.MaxUnit == medical.MaxUnit {
+					cancel_number = lastCancel.Count * medical.MinNumber
+				}
+
+				if lastCancel.MaxUnit == medical.MinUnit {
+					cancel_number = lastCancel.Count
+				}
+				fmt.Println("999999232323232232232323232323", lastCancel)
+				var total int64
+
+				if medical.MaxUnit == item.MaxUnit {
+					total = item.Count - cancel_number
+
+					warehouseInfo := models.XtDrugWarehouseInfo{
+						StockMaxNumber: total,
+					}
+					errs = service.UpdateDrugWarehouseInfo(&warehouseInfo, item.BatchNumberId)
+					if errs != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+						return
+					}
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "1",
+					})
+				}
+				if medical.MinUnit == item.MaxUnit {
+					total = item.Count - cancel_number
+					warehouseInfo := models.XtDrugWarehouseInfo{
+						StockMinNumber: total,
+					}
+
+					errs = service.UpdateDrugWarehouseInfoOne(&warehouseInfo, item.BatchNumberId)
+					if errs != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+						return
+					}
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "1",
+					})
+				}
+				if errs != nil {
+					utils.ErrorLog(errs.Error())
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+					return
+				}
+
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "1",
+				})
+			}
+		}
+	}
+	if len(drugFlow) > 0 {
+		parseDateErr := service.CreateDrugFlow(drugFlow)
+		fmt.Println(parseDateErr)
 	}
 
 	if len(upDateCancelStockInfos) > 0 {
+		var total int64
 		for _, item := range upDateCancelStockInfos {
 			errs = service.UpDateDrugCancelStockInfo(item)
+			//查询该批次最后一条退库记录
+			info, _ := service.GetLastCancelStockInfo(id)
+			//查询该药品的信息
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+
+			if item.MaxUnit == medical.MaxUnit {
+				item.Count = item.Count * medical.MinNumber
+				//更新库存
+				total = item.Count - info.Count
+				fmt.Println("total232323232323232232323", total)
+				service.UpdatedDrugInfo(item.BatchNumberId, total)
+				break
+			}
+
+			if item.MaxUnit == medical.MinUnit {
+				item.Count = item.Count
+				total = item.Count - info.Count
+				service.UpdatedDrugInfoOne(item.BatchNumberId, total)
+				break
+			}
 		}
 	}
 
@@ -2109,7 +2687,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "编辑成功",
+		"msg": "1",
 	})
 
 }

controllers/gobal_config_api_controller.go

@@ -2010,16 +2010,18 @@ func (c *GobalConfigApiController) GetDrugCountList() {
 	outCountList, _ := service.GetOutDrugCountList(startTime, endTime, orgId)
 	auCountList, err := service.GetAutoDrugCountList(startTime, endTime, orgId)
 	info, _ := service.GetDrugWarehouOrderInfo(startTime, endTime, orgId)
+	cancelCountList, _ := service.GetCancelDrugCountList(startTime, endTime, orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"countList":    list,
-		"outCountList": outCountList,
-		"auCountList":  auCountList,
-		"minCount":     countList,
-		"info":         info,
+		"countList":       list,
+		"outCountList":    outCountList,
+		"auCountList":     auCountList,
+		"minCount":        countList,
+		"info":            info,
+		"cancelCountList": cancelCountList,
 	})
 }
 
@@ -2053,14 +2055,17 @@ func (c *GobalConfigApiController) GetAutoDrugDetail() {
 	list, err, total := service.FindDrugStockUserDetailByIdThree(id, record_time, orgId)
 	//获取手动出库
 	outList, err := service.FindeDrugWarehouserInfo(warehouse_out_id, id, orgId)
+
+	batchNumber, err := service.GetDrugFlowBatch(warehouse_out_id, id, orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"list":    list,
-		"total":   total,
-		"outList": outList,
+		"list":        list,
+		"total":       total,
+		"outList":     outList,
+		"batchNumber": batchNumber,
 	})
 }
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3332,7 +3332,16 @@ func (c *DialysisAPIController) CreateConsumables() {
 		//查询是否有库存
 		for _, item := range dialysisBefor {
 			warehouse, err := service.FindFirstWarehousingInfoByStock(item.GoodId, item.GoodTypeId)
-			fmt.Println("库存数量00000000000000000000", warehouse.StockCount)
+			fmt.Println("库存数量00000000000000000000", warehouse.StockCount, err)
+			if err == gorm.ErrRecordNotFound {
+				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"message":            "1",
+					"good_name":          goodObj.GoodName,
+					"specification_name": goodObj.SpecificationName,
+				})
+				return
+			}
 			if err != nil {
 				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 				c.ServeSuccessJSON(map[string]interface{}{
@@ -3344,7 +3353,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 			}
 		}
 
-		fmt.Println("dialysisBefor9999999999999999999", dialysisBefor)
+		fmt.Println("dialysisBefor9999999999999999999", dialysisBefor, active)
+
 		//新增
 		if active == 1 && len(goods) > 0 {
 			for _, item := range dialysisBefor {
@@ -3367,7 +3377,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 			}
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "保存成功",
+					"msg":     "保存成功",
+					"message": "2",
 				})
 				return
 
@@ -3801,7 +3812,20 @@ func (c *DialysisAPIController) EditConsumables() {
 
 						//查询该批次剩余库存
 						lastInfo, _ := service.GetLastStockOut(goodInfo.WarehouseInfotId)
+						if lastInfo.StockCount == 0 {
+							//查询该耗材的总库存
+							wareinfo, _ := service.GetStockGoodCount(item.GoodId)
+							if wareinfo.StockCount == 0 {
+								goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+								c.ServeSuccessJSON(map[string]interface{}{
+									"message":            "1",
+									"good_name":          goodObj.GoodName,
+									"specification_name": goodObj.SpecificationName,
+								})
+								return
+							}
 
+						}
 						//比较剩余库存 和 当前相差的数量,库存剩余量大于则正常出库
 						fmt.Println("剩余库存", lastInfo.StockCount)
 						fmt.Println("差", last_total)
@@ -4500,6 +4524,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 	// 先根据相关信息查询当天该耗材的出库信息
 	warehouseOutInfos, err := service.FindStockOutInfoByStockTwo(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time, good_yc.PatientId)
 	fmt.Println("errr232323232323232323232323232", err)
+
 	if err != nil {
 		return err
 	}
@@ -4532,7 +4557,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 	warehouseOutInfo.Manufacturer = stockInInfo.Manufacturer
 	warehouseOutInfo.ExpiryDate = stockInInfo.ExpiryDate
 	warehouseOutInfo.ProductDate = stockInInfo.ProductDate
-	warehouseOutInfo.Number = stockInInfo.Number
+	warehouseOutInfo.Number = warehouseOutInfos.Number
 	warehouseOutInfo.LicenseNumber = stockInInfo.LicenseNumber
 	warehouseOutInfo.WarehouseInfotId = stockInInfo.ID
 	//查找当天是否存在出库记录
@@ -4546,7 +4571,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
 			GoodId:                  good_yc.GoodId,
-			Number:                  stockInInfo.Number,
+			Number:                  warehouseOutInfos.Number,
 			ProductDate:             stockInInfo.ProductDate,
 			ExpireDate:              stockInInfo.ExpiryDate,
 			Count:                   count,
@@ -4564,6 +4589,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 			WarehousingDetailId:     0,
 			IsSys:                   1,
 			UpdateCreator:           creater,
+			PatientId:               patient_id,
 		}
 		//创建流水表
 		err := service.CreateStockFlowOne(stockFlow)
@@ -4578,7 +4604,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
 			GoodId:                  good_yc.GoodId,
-			Number:                  stockInInfo.Number,
+			Number:                  warehouseOutInfos.Number,
 			ProductDate:             stockInInfo.ProductDate,
 			ExpireDate:              stockInInfo.ExpiryDate,
 			Count:                   count,
@@ -4596,6 +4622,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 			WarehousingDetailId:     0,
 			IsSys:                   1,
 			UpdateCreator:           creater,
+			PatientId:               patient_id,
 		}
 		//创建流水表
 		service.CreateStockFlowOne(stockFlow)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -608,7 +608,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.Org.Id)
-
+		fmt.Println("2323232323232323232开关", drugStockConfig.IsOpen)
 		if drugStockConfig.IsOpen == 1 {
 			if groupno > 0 {
 				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
@@ -620,21 +620,42 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				if isHasWay {
+					var total int64
+					var prescribing_number_total int64
 					for _, item := range advices {
 						if item.Way == 1 {
 							//查询该药品是否有库存
 							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
-							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-							if list.Count == 0 {
+							fmt.Println("list23232323232232323232323232", list)
+							//查询改药品信息
+							medical, _ := service.GetBaseDrugMedical(item.DrugId)
+							//判断单位是否相等
+							if medical.MaxUnit == item.PrescribingNumberUnit {
+								prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+								//转化为最小单位
+								total = list.Count * medical.MinNumber
+								prescribing_number_total = count * medical.MinNumber
+							}
+							if medical.MinUnit == item.PrescribingNumberUnit {
+								prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+								total = list.Count*medical.MinNumber + list.StockMinNumber
+								prescribing_number_total = count
+							}
+
+							fmt.Println("数量一", prescribing_number_total)
+							fmt.Println("数量二", total)
+
+							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "1",
+									"msg":    "3",
 									"advice": advice,
 									"ids":    ids,
 								})
 								return
 							}
-							if count > list.Count {
+							if prescribing_number_total > total {
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "2",
 									"advice": advice,
@@ -642,11 +663,21 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								})
 								return
 							}
-							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+							if prescribing_number_total <= total {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
+
 						}
 					}
 				}
 			} else {
+
 				advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 				isHasWay := false //用来判断是否包含来自药品库的医嘱
 
@@ -655,25 +686,45 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						isHasWay = true
 					}
 				}
+				fmt.Println("hh2h32323232323232323", isHasWay)
 				if isHasWay {
+					var total int64
+					var prescribing_number_total int64
 					for _, item := range advices {
+						fmt.Println("hhh23h2h3h232323", item.Way)
 						if item.Way == 1 {
 							//查询该药品是否有库存
 							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
-							//获取该药品的信息
-							//medical, _ := service.GetBaseDrugMedical(item.DrugId)
-							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
-							if list.Count == 0 {
+							//查询改药品信息
+							medical, _ := service.GetBaseDrugMedical(item.DrugId)
+							//判断单位是否相等
+							if medical.MaxUnit == item.PrescribingNumberUnit {
+								prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+								//转化为最小单位
+								total = list.Count * medical.MinNumber
+								prescribing_number_total = count * medical.MinNumber
+							}
+							if medical.MinUnit == item.PrescribingNumberUnit {
+								prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+								total = list.Count*medical.MinNumber + list.StockMinNumber
+								prescribing_number_total = count
+							}
+
+							fmt.Println("数量一", prescribing_number_total)
+							fmt.Println("数量二", total)
+
+							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "1",
+									"msg":    "3",
 									"advice": advice,
 									"ids":    ids,
 								})
 								return
 							}
-							if count > list.Count {
+							if prescribing_number_total > total {
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "2",
 									"advice": advice,
@@ -681,7 +732,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								})
 								return
 							}
-							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+							if prescribing_number_total <= total {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
 						}
 					}
 				}
@@ -784,7 +843,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"msg":    "ok",
+			"msg":    "1",
 			"advice": advice,
 			"ids":    ids,
 		})
@@ -832,18 +891,59 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			if drugStockConfig.IsOpen == 1 {
 				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
 				//查询该药品是否有库存
+				//  list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
+				//  prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+				//  count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				//  if list.Count == 0 {
+				//    c.ServeSuccessJSON(map[string]interface{}{
+				//      "msg":    "1",
+				//      "advice": advice,
+				//      "ids":    ids,
+				//    })
+				//    return
+				//  }
+				//  if count > list.Count {
+				//    c.ServeSuccessJSON(map[string]interface{}{
+				//      "msg":    "2",
+				//      "advice": advice,
+				//      "ids":    ids,
+				//    })
+				//    return
+				//}
+				var total int64
+				var prescribing_number_total int64
+				//查询该药品是否有库存
 				list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
-				prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-				if list.Count == 0 {
+
+				//查询改药品信息
+				medical, _ := service.GetBaseDrugMedical(advice.DrugId)
+				//判断单位是否相等
+				if medical.MaxUnit == advice.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					//转化为最小单位
+					total = list.Count * medical.MinNumber
+					prescribing_number_total = count * medical.MinNumber
+				}
+				if medical.MinUnit == advice.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					total = list.Count*medical.MinNumber + list.StockMinNumber
+					prescribing_number_total = count
+				}
+
+				fmt.Println("数量一", prescribing_number_total)
+				fmt.Println("数量二", total)
+
+				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "1",
+						"msg":    "3",
 						"advice": advice,
 						"ids":    ids,
 					})
 					return
 				}
-				if count > list.Count {
+				if prescribing_number_total > total {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":    "2",
 						"advice": advice,
@@ -851,8 +951,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					})
 					return
 				}
-
-				service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+				if prescribing_number_total <= total {
+					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+						"ids":    ids,
+					})
+					return
+				}
 			}
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "ok",
@@ -1069,6 +1176,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			"advice": advice,
 		})
 	} else if origin == 2 {
+		fmt.Println("金鳌地方 大房贷首付地方阿凡达阿方")
 		adminInfo := c.GetMobileAdminUserInfo()
 		advice_id, _ := c.GetInt64("advice_id")
 		advices, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)

controllers/patient_api_controller.go

@@ -714,7 +714,14 @@ func (c *PatientApiController) EditLapseto() {
 	//		return
 	//	}
 	//}
+
 	err = service.EditPatientLapseto(&patient, &lapseto)
+
+	if lapseto.LapsetoType == 3 {
+		service.UpdateScheduleByDeathTime(id, lapsetoTimeUnix.Unix())
+		service.UpdateScheduleItemByPatientId(id)
+	}
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeEditLapsetoFail)
 		return
@@ -1652,33 +1659,80 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		fmt.Println("999999992322322323232", drugStockConfig.IsOpen)
 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.CurrentOrgId)
-
+		fmt.Println("drugStockConfig2323232332232332", drugStockConfig.IsOpen)
 		if drugStockConfig.IsOpen == 1 {
-
+			var total int64
+			var prescribing_number_total int64
 			advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
 				fmt.Println("imte00000000000000", item.PrescribingNumber)
-
 				//查询该药品是否有库存
 				list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
-				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-				if list.Count == 0 {
+				fmt.Println("list23232323232232323232323232", list)
+				//查询改药品信息
+				medical, _ := service.GetBaseDrugMedical(item.DrugId)
+				//判断单位是否相等
+				if medical.MaxUnit == item.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					//转化为最小单位
+					total = list.Count * medical.MinNumber
+					prescribing_number_total = count * medical.MinNumber
+				}
+				if medical.MinUnit == item.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					total = list.Count*medical.MinNumber + list.StockMinNumber
+					prescribing_number_total = count
+				}
+
+				fmt.Println("数量一", prescribing_number_total)
+				fmt.Println("数量二", total)
+
+				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "1",
+						"msg":    "3",
 						"advice": advice,
 					})
 					return
 				}
-				if count > list.Count {
+				if prescribing_number_total > total {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":    "2",
 						"advice": advice,
 					})
 					return
 				}
-				//调用药品出库接口
-				service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+				if prescribing_number_total <= total {
+					service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+					break
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+					})
+					return
+				}
+
+				////查询该药品是否有库存
+				//list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
+				//prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				//count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				//if list.Count == 0 {
+				//	c.ServeSuccessJSON(map[string]interface{}{
+				//		"msg":    "1",
+				//		"advice": advice,
+				//	})
+				//	return
+				//}
+				//if count > list.Count {
+				//	c.ServeSuccessJSON(map[string]interface{}{
+				//		"msg":    "2",
+				//		"advice": advice,
+				//	})
+				//	return
+				//}
+				////调用药品出库接口
+				//service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 
 			}
 		}
@@ -1728,7 +1782,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		}
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"msg":    "ok",
+			"msg":    "1",
 			"advice": advice,
 		})
 		return
@@ -1811,29 +1865,83 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			//查询已经执行的医嘱
 			advices, _ := service.GetHisExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
+				var total int64
+				var prescribing_number_total int64
 				//查询该药品是否有库存
-				list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
-				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-				if list.Count == 0 {
+				list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
+
+				//查询改药品信息
+				medical, _ := service.GetBaseDrugMedical(advice.DrugId)
+				//判断单位是否相等
+				if medical.MaxUnit == advice.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					//转化为最小单位
+					total = list.Count * medical.MinNumber
+					prescribing_number_total = count * medical.MinNumber
+				}
+				fmt.Println("单位1", medical.MinUnit)
+				fmt.Println("d单位23", advice.PrescribingNumberUnit)
+				fmt.Println("hhhhhhh", list.Count)
+				if medical.MinUnit == advice.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					total = list.Count*medical.MinNumber + list.StockMinNumber
+					fmt.Println("23232322323322323233223", total)
+					prescribing_number_total = count
+					fmt.Println("7777777777777777", prescribing_number_total)
+				}
+
+				fmt.Println("数量一", prescribing_number_total)
+				fmt.Println("数量二", total)
+
+				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "1",
+						"msg":    "3",
 						"advice": advice,
 					})
 					return
 				}
-				if count > list.Count {
+				if prescribing_number_total > total {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":    "2",
 						"advice": advice,
 					})
 					return
 				}
-				service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+				if prescribing_number_total <= total {
+					service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+					break
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+					})
+					return
+				}
 			}
+			//	//查询该药品是否有库存
+			//	list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
+			//	prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+			//	if list.Count == 0 {
+			//		c.ServeSuccessJSON(map[string]interface{}{
+			//			"msg":    "1",
+			//			"advice": advice,
+			//		})
+			//		return
+			//	}
+			//	if count > list.Count {
+			//		c.ServeSuccessJSON(map[string]interface{}{
+			//			"msg":    "2",
+			//			"advice": advice,
+			//		})
+			//		return
+			//	}
+			//	service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+			//}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"msg":    "ok",
+			"msg":    "1",
 			"advice": advice,
 		})
 		return

controllers/print_data_api_controller.go

@@ -16,6 +16,7 @@ func PrintDataAPIControllerRegistRouters() {
 	beego.Router("/api/print/stock", &PrintDataAPIController{}, "get:StockRecordPrintData")
 	beego.Router("/api/print/course", &PrintDataAPIController{}, "get:CourseRecordPrintData")
 	beego.Router("/api/print/getlastafterweight", &PrintDataAPIController{}, "get:GetLastAfterWeight")
+	beego.Router("/api/stock/getgooddetailprintlist", &PrintDataAPIController{}, "get:GetGoodDetailPrintList")
 }
 
 type PrintDataAPIController struct {
@@ -159,3 +160,48 @@ func (this *PrintDataAPIController) GetLastAfterWeight() {
 		"weight": weight,
 	})
 }
+
+func (this *PrintDataAPIController) GetGoodDetailPrintList() {
+
+	types, _ := this.GetInt("type", 0)
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	adminUserInfo := this.GetAdminUserInfo()
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+
+	//入库详情
+	if types == 1 {
+		list, err := service.GetWarehouseInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+	}
+
+}

controllers/schedule_api_controller.go

@@ -2087,7 +2087,7 @@ func (this *ScheduleApiController) GetCopyPatientSchedules() {
 			item.ScheduleDate = copy_startime + 432000
 		}
 		//礼拜天
-		if item.ScheduleWeek == 0 {
+		if item.ScheduleWeek == 7 {
 			item.ScheduleDate = copy_endtime
 		}
 		schedule := models.XtSchedule{

controllers/stock_in_api_controller.go

@@ -1539,6 +1539,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 			//1.查询该耗材该批次的最后一次出库记录
 			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId, adminUserInfo.CurrentOrgId)
+			fmt.Println("lastGood", lastGood.Count)
+			fmt.Println("item2323232", item.Count)
 
 			// 退库的库存和该耗材该批次最后一次出库数量进行比较
 			//如果退库数量大于 最后一次批次的数量(要么要进行出库)
@@ -1622,7 +1624,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 								return
 							}
 							c.ServeSuccessJSON(map[string]interface{}{
-								"msg": "编辑成功",
+								"msg": "1",
 							})
 						} else if errcode == nil {
 							service.UpDateWarehouseOutInfo(item)
@@ -1695,7 +1697,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							return
 						}
 						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "编辑成功",
+							"msg": "1",
 						})
 					} else if errcode == nil {
 						service.UpDateWarehouseOutInfo(item)
@@ -1713,6 +1715,14 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 			if item.Count == lastGood.Count {
 				errs = service.UpDateWarehouseOutInfo(item)
+				if errs != nil {
+					utils.ErrorLog(errs.Error())
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+					return
+				}
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "1",
+				})
 			}
 
 		}
@@ -1773,7 +1783,7 @@ func (c *StockManagerApiController) CreateCancelStock() {
 	}
 
 	var cancelStockInfos []*models.CancelStockInfo
-
+	var stockFLow []*models.VmStockFlow
 	if dataBody["cancelStock"] != nil && reflect.TypeOf(dataBody["cancelStock"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["cancelStock"].([]interface{})
 		if len(thisStockIn) > 0 {
@@ -1812,11 +1822,8 @@ func (c *StockManagerApiController) CreateCancelStock() {
 
 				dealer, _ := items["dealer"].(string)
 
-				//productDate, _ := items["product_date"].(string)
-				//product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
-				//
-				//expiryDate, _ := items["expiry_date"].(string)
-				//expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
+
 				var expiryDates int64
 				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
 					expiryDates = 0
@@ -1869,24 +1876,56 @@ func (c *StockManagerApiController) CreateCancelStock() {
 					RegisterAccount: register_account,
 					Remark:          remark,
 					Price:           price,
+					WarehouseInfoId: warehouse_info_id,
 				}
 				cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
+				flow := &models.VmStockFlow{
+					WarehousingId:           0,
+					GoodId:                  good_id,
+					Number:                  number,
+					LicenseNumber:           "",
+					Count:                   count,
+					UserOrgId:               adminUserInfo.CurrentOrgId,
+					PatientId:               0,
+					SystemTime:              time.Now().Unix(),
+					ConsumableType:          4,
+					IsSys:                   0,
+					WarehousingOrder:        "",
+					WarehouseOutId:          0,
+					WarehouseOutOrderNumber: "",
+					IsEdit:                  0,
+					CancelStockId:           cancelStock.ID,
+					CancelOrderNumber:       cancelStock.OrderNumber,
+					Manufacturer:            0,
+					Dealer:                  0,
+					Creator:                 adminUserInfo.AdminUser.Id,
+					UpdateCreator:           0,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Mtime:                   0,
+					Price:                   price,
+					WarehousingDetailId:     0,
+					WarehouseOutDetailId:    0,
+					CancelOutDetailId:       0,
+					ProductDate:             productDates,
+					ExpireDate:              expiryDates,
+				}
+				stockFLow = append(stockFLow, flow)
 			}
 		}
 	}
-	errs := service.CreateCancelStockInfo(cancelStockInfos)
 
 	for _, item := range cancelStockInfos {
 
-		//查找该耗材是否有出库记录
-		_, errcode := service.GetWarehoureOutOrderInfo(item.GoodId, item.OrgId)
-		if errcode == gorm.ErrRecordNotFound {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "1",
-			})
-			return
-		}
+		////查找该耗材是否有出库记录
+		//_, errcode := service.GetWarehoureOutOrderInfo(item.GoodId, item.OrgId)
+		//if errcode == gorm.ErrRecordNotFound {
+		//	c.ServeSuccessJSON(map[string]interface{}{
+		//		"msg": "1",
+		//	})
+		//	return
+		//}
 
 		//统计该耗材的出库数量
 		info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId)
@@ -1896,27 +1935,45 @@ func (c *StockManagerApiController) CreateCancelStock() {
 			})
 			return
 		}
-	}
 
-	// 改变入库单的值
-	for _, item := range cancelStockInfos {
+		//查询该批次入库的值
+		infolist, _ := service.GetWarehouseInfoById(item.WarehouseInfoId)
 
-		//查询该耗材的入库记录
-		list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
-		//调用退库的方法
-		parseDateErr := service.UpdateCancelOut(list, item.Count)
-		fmt.Println("999999999999", parseDateErr)
-	}
+		if item.Count > infolist.WarehousingCount {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "4",
+			})
+			return
+		}
 
-	if errs != nil {
-		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
-		return
+		if item.Count <= infolist.WarehousingCount {
+
+			errs := service.CreateCancelStockInfo(cancelStockInfos)
+			if len(stockFLow) > 0 {
+				service.CreateStockFlow(stockFLow)
+			}
+			if errs != nil {
+				utils.ErrorLog(errs.Error())
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+				return
+			}
+
+			//更改入库数量
+			errs = service.UpdateWareInfoById(item.WarehouseInfoId, item.Count)
+
+			//查询该耗材的入库记录
+			//list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
+			////调用退库的方法
+			//parseDateErr := service.UpdateCancelOut(list, item.Count)
+			//fmt.Println("999999999999", parseDateErr)
+			break
+		}
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "3",
 	})
+	return
 
 }
 func (c *StockManagerApiController) GetCancelStockInfoList() {
@@ -2052,7 +2109,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 	var cancelStockInfos []*models.CancelStockInfo
 	var upDateCancelStockInfos []*models.CancelStockInfo
-
+	var stockFlow []*models.VmStockFlow
 	if dataBody["cancelStock"] != nil && reflect.TypeOf(dataBody["cancelStock"]).String() == "[]interface {}" {
 		thisCancelStock, _ := dataBody["cancelStock"].([]interface{})
 		if len(thisCancelStock) > 0 {
@@ -2156,6 +2213,40 @@ func (c *StockManagerApiController) EditCancelStock() {
 					}
 					cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
+					flow := &models.VmStockFlow{
+						WarehousingId:           0,
+						GoodId:                  good_id,
+						Number:                  number,
+						LicenseNumber:           "",
+						Count:                   count,
+						UserOrgId:               adminUserInfo.CurrentOrgId,
+						PatientId:               0,
+						SystemTime:              time.Now().Unix(),
+						ConsumableType:          4,
+						IsSys:                   0,
+						WarehousingOrder:        "",
+						WarehouseOutId:          0,
+						WarehouseOutOrderNumber: "",
+						IsEdit:                  2,
+						CancelStockId:           cancelStock.ID,
+						CancelOrderNumber:       cancelStock.OrderNumber,
+						Manufacturer:            0,
+						Dealer:                  0,
+						Creator:                 adminUserInfo.AdminUser.Id,
+						UpdateCreator:           0,
+						Status:                  1,
+						Ctime:                   time.Now().Unix(),
+						Mtime:                   0,
+						Price:                   price,
+						WarehousingDetailId:     0,
+						WarehouseOutDetailId:    0,
+						CancelOutDetailId:       0,
+						ProductDate:             productDates,
+						ExpireDate:              expiryDates,
+					}
+
+					stockFlow = append(stockFlow, flow)
+
 				} else {
 					cancelStockInfo := &models.CancelStockInfo{
 						ID:              id,
@@ -2178,50 +2269,141 @@ func (c *StockManagerApiController) EditCancelStock() {
 						Price:           price,
 					}
 					upDateCancelStockInfos = append(upDateCancelStockInfos, cancelStockInfo)
+
+					flow := &models.VmStockFlow{
+						WarehousingId:           0,
+						GoodId:                  good_id,
+						Number:                  number,
+						LicenseNumber:           "",
+						Count:                   count,
+						UserOrgId:               adminUserInfo.CurrentOrgId,
+						PatientId:               0,
+						SystemTime:              time.Now().Unix(),
+						ConsumableType:          4,
+						IsSys:                   0,
+						WarehousingOrder:        "",
+						WarehouseOutId:          0,
+						WarehouseOutOrderNumber: "",
+						IsEdit:                  2,
+						CancelStockId:           cancelStock.ID,
+						CancelOrderNumber:       cancelStock.OrderNumber,
+						Manufacturer:            0,
+						Dealer:                  0,
+						Creator:                 adminUserInfo.AdminUser.Id,
+						UpdateCreator:           0,
+						Status:                  1,
+						Ctime:                   time.Now().Unix(),
+						Mtime:                   0,
+						Price:                   price,
+						WarehousingDetailId:     0,
+						WarehouseOutDetailId:    0,
+						CancelOutDetailId:       0,
+						ProductDate:             productDates,
+						ExpireDate:              expiryDates,
+					}
+
+					stockFlow = append(stockFlow, flow)
 				}
 			}
 		}
 	}
 	var errs error
+	fmt.Println("出库22322333223", cancelStockInfos)
+	fmt.Println("更新23232323232323233", upDateCancelStockInfos)
 	if len(cancelStockInfos) > 0 {
-		errs = service.CreateCancelStockInfo(cancelStockInfos)
-		// 改变入库单的值
+
 		for _, item := range cancelStockInfos {
-			//查询该耗材的入库记录
-			list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
-			//调用退库的方法
-			parseDateErr := service.UpdateCancelOut(list, item.Count)
-			if parseDateErr != nil {
-				utils.ErrorLog(errs.Error())
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+			//统计该耗材的出库数量
+			info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId)
+			if item.Count > info.Count {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "2",
+				})
 				return
 			}
+			//查询该批次入库的值
+			infolist, _ := service.GetWarehouseInfoById(item.WarehouseInfoId)
+
+			if item.Count > infolist.WarehousingCount {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "4",
+				})
+				return
+			}
+
+			if item.Count <= infolist.WarehousingCount {
+
+				errs := service.CreateCancelStockInfo(cancelStockInfos)
+				if len(stockFlow) > 0 {
+					service.CreateStockFlow(stockFlow)
+				}
+				if errs != nil {
+					utils.ErrorLog(errs.Error())
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+					return
+				}
+
+				//更改入库数量
+				errs = service.UpdateWareInfoById(item.WarehouseInfoId, item.Count)
+
+				break
+			}
 
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "编辑成功",
-			})
 		}
 	}
 
 	if len(upDateCancelStockInfos) > 0 {
 		for _, item := range upDateCancelStockInfos {
 
-			errs = service.UpDateCancelStockInfo(item)
-			list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
-			//调用退库的方法
-			parseDateErr := service.UpdateCancelOut(list, item.Count)
-			fmt.Println("999999999999", parseDateErr)
-
-			if parseDateErr != nil {
-				utils.ErrorLog(errs.Error())
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-				return
+			//获取该批次最后一套出库记录
+			info, _ := service.GetLastCancelInfo(item.WarehouseInfoId, item.GoodId)
+			fmt.Println("info232332322332233223", info.Count, item.Count)
+			//比较出库数量和最后一次出库数据大小
+			//退库(加)
+			if item.Count < info.Count {
+				var total = info.Count - item.Count
+				errs = service.UpDateCancelStockInfo(item)
+
+				service.CreateStockFlow(stockFlow)
+				parseDateErr := service.UpdateWareInfoById(item.WarehouseInfoId, total)
+				if parseDateErr != nil {
+					utils.ErrorLog(errs.Error())
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+					break
+				}
 			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "编辑成功",
-			})
+			//(减)
+			if item.Count > info.Count {
+				errs = service.UpDateCancelStockInfo(item)
+				service.CreateStockFlow(stockFlow)
+				//查询该批次入库的值
+				infolist, _ := service.GetWarehouseInfoById(item.WarehouseInfoId)
+				if item.Count > infolist.WarehousingCount {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "4",
+					})
+					return
+				}
+				if item.Count <= infolist.WarehousingCount {
+					var total_count = info.Count - item.Count
+					parseDateErr := service.UpdateWareInfoById(item.WarehouseInfoId, total_count)
+					if parseDateErr != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+						return
+					}
+				}
+			}
+		}
+		if errs != nil {
+			utils.ErrorLog(errs.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+			return
 		}
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "3",
+		})
 	}
 
 	if errs != nil {
@@ -2231,7 +2413,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "编辑成功",
+		"msg": "3",
 	})
 
 }
@@ -4254,13 +4436,17 @@ func (this *StockManagerApiController) GetOrderDetailById() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	//自动出库
 	userDetails, err, total := service.FindUserDetailByIdOne(good_id, record_time, orgId)
+
 	//手动出库
 	info, _ := service.GetWarehouseOutInfoById(id, good_id)
+
+	stockFlowList, err := service.GetStockFlowBatchNumber(id, good_id)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":  userDetails,
-			"total": total,
-			"info":  info,
+			"list":          userDetails,
+			"total":         total,
+			"info":          info,
+			"stockFlowList": stockFlowList,
 		})
 	} else {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

models/drug_stock.go

@@ -238,6 +238,7 @@ type DrugCancelStockInfo struct {
 	BatchNumber      string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	MaxUnit          string      `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	BaseDrugLib      BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	BatchNumberId    int64       `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
 }
 
 func (DrugCancelStockInfo) TableName() string {
@@ -274,8 +275,12 @@ type VmDrugAutomaticReduceDetail struct {
 }
 
 type VmDrugWarehouseInfo struct {
-	DrugId int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Count  int64 `gorm:"column:count" json:"count" form:"count"`
+	DrugId         int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count          int64  `gorm:"column:count" json:"count" form:"count"`
+	MaxUnit        string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit        string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMinNumber int64  `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	StockMaxNumber int64  `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
 }
 
 type StDrugWarehouseOutInfo struct {
@@ -336,7 +341,7 @@ type DrugFlow struct {
 	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
 	IsEdit                  int64   `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
 	CancelStockId           int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	CancelOrderNumber       int64   `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	CancelOrderNumber       string  `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
 	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	Creator                 int64   `gorm:"column:creator" json:"creator" form:"creator"`

models/good_models.go

@@ -107,24 +107,27 @@ func (GoodsTypeOne) TableName() string {
 }
 
 type XtCancelStockInfo struct {
-	ID            int64       `gorm:"column:id" json:"id"`
-	GoodId        int64       `gorm:"column:good_id" json:"good_id"`
-	CancelStockId int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
-	GoodTypeId    int64       `gorm:"column:good_type_id" json:"good_type_id"`
-	Count         int64       `gorm:"column:count" json:"count"`
-	Price         float64     `gorm:"column:price" json:"price"`
-	Total         float64     `gorm:"column:total" json:"total"`
-	ProductDate   int64       `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate    int64       `gorm:"column:expiry_date" json:"expiry_date"`
-	Ctime         int64       `gorm:"column:ctime" json:"ctime"`
-	Mtime         int64       `gorm:"column:mtime" json:"mtime"`
-	Status        int64       `gorm:"column:status" json:"status"`
-	OrgId         int64       `gorm:"column:org_id" json:"org_id"`
-	OrderNumber   string      `gorm:"column:order_number" json:"order_number"`
-	Type          int64       `gorm:"column:type" json:"type"`
-	CancelStock   CancelStock `ForeignKey:CancelStockId json:"CancelStock"`
-	Dealer        int64       `gorm:"column:dealer" json:"dealer"`
-	Manufacturer  int64       `gorm:"column:manufacturer" json:"manufacturer"`
+	ID              int64    `gorm:"column:id" json:"id"`
+	GoodId          int64    `gorm:"column:good_id" json:"good_id"`
+	CancelStockId   int64    `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
+	GoodTypeId      int64    `gorm:"column:good_type_id" json:"good_type_id"`
+	Count           int64    `gorm:"column:count" json:"count"`
+	Price           float64  `gorm:"column:price" json:"price"`
+	Total           float64  `gorm:"column:total" json:"total"`
+	ProductDate     int64    `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate      int64    `gorm:"column:expiry_date" json:"expiry_date"`
+	Ctime           int64    `gorm:"column:ctime" json:"ctime"`
+	Mtime           int64    `gorm:"column:mtime" json:"mtime"`
+	Status          int64    `gorm:"column:status" json:"status"`
+	OrgId           int64    `gorm:"column:org_id" json:"org_id"`
+	OrderNumber     string   `gorm:"column:order_number" json:"order_number"`
+	Type            int64    `gorm:"column:type" json:"type"`
+	Dealer          string   `gorm:"column:dealer" json:"dealer"`
+	Manufacturer    string   `gorm:"column:manufacturer" json:"manufacturer"`
+	GoodInfo        GoodInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"GoodInfo"`
+	Number          string   `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount string   `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark          string   `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
 func (XtCancelStockInfo) TableName() string {

models/self_drug_models.go

@@ -67,6 +67,7 @@ type XtBaseDrug struct {
 	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
 	PrescribingNumberUnit  string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	MinNumber              int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
 }
 
 func (XtBaseDrug) TableName() string {
@@ -344,6 +345,10 @@ type XtDrugWarehouseOutInfo struct {
 	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
 	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	CountUnit               string  `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 }
 
 func (XtDrugWarehouseOutInfo) TableName() string {
@@ -394,6 +399,7 @@ type XtDrugWarehouseInfo struct {
 	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number"`
 	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number"`
 	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 }
 
 func (XtDrugWarehouseInfo) TableName() string {
@@ -474,8 +480,8 @@ type BloodDrugCancelStockInfo struct {
 	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
 	Type             int64   `gorm:"column:type" json:"type" form:"type"`
-	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer           string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
 	Number           string  `gorm:"column:number" json:"number" form:"number"`
@@ -484,6 +490,10 @@ type BloodDrugCancelStockInfo struct {
 	DrugSpec         string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
 	Creater          int64   `gorm:"column:creater" json:"creater" form:"creater"`
 	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MaxUnit          string  `json:"max_unit"`
+	MinNumber        int64   `json:"min_number"`
+	Dose             float64 `json:"dose"`
+	DoseUnit         string  `json:"dose_unit"`
 }
 
 type BloodDrugSalesReturnInfo struct {

models/stock_models.go

@@ -282,20 +282,20 @@ type VmCancelStockInfo struct {
 }
 
 type CancelStock struct {
-	ID              int64  `gorm:"column:id" json:"id"`
-	OrderNumber     string `gorm:"column:order_number" json:"order_number"`
-	OperaTime       int64  `gorm:"column:opera_time" json:"opera_time"`
-	Total           int64  `gorm:"column:total" json:"total"`
-	Creater         int64  `gorm:"column:creater" json:"creater"`
-	Ctime           int64  `gorm:"column:ctime" json:"ctime"`
-	Mtime           int64  `gorm:"column:mtime" json:"mtime"`
-	Status          int64  `gorm:"column:status" json:"status"`
-	OrgId           int64  `gorm:"column:org_id" json:"org_id"`
-	ReturnTime      int64  `gorm:"column:return_time" json:"return_time"`
-	Dealer          int64  `gorm:"column:dealer" json:"dealer"`
-	Manufacturer    int64  `gorm:"column:manufacturer" json:"manufacturer"`
-	Type            int64  `gorm:"column:type" json:"type"`
-	CancelStockInfo []*XtCancelStockInfo
+	ID                int64                `gorm:"column:id" json:"id"`
+	OrderNumber       string               `gorm:"column:order_number" json:"order_number"`
+	OperaTime         int64                `gorm:"column:opera_time" json:"opera_time"`
+	Total             int64                `gorm:"column:total" json:"total"`
+	Creater           int64                `gorm:"column:creater" json:"creater"`
+	Ctime             int64                `gorm:"column:ctime" json:"ctime"`
+	Mtime             int64                `gorm:"column:mtime" json:"mtime"`
+	Status            int64                `gorm:"column:status" json:"status"`
+	OrgId             int64                `gorm:"column:org_id" json:"org_id"`
+	ReturnTime        int64                `gorm:"column:return_time" json:"return_time"`
+	Dealer            int64                `gorm:"column:dealer" json:"dealer"`
+	Manufacturer      int64                `gorm:"column:manufacturer" json:"manufacturer"`
+	Type              int64                `gorm:"column:type" json:"type"`
+	XtCancelStockInfo []*XtCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"XtCancelStockInfo"`
 }
 
 func (CancelStock) TableName() string {
@@ -506,7 +506,7 @@ type VmStockFlow struct {
 	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
 	IsEdit                  int64   `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
 	CancelStockId           int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	CancelOrderNumber       int64   `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	CancelOrderNumber       string  `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
 	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	Creator                 int64   `gorm:"column:creator" json:"creator" form:"creator"`
@@ -548,6 +548,7 @@ type CancelStockInfo struct {
 	Number          string      `gorm:"column:number" json:"number" form:"number"`
 	RegisterAccount string      `gorm:"column:register_account" json:"register_account" form:"register_account"`
 	Remark          string      `gorm:"column:remark" json:"remark" form:"remark"`
+	WarehouseInfoId int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
 	GoodInfo        GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
 }
 

service/gobal_config_service.go

@@ -364,9 +364,9 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	} else {
-		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	}
 
 	return cancel, total, err
@@ -664,6 +664,23 @@ func GetAutoDrugCountList(startime int64, endtime int64, orgid int64) (info []*m
 
 }
 
+func GetCancelDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.DrugCancelStockInfo, err error) {
+
+	db := XTReadDB().Table(" xt_drug_cancel_stock_info as x").Where("x.status = 1")
+
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("sum(x.count) as count,x.drug_id").Group("x.drug_id").Scan(&info).Error
+	return info, err
+}
+
 func GetSingleOrderDetail(id int64, orgid int64) (info []*models.VmDrugWarehouseOutInfo, err error) {
 
 	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
@@ -714,3 +731,9 @@ func FindeDrugWarehouserInfo(ware_out_id int64, drug_id int64, orgid int64) (out
 
 	return outInfo, err
 }
+
+func GetDrugFlowBatch(ware_out_id int64, drug_id int64, orgid int64) (flow []*models.DrugFlow, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id = ? and drug_id = ? and user_org_id = ? and status = 1", ware_out_id, drug_id, orgid).Group("number").Find(&flow).Error
+	return flow, err
+}

service/patient_service.go

@@ -1504,3 +1504,14 @@ func FindRemindAdvice(user_org_id int64, advice_name string, advice_desc string,
 	err = XTWriteDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and record_date = ? and advice_name = ? and advice_desc = ? and template_id = ? and frequency_type = ? AND advice_type = 2 ", patient_id, user_org_id, record_date, advice_name, advice_desc, template_id, fre_type).First(&advice).Error
 	return
 }
+
+func UpdateScheduleByDeathTime(patientid int64, shcheduledate int64) error {
+	err := XTWriteDB().Model(models.XtSchedule{}).Where("patient_id = ? and schedule_date>?", patientid, shcheduledate).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func UpdateScheduleItemByPatientId(id int64) error {
+
+	err := XTWriteDB().Model(models.PatientScheduleTemplateItem{}).Where("patient_id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -214,3 +214,23 @@ func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error)
 	err = p_service.XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&goodInfo).Error
 	return goodInfo, err
 }
+
+func GetWarehouseInfoGoodDetailPrintList(orgid int64, startime int64, endtime int64, limit int64, page int64) (info []*models.VmWarehousingInfo, err error) {
+	offset := (page - 1) * limit
+	db := p_service.XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	table := p_service.XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_unit").Joins("left join xt_good_information as t on t.id = x.good_id").Offset(offset).Limit(limit).Scan(&info).Error
+	return info, err
+}

service/self_drug_service.go

@@ -799,3 +799,12 @@ func GetSelfOutStockQuery(startTime int64, endTime int64, orgid int64) (selfouts
 	err = db.Select("x.drug_name_id,Sum(x.outstore_number) as count").Group("x.drug_name").Scan(&selfoutstock).Error
 	return selfoutstock, err
 }
+
+func GetLastDrugWarehouseOutInfo(drugid int64, warehouseOutId int64, orgid int64) (models.XtDrugWarehouseOutInfo, error) {
+
+	info := models.XtDrugWarehouseOutInfo{}
+
+	err = XTReadDB().Model(&info).Where("drug_id = ? and  warehouse_out_id = ? and org_id = ? and status = 1", drugid, warehouseOutId, orgid).Last(&info).Error
+
+	return info, err
+}

service/stock_service.go

@@ -337,6 +337,11 @@ func FindAllWarehouseTotal(org_id int64) (total int64, err error) {
 	err = readDb.Model(&models.Warehousing{}).Where("org_id = ?", org_id).Count(&total).Error
 	return total, err
 }
+
+func FindAllWarehouseTotalOne(org_id int64) (total int64, err error) {
+	err = readDb.Model(&models.XtDrugWarehouse{}).Where("org_id = ?", org_id).Count(&total).Error
+	return total, err
+}
 func AddSigleWarehouse(warehouse *models.Warehousing) error {
 	err := writeDb.Create(&warehouse).Error
 	return err
@@ -505,7 +510,7 @@ func CreateDrugFlow(drugflow []*models.DrugFlow) (err error) {
 	if len(drugflow) > 0 {
 		utx := writeDb.Begin()
 		if len(drugflow) > 0 {
-			thisSQL := "INSERT INTO xt_drug_flow (warehousing_id, drug_id, number,batch_number,count,user_org_id,patient_id,system_time,consumable_type,is_sys,warehousing_order,warehouse_out_id,warehouse_out_order_number,is_edit,cancel_stock_id,cancel_order_number,manufacturer,dealer,creator,update_creator,status,ctime,mtime,price,warehousing_detail_id,warehouse_out_detail_id,cancel_out_detail_id,expire_date,product_date,max_unit,min_unit ) VALUES "
+			thisSQL := "INSERT INTO xt_drug_flow (warehousing_id, drug_id, number,batch_number,count,user_org_id,patient_id,system_time,consumable_type,is_sys,warehousing_order,warehouse_out_id,warehouse_out_order_number,is_edit,cancel_stock_id,cancel_order_number,manufacturer,dealer,creator,update_creator,status,ctime,mtime,price,warehousing_detail_id,warehouse_out_detail_id,cancel_out_detail_id,expire_date,product_date,max_unit,min_unit) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range drugflow {
@@ -1112,6 +1117,7 @@ type DrugCancelStockInfo struct {
 	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	Drug             *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+	BatchNumberId    int64   `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
 }
 
 func (DrugCancelStockInfo) TableName() string {
@@ -1465,11 +1471,11 @@ func CreateCancelStockInfo(cancelStockInfo []*models.CancelStockInfo) (err error
 	if len(cancelStockInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(cancelStockInfo) > 0 {
-			thisSQL := "INSERT INTO xt_cancel_stock_info (good_id, cancel_stock_id, good_type_id, count, price,total,ctime,status,org_id,order_number,type,dealer,manufacturer,number,register_account,remark,product_date,expiry_date) VALUES "
+			thisSQL := "INSERT INTO xt_cancel_stock_info (good_id, cancel_stock_id, good_type_id, count, price,total,ctime,status,org_id,order_number,type,dealer,manufacturer,number,register_account,remark,product_date,expiry_date,warehouse_info_id) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range cancelStockInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.GoodId)
 				insertData = append(insertData, info.CancelStockId)
 				insertData = append(insertData, info.GoodTypeId)
@@ -1488,6 +1494,7 @@ func CreateCancelStockInfo(cancelStockInfo []*models.CancelStockInfo) (err error
 				insertData = append(insertData, info.Remark)
 				insertData = append(insertData, info.ProductDate)
 				insertData = append(insertData, info.ExpiryDate)
+				insertData = append(insertData, info.WarehouseInfoId)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -1506,11 +1513,11 @@ func CreateDrugCancelStockInfo(cancelStockInfo []*models.DrugCancelStockInfo) (e
 	if len(cancelStockInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(cancelStockInfo) > 0 {
-			thisSQL := "INSERT INTO xt_drug_cancel_stock_info (drug_id,cancel_stock_id, count, price,total,ctime,status,org_id,order_number,type,dealer,manufacturer,retail_price,retail_total_price,register_account,batch_number,remark,max_unit,product_date,expiry_date) VALUES "
+			thisSQL := "INSERT INTO xt_drug_cancel_stock_info (drug_id,cancel_stock_id, count, price,total,ctime,status,org_id,order_number,type,dealer,manufacturer,retail_price,retail_total_price,register_account,batch_number,remark,max_unit,product_date,expiry_date,batch_number_id) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range cancelStockInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.CancelStockId)
 				insertData = append(insertData, info.Count)
@@ -1531,6 +1538,7 @@ func CreateDrugCancelStockInfo(cancelStockInfo []*models.DrugCancelStockInfo) (e
 				insertData = append(insertData, info.MaxUnit)
 				insertData = append(insertData, info.ProductDate)
 				insertData = append(insertData, info.ExpiryDate)
+				insertData = append(insertData, info.BatchNumberId)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -2145,6 +2153,12 @@ func FindCancelStockById(id int64, org_id int64) (cancelStock models.CancelStock
 
 }
 
+func FindCancelDrugById(id int64, org_id int64) (cancelStock models.DrugCancelStock, err error) {
+	err = readDb.Model(&models.CancelStock{}).Where("id = ? AND status = 1", id).First(&cancelStock).Error
+	return cancelStock, err
+
+}
+
 func FindDrugCancelStockById(id int64) (cancelStock models.DrugCancelStock, err error) {
 	err = readDb.Model(&models.DrugCancelStock{}).Where("id = ? AND status = 1", id).First(&cancelStock).Error
 	return cancelStock, err
@@ -2441,7 +2455,7 @@ func FindDrugStockOutByIsSys(org_id int64, is_sys int, record_time int64) (out m
 }
 
 func FindLastStockInInfoRecord(good_id int64, org_id int64) (in models.WarehousingInfo, err error) {
-	err = readDb.Model(&models.WarehousingInfo{}).Where("status = 1 AND org_id = ? AND good_id = ?", org_id, good_id).Last(&in).Error
+	err = readDb.Model(&models.WarehousingInfo{}).Where("status = 1 AND org_id = ? AND good_id = ?", org_id, good_id).First(&in).Error
 	return
 }
 
@@ -3496,7 +3510,7 @@ func GetDrugTotalCount(drugid int64, orgid int64) (info models.VmDrugWarehouseIn
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.drug_id,sum(x.stock_max_number) as count").Find(&info).Error
+	err = db.Select("x.drug_id,sum(x.stock_max_number) as count,sum(x.stock_min_number) as stock_min_number,x.max_unit,x.min_unit").Find(&info).Error
 	return info, err
 }
 
@@ -3525,7 +3539,7 @@ func GetWarehoureOrderInfoList(goodid int64, orgid int64) (info []*models.Wareho
 
 func UpdateWarehousingCount(info *models.WarehousingInfo, goodid int64, orgid int64, warehousingId int64) error {
 
-	err := XTWriteDB().Model(&info).Where("good_id = ? and org_id = ? and status =1 and warehousing_id = ?", goodid, orgid, warehousingId).Updates(map[string]interface{}{"stock_count": info.StockCount}).Error
+	err := XTWriteDB().Model(models.WarehousingInfo{}).Where("good_id = ? and org_id = ? and status = 1 and warehousing_id = ?", goodid, orgid, warehousingId).Updates(map[string]interface{}{"stock_count": info.StockCount}).Error
 	return err
 }
 
@@ -3548,8 +3562,9 @@ func UpdateCancelOut(list []*models.WarehousingInfo, count int64) error {
 				WarehousingId: item.WarehousingId,
 				StockCount:    item.StockCount + count,
 			}
-			UpdateWarehousingCount(&info, item.GoodId, item.OrgId, item.WarehousingId)
-			break
+			err2 := UpdateWarehousingCount(&info, item.GoodId, item.OrgId, item.WarehousingId)
+			fmt.Println("2323233232323232323232323232323", err2)
+			return err
 		}
 
 		if (item.WarehousingCount - item.StockCount) < count {
@@ -3602,7 +3617,7 @@ func GetCancelStockOrderPrintOne(idstr []string, orgid int64) (info []*models.Ca
 
 	if len(idstr) > 0 {
 		err = XTReadDB().Model(&info).Where("id in(?)", idstr).
-			Preload("CancelStockInfo", func(db *gorm.DB) *gorm.DB {
+			Preload("XtCancelStockInfo", func(db *gorm.DB) *gorm.DB {
 				return XTReadDB().Where("org_id=? and status = 1", orgid).Preload("GoodInfo", "status = 1 and org_id = ?", orgid)
 			}).Find(&info).Error
 	}
@@ -3665,6 +3680,12 @@ func GetWarehouseOutInfoById(id int64, goodid int64) (info []*models.WarehouseOu
 	return info, err
 }
 
+func GetStockFlowBatchNumber(id int64, goodid int64) (stock []*models.VmStockFlow, err error) {
+
+	err = XTReadDB().Model(&stock).Where("warehouse_out_id = ? and good_id = ? and status = 1", id, goodid).Group("patient_id,number").Find(&stock).Error
+	return stock, err
+}
+
 func GetDrugBatchNumber(drug_id int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
 
 	err = XTReadDB().Model(&info).Where("drug_id = ? and org_id = ? and status = 1 and batch_number <>''", drug_id, orgid).Find(&info).Error
@@ -3840,6 +3861,11 @@ func GetStockFlowList(limit int64, page int64, consumable_type int64, orgId int6
 		if consumable_type == 3 {
 			db = db.Where(" consumable_type = ? and is_sys = 1", consumable_type)
 		}
+
+		//4.手动退库
+		if consumable_type == 4 {
+			db = db.Where(" consumable_type = ?", consumable_type)
+		}
 	}
 	if orgId > 0 {
 		db = db.Where("user_org_id = ?", orgId)
@@ -3901,6 +3927,16 @@ func GetLastStockOut(id int64) (models.WarehousingInfo, error) {
 	return info, err
 }
 
+func GetStockGoodCount(good_id int64) (models.WarehousingInfo, error) {
+	info := models.WarehousingInfo{}
+	db := XTReadDB().Model(&info)
+	if good_id > 0 {
+		db = db.Where("good_id = ? and status = 1", good_id)
+	}
+	err := db.Select("sum(stock_count) as stock_count").Find(&info).Error
+	return info, err
+}
+
 func GetDrugFlow(drugid int64, orgid int64, limit int64, page int64, startTime int64, endTime int64, stock_type int64) (drug_flow []*models.DrugFlow, total int64, err error) {
 
 	offset := (page - 1) * limit
@@ -3933,6 +3969,9 @@ func GetDrugFlow(drugid int64, orgid int64, limit int64, page int64, startTime i
 		if stock_type == 3 {
 			db = db.Where("consumable_type = 3 and is_sys = 1")
 		}
+		if stock_type == 4 {
+			db = db.Where("consumable_type = 4")
+		}
 	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&drug_flow).Error
 	return drug_flow, total, err
@@ -3991,3 +4030,92 @@ func GetCancelStockDetail(id int64) (info []*models.DrugCancelStockInfo, err err
 	err = db.Find(&info).Error
 	return info, err
 }
+
+func GetDrugWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
+
+	info := models.XtDrugWarehouseInfo{}
+
+	db := XTReadDB().Model(&info).Where("status = 1")
+	if id > 0 {
+		db = db.Where("id = ?", id)
+	}
+	err := db.Select("drug_id,warehousing_count,stock_max_number,stock_min_number").Find(&info).Error
+
+	return info, err
+}
+
+func GetDrugWarehouseInfoById(id int64) (models.XtDrugWarehouseInfo, error) {
+
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Model(&info).Where("id=? and status =1", id).Find(&info).Error
+	return info, err
+}
+
+func UpdateDrugWarehouseInfo(info *models.XtDrugWarehouseInfo, id int64) error {
+
+	//err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber}).Error
+	//return err
+	err = writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", info.StockMaxNumber)).Error
+	return err
+}
+
+func UpdateDrugWarehouseInfoOne(info *models.XtDrugWarehouseInfo, id int64) error {
+
+	//err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_min_number": info.StockMaxNumber}).Error
+	//return err
+
+	err = writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
+	return err
+}
+
+func GetLastCancelStockInfo(id int64) (models.DrugCancelStockInfo, error) {
+
+	info := models.DrugCancelStockInfo{}
+
+	err := XTReadDB().Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func UpdatedDrugInfo(id int64, count int64) (err error) {
+
+	err = writeDb.Model(&models.DrugWarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	return err
+}
+
+func UpdatedDrugInfoOne(id int64, count int64) (err error) {
+
+	err = writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	return err
+}
+
+func UpdateWarehouseInfo(count int64, drugid int64, orgid int64) error {
+
+	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ?  and org_id = ? and status = 1", drugid, orgid).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+
+	return err
+}
+
+func UpdateWarehouseInfoOne(count int64, drugid int64, orgid int64) error {
+
+	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ?  and org_id = ? and status = 1", drugid, orgid).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	return err
+}
+
+func GetWarehouseInfoById(id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Model(&info).Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func UpdateWareInfoById(id int64, count int64) error {
+
+	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+	return err
+}
+
+func GetLastCancelInfo(id int64, goodid int64) (models.CancelStockInfo, error) {
+	info := models.CancelStockInfo{}
+	err := XTReadDB().Model(&info).Where("warehouse_info_id  = ? and good_id = ? and status = 1", id, goodid).Find(&info).Error
+	return info, err
+}

service/warhouse_service.go

@@ -957,8 +957,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Number:                  warehouse.Number,
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   count,
-				Price:                   warehouse.Price,
+				Count:                   deliver_number,
+				Price:                   info.PackingPrice,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
@@ -972,6 +972,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutDetailId:    warehouseOutInfo.ID,
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
+				PatientId:               patient_id,
 			}
 			CreateStockFlowOne(flow)
 			if errTwo != nil {
@@ -988,8 +989,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Number:                  warehouse.Number,
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   count,
-				Price:                   warehouse.Price,
+				Count:                   deliver_number,
+				Price:                   info.PackingPrice,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
@@ -1003,6 +1004,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutDetailId:    warehouseOutInfo.ID,
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
+				PatientId:               patient_id,
 			}
 			CreateStockFlowOne(flow)
 		}
@@ -1069,7 +1071,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Number:                  warehouse.Number,
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   count,
+				Count:                   stock_number,
 				Price:                   warehouse.Price,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
@@ -1084,6 +1086,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutDetailId:    warehouseOutInfo.ID,
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
+				PatientId:               patient_id,
 			}
 			CreateStockFlowOne(flow)
 		} else if errcodes == nil {
@@ -1099,7 +1102,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Number:                  warehouse.Number,
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   count,
+				Count:                   goods.Count + stock_number,
 				Price:                   warehouse.Price,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
@@ -1114,6 +1117,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutDetailId:    warehouseOutInfo.ID,
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
+				PatientId:               patient_id,
 			}
 			CreateStockFlowOne(flow)
 		}
@@ -1258,7 +1262,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId)
 	fmt.Println("err222222222222222222222", warehouse.StockCount)
 	if err != nil {
-		fmt.Println("232323232323进来")
+
 		return err
 	}
 
@@ -1306,14 +1310,14 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			UserOrgId:               goods.OrgId,
 			PatientId:               goods.PatientId,
 			SystemTime:              record_time,
-			ConsumableType:          3,
+			ConsumableType:          2,
 			IsSys:                   goods.IsSys,
 			WarehousingOrder:        "",
 			WarehouseOutId:          warehouseOut.ID,
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			IsEdit:                  1,
 			CancelStockId:           0,
-			CancelOrderNumber:       0,
+			CancelOrderNumber:       "",
 			Manufacturer:            goods.Manufacturer,
 			Dealer:                  goods.Dealer,
 			Creator:                 creator,
@@ -1394,14 +1398,14 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			UserOrgId:               goods.OrgId,
 			PatientId:               0,
 			SystemTime:              record_time,
-			ConsumableType:          3,
+			ConsumableType:          2,
 			IsSys:                   0,
 			WarehousingOrder:        "",
 			WarehouseOutId:          warehouseOut.ID,
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			IsEdit:                  1,
 			CancelStockId:           0,
-			CancelOrderNumber:       0,
+			CancelOrderNumber:       "",
 			Manufacturer:            goods.Manufacturer,
 			Dealer:                  goods.Dealer,
 			Creator:                 creator,
@@ -1610,7 +1614,7 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 }
 
 func DeleteWarehouseInfo(id int64) error {
-	err := XTWriteDB().Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_count": 0}).Error
+	err := XTWriteDB().Model(models.WarehousingInfo{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_count": 0}).Error
 	return err
 }