11月9日库存管理

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
-httpport = 9531
-runmode =prod
+httpport = 9529
+runmode =dev
 #dev/prod
 
 #

controllers/his_api_controller.go

@@ -6645,7 +6645,6 @@ func (c *HisApiController) Refund() {
 			infos = append(infos, &info.HisDoctorAdviceInfo)
 		}
 		if info.ProjectId > 0 && info.AdviceId == 0 {
-			fmt.Println("info232323233232233", order_id)
 			if info.HisPrescriptionProject.Type == 3 {
 				var good models.DialysisBeforePrepareGoods
 				var newGood models.NewDialysisBeforePrepareGoods

controllers/patient_api_controller.go

@@ -4526,10 +4526,7 @@ func (c *PatientApiController) GetRemindPatientList() {
 	limit, _ := c.GetInt64("limit", 10)
 	adminUserInfo := c.GetAdminUserInfo()
 	total, patients, _ := service.GetAllWaitRemindPatient(adminUserInfo.CurrentOrgId, page, limit)
-	fmt.Println("机构ID2222222222222", c.GetAdminUserInfo().CurrentOrgId)
-
 	_, errcode := service.GetOrgFollowIsExist(c.GetAdminUserInfo().CurrentOrgId)
-	fmt.Println("机构ID2222222222222", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		information, err := service.GetAdminUserRoleInformation(0)
 		if err != nil {

controllers/self_drug_api_congtroller.go

@@ -3410,7 +3410,6 @@ func (this *SelfDrugApiController) GetDrugNewQuery() {
 	for _, it := range drug {
 		var sum_count int64
 		var limit_count int64
-		fmt.Println("it233323323232323223", it.DrugName)
 		drugInfo, _ := service.GetDrugWarehouseInfoName(it.ID, orgId)
 		for _, item := range drugInfo {
 

controllers/stock_in_api_controller.go

@@ -154,6 +154,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/settle/stock", &StockManagerApiController{}, "Get:HandleSettleStock")
 	beego.Router("/api/settle/cancelstock", &StockManagerApiController{}, "Get:HandleRefundStock")
 
+	beego.Router("/api/stock/getnewgoodwarehouseinfo", &StockManagerApiController{}, "Get:GetNewGoodWarehouseInfo")
+
 }
 func (c *StockManagerApiController) HandleRefundStock() {
 	order_id, _ := c.GetInt64("order_id", 0)
@@ -663,6 +665,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)
@@ -694,6 +697,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
 						IsCheck:          2,
+						RegisterNumber:   register_number,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -721,6 +725,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						LicenseNumber:    license_number,
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
+						RegisterNumber:   register_number,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
@@ -745,6 +750,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						ConsumableType:      1,
 						WarehousingDetailId: warehouseInfo.ID,
 						StorehouseId:        storehouse_id,
+						RegisterNumber:      register_number,
 					}
 
 					stockFlow = append(stockFlow, flow)
@@ -7801,3 +7807,54 @@ func (this *StockManagerApiController) GetInvetoryWarehouseInfoList() {
 		"dealerList":       dealerList,
 	})
 }
+
+func (this *StockManagerApiController) GetNewGoodWarehouseInfo() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+
+	keywords := this.GetString("keywords")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	var goodids []int64
+	//查询商品名称
+	if len(keywords) > 0 {
+		//查询商品名称
+		list, _ := service.GetGoodInforByGoodName(keywords, orgId)
+		for _, item := range list {
+			goodids = append(goodids, item.ID)
+			//入库详情但里面查询
+		}
+	}
+
+	list, _ := service.GetNewGoodWarehouseInfo(startTime, endTime, orgId, goodids, storehouse_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+		//"manufacturerList": manufacturerList,
+		//"dealerList":       dealerList,
+	})
+}

service/manage_center_service.go

@@ -461,9 +461,15 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 			var sum_count int64  //该批次总库存
 			var over_count int64 //剩余数量
 
-			over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
+			if druginfo.MaxUnit != druginfo.MinUnit {
+				over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
+			}
+			if druginfo.MaxUnit == druginfo.MinUnit {
+				over_count = druginfo.StockMaxNumber + druginfo.StockMinNumber
+			}
+
 			if infos.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-				out_count = info.Count * drug.MinNumber
+				out_count = infos.Count * drug.MinNumber
 
 			}
 			if infos.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
@@ -491,7 +497,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 			fmt.Println("g该批次总库存wowowoowow", sum_count)
 			if (over_count + out_count) <= sum_count {
 				if its.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-
+					fmt.Print("itscoutn233232223999wi", its.Count)
 					//退库
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMinNumber: its.Count,
@@ -505,7 +511,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 
 				}
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-
+					fmt.Print("itscoutn999888", its.Count)
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
@@ -518,7 +524,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				}
 
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-
+					fmt.Print("itscoutnwohhhhwhw", its.Count)
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
@@ -906,7 +912,6 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 
 func GoodAutoAddCancelInfo(good *models.NewDialysisBeforePrepareGoods, creater int64) error {
 
-	fmt.Print("order_id223233232323223323223wo", good.OrderId)
 	//查询已经出库数量
 	info, _ := GetWareOutInfo(good.GoodId, good.RecordDate, good.UserOrgId, good.PatientId, good.OrderId)
 	if len(info) > 0 {

service/new_warehouse_service.go

@@ -1848,6 +1848,9 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
 		}
 
+		fmt.Println("libai", out_count)
+		fmt.Println("cancel", cancel_count)
+		fmt.Println("deliver_number", deliver_number)
 		if deliver_number < (out_count - cancel_count) {
 			operation_time := time.Now().Unix()
 
@@ -2002,7 +2005,7 @@ func GetSigleDrugWarehouseOutInfoOne(patient_id int64, advice_date int64, orgid
 
 func UpdateSingleDrugWarehouseOutInfoSix(patient_id int64, advice_date int64, orgid int64, info *models.DrugWarehouseOutInfo, advice_id int64) error {
 
-	err := XTWriteDB().Model(&models.XtDrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time = ? and org_id = ? and advice_id = ?", patient_id, advice_date, orgid, advice_id).Update(map[string]interface{}{"count": info.Count, "price": info.Price, "total_price": info.TotalPrice, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "number": info.Number, "batch_number": info.BatchNumber, "count_unit": info.CountUnit, "warehouse_info_id": info.WarehouseInfoId, "storehouse_id": info.StorehouseId}).Error
+	err := XTWriteDB().Model(&models.XtDrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time = ? and org_id = ? and advice_id = ? and status= 1", patient_id, advice_date, orgid, advice_id).Update(map[string]interface{}{"count": info.Count, "price": info.Price, "total_price": info.TotalPrice, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "number": info.Number, "batch_number": info.BatchNumber, "count_unit": info.CountUnit, "warehouse_info_id": info.WarehouseInfoId, "storehouse_id": info.StorehouseId}).Error
 	return err
 }
 
@@ -2083,7 +2086,7 @@ func FindDrugCancelStock(return_date int64, org_id int64) (*models.DrugCancelSto
 
 	stock := models.DrugCancelStock{}
 	var err error
-	err = XTReadDB().Where("return_date = ? and org_id = ? and status = 1", return_date, org_id).Find(&stock).Error
+	err = XTReadDB().Where("return_time = ? and org_id = ? and status = 1", return_date, org_id).Find(&stock).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -2096,7 +2099,7 @@ func FindDrugCancelStock(return_date int64, org_id int64) (*models.DrugCancelSto
 func FindLastDrugCancelStock(advice_date int64, org_id int64) (models.DrugCancelStock, error) {
 
 	cancelStock := models.DrugCancelStock{}
-	err := XTReadDB().Where("return_date = ? and org_id = ? and status = 1", advice_date, org_id).Find(&cancelStock).Error
+	err := XTReadDB().Where("return_time = ? and org_id = ? and status = 1", advice_date, org_id).Find(&cancelStock).Error
 	return cancelStock, err
 }
 
@@ -2127,15 +2130,19 @@ func UpdateHisPrescriptionProjectStatus(project_id int64, record_time int64, use
 }
 
 // 药品自动出库 递归方式
-func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
+func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, prescribingCount float64) (err error) {
 
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
+	var deliver_number_one int64 = 0
 	var stock_number int64 = 0
 
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
+	prescribingCount_temp := strconv.FormatFloat(math.Abs(prescribingCount), 'f', 0, 64)
+	prescribe_count, _ := strconv.ParseInt(prescribingCount_temp, 10, 64)
+
 	var drug_price float64
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		deliver_number = count * drup.MinNumber
@@ -2145,6 +2152,14 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 	}
 
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		deliver_number_one = prescribe_count * drup.MinNumber
+
+	} else {
+		deliver_number_one = prescribe_count
+
+	}
+
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		drug_price = drup.RetailPrice
 	}
@@ -2162,7 +2177,8 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 	// 如果没有对应的库存，则报错
 	storeConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
-	if lastWarehouse.StockMinNumber >= drup.MinNumber {
+
+	if lastWarehouse.StockMinNumber >= drup.MinNumber && lastWarehouse.MaxUnit != lastWarehouse.MinUnit {
 		var stockMax int64
 		var stockMin int64
 		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
@@ -2174,7 +2190,6 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 
 	if err != nil {
-
 		return err
 	}
 	// 将该批次的剩余库存数量转换为拆零数量
@@ -2196,8 +2211,8 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 	}
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
-	fmt.Println("stock_nbumber3223323232", stock_number)
-	fmt.Println("deliver_number", deliver_number)
+	fmt.Println("剩余库存2332233223232323", stock_number)
+	fmt.Println("出库数量233232332323232", deliver_number)
 	if stock_number >= deliver_number {
 
 		var maxNumber int64 = 0
@@ -2235,41 +2250,83 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 		warehouse.Mtime = time.Now().Unix()
 
-		fmt.Println("minnU目标而332322323323233223323223我", minNumber)
-		fmt.Println("max_number232232332232322wo", maxNumber)
-		fmt.Println(" warehouse.StockMinNumber", warehouse.StockMinNumber)
+		//fmt.Println("minnU目标而332322323323233223323223我", minNumber)
+		//fmt.Println("max_number232232332232322wo", maxNumber)
+		//fmt.Println(" warehouse.StockMinNumber", warehouse.StockMinNumber)
 
-		if warehouse.StockMinNumber < minNumber {
+		if warehouse.MaxUnit != warehouse.MinUnit {
+			if warehouse.StockMinNumber < minNumber {
 
-			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-			if warehouse.MaxUnit != warehouse.MinUnit {
-				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-			}
-		} else {
-			if minNumber > 0 {
-				if (warehouse.StockMinNumber - minNumber) >= 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+				if warehouse.MaxUnit != warehouse.MinUnit {
+					warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 				}
+			} else {
+				if minNumber > 0 {
+					if (warehouse.StockMinNumber - minNumber) >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+					}
 
-			}
+				}
 
-			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
-				if warehouse.StockMinNumber > 0 {
-					if warehouse.StockMinNumber-deliver_number >= 0 {
+				if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+					if warehouse.StockMinNumber > 0 {
+						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
 					}
 
 				}
 
 			}
-
 		}
 
-		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-			if (warehouse.StockMinNumber - deliver_number) >= 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+		if warehouse.MinUnit == warehouse.MaxUnit {
+			//fmt.Println("minNUMBER233223233223322323",minNumber)
+			//fmt.Println("warehouse.StockMinNumber",warehouse.StockMinNumber)
+			//fmt.Println("warehouse.StockMaxNumber",warehouse.StockMaxNumber)
+			if warehouse.StockMaxNumber > 0 && warehouse.StockMinNumber == 0 && warehouse.StockMaxNumber >= minNumber {
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - minNumber
+
 			}
 
+			if warehouse.StockMaxNumber == 0 && warehouse.StockMinNumber > 0 && warehouse.StockMinNumber >= minNumber {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+			}
+
+			if warehouse.StockMaxNumber > 0 && warehouse.StockMinNumber > 0 && (warehouse.StockMaxNumber+warehouse.StockMinNumber) > minNumber {
+
+				var out_false int64 = 0
+				if warehouse.StockMinNumber >= minNumber {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+					out_false = 1
+				}
+				fmt.Println("out_false233223233223wo", out_false)
+				if warehouse.StockMinNumber < minNumber && out_false == 0 {
+
+					var over_total int64
+					over_total = warehouse.StockMinNumber
+					warehouse.StockMinNumber = 0
+					warehouse.StockMaxNumber = warehouse.StockMaxNumber - (minNumber - over_total)
+				}
+			}
+
+			//if warehouse.StockMaxNumber < minNumber && warehouse.StockMaxNumber < minNumber && (warehouse.StockMaxNumber + warehouse.StockMinNumber) > minNumber {
+			//  var over_count int64
+			//  over_count = warehouse.StockMinNumber
+			//  warehouse.StockMinNumber = 0
+			//  warehouse.StockMaxNumber = warehouse.StockMaxNumber - (minNumber -over_count)
+			//
+			//}
+
 		}
 
 		if drup.MaxUnit != drup.MinUnit {
@@ -2330,7 +2387,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 		//查询今日该药品该患者是否有出库数据
 		lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
-
+		fmt.Println("lastDrugOutInfo0000000293293292392392393293239239", lastDrugOutInfo)
 		if lastDrugOutInfo.ID == 0 {
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -2345,7 +2402,10 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			if lastDrugOutInfo.CountUnit == drup.MinUnit {
 				his_count = lastDrugOutInfo.Count
 			}
+			fmt.Println("deliver_numberwode8888888823832832832832832832823823-------------------------", deliver_number)
+			fmt.Println("his_countnide-------------------------------------------------------", his_count)
 			if deliver_number != his_count {
+				//warehouseOutInfo.Count = deliver_number_one
 				errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
 				if errThree != nil {
 					return errThree
@@ -2367,11 +2427,11 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			cancel_count += item.Count
 		}
 
-		fmt.Println("deliver_number", deliver_number)
+		fmt.Println("deliver_number_one", deliver_number)
 		fmt.Println("out_count", out_count)
 		fmt.Println("cancel_count", cancel_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
-		if deliver_number > (out_count - cancel_count) {
+		if deliver_number_one > (out_count - cancel_count) {
 			drugflow := models.DrugFlow{
 				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 				WarehouseOutId:          warehouseout.ID,
@@ -2379,7 +2439,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 				Number:                  warehouse.Number,
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   deliver_number - (out_count - cancel_count), //按最小单位计算,
+				Count:                   deliver_number_one - (out_count - cancel_count), //按最小单位计算,
 				Price:                   warehouse.RetailPrice,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
@@ -2450,7 +2510,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 		}
 
 		//如果本次出库数据小于历史出库数据 新增1条退库流水
-		if deliver_number < (out_count - cancel_count) {
+		if deliver_number_one < (out_count - cancel_count) {
 
 			operation_time := time.Now().Unix()
 
@@ -2484,9 +2544,9 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 			manufactureName, _ := GetManufactureById(warehouse.Manufacturer)
 			dealer, _ := GetDealerById(warehouse.Dealer)
-			cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+			//cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
 			cancelStockInfo := models.DrugCancelStockInfo{
-				OrderNumber:      cancelInfo.OrderNumber,
+				OrderNumber:      lastDrugCancelStock.OrderNumber,
 				CancelStockId:    lastDrugCancelStock.ID,
 				DrugId:           advice.DrugId,
 				Count:            (out_count - cancel_count) - deliver_number,
@@ -2658,17 +2718,21 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			OrderId:                 warehouseout.OrderId,
 		}
 		//查询是否存在出库数据
-		_, errCode := GetSigleDrugWarehouseOutInfo(advice.PatientId, advice.AdviceDate, orgID)
-		if errCode == gorm.ErrRecordNotFound {
+
+		lastDrugOutInfoTwo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
+		//_, errCode := GetSigleDrugWarehouseOutInfo(advice.PatientId, advice.AdviceDate, orgID)
+		//fmt.Println("errcoedee232233223233232323232323233223232323322323232323232323",errCode)
+		if lastDrugOutInfoTwo.ID == 0 {
 
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
 				return errOne
 			}
 		}
-		if errCode == nil {
+		if lastDrugOutInfoTwo.ID > 0 {
 
 			lastDrugOutInfo, _ := GetSigleDrugWarehouseOutInfoOne(advice.PatientId, advice.AdviceDate, orgID)
+			fmt.Println("中国人民肌肤32323223332332232322323喔", lastDrugOutInfo)
 			var his_count int64
 			if lastDrugOutInfo.CountUnit == drup.MaxUnit {
 				his_count = lastDrugOutInfo.Count * drup.MinNumber
@@ -2676,7 +2740,10 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			if lastDrugOutInfo.CountUnit == drup.MinUnit {
 				his_count = lastDrugOutInfo.Count
 			}
+			fmt.Println("deliver_number3232323232wowooww", deliver_number)
+			fmt.Println("his_count99999992i2222wo", his_count)
 			if deliver_number != his_count {
+
 				errThree := UpdateSingleDrugWarehouseOutInfoSix(advice.PatientId, advice.AdviceDate, orgID, warehouseOutInfo, advice.ID)
 				if errThree != nil {
 					return errThree
@@ -2727,6 +2794,9 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			cancel_count += item.Count
 		}
 
+		fmt.Println("出库数量", deliver_number)
+		fmt.Println("out_coutn233232322323wo", cancel_count)
+		fmt.Println("out_count99988233232", out_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		if deliver_number > (out_count - cancel_count) {
 
@@ -2768,6 +2838,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 		}
 
 		if deliver_number < (out_count - cancel_count) {
+			fmt.Println("即那里3232232323")
 			operation_time := time.Now().Unix()
 
 			ctime := time.Now().Unix()
@@ -2880,8 +2951,9 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
 		advice.PrescribingNumberUnit = drup.MinUnit
+		fmt.Println("剩余库存9999999233232", overPlusNumber)
 
-		HisSettleDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
+		HisSettleDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, prescribingCount)
 	}
 
 	return

service/stock_service.go

@@ -8380,3 +8380,26 @@ func GetWarehouseOutInfoIsExistSix(good_id int64, patient_id int64, record_time
 	}
 	return &info, nil
 }
+
+func GetNewGoodWarehouseInfo(startime int64, endtime int64, orgid int64, good_id []int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
+
+	db := XTReadDB().Model(&info).Where("status = 1")
+
+	if startime > 0 {
+		db = db.Where("ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(good_id) > 0 {
+		db = db.Where("good_id in(?)", good_id)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+	err = db.Find(&info).Error
+	return info, err
+}

service/warhouse_service.go

@@ -12219,7 +12219,7 @@ func HisSettleDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctor
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
 
-			HisSettleDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
+			HisSettleDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber)
 
 		} else {
 			return errors.New("药品信息不存在")