新增注册编码

controllers/his_api_controller.go

@@ -834,7 +834,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 	houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 	if adminInfo.CurrentOrgId == 9675 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10215 {
 		//获取所有基础药
-		drugs, _ := service.GetAllDrugLibListSeven(adminInfo.CurrentOrgId, houseConfig.DrugStorehouseOut)
+		drugs, _ := service.GetAllDrugLibListSix(adminInfo.CurrentOrgId, houseConfig.DrugStorehouseOut)
 		_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
 		if config.ID > 0 && config.IsOpen == 1 {
 			for _, item := range drugs {

controllers/stock_in_api_controller.go

@@ -268,6 +268,8 @@ func (c *StockManagerApiController) CreateWarehouse() {
 				dealer := int64(items["dealer"].(float64))
 
 				license_number, _ := items["license_number"].(string)
+
+				register_number, _ := items["register_number"].(string)
 				//入库单表格
 				warehouseInfo := &models.WarehousingInfo{
 					WarehousingOrder: warehousing.WarehousingOrder,
@@ -291,6 +293,7 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					LicenseNumber:    license_number,
 					PackingPrice:     packing_price,
 					StorehouseId:     storehouse_id,
+					RegisterNumber:   register_number,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -315,6 +318,7 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					ConsumableType:      1,
 					WarehousingDetailId: warehouseInfo.ID,
 					StorehouseId:        storehouse_id,
+					RegisterNumber:      register_number,
 				}
 				stockFlow = append(stockFlow, flow)
 			}
@@ -345,6 +349,7 @@ func (c *StockManagerApiController) CreateWarehouse() {
 			ConsumableType:      1,
 			WarehousingDetailId: warehousinginfo.ID,
 			StorehouseId:        storehouse_id,
+			RegisterNumber:      item.RegisterNumber,
 		}
 		service.CreateStockFlowOne(flow)
 	}
@@ -599,6 +604,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				manufacturer := int64(items["manufacturer"].(float64))
 				dealer := int64(items["dealer"].(float64))
 				license_number, _ := items["license_number"].(string)
+				register_number, _ := items["register_number"].(string)
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -629,6 +635,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						LicenseNumber:    license_number,
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
+						RegisterNumber:   register_number,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -656,6 +663,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						LicenseNumber:    license_number,
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
+						RegisterNumber:   register_number,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
@@ -680,6 +688,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						ConsumableType:      1,
 						WarehousingDetailId: warehouseInfo.ID,
 						StorehouseId:        storehouse_id,
+						RegisterNumber:      register_number,
 					}
 
 					stockFlow = append(stockFlow, flow)
@@ -715,6 +724,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				ConsumableType:      1,
 				WarehousingDetailId: info.ID,
 				StorehouseId:        storehouse_id,
+				RegisterNumber:      info.RegisterNumber,
 			}
 			_, errcodescode := service.GetGoodStockFlowInfo(info.ID, info.GoodId)
 
@@ -770,6 +780,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 					Remark:           item.Remark,
 					PackingPrice:     item.PackingPrice,
 					StorehouseId:     storehouse_id,
+					RegisterNumber:   item.RegisterNumber,
 				}
 
 				//改变库存
@@ -810,6 +821,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 					Remark:           item.Remark,
 					PackingPrice:     item.PackingPrice,
 					StorehouseId:     storehouse_id,
+					RegisterNumber:   item.RegisterNumber,
 				}
 
 				//改变库存
@@ -848,6 +860,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 					Remark:           item.Remark,
 					PackingPrice:     item.PackingPrice,
 					StorehouseId:     storehouse_id,
+					RegisterNumber:   item.RegisterNumber,
 				}
 				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
 				//查询该机构默认仓库
@@ -869,15 +882,16 @@ func (c *StockManagerApiController) EditWarehouse() {
 	if len(stockFlow) > 0 {
 		for _, item := range stockFlow {
 			flow := models.VmStockFlow{
-				Count:         item.Count,
-				Number:        item.Number,
-				ProductDate:   item.ProductDate,
-				ExpireDate:    item.ExpireDate,
-				Price:         item.Price,
-				Manufacturer:  item.Manufacturer,
-				Dealer:        item.Dealer,
-				LicenseNumber: item.LicenseNumber,
-				StorehouseId:  storehouse_id,
+				Count:          item.Count,
+				Number:         item.Number,
+				ProductDate:    item.ProductDate,
+				ExpireDate:     item.ExpireDate,
+				Price:          item.Price,
+				Manufacturer:   item.Manufacturer,
+				Dealer:         item.Dealer,
+				LicenseNumber:  item.LicenseNumber,
+				StorehouseId:   storehouse_id,
+				RegisterNumber: item.RegisterNumber,
 			}
 			parseDateErr := service.UpdatedStockFlowByGoodIdOne(item.WarehousingId, item.GoodId, flow)
 			fmt.Println(parseDateErr)
@@ -1442,6 +1456,8 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					productDate = theTime.Unix()
 				}
 				license_number := items["license_number"].(string)
+
+				register_number := items["register_number"].(string)
 				warehouseOutInfo := &models.WarehouseOutInfo{
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 					WarehouseOutId:          warehouseOut.ID,
@@ -1466,6 +1482,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					AdminUserId:             admin_user_id,
 					BuyPrice:                buy_price,
 					StockCount:              stock_count,
+					RegisterNumber:          register_number,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1780,6 +1797,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				license_number := items["license_number"].(string)
 
+				register_number := items["register_number"].(string)
+
 				timeLayout := "2006-01-02"
 				loc, _ := time.LoadLocation("Local")
 				expiry_date := items["expiry_date"].(string)
@@ -1892,6 +1911,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
+						RegisterNumber:          register_number,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
@@ -2032,6 +2052,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							StorehouseId:            item.StorehouseId,
 							AdminUserId:             item.AdminUserId,
 							StockCount:              item.StockCount,
+							RegisterNumber:          item.RegisterNumber,
 						}
 
 						//查询是否存在
@@ -2048,17 +2069,18 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							service.UpDateWarehouseOutInfo(item)
 							//更新流水
 							flow := models.VmStockFlow{
-								Number:        item.Number,
-								LicenseNumber: item.LicenseNumber,
-								Count:         item.Count,
-								Manufacturer:  item.Manufacturer,
-								Dealer:        item.Dealer,
-								ProductDate:   item.ProductDate,
-								ExpireDate:    item.ExpiryDate,
-								Price:         item.Price,
-								StorehouseId:  item.StorehouseId,
-								AdminUserId:   item.AdminUserId,
-								StockCount:    item.StockCount,
+								Number:         item.Number,
+								LicenseNumber:  item.LicenseNumber,
+								Count:          item.Count,
+								Manufacturer:   item.Manufacturer,
+								Dealer:         item.Dealer,
+								ProductDate:    item.ProductDate,
+								ExpireDate:     item.ExpiryDate,
+								Price:          item.Price,
+								StorehouseId:   item.StorehouseId,
+								AdminUserId:    item.AdminUserId,
+								StockCount:     item.StockCount,
+								RegisterNumber: item.RegisterNumber,
 							}
 							service.UpdateStockFlowByDetailId(flow, item.ID)
 
@@ -2128,6 +2150,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						StorehouseId:            item.StorehouseId,
 						AdminUserId:             item.AdminUserId,
 						StockCount:              item.StockCount,
+						RegisterNumber:          item.RegisterNumber,
 					}
 					//查询是否存在
 					_, errcode := service.GetWarehouseOutInfoIsExist(item.ID)
@@ -2142,17 +2165,18 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					} else if errcode == nil {
 						service.UpDateWarehouseOutInfo(item)
 						flow := models.VmStockFlow{
-							Number:        item.Number,
-							LicenseNumber: item.LicenseNumber,
-							Count:         item.Count,
-							Manufacturer:  item.Manufacturer,
-							Dealer:        item.Dealer,
-							ProductDate:   item.ProductDate,
-							ExpireDate:    item.ExpiryDate,
-							Price:         item.Price,
-							StorehouseId:  item.StorehouseId,
-							AdminUserId:   item.AdminUserId,
-							StockCount:    item.StockCount,
+							Number:         item.Number,
+							LicenseNumber:  item.LicenseNumber,
+							Count:          item.Count,
+							Manufacturer:   item.Manufacturer,
+							Dealer:         item.Dealer,
+							ProductDate:    item.ProductDate,
+							ExpireDate:     item.ExpiryDate,
+							Price:          item.Price,
+							StorehouseId:   item.StorehouseId,
+							AdminUserId:    item.AdminUserId,
+							StockCount:     item.StockCount,
+							RegisterNumber: item.RegisterNumber,
 						}
 						service.UpdateStockFlowByDetailId(flow, item.ID)
 						goodInfo := models.GoodInfo{
@@ -2177,18 +2201,19 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				errs = service.UpDateWarehouseOutInfo(item)
 				flow := models.VmStockFlow{
-					Number:        item.Number,
-					LicenseNumber: item.LicenseNumber,
-					Count:         item.Count,
-					Manufacturer:  item.Manufacturer,
-					Dealer:        item.Dealer,
-					ProductDate:   item.ProductDate,
-					ExpireDate:    item.ExpiryDate,
-					Price:         item.Price,
-					StorehouseId:  item.StorehouseId,
-					AdminUserId:   item.AdminUserId,
-					BuyPrice:      item.BuyPrice,
-					StockCount:    item.StockCount,
+					Number:         item.Number,
+					LicenseNumber:  item.LicenseNumber,
+					Count:          item.Count,
+					Manufacturer:   item.Manufacturer,
+					Dealer:         item.Dealer,
+					ProductDate:    item.ProductDate,
+					ExpireDate:     item.ExpiryDate,
+					Price:          item.Price,
+					StorehouseId:   item.StorehouseId,
+					AdminUserId:    item.AdminUserId,
+					BuyPrice:       item.BuyPrice,
+					StockCount:     item.StockCount,
+					RegisterNumber: item.RegisterNumber,
 				}
 				service.UpdateStockFlowByDetailId(flow, item.ID)
 				goodInfo := models.GoodInfo{

models/stock_models.go

@@ -142,6 +142,7 @@ type WarehousingInfo struct {
 	SupplyWarehouseDetailInfo int64       `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 	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"`
+	RegisterNumber            string      `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (WarehousingInfo) TableName() string {
@@ -258,6 +259,7 @@ type WarehouseOutInfo struct {
 	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"`
+	RegisterNumber          string       `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -509,6 +511,7 @@ type WarehouseOutInfoOne struct {
 	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"`
+	RegisterNumber              string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 type WarehouseOutInfoTwo struct {
@@ -623,6 +626,7 @@ type VmStockFlow struct {
 	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"`
+	RegisterNumber            string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (VmStockFlow) TableName() string {

service/stock_service.go

@@ -4127,7 +4127,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,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
+	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,x.register_number,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
 }
 
@@ -4156,7 +4156,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,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
+	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,x.register_number,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
 }
 
@@ -5997,7 +5997,7 @@ func UpdateWarehouseInfoByGoodId(info models.WarehousingInfo, id int64) error {
 
 func UpdateWarehouseInfoByGoodIdOne(info models.WarehousingInfo, id int64) error {
 
-	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId}).Error
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber}).Error
 	return err
 }
 
@@ -6009,12 +6009,12 @@ func UpdatedStockFlowByGoodId(warehousing_id int64, good_id int64, flow models.V
 
 func UpdatedStockFlowByGoodIdOne(warehousing_id int64, good_id int64, flow models.VmStockFlow) error {
 
-	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, good_id).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, "storehouse_id": flow.StorehouseId}).Error
+	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, good_id).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, "storehouse_id": flow.StorehouseId, "register_number": flow.RegisterNumber}).Error
 	return err
 }
 
 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, "stock_count": flow.StockCount}).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, "register_number": flow.RegisterNumber}).Error
 	return err
 }
 

service/warhouse_service.go

@@ -262,13 +262,18 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			}
 
 			if minNumber == 0 && maxNumber != 1 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
+
 			}
 
 		}
 
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
 			if warehouse.StockMinNumber == 0 {
 				warehouse.StockMaxNumber = stock_max_number
 			}
@@ -674,13 +679,18 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			}
 
 			if minNumber == 0 && maxNumber != 1 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
+
 			}
 		}
 
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
 
-			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			if warehouse.StockMinNumber == 0 {
 				warehouse.StockMaxNumber = stock_max_number
 			}
@@ -1841,6 +1851,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
+			RegisterNumber:          goods.RegisterNumber,
 		}
 		warehouseOutInfo.Count = goods.Count
 		//添加出库单详情
@@ -1884,6 +1895,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
+			RegisterNumber:          goods.RegisterNumber,
 		}
 
 		//创建出库流水
@@ -1951,6 +1963,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
+			RegisterNumber:          goods.RegisterNumber,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -2003,6 +2016,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
+			RegisterNumber:          goods.RegisterNumber,
 		}
 
 		//创建出库明细
@@ -2343,13 +2357,17 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			}
 
 			if minNumber == 0 && maxNumber != 1 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
 			}
 		}
 
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
 
-			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			if warehouse.StockMinNumber == 0 {
 				warehouse.StockMaxNumber = stock_max_number
 			}
@@ -2694,13 +2712,17 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			}
 
 			if minNumber == 0 && maxNumber != 1 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
+
 			}
 		}
 
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-
-			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
 			if warehouse.StockMinNumber == 0 {
 				warehouse.StockMaxNumber = stock_max_number
 			}
@@ -4401,20 +4423,29 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 		} else {
 			if minNumber > 0 {
 				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					if (warehouse.StockMinNumber - deliver_number) > 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
 				} else {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 				}
 			}
 
 			if minNumber == 0 && maxNumber != 1 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
+
 			}
 
 		}
 
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
+
 			if warehouse.StockMinNumber == 0 {
 				warehouse.StockMaxNumber = stock_max_number
 			}
@@ -4706,20 +4737,33 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		} else {
 			if minNumber > 0 {
 				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					if (warehouse.StockMinNumber - deliver_number) > 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
 				} else {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 				}
 			}
 
 			if minNumber == 0 && maxNumber != 1 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
+
 			}
 
 		}
 
+		fmt.Println("maxNumber2332323233223", maxNumber)
+		fmt.Println("minNumber", minNumber)
+		fmt.Println("warehouse.StockMinNumber2332322323", warehouse.StockMinNumber)
+		fmt.Println("deliver_number233232323233223332", deliver_number)
+
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
 			if warehouse.StockMinNumber == 0 {
 				warehouse.StockMaxNumber = stock_max_number
 			}