11月8日库存管理

controllers/drug_stock_api_contorller.go

@@ -1578,6 +1578,15 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 				admin_user_id := int64(items["admin_user_id"].(float64))
 
+				//if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+				//  utils.ErrorLog("last_price")
+				//  c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//  return
+				//}
+				//last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
+
+				stock_count, _ := items["stock_count"].(string)
+
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
 
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1604,6 +1613,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					WarehouseInfoId:         warehouse_info_id,
 					StorehouseId:            storehouse_id,
 					AdminUserId:             admin_user_id,
+					StockCount:              stock_count,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -2003,6 +2013,15 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 				admin_user_id := int64(items["admin_user_id"].(float64))
 
+				//if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+				//  utils.ErrorLog("last_price")
+				//  c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//  return
+				//}
+				//last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
+
+				stock_count, _ := items["stock_count"].(string)
+
 				if id == 0 {
 					warehouseOutInfo := &models.DrugWarehouseOutInfo{
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -2030,6 +2049,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						WarehouseInfoId:         warehouse_info_id,
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
+						StockCount:              stock_count,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -2057,6 +2077,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						WarehouseOutId:          id,
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
+						StockCount:              stock_count,
 					}
 
 					drugFlow = append(drugFlow, drugflow)
@@ -2104,6 +2125,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						WarehouseInfoId:         warehouse_info_id,
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
+						StockCount:              stock_count,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 
@@ -2131,6 +2153,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						WarehouseOutId:          warehouseOut.ID,
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
+						StockCount:              stock_count,
 					}
 
 					drugFlow = append(drugFlow, drugflow)
@@ -2250,6 +2273,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					WarehouseOutId: item.WarehouseOutId,
 					StorehouseId:   item.StorehouseId,
 					AdminUserId:    item.AdminUserId,
+					StockCount:     item.StockCount,
 				}
 				service.UpdateDrugFlowSix(item.WarehouseOutId, item.DrugId, item.WarehouseOutOrderNumber, flow)
 				cha_number = min_number - max_number

controllers/manager_center_api_controller.go

@@ -2285,7 +2285,8 @@ func (c *ManagerCenterApiController) GetAllDrugList() {
 func (c *ManagerCenterApiController) GetSearchDrugList() {
 	keyword := c.GetString("keyword")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
-	list, err := service.GetSearchDrugList(keyword, orgId)
+	config, _ := service.GetAllStoreHouseConfig(orgId)
+	list, err := service.GetSearchDrugListSix(keyword, orgId, config.DrugStorehouseOut)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	if err == nil {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -4459,9 +4459,6 @@ func (c *DialysisAPIController) EditConsumables() {
 					//判断当前出库数量和最后一次出库数量的大小
 					//如果当前出库数量小于最后一次出库数量 正常出库后 需要退库操作
 
-					fmt.Println("当前出库数量", item.Count)
-					fmt.Println("最后一次出库数量", goodInfo.Count)
-
 					if item.Count < goodInfo.Count {
 						//出库
 						err = ConsumablesDeliveryTotalSeven(adminInfo.Org.Id, patient_id, record_time, beforePrepares, adminInfo.AdminUser.Id, item.Count)
@@ -4487,7 +4484,7 @@ func (c *DialysisAPIController) EditConsumables() {
 
 						//查询该批次剩余库存
 						lastInfo, _ := service.GetLastStockOut(goodInfo.WarehouseInfotId)
-						fmt.Println("剩余库存333333333333333", lastInfo)
+
 						if lastInfo.StockCount == 0 {
 							//查询该耗材的总库存
 							wareinfo, _ := service.GetStockGoodCount(item.GoodId)
@@ -4504,8 +4501,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						}
 
 						//比较剩余库存 和 当前相差的数量,库存剩余量大于则正常出库
-						fmt.Println("剩余库存", lastInfo.StockCount)
-						fmt.Println("差", last_total)
+
 						//查询该耗材的总库存
 						wareinfo, _ := service.GetStockGoodCount(item.GoodId)
 						// 如果库存差大于剩余库存则提示库存不足
@@ -4662,9 +4658,6 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 				lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, adminUser.Org.Id, date.Unix())
 				item.Project = project
 
-				fmt.Println(goodUser)
-				fmt.Println(lastGoodUserDetial)
-
 				item.LastAutomaticReduceDetail = goodUser
 				item.LastDialysisBeforePrepare = lastGoodUserDetial
 			}
@@ -4839,7 +4832,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 			}
 		}
 	}
-	fmt.Println("前端数据9999999999999", beforePrepares)
+
 	//查询是否有库存
 	for _, item := range beforePrepares {
 		storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
@@ -5053,13 +5046,13 @@ func (c *DialysisAPIController) BatchDeleteMonitor() {
 func (c *DialysisAPIController) GetPatientDialysisRecordList() {
 
 	id, _ := c.GetInt64("id")
-	fmt.Println(id)
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	start_time := time.Now().Format("2006-01-02")
 
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	fmt.Println("start_timestart_time", start_time)
+
 	nowTime := time.Now()
 	endTime := nowTime.AddDate(-1, 0, 0)
 	endTimes := endTime.Format("2006-01-02")
@@ -5077,7 +5070,7 @@ func (c *DialysisAPIController) BathDeleteAdviceList() {
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	ids := c.GetString("ids")
-	fmt.Println("dis22222222", ids)
+
 	idArray := strings.Split(ids, ",")
 	origin, _ := c.GetInt64("origin")
 	if origin == 1 {
@@ -5112,9 +5105,8 @@ func (c *DialysisAPIController) DeleteAutoReduceDetail() {
 	good_id, _ := c.GetInt64("good_id")
 	record_time, _ := c.GetInt64("record_time")
 	patient_id, _ := c.GetInt64("patient_id")
-	fmt.Println("0000000000000000", patient_id)
 	service.DeleteDialysisBeforOne(good_id, record_time, patient_id)
-	fmt.Println()
+
 	err := service.DeleteAutoReduceDetail(good_id, record_time, patient_id)
 	fmt.Print("err", err)
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -5230,10 +5222,10 @@ func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time in
 				// 如果已经出库的数量 小于 新请求出库的梳理，则代表需要增加出库
 				if goods_yc_temp.Count < goods_temp.Count {
 					temp_count := goods_temp.Count - goods_yc_temp.Count
-					//fmt.Println("988888888888888", temp_count)
+
 					goods[j].Count = temp_count
 					goods_yc = append(goods_yc[:i], goods_yc[i+1:]...)
-					//fmt.Println("888888888", goods_yc)
+
 					break
 				}
 			}
@@ -5269,7 +5261,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 	delete_count = warehouseOutInfos.Count - count
 
 	houseConfig, _ := service.GetAllStoreHouseConfig(orgID)
-	fmt.Println("delete_count2323232", delete_count)
+
 	// 在出库记录表里记录退库详情
 	warehouseOutInfo := &models.WarehouseOutInfo{
 		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -5467,11 +5459,11 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 		service.CreateAutoReduceRecord(&details)
 	}
 	// 删除出库完成后，要增加对应批次的库存数量
-	fmt.Println("deletecount2323232323232323232323232323", delete_count)
+
 	errThree := service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count)
 	service.ModifyGoodAddInformation(good_yc.GoodId, delete_count, good_yc.OrgId)
 	errOne := service.UpDateWarehouStockFlowByStockDelete(warehouseOutInfos.WarehouseInfotId, record_time, good_yc.GoodId, delete_count, good_yc.PatientId)
-	fmt.Println("erron2332323232323232232323", errOne)
+	fmt.Println("errOne", errOne)
 	if errThree != nil {
 		return errThree
 	}
@@ -5521,8 +5513,6 @@ func ConsumablesDeliveryTotalSix(orgID int64, patient_id int64, record_time int6
 
 	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
 	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
-	fmt.Println("goods222222222222", goods)
-	fmt.Println("goodsy999999999999", goods_yc)
 
 	if len(goods) > 0 {
 		out, err := service.FindStockOutByIsSys(orgID, 1, record_time)
@@ -5638,7 +5628,7 @@ func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *mod
 		// 删除出库完成后，要改变流水库存
 		errOne = service.UpDateWarehouStockFlowByStockDelete(ware.WarehouseInfotId, record_time, good_yc.GoodId, delete_count, good_yc.PatientId)
 
-		fmt.Println("erron2332323232323232232323", errOne)
+		fmt.Println("errOne", errOne)
 		errThree := service.UpDateWarehouseInfoByStockDelete(ware.WarehouseInfotId, delete_count)
 		service.ModifyGoodAddInformation(good_yc.GoodId, delete_count, good_yc.OrgId)
 		if errThree != nil {

controllers/stock_in_api_controller.go

@@ -1408,6 +1408,16 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
 
 				admin_user_id := int64(items["admin_user_id"].(float64))
+
+				if items["buy_price"] == nil || reflect.TypeOf(items["buy_price"]).String() != "string" {
+					utils.ErrorLog("buy_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				buy_price, _ := strconv.ParseFloat(items["buy_price"].(string), 64)
+
+				stock_count := items["stock_count"].(string)
+
 				timeLayout := "2006-01-02"
 				loc, _ := time.LoadLocation("Local")
 				var expiryDate int64
@@ -1454,6 +1464,8 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					WarehouseInfotId:        warehouse_info_id,
 					StorehouseId:            storehouse_id,
 					AdminUserId:             admin_user_id,
+					BuyPrice:                buy_price,
+					StockCount:              stock_count,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1787,6 +1799,16 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
 
 				admin_user_id := int64(items["admin_user_id"].(float64))
+
+				//if items["buy_price"] == nil || reflect.TypeOf(items["buy_price"]).String() != "string" {
+				//  utils.ErrorLog("buy_price")
+				//  c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//  return
+				//}
+				//buy_price, _ := strconv.ParseFloat(items["buy_price"].(string), 64)
+
+				stock_count := items["stock_count"].(string)
+
 				var productDate int64
 				if len(product_date) > 0 {
 					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
@@ -1823,6 +1845,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						WarehouseInfotId:        warehouse_info_id,
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
+						StockCount:              stock_count,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1868,6 +1891,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						WarehouseInfotId:        warehouse_info_id,
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
+						StockCount:              stock_count,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
@@ -2007,6 +2031,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							ConsumableType:          2,
 							StorehouseId:            item.StorehouseId,
 							AdminUserId:             item.AdminUserId,
+							StockCount:              item.StockCount,
 						}
 
 						//查询是否存在
@@ -2033,6 +2058,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 								Price:         item.Price,
 								StorehouseId:  item.StorehouseId,
 								AdminUserId:   item.AdminUserId,
+								StockCount:    item.StockCount,
 							}
 							service.UpdateStockFlowByDetailId(flow, item.ID)
 
@@ -2101,6 +2127,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						Count:                   item.Count,
 						StorehouseId:            item.StorehouseId,
 						AdminUserId:             item.AdminUserId,
+						StockCount:              item.StockCount,
 					}
 					//查询是否存在
 					_, errcode := service.GetWarehouseOutInfoIsExist(item.ID)
@@ -2125,6 +2152,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							Price:         item.Price,
 							StorehouseId:  item.StorehouseId,
 							AdminUserId:   item.AdminUserId,
+							StockCount:    item.StockCount,
 						}
 						service.UpdateStockFlowByDetailId(flow, item.ID)
 						goodInfo := models.GoodInfo{
@@ -2159,6 +2187,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					Price:         item.Price,
 					StorehouseId:  item.StorehouseId,
 					AdminUserId:   item.AdminUserId,
+					BuyPrice:      item.BuyPrice,
+					StockCount:    item.StockCount,
 				}
 				service.UpdateStockFlowByDetailId(flow, item.ID)
 				goodInfo := models.GoodInfo{
@@ -5479,7 +5509,10 @@ func (this *StockManagerApiController) PostSearchGoodList() {
 	keyword := this.GetString("keyword")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	list, _ := service.GetSearchGoodList(keyword, orgId)
+
+	config, _ := service.GetAllStoreHouseConfig(orgId)
+	list, _ := service.GetSearchGoodListSix(keyword, orgId, config.StorehouseOutInfo)
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	this.ServeSuccessJSON(map[string]interface{}{

models/drug_stock.go

@@ -165,6 +165,8 @@ type DrugWarehouseOutInfo struct {
 	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId   int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice               float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
@@ -410,6 +412,8 @@ type DrugFlow struct {
 	StorehouseId              int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId     int64                `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	AdminUserId               int64                `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice                 float64              `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount                string               `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 }
 
 func (DrugFlow) TableName() string {

models/self_drug_models.go

@@ -409,8 +409,8 @@ 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"`
-	MinUnit                   string     `gorm:"column:min_unit" json:"max_unit" form:"min_unit"`
 	MaxUnit                   string     `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string     `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	WarehousingInfoId         int64      `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 	XtBaseDrug                XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 	SupplyWarehouseId         int64      `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
@@ -688,6 +688,7 @@ type VmDrugWarehouseOutInfo struct {
 	MedicalInsuranceNumber  string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 }
 
 type XtDrugAdjustPrice struct {

models/stock_models.go

@@ -256,6 +256,8 @@ type WarehouseOutInfo struct {
 	StorehouseId            int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId   int64        `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	AdminUserId             int64        `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	BuyPrice                float64      `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	StockCount              string       `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -505,6 +507,8 @@ type WarehouseOutInfoOne struct {
 	SupplyWarehouseId           int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	StorehouseId                int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	AdminUserId                 int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	BuyPrice                    float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	StockCount                  string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 }
 
 type WarehouseOutInfoTwo struct {
@@ -617,6 +621,8 @@ type VmStockFlow struct {
 	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	AdminUserId               int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	BuyPrice                  float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	StockCount                string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 }
 
 func (VmStockFlow) TableName() string {

service/gobal_config_service.go

@@ -859,7 +859,7 @@ func GetSingleOrderDetail(id int64, orgid int64) (info []*models.VmDrugWarehouse
 		db = db.Where("x.warehouse_out_id = ?", id)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,x.price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price as total_price,x.retail_total_price,x.storehouse_id,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,x.admin_user_id,t.dose,t.dose_unit,t.last_price,t.min_price,t.medical_insurance_number,t.retail_price ,x.warehouse_info_id").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,x.price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price as total_price,x.retail_total_price,x.storehouse_id,x.stock_count,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,x.admin_user_id,t.dose,t.dose_unit,t.last_price,t.min_price,t.medical_insurance_number,t.retail_price ,x.warehouse_info_id").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
 	return info, err
 }
 

service/stock_service.go

@@ -1701,6 +1701,8 @@ type DrugWarehouseOutInfo struct {
 	SupplyCancelOutId       int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseId       int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice               float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
@@ -2523,7 +2525,7 @@ func UpDateDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo) (err error) {
 
 func UpdateDrugFlowSix(warehousoutid int64, drugid int64, warehouse_out_order_number string, flow models.DrugFlow) error {
 
-	err := XTWriteDB().Model(&flow).Where("warehouse_out_id = ? and drug_id = ? and warehouse_out_order_number = ?", warehousoutid, drugid, warehouse_out_order_number).Updates(map[string]interface{}{"count": flow.Count, "expire_date": flow.ExpireDate, "product_date": flow.ProductDate, "price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "number": flow.Number, "storehouse_id": flow.StorehouseId, "admin_user_id": flow.AdminUserId}).Error
+	err := XTWriteDB().Model(&flow).Where("warehouse_out_id = ? and drug_id = ? and warehouse_out_order_number = ?", warehousoutid, drugid, warehouse_out_order_number).Updates(map[string]interface{}{"count": flow.Count, "expire_date": flow.ExpireDate, "product_date": flow.ProductDate, "price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "number": flow.Number, "storehouse_id": flow.StorehouseId, "admin_user_id": flow.AdminUserId, "stock_count": flow.StockCount}).Error
 	return err
 }
 
@@ -3657,6 +3659,22 @@ func GetSearchDrugList(keywords string, orgid int64) (drug []*models.BaseDrugLib
 	return
 }
 
+func GetSearchDrugListSix(keywords string, orgid int64, storehouse_id int64) (drug []*models.BaseDrugLib, err error) {
+
+	db := XTReadDB().Model(&drug).Where("org_id=? and status=1  and drug_status<>'停用'", orgid)
+	if len(keywords) > 0 {
+		likekey := "%" + keywords + "%"
+		err = db.Where("(drug_name LIKE ?)", likekey).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id = ?", orgid, storehouse_id).Group("id")
+		}).Find(&drug).Error
+	} else {
+		err = db.Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id = ?", orgid, storehouse_id).Group("id")
+		}).Find(&drug).Error
+	}
+	return
+}
+
 func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, err error) {
 
 	db := XTReadDB().Model(&good).Where("org_id =? and status = 1 and good_status <> '停用'", orgid)
@@ -3673,6 +3691,22 @@ func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, e
 	return
 }
 
+func GetSearchGoodListSix(keywords string, orgid int64, storehouse_id int64) (good []*models.GoodInfo, err error) {
+
+	db := XTReadDB().Model(&good).Where("org_id =? and status = 1 and good_status <> '停用'", orgid)
+	if len(keywords) > 0 {
+		likekey := "%" + keywords + "%"
+		err = db.Where("(good_name Like ?)", likekey).Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id =?", orgid, storehouse_id)
+		}).Find(&good).Error
+	} else {
+		err = db.Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id = ?", orgid, storehouse_id)
+		}).Find(&good).Error
+	}
+	return
+}
+
 func CreateAutoReduceRecord(detail *models.BloodAutomaticReduceDetail) error {
 	db := writeDb.Begin()
 	err := db.Create(&detail).Error
@@ -4046,7 +4080,7 @@ func GetOrderDetialByOrderId(id int64, orgid int64) (out []*models.WarehouseOutI
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,x.supply_cancel_out_id,x.supply_warehouse_id,x.storehouse_id,x.admin_user_id,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id,x.warehouse_info_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,x.supply_cancel_out_id,x.supply_warehouse_id,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id,x.warehouse_info_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
@@ -4075,7 +4109,7 @@ func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.Warehou
 		db = db.Where("x.org_id = ?", orgid)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
@@ -5881,7 +5915,7 @@ func UpdatedStockFlowByGoodIdOne(warehousing_id int64, good_id int64, flow model
 }
 
 func UpdateStockFlowByDetailId(flow models.VmStockFlow, wareoutdetailid int64) error {
-	err := XTWriteDB().Model(&flow).Where("warehouse_out_detail_id = ? and status = 1", wareoutdetailid).Updates(map[string]interface{}{"count": flow.Count, "number": flow.Number, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate, "Price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "license_number": flow.LicenseNumber, "price": flow.Price, "storehouse_id": flow.StorehouseId, "admin_user_id": flow.AdminUserId}).Error
+	err := XTWriteDB().Model(&flow).Where("warehouse_out_detail_id = ? and status = 1", wareoutdetailid).Updates(map[string]interface{}{"count": flow.Count, "number": flow.Number, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate, "Price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "license_number": flow.LicenseNumber, "price": flow.Price, "storehouse_id": flow.StorehouseId, "admin_user_id": flow.AdminUserId, "stock_count": flow.StockCount}).Error
 	return err
 }
 

service/warhouse_service.go

@@ -267,8 +267,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 		}
 
-		fmt.Println("max_number", maxNumber)
-		fmt.Println("min_number2332232332", minNumber)
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
 			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			if warehouse.StockMinNumber == 0 {
@@ -1132,10 +1130,10 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 				// 如果已经出库的数量 小于 新请求出库的梳理，则代表需要增加出库
 				if goods_yc_temp.Count < goods_temp.Count {
 					temp_count := goods_temp.Count - goods_yc_temp.Count
-					//fmt.Println("988888888888888", temp_count)
+
 					goods[j].Count = temp_count
 					goods_yc = append(goods_yc[:i], goods_yc[i+1:]...)
-					//fmt.Println("888888888", goods_yc)
+
 					break
 				}
 			}
@@ -1216,7 +1214,8 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 //耗材出库
 func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
 
-	fmt.Println("count23323223233232323232332232323", count, goods.Count)
+	//开事务
+	tx := XTWriteDB().Begin()
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
 	var maxNumber int64 = 0
@@ -1459,7 +1458,10 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		ModifyGoodReduceInformationSix(goods.GoodId, goods.Count, orgID, warehouse.PackingPrice)
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
-			return errThree
+			utils.ErrorLog("事务失败,原因为: %v", err.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
 		}
 
 		return nil
@@ -1648,8 +1650,12 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		warehouse.Mtime = time.Now().Unix()
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
-			return errThree
+			utils.ErrorLog("事务失败,原因为: %v", err.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
 		}
+
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		goods.Count = deliver_number - stock_number
 
@@ -1781,6 +1787,9 @@ func GetWarehouseById(id int64) (models.WarehouseOut, error) {
 //耗材出库
 func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.WarehouseOutInfo, warehouseOut *models.WarehouseOut, count int64, creator int64) (err error) {
 
+	//开事务
+	tx := XTWriteDB().Begin()
+
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
 	var maxNumber int64 = 0
@@ -1824,6 +1833,8 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            goods.StorehouseId,
 			AdminUserId:             goods.AdminUserId,
+			BuyPrice:                warehouse.Price,
+			StockCount:              goods.StockCount,
 		}
 		warehouseOutInfo.Count = goods.Count
 		//添加出库单详情
@@ -1865,6 +1876,8 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            warehouse.StorehouseId,
 			AdminUserId:             goods.AdminUserId,
+			BuyPrice:                warehouse.Price,
+			StockCount:              goods.StockCount,
 		}
 
 		//创建出库流水
@@ -1881,7 +1894,12 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 
 		//扣减库存
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
-		//扣减库存
+		if errThree != nil {
+			utils.ErrorLog("事务失败,原因为: %v", errThree.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
 
 		//查询该机构默认仓库
 		storeConfig, _ := GetAllStoreHouseConfig(goods.OrgId)
@@ -1924,6 +1942,8 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            warehouse.StorehouseId,
 			AdminUserId:             goods.AdminUserId,
+			BuyPrice:                warehouse.Price,
+			StockCount:              goods.StockCount,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -1974,6 +1994,8 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            goods.StorehouseId,
 			AdminUserId:             goods.AdminUserId,
+			BuyPrice:                warehouse.Price,
+			StockCount:              goods.StockCount,
 		}
 
 		//创建出库明细
@@ -1996,7 +2018,10 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
 
 		if errThree != nil {
-			return errThree
+			utils.ErrorLog("事务失败,原因为: %v", errThree.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
 		}
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		goods.Count = deliver_number - stock_number
@@ -2009,6 +2034,8 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 //退库逻辑
 func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count int64) (err error) {
 
+	//开事务
+	tx := XTWriteDB().Begin()
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
 	var maxNumber int64 = 0
@@ -2070,8 +2097,12 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
 
 		if errThree != nil {
-			return errThree
+			utils.ErrorLog("事务失败,原因为: %v", err.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
 		}
+
 		return
 	} else {
 
@@ -2108,7 +2139,10 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 		warehouse.Mtime = time.Now().Unix()
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
-			return errThree
+			utils.ErrorLog("事务失败,原因为: %v", err.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
 		}
 
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
@@ -2507,6 +2541,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 	if advice.PrescribingNumberUnit != drup.MaxUnit && advice.PrescribingNumberUnit != drup.MinUnit {
 		min_price = drup.RetailPrice
 	}
+
 	fmt.Println(min_price)
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 	// 如果没有对应的库存，则报错
@@ -2673,7 +2708,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 		}
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-		fmt.Println("扣减2333333232323232323323223232323232323233223332233232323232322332", errThree)
+
 		if errThree != nil {
 			return errThree
 		}
@@ -2837,7 +2872,6 @@ func HisAuToReduce(orgID int64, prescribingNumber float64, warehouseout *models.
 	//  比较数据大小
 	//如果当期医嘱数量小于最后一次出库则退库
 	if device_number < count_number {
-		fmt.Println("进来了吗")
 		var cha_number int64
 		var maxNumber int64
 		var minNumber int64
@@ -2869,8 +2903,7 @@ func HisAuToReduce(orgID int64, prescribingNumber float64, warehouseout *models.
 		ModifyDrugFlow(flow, drugInfo.WarehouseOutOrderNumber, advice.DrugId, advice.PatientId)
 
 	}
-	fmt.Println("医嘱数量44444444444444", device_number)
-	fmt.Println("最后一次出库数量", count_number)
+
 	//如果当期医嘱数量大于最后一次出库则需要出库
 	if device_number > count_number {
 		var cha_number int64
@@ -3541,7 +3574,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			StorehouseId:            goods.StorehouseId,
 			SecondWarehouseInfoId:   goods.SecondWarehouseInfoId,
 		}
-		fmt.Println("goods23233232233223323232323223232333232323232", goods.Count)
+
 		warehouseOutInfo.Count = goods.Count
 		//添加出库单详情
 		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
@@ -3599,7 +3632,6 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 		//扣减库存
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
 
-		fmt.Println("2332323232323223323232233232323", goods.Count)
 		//入库
 		warehouseInfo := &models.WarehousingInfo{
 			WarehousingOrder:      warehouseInfo.WarehousingOrder,
@@ -3990,7 +4022,7 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 		if errThree != nil {
 			return errThree
 		}
-		fmt.Println("出库数量2333333333333333333333333333333333333", deliver_number)
+
 		//入库
 		drugInfo := models.DrugWarehouseInfo{
 			WarehousingOrder:      drugWarehouse.WarehousingOrder,
@@ -4332,8 +4364,7 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
-		fmt.Println("maxNumber2323232233232332332323232323233232", maxNumber)
-		fmt.Println("minNumber3223233232323233232332322332", minNumber)
+
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
@@ -4374,8 +4405,6 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 
 		}
 
-		fmt.Println("max_number", maxNumber)
-		fmt.Println("min_number2332232332", minNumber)
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
 			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			if warehouse.StockMinNumber == 0 {
@@ -4392,9 +4421,8 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 			warehouse.StockMinNumber = 0
 		}
 
-		fmt.Println("er2332323232232323233223322323233223322323", warehouse.StockMinNumber)
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-		fmt.Println("er2332323232232323233223322323233223322323", errThree)
+
 		if errThree != nil {
 			return errThree
 		}
@@ -4530,7 +4558,8 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 
 // 药品手动出库 递归方式
 func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
-
+	//开事务
+	tx := XTWriteDB().Begin()
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -4585,6 +4614,8 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            advice.StorehouseId,
 			AdminUserId:             advice.AdminUserId,
+			LastPrice:               warehouse.Price,
+			StockCount:              advice.StockCount,
 		}
 
 		warehouseOutInfo.Count = prescribingNumber
@@ -4621,6 +4652,8 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            advice.StorehouseId,
 			AdminUserId:             advice.AdminUserId,
+			LastPrice:               warehouse.Price,
+			StockCount:              advice.StockCount,
 		}
 		if warehouse.RetailPrice == 0 {
 			drugflow.Price = advice.Price
@@ -4696,7 +4729,10 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 
 		if errThree != nil {
-			return errThree
+			utils.ErrorLog("事务失败,原因为: %v", err.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
 		}
 
 		//查询默认仓库
@@ -4746,6 +4782,8 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            advice.StorehouseId,
 			AdminUserId:             advice.AdminUserId,
+			LastPrice:               warehouse.Price,
+			StockCount:              advice.StockCount,
 		}
 
 		warehouseOutInfo.Count = stock_number
@@ -4782,6 +4820,8 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            advice.StorehouseId,
 			AdminUserId:             advice.AdminUserId,
+			LastPrice:               warehouse.Price,
+			StockCount:              advice.StockCount,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -4793,6 +4833,12 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		warehouse.Mtime = time.Now().Unix()
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+		if errThree != nil {
+			utils.ErrorLog("事务失败,原因为: %v", err.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
 
 		//查询默认仓库
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)