11月8日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 #

models/drug.go

@@ -75,6 +75,18 @@ func (BaseDrugLib) TableName() string {
 	return "xt_base_drug"
 }
 
+type BaseDrugLibSeven struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName  string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit   string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit   string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+}
+
+func (BaseDrugLibSeven) TableName() string {
+	return "xt_base_drug"
+}
+
 type DrugUnitSafeguard struct {
 	ID               int64  `gorm:"column:id" json:"id" form:"id"`
 	Unit             string `gorm:"column:unit" json:"unit" form:"unit"`

models/drug_stock.go

@@ -84,6 +84,15 @@ func (DrugWarehouseInfo) TableName() string {
 	return "xt_drug_warehouse_info"
 }
 
+type DrugWarehouseInfoSeven struct {
+	StockMaxNumber int64 `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber int64 `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+}
+
+func (DrugWarehouseInfoSeven) TableName() string {
+	return "xt_drug_warehouse_info"
+}
+
 type DrugWarehouseOut struct {
 	ID                      int64         `gorm:"column:id" json:"id" form:"id"`
 	WarehouseOutOrderNumber string        `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`

models/good_models.go

@@ -87,6 +87,15 @@ func (GoodInfo) TableName() string {
 	return "xt_good_information"
 }
 
+type GoodInfoSeven struct {
+	ID       int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodName string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+}
+
+func (GoodInfoSeven) TableName() string {
+	return "xt_good_information"
+}
+
 type GoodsTypeOne struct {
 	ID             int64       `gorm:"column:id" json:"id"`
 	TypeCode       string      `gorm:"column:type_code" json:"type_code"`

models/stock_models.go

@@ -137,6 +137,14 @@ func (WarehousingInfo) TableName() string {
 	return "xt_warehouse_info"
 }
 
+type WarehousingInfoSeven struct {
+	StockCount int64 `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+}
+
+func (WarehousingInfoSeven) TableName() string {
+	return "xt_warehouse_info"
+}
+
 type VmWarehousingInfo struct {
 	ID                int64       `gorm:"column:id" json:"id"`
 	WarehousingId     int64       `gorm:"column:warehousing_id" json:"warehousing_id"`

service/manage_center_service.go

@@ -173,6 +173,11 @@ func FindBaseDrugLibRecord(org_id int64, id int64) (lib models.BaseDrugLib, err
 	return
 }
 
+func FindBaseDrugLibRecordSeven(org_id int64, id int64) (lib models.BaseDrugLibSeven, err error) {
+	err = readDb.Select("id,drug_name,max_unit,min_number,min_unit").Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
+	return
+}
+
 func GetDrugAutoWarehouseOut(patient_id int64, advicedate int64, drugid int64) (*models.DrugWarehouseOutInfo, error) {
 	detail := models.DrugWarehouseOutInfo{}
 	err := XTReadDB().Model(&detail).Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1", patient_id, advicedate, drugid).Find(&detail).Error

service/stock_service.go

@@ -3563,12 +3563,23 @@ func FindGoodInfoByIdTwo(id int64) (goodInfo models.GoodInfo, err error) {
 	return
 }
 
+func FindGoodInfoByIdSeven(id int64) (goodInfo models.GoodInfoSeven, err error) {
+	err = readDb.Select("id,good_name").Where("id = ? AND status = 1", id).First(&goodInfo).Error
+	return
+}
+
 func GetGoodWarehouseInfo(good_id int64) (info []*models.WarehousingInfo, err error) {
 
 	err = readDb.Where("good_id = ? and status = 1 and stock_count<>0", good_id).Find(&info).Error
 	return info, err
 }
 
+func GetGoodWarehouseInfoSeven(good_id int64) (info []*models.WarehousingInfoSeven, err error) {
+
+	err = readDb.Select("stock_count").Where("good_id = ? and status = 1 and stock_count<>0", good_id).Find(&info).Error
+	return info, err
+}
+
 func GetAllStockList(page int64, limit int64, startime int64, endtime int64, good_type int64, keyword string, orgid int64) (info []*models.VmWarehousingInfo, total int64, err error) {
 
 	offset := (page - 1) * limit
@@ -4669,6 +4680,12 @@ func GetDrugWarehouseInfoPrescription(drugid int64, orgid int64) (info []*models
 	return info, err
 }
 
+func GetDrugWarehouseInfoPrescriptionSeven(drugid int64, orgid int64) (info []*models.DrugWarehouseInfoSeven, err error) {
+
+	err = XTReadDB().Select("id,stock_max_number,stock_min_number").Where("drug_id = ? and org_id =? and status = 1", drugid, orgid).Find(&info).Error
+	return info, err
+}
+
 func GetHisAdviceListByDrugId(drugid int64, patient_id int64, advice_date int64) (models.HisDoctorAdviceInfo, error) {
 
 	info := models.HisDoctorAdviceInfo{}

service/warhouse_service.go

@@ -451,6 +451,7 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 // 药品出库 递归方式
 func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
 
+	//fmt.Println("进来了吗323222222222222222222222222222222222222222222222222222222222222222222")
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -579,36 +580,49 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
 
+		//fmt.Println("deliver_number23332323232333232323233232323232",deliver_number)
 		maxNumber = deliver_number / drup.MinNumber
-		minNumber = deliver_number % drup.MinNumber
+
+		if deliver_number <= drup.MinNumber {
+			minNumber = deliver_number % drup.MinNumber
+		} else {
+			minNumber = deliver_number
+		}
+
+		if deliver_number <= drup.MinNumber && warehouse.StockMaxNumber == 0 {
+			minNumber = deliver_number
+		}
+
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
 
 		if drup.MaxUnit != drup.MinUnit {
-			if warehouse.StockMaxNumber < maxNumber {
+			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
 				return errors.New("库存数量不足")
 			}
 		}
 
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		//fmt.Println("最大单位23323232323232332323233232323",warehouse.StockMaxNumber)
 		if warehouse.StockMaxNumber < 0 {
 			warehouse.StockMaxNumber = 0
 		}
 
 		warehouse.Mtime = time.Now().Unix()
-
+		//fmt.Println("最小单位2323223233232233233232323232323323232",warehouse.StockMinNumber)
+		//fmt.Println("最小换算量233232332322323322332323232332323223",minNumber)
 		if warehouse.StockMinNumber < minNumber {
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 		} else {
-
+			//fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhh",warehouse.StockMinNumber,minNumber)
 			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
-
+			//fmt.Println("我的魏2232332322323323",warehouse.StockMinNumber)
 		}
 
 		if drup.MaxUnit != drup.MinUnit {
-			if warehouse.StockMaxNumber < 0 {
+			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
 				return errors.New("库存数量不足")
 			}
 		}