11月8日库存管理

controllers/supply_order_api_contorller.go

@@ -2077,6 +2077,7 @@ func (this *SupplyOrderApiController) GetAllOrderCountList() {
 	purcaseOrder, _ := service.GetAllPurcaseOrderById(id, orgId)
 	//获取购货单的数据
 	goodOrder, err := service.GetAllGoodOrderByIdSix(id, orgId)
+	fmt.Println("2323232332232323232332", goodOrder)
 	drugList, err := service.GetSupplyDrugList(orgId)
 
 	if err == nil {
@@ -2708,12 +2709,17 @@ func (this *SupplyOrderApiController) SaveGoodReturnOrder() {
 	}
 
 	for _, item := range warehouseCancel {
+		if item.SupplyWarehouseDetailInfo > 0 {
+			item.Type = 1
+		} else {
+			item.Type = 2
+		}
 		service.CreateCancelReturnOrder(item)
 		//查询该商品在退库单中是否存在
 		_, errcodes := service.GetSupplyWarehouseOutIsExsit(item.WarehouseOutId, item.ProjectId, orgId)
 		//如果不存在则情况退库单的关联信息
 		if errcodes == gorm.ErrRecordNotFound {
-			service.ModfySupplyCancel(item.WarehouseCancelId, orgId)
+			service.ModfySupplyCancel(item.WarehouseCancelId, orgId, item.ProjectId)
 
 		}
 
@@ -3034,7 +3040,7 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 						Status:                  1,
 						Mtime:                   0,
 						WarehouseCancelId:       warehouse_out_id,
-						Type:                    1,
+						Type:                    2,
 						ReturnNumber:            return_number,
 						WarehouseOutId:          warehouse_out_id,
 						SupplySpecificationName: supply_specification_name,
@@ -3054,11 +3060,13 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 
 		if len(updateWarehouseCancel) > 0 {
 			for _, item := range updateWarehouseCancel {
+
 				service.UpdateWarehouseCancelOrder(item)
 			}
 		}
 		if len(warehouseCancel) > 0 {
 			for _, item := range warehouseCancel {
+
 				service.CreateCancelReturnOrder(item)
 			}
 		}
@@ -3277,14 +3285,14 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 	//获取退库单详情
 	list, _ := service.GetSupplyCancelOrderDetail(id, orgId)
 	for _, item := range list {
-
+		fmt.Println("itme.233232323232323232323232323232232332", item.Type)
 		var total_count int64
 		var prescribing_number_total int64
 		//药品
 		if item.IsSource == 1 {
 
 			//获取药品库存
-			info, _ := service.GetDrugTotalCountTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo)
+			info, _ := service.GetDrugTotalCountTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo, item.Type)
 
 			for _, it := range info {
 
@@ -3399,12 +3407,13 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				SupplyCancelOutId:       id,
 				SupplyWarehouseId:       warehouse_out_id,
 				SysRecordTime:           record_date,
+				IsSource:                item.Type,
 			}
 
 			drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
 			if drup.ID > 0 {
 				prescribingNumber := item.SupplyCount
-				service.AutoDrugDeliverInfoNight(orgId, prescribingNumber, &warehouseOut, &drup, warehouseOutInfo)
+				service.AutoDrugDeliverInfoNight(orgId, prescribingNumber, &warehouseOut, &drup, warehouseOutInfo, warehouse_out_id, id)
 			}
 
 			//修改原数据
@@ -3417,7 +3426,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 		//耗材
 		if item.IsSource == 2 {
 			// 查询该耗材是否有库存
-			warehouseOne, _ := service.FindWarehousingInfoTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo)
+			warehouseOne, _ := service.FindWarehousingInfoTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo, item.Type)
 
 			// 如果出库数量大于该批次剩余库存数量
 			if item.SupplyCount > warehouseOne.StockCount {
@@ -3490,6 +3499,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				SupplyCancelOutId:       id,
 				OrgId:                   orgId,
 				SupplyWarehouseId:       warehouse_out_id,
+				IsSource:                item.Type,
 			}
 			//出库逻辑
 			parseDateErr := service.ConsumablesDeliveryNight(orgId, record_date, info, &warehouseOut, item.SupplyCount, creater, warehouse_out_id, id)
@@ -3499,11 +3509,6 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 				return
 			}
-			//更改原退库数据
-			//order := models.SpSupplierWarehousingCancelOrder{
-			//	SourceCount: item.SourceCount - item.SupplyCount,
-			//}
-			//service.UpdateSupplyCancelById(item.ID, order)
 		}
 	}
 	cancel := models.SpSupplierWarehouseCancel{
@@ -3512,7 +3517,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 		CheckTime: record_date,
 	}
 	err := service.CheckReturnOrder(id, orgId, cancel)
-
+	fmt.Println("3232233232322332232323232323322332232323232323")
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msg":        "1",

models/drug_stock.go

@@ -154,6 +154,7 @@ type DrugWarehouseOutInfo struct {
 	AdviceId                int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
 	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"`
+	IsSource                int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {

models/stock_models.go

@@ -242,6 +242,7 @@ type WarehouseOutInfo struct {
 	ProjectId               int64        `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	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"`
+	IsSource                int64        `gorm:"column:is_source" json:"is_source" form:"is_source"`
 }
 
 func (WarehouseOutInfo) TableName() string {

models/supply.models.go

@@ -71,6 +71,7 @@ type SpWarehouseInfo struct {
 	Status                    int64 `gorm:"column:status" json:"status" form:"status"`
 	OrgId                     int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	SupplyWarehouseDetailInfo int64 `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	SupplyWarehouseId         int64 `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (SpWarehouseInfo) TableName() string {
@@ -88,6 +89,7 @@ type SpDrugWarehouseInfo struct {
 	Status                    int64  `gorm:"column:status" json:"status" form:"status"`
 	OrgId                     int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	SupplyWarehouseDetailInfo int64  `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	SupplyWarehouseId         int64  `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (SpDrugWarehouseInfo) TableName() string {

service/gobal_config_service.go

@@ -715,7 +715,7 @@ func GetDrugStockOutFlow(drugid int64, startime int64, endtime int64, page int64
 
 func GetBatchOrderDetail(drugid int64, orgid int64, page int64, limit int64) (drug []*models.DrugWarehouseInfo, total int64, err error) {
 	offset := (page - 1) * limit
-	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ?", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Find(&drug).Error
+	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ? and status = 1", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Find(&drug).Error
 	return drug, total, err
 }
 

service/stock_service.go

@@ -772,6 +772,17 @@ func FindLastDrugWarehousingInfoByID(drug_id int64) (info models.XtDrugWarehouse
 	return info, err
 }
 
+func FindLastDrugWarehousingInfoByIDSix(drug_id int64, warehouse_out_id int64, is_source int64) (info models.XtDrugWarehouseInfo, err error) {
+	if is_source == 1 {
+		err = readDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) and supply_warehouse_id = ? ", drug_id, warehouse_out_id).Order("ctime").First(&info).Error
+	}
+
+	if is_source == 2 || is_source == 0 {
+		err = readDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0)", drug_id).Order("ctime").First(&info).Error
+	}
+	return info, err
+}
+
 // 出库时先进先出，找出最先入库的批次
 func FindLastWarehousingInfoByID(drug_id int64) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("drup_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) ", drug_id).Order("ctime").First(&info).Error

service/supply_service.go

@@ -729,7 +729,7 @@ func GetGoodReturnOrderDetail(id int64, orgid int64) (order []*models.SpSupplier
 
 func UpdateWarehouseCancelOrder(order *models.SpSupplierWarehousingCancelOrder) error {
 
-	err = XTWriteDB().Model(&order).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{"manufacturer_id": order.ManufacturerId, "order_number": order.OrderNumber, "project_id": order.ProjectId, "is_source": order.IsSource, "count": order.Count, "price": order.Price, "remark": order.Remark, "rate_of_concession": order.RateOfConcession, "discount_amount": order.DiscountAmount, "type": order.Type, "supply_specification_name": order.SupplySpecificationName, "supply_type": order.SupplyType, "supply_total": order.SupplyTotal, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "supply_license_number": order.SupplyLicenseNumber, "supply_count": order.SupplyCount, "deposit_rate": order.DepositRate}).Error
+	err = XTWriteDB().Model(&order).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{"manufacturer_id": order.ManufacturerId, "order_number": order.OrderNumber, "project_id": order.ProjectId, "is_source": order.IsSource, "count": order.Count, "price": order.Price, "remark": order.Remark, "rate_of_concession": order.RateOfConcession, "discount_amount": order.DiscountAmount, "supply_specification_name": order.SupplySpecificationName, "supply_type": order.SupplyType, "supply_total": order.SupplyTotal, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "supply_license_number": order.SupplyLicenseNumber, "supply_count": order.SupplyCount, "deposit_rate": order.DepositRate}).Error
 	return err
 }
 
@@ -929,7 +929,7 @@ func GetDrugWarehouseOutById(orgid int64, record_date int64) (*models.DrugWareho
 
 	out := models.DrugWarehouseOut{}
 	var err error
-	err = XTReadDB().Where("org_id = ? and warehouse_out_time = ?", orgid, record_date).Find(&out).Error
+	err = XTReadDB().Where("org_id = ? and warehouse_out_time = ? and status =1", orgid, record_date).Find(&out).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -1026,25 +1026,46 @@ func ModfySupplyWarehouseOut(warehousing_id int64, orgid int64) error {
 	return err
 }
 
-func FindWarehousingInfoTwenTy(goodId int64, supply_warehouse_detail_info int64) (models.WarehousingInfo, error) {
+func FindWarehousingInfoTwenTy(goodId int64, supply_warehouse_detail_info int64, source int64) (models.WarehousingInfo, error) {
+	fmt.Println("source232232332232323232323", source)
 	info := models.WarehousingInfo{}
-	err := XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1 and supply_warehouse_detail_info =?", goodId, supply_warehouse_detail_info).Find(&info).Error
+	var err error
+	if source == 1 {
+		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1 and supply_warehouse_detail_info =?", goodId, supply_warehouse_detail_info).Find(&info).Error
+
+	}
+	if source == 2 {
+		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1", goodId).Find(&info).Error
+
+	}
 	return info, err
 }
 
-func GetDrugTotalCountTwenTy(drugid int64, supply_warehouse_detail_info int64) (list []*models.VmDrugWarehouseInfo, err error) {
+func GetDrugTotalCountTwenTy(drugid int64, supply_warehouse_detail_info int64, source int64) (list []*models.VmDrugWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
-	table := XTReadDB().Table("xt_base_drug as d").Where("d.status = 1")
-	fmt.Println(table)
-	if drugid > 0 {
-		db = db.Where("x.drug_id = ?", drugid)
-	}
-	if supply_warehouse_detail_info > 0 {
-		db = db.Where("x.supply_warehouse_detail_info = ?", supply_warehouse_detail_info)
+	if source == 1 {
+		db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+		table := XTReadDB().Table("xt_base_drug as d").Where("d.status = 1")
+		fmt.Println(table)
+		if drugid > 0 {
+			db = db.Where("x.drug_id = ?", drugid)
+		}
+		if supply_warehouse_detail_info > 0 {
+			db = db.Where("x.supply_warehouse_detail_info = ?", supply_warehouse_detail_info)
+		}
+		err = db.Select("x.drug_id,x.stock_max_number,x.stock_min_number,d.min_number,d.max_unit,d.min_unit,x.max_unit as count_unit,x.supply_warehouse_detail_info").Joins("left join xt_base_drug as d on d.id = x.drug_id").Scan(&list).Error
 	}
-	err = db.Select("x.drug_id,x.stock_max_number,x.stock_min_number,d.min_number,d.max_unit,d.min_unit,x.max_unit as count_unit,x.supply_warehouse_detail_info").Joins("left join xt_base_drug as d on d.id = x.drug_id").Scan(&list).Error
 
+	if source == 2 {
+		db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+		table := XTReadDB().Table("xt_base_drug as d").Where("d.status = 1")
+		fmt.Println(table)
+		if drugid > 0 {
+			db = db.Where("x.drug_id = ?", drugid)
+		}
+		err = db.Select("x.drug_id,x.stock_max_number,x.stock_min_number,d.min_number,d.max_unit,d.min_unit,x.max_unit as count_unit,x.supply_warehouse_detail_info").Joins("left join xt_base_drug as d on d.id = x.drug_id").Scan(&list).Error
+
+	}
 	return list, err
 }
 
@@ -1062,11 +1083,11 @@ func GetSupplyWarehouseOutIsExsit(warehouse_out_id int64, project_id int64, orgi
 	return &out, nil
 }
 
-func ModfySupplyCancel(id int64, orgid int64) error {
+func ModfySupplyCancel(id int64, orgid int64, project_id int64) error {
 
 	err := XTWriteDB().Model(models.SpSupplierWarehouseCancel{}).Where("id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"warehouse_out_id": 0}).Error
 
-	err = XTWriteDB().Model(models.SpSupplierWarehousingCancelOrder{}).Where("warehouse_cancel_id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"warehouse_info_id": 0, "warehouse_out_id": 0, "warehousing_id": 0, "good_number": "", "order_number": ""}).Error
+	err = XTWriteDB().Model(models.SpSupplierWarehousingCancelOrder{}).Where("warehouse_cancel_id = ? and user_org_id = ? and status = 1 and project_id = ?", id, orgid, project_id).Updates(map[string]interface{}{"warehouse_info_id": 0, "warehouse_out_id": 0, "warehousing_id": 0, "good_number": "", "order_number": ""}).Error
 	return err
 }
 
@@ -1168,3 +1189,9 @@ func GetAllGoodWarehouseInfo(orgid int64) (info []*models.WarehousingInfo, err e
 	err = XTReadDB().Where("org_id = ? and status = 1 and supply_warehouse_id>0", orgid).Find(&info).Error
 	return info, err
 }
+
+func GetLastDrugWarehosueInfoByWarehouseOutId(orgid int64, warehouse_out_id int64) (models.XtDrugWarehouseInfo, error) {
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Model(&info).Where("user_org_id = ? and status = 1 and supply_warehouse_id = ?", orgid, warehouse_out_id).Find(&info).Error
+	return info, err
+}

service/warhouse_service.go

@@ -806,6 +806,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 
 	fmt.Println("库存1", stock_number)
 	fmt.Println("c出库数量", deliver_number)
+
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -877,6 +878,9 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 		if advice.CountUnit == drup.MinUnit {
 			maxNumber = prescribingNumber / drup.MinNumber
 			minNumber = prescribingNumber % drup.MinNumber
+			if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+				minNumber = maxNumber
+			}
 		} else {
 			maxNumber = prescribingNumber
 		}
@@ -895,6 +899,11 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 		} else {
 			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 		}
+		fmt.Println("ware233232322332323232", warehouse.StockMaxNumber)
+		fmt.Println("ware233232322332323232", warehouse.StockMinNumber)
+		if warehouse.StockMaxNumber == 1 && warehouse.StockMinNumber == 1 && drup.MaxUnit == drup.MinUnit {
+			warehouse.StockMinNumber = 0
+		}
 
 		if warehouse.StockMaxNumber < 0 {
 			return errors.New("库存数量不足")
@@ -2406,9 +2415,13 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 		}
 
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
 		warehouse.Mtime = time.Now().Unix()
 
 		if warehouse.StockMinNumber < minNumber {
+			fmt.Println("233323232233223")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 		} else {
@@ -2782,7 +2795,7 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 
 	// 如果没有对应的库存，则报错
-	warehouse, err := FindFirstWarehousingInfoByStockNight(goods.GoodId, goods.GoodTypeId, warehouse_out_id)
+	warehouse, err := FindFirstWarehousingInfoByStockNight(goods.GoodId, goods.GoodTypeId, warehouse_out_id, goods.IsSource)
 	if err != nil {
 
 		return err
@@ -2970,13 +2983,21 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 	return nil
 }
 
-func FindFirstWarehousingInfoByStockNight(good_id int64, good_type_id int64, warehouse_out_id int64) (info models.WarehousingInfo, err error) {
-	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0 and supply_warehouse_id = ?", good_id, good_type_id, warehouse_out_id).Order("ctime").First(&info).Error
+func FindFirstWarehousingInfoByStockNight(good_id int64, good_type_id int64, warehouse_out_id int64, is_source int64) (info models.WarehousingInfo, err error) {
+
+	fmt.Println("is_source2233232233232323232232323", is_source)
+	if is_source == 1 {
+		err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0 and supply_warehouse_id = ?", good_id, good_type_id, warehouse_out_id).Order("ctime").First(&info).Error
+
+	}
+	if is_source == 2 || is_source == 0 {
+		err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0", good_id, good_type_id).Order("ctime").First(&info).Error
+	}
 	return info, err
 }
 
 // 药品出库 递归方式
-func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
+func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo, warehouse_out_id int64, cancel_out_id int64) (err error) {
 
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
@@ -2992,7 +3013,7 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 	// 如果没有对应的库存，则报错
 	//开启事物
 
-	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
+	warehouse, err := FindLastDrugWarehousingInfoByIDSix(advice.DrugId, warehouse_out_id, advice.IsSource)
 
 	if err != nil {
 
@@ -3077,16 +3098,25 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 		if advice.CountUnit == drup.MinUnit {
 			maxNumber = prescribingNumber / drup.MinNumber
 			minNumber = prescribingNumber % drup.MinNumber
+			if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+				minNumber = maxNumber
+			}
 		} else {
 			maxNumber = prescribingNumber
 		}
-
+		fmt.Println("maxNUMBER23323232323323322323", maxNumber)
+		fmt.Println("MIN_NUMBWEEEWEWEWWEEWEWEWWE", minNumber)
+		fmt.Println("编辑55555555555555")
 		if warehouse.StockMaxNumber < maxNumber {
 
 			return errors.New("库存数量不足")
 		}
 
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
+
 		warehouse.Mtime = time.Now().Unix()
 
 		if warehouse.StockMinNumber < minNumber {
@@ -3099,6 +3129,9 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 		if warehouse.StockMaxNumber < 0 {
 			return errors.New("库存数量不足")
 		}
+		if warehouse.StockMaxNumber == 1 && warehouse.StockMinNumber == 1 && drup.MaxUnit == drup.MinUnit {
+			warehouse.StockMinNumber = 0
+		}
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
@@ -3182,7 +3215,7 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 		prescribingNumber_two_temp := deliver_number - stock_number
 		advice.CountUnit = drup.MinUnit
 
-		AutoDrugDeliverInfoNight(orgID, prescribingNumber_two_temp, warehouseout, drup, advice)
+		AutoDrugDeliverInfoNight(orgID, prescribingNumber_two_temp, warehouseout, drup, advice, warehouse_out_id, cancel_out_id)
 	}
 
 	return