11月8日库存管理

conf/app.conf

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

controllers/drug_stock_api_contorller.go

@@ -119,6 +119,9 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 	if warehousing_id == 0 {
 		service.AddSigleDrugWarehouse(&warehousing)
 	}
+	if warehousing_id > 0 {
+		service.UpdateSigleDrugWarehouse(warehousing_id, storehouse_id)
+	}
 	info, _ := service.FindLastWarehousingSeven(adminUserInfo.CurrentOrgId)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -1171,6 +1174,9 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 	if warehouse_out_id == 0 {
 		service.AddSigleDrugWarehouseOut(&warehouseOut)
 	}
+	if warehouse_out_id > 0 {
+		service.UpdateSingleDrugWarehouseOut(warehouse_out_id, storehouse_id)
+	}
 	lastWarehouseOut, _ := service.GetDrugLastWarehouseOut(adminUserInfo.CurrentOrgId)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -1419,35 +1425,35 @@ func (c *StockDrugApiController) DeleteDrugWarehouseOut() {
 	idArray := strings.Split(ids, ",")
 	err := service.DeleteDrugWarehouseOut(idArray)
 
-	list, _ := service.GetDrugWarhouseOutByIds(idArray)
-	for _, item := range list {
-		medical, _ := service.GetBaseDrugMedical(item.DrugId)
-		if item.CountUnit == medical.MaxUnit {
-
-			service.UpdateDrugInfoByIds(item.WarehouseInfoId, item.Count)
-
-		}
-		if medical.MaxUnit != medical.MinUnit && item.CountUnit == medical.MinUnit {
-			service.UpdateDrugInfoByIdsOne(item.WarehouseInfoId, item.Count)
-		}
-
-		//查询默认仓库
-		houseConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
-		//查询默认仓库剩余多少库存
-		list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
-		var sum_count int64
-		var sum_in_count int64
-		for _, it := range list {
-			baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-			if it.MaxUnit == baseDrug.MaxUnit {
-				it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-				it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-			}
-			sum_count += it.StockMaxNumber + it.StockMinNumber
-			sum_in_count += it.WarehousingCount
-		}
-		service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
-	}
+	//list, _ := service.GetDrugWarhouseOutByIds(idArray)
+	//for _, item := range list {
+	//	medical, _ := service.GetBaseDrugMedical(item.DrugId)
+	//	if item.CountUnit == medical.MaxUnit {
+	//
+	//		service.UpdateDrugInfoByIds(item.WarehouseInfoId, item.Count)
+	//
+	//	}
+	//	if medical.MaxUnit != medical.MinUnit && item.CountUnit == medical.MinUnit {
+	//		service.UpdateDrugInfoByIdsOne(item.WarehouseInfoId, item.Count)
+	//	}
+	//
+	//	//查询默认仓库
+	//	houseConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
+	//	//查询默认仓库剩余多少库存
+	//	list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
+	//	var sum_count int64
+	//	var sum_in_count int64
+	//	for _, it := range list {
+	//		baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+	//		if it.MaxUnit == baseDrug.MaxUnit {
+	//			it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+	//			it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+	//		}
+	//		sum_count += it.StockMaxNumber + it.StockMinNumber
+	//		sum_in_count += it.WarehousingCount
+	//	}
+	//	service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
+	//}
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -1462,37 +1468,37 @@ func (this *StockDrugApiController) DeleteDrugWarehouseOutInfo() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	//查询详情
-	info, _ := service.GetDrugWarehosueOutInfo(id)
-
-	//查询默认仓库
-	houseConfig, _ := service.GetAllStoreHouseConfig(info.OrgId)
-	//查询默认仓库剩余多少库存
-	list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, info.OrgId, info.DrugId)
-
-	for _, it := range list {
-
-		//查询默认仓库
-		houseConfig, _ := service.GetAllStoreHouseConfig(it.OrgId)
-		//查询默认仓库剩余多少库存
-		list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, it.OrgId, it.DrugId)
-		var sum_count int64
-		var sum_in_count int64
-		for _, it := range list {
-			baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-			if it.MaxUnit == baseDrug.MaxUnit {
-				it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-				it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-			}
-			sum_count += it.StockMaxNumber + it.StockMinNumber
-			sum_in_count += it.WarehousingCount
-		}
-		service.UpdateMedicalSumCount(it.DrugId, sum_count, sum_in_count, it.OrgId)
-
-	}
+	////查询详情
+	//info, _ := service.GetDrugWarehosueOutInfo(id)
+	//
+	////查询默认仓库
+	//houseConfig, _ := service.GetAllStoreHouseConfig(info.OrgId)
+	////查询默认仓库剩余多少库存
+	//list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, info.OrgId, info.DrugId)
+	//
+	//for _, it := range list {
+	//
+	//	//查询默认仓库
+	//	houseConfig, _ := service.GetAllStoreHouseConfig(it.OrgId)
+	//	//查询默认仓库剩余多少库存
+	//	list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, it.OrgId, it.DrugId)
+	//	var sum_count int64
+	//	var sum_in_count int64
+	//	for _, it := range list {
+	//		baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+	//		if it.MaxUnit == baseDrug.MaxUnit {
+	//			it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+	//			it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+	//		}
+	//		sum_count += it.StockMaxNumber + it.StockMinNumber
+	//		sum_in_count += it.WarehousingCount
+	//	}
+	//	service.UpdateMedicalSumCount(it.DrugId, sum_count, sum_in_count, it.OrgId)
+	//
+	//}
 
 	//删除流水
-	service.DeleteDrugWarehouseOutInfoById(info.ID)
+	//service.DeleteDrugWarehouseOutInfoById(info.ID)
 	err := service.UpDateDrugWarehouseOutStatus(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
@@ -2212,6 +2218,9 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 	if cancelstock_id == 0 {
 		service.AddSigleDrugCancelStock(&cancelStock)
 	}
+	if cancelstock_id > 0 {
+		service.UpdateSingleDrugCancelStock(cancelstock_id, storehouse_id)
+	}
 	cancelLastStock, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -3526,6 +3535,7 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 
 	warehousing_id, _ := c.GetInt64("warehousing_id")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 	//更改核对状态
 	err := service.CheckWarehousingInfo(warehousing_id, orgId)
 
@@ -3588,26 +3598,22 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 			}
 			service.CreateDrugFlowTwo(flow)
 
-			//查询该药品默认仓库剩余库存
-			druglist, _ := service.GetDrugStockWarehouseInfo(item.ID, item.OrgId)
-			var sum_in_count int64
+			//查询默认仓库
+
+			//查询默认仓库剩余多少库存
+			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
 			var sum_count int64
-			for _, its := range druglist {
-				drugMedical, _ := service.GetBaseDrugMedical(its.DrugId)
-				if its.MaxUnit == drugMedical.MaxUnit && drugMedical.MaxUnit != drugMedical.MinUnit {
-					sum_in_count += its.WarehousingCount * drugMedical.MinNumber
-					sum_count += its.StockMaxNumber*drugMedical.MinNumber + its.StockMinNumber
-				}
-				if its.MaxUnit == drugMedical.MinUnit && drugMedical.MaxUnit != drugMedical.MinUnit {
-					sum_in_count += its.WarehousingCount
-					sum_count += its.StockMaxNumber + its.StockMinNumber
-				}
-				if its.MaxUnit == drugMedical.MinUnit && drugMedical.MaxUnit == drugMedical.MinUnit {
-					sum_in_count += its.WarehousingCount
-					sum_count += its.StockMaxNumber + its.StockMinNumber
-				}
-				service.UpdateBaseDrugSum(its.DrugId, its.OrgId, sum_count, sum_in_count)
+			var sum_in_count int64
+			for _, it := range list {
+				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+				if it.MaxUnit == baseDrug.MaxUnit {
+					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+				}
+				sum_count += it.StockMaxNumber + it.StockMinNumber
+				sum_in_count += it.WarehousingCount
 			}
+			service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
 
 		}
 
@@ -3693,7 +3699,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		var total_count int64
 		var out_count int64
 		//查询剩余库存
-		stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, it.OrgId, it.DrugId)
+		stockInfo, _ := service.GetDrugAllStockInfo(it.StorehouseId, it.OrgId, it.DrugId)
 		drup, _ := service.FindBaseDrugLibRecord(it.OrgId, it.DrugId)
 
 		for _, item := range stockInfo {

controllers/his_api_controller.go

@@ -623,9 +623,25 @@ func (c *HisApiController) GetHisPatientInfo() {
 	last_p_info, _ := service.FindLastPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	if p_type == 1 { //住院
 		prescriptions, _ = service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+		for _, item := range prescriptions {
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				info, _ := service.GetWarehoseInfoByDrugId(subItem.DrugId, admin.CurrentOrgId)
+				if info.RetailPrice > 0 {
+					subItem.Drug.MinPrice = info.RetailPrice
+				}
+			}
+		}
 		last_prescriptions, _ = service.GetHisPrescription(admin.CurrentOrgId, patient_id, last_p_info.RecordDate, p_type)
 	} else { //门诊
 		prescriptions, _ = service.GetNewHisPrescription(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime, p_type)
+		for _, item := range prescriptions {
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				info, _ := service.GetWarehoseInfoByDrugId(subItem.DrugId, admin.CurrentOrgId)
+				if info.RetailPrice > 0 {
+					subItem.Drug.MinPrice = info.RetailPrice
+				}
+			}
+		}
 		last_prescriptions, _ = service.GetHisPrescription(admin.CurrentOrgId, patient_id, last_p_info.RecordDate, p_type)
 	}
 
@@ -844,6 +860,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 						index = index + 1
 						if subItem.RetailPrice > 0 {
 							item.MinPrice = subItem.RetailPrice
+
 						}
 					}
 				}

controllers/stock_in_api_controller.go

@@ -186,7 +186,10 @@ func (c *StockManagerApiController) CreateWarehouse() {
 	if warehousing_info_id == 0 {
 		service.AddSigleWarehouse(&warehousing)
 	}
-
+	if warehousing_info_id > 0 {
+		service.UpdateWarehouse(warehousing_info_id, storehouse_id)
+	}
+	info, _ := service.FindLastWarehousingSix(adminUserInfo.CurrentOrgId)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -288,11 +291,12 @@ func (c *StockManagerApiController) CreateWarehouse() {
 
 				license_number, _ := items["license_number"].(string)
 
+				register_number, _ := items["register_number"].(string)
 				//入库单表格
 				warehouseInfo := &models.WarehousingInfo{
 					ID:               id,
 					WarehousingOrder: warehousing.WarehousingOrder,
-					WarehousingId:    warehousing.ID,
+					WarehousingId:    info.ID,
 					GoodId:           good_id,
 					Number:           number,
 					GoodTypeId:       good_type_id,
@@ -313,6 +317,7 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					PackingPrice:     packing_price,
 					StorehouseId:     storehouse_id,
 					IsCheck:          2,
+					RegisterNumber:   register_number,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -330,8 +335,6 @@ func (c *StockManagerApiController) CreateWarehouse() {
 
 	}
 
-	info, _ := service.FindLastWarehousingSix(adminUserInfo.CurrentOrgId)
-
 	//查询入库数据
 	list, _ := service.GetGoodWarehouseInfoById(info.ID, info.OrgId)
 	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
@@ -1259,6 +1262,9 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			service.AddSigleWarehouseOut(&warehouseOut)
 		}
 	}
+	if warehouseOut_id > 0 {
+		service.UpdateSingleWarehoseOut(warehouseOut_id, storehouse_id)
+	}
 
 	goodWarehouseOut, _ := service.GetLastGoodWarehouseOutTwenty(adminUserInfo.CurrentOrgId)
 
@@ -1404,23 +1410,23 @@ func (c *StockManagerApiController) DeleteWarehouseOut() {
 	idArray := strings.Split(ids, ",")
 
 	err := service.DeleteWarehouseOut(idArray)
-	list, _ := service.GetWarehouseOutInfoByIds(idArray)
-	for _, item := range list {
-		//添加库存
-		service.UpdateWarehouseInfoById(item.WarehouseInfotId, item.Count)
-		//添加库存
-		//查询该机构默认仓库
-		storeConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
-		//查询剩余库存
-		goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId)
-		var sum_count int64
-		var sum_in_count int64
-		for _, item := range goodList {
-			sum_count += item.StockCount
-			sum_in_count += item.WarehousingCount
-		}
-		service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
-	}
+	//list, _ := service.GetWarehouseOutInfoByIds(idArray)
+	//for _, item := range list {
+	//	//添加库存
+	//	service.UpdateWarehouseInfoById(item.WarehouseInfotId, item.Count)
+	//	//添加库存
+	//	//查询该机构默认仓库
+	//	storeConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
+	//	//查询剩余库存
+	//	goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId)
+	//	var sum_count int64
+	//	var sum_in_count int64
+	//	for _, item := range goodList {
+	//		sum_count += item.StockCount
+	//		sum_in_count += item.WarehousingCount
+	//	}
+	//	service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
+	//}
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -1436,25 +1442,26 @@ func (this *StockManagerApiController) DeleteWarehouseOutInfo() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	//添加库存
-	out, _ := service.GetWarhouseOutById(id)
-
-	service.UpdateWareInfoById(out.WarehouseInfotId, out.Count)
-
-	//查询该机构默认仓库
-	storeConfig, _ := service.GetAllStoreHouseConfig(out.OrgId)
-	//查询剩余库存
-	goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, out.GoodId, out.OrgId)
-	var sum_count int64
-	var sum_in_count int64
-	for _, item := range goodList {
-		sum_count += item.StockCount
-		sum_in_count += item.WarehousingCount
-	}
-	service.UpdateGoodByGoodId(out.GoodId, sum_count, sum_in_count, out.OrgId)
-
 	err := service.UpDateWarehouseOutStatus(id)
-	service.UpdateStockFlowWarehouseOutById(id)
+	//添加库存
+	//out, _ := service.GetWarhouseOutById(id)
+	//
+	//service.UpdateWareInfoById(out.WarehouseInfotId, out.Count)
+	//
+	////查询该机构默认仓库
+	//storeConfig, _ := service.GetAllStoreHouseConfig(out.OrgId)
+	////查询剩余库存
+	//goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, out.GoodId, out.OrgId)
+	//var sum_count int64
+	//var sum_in_count int64
+	//for _, item := range goodList {
+	//	sum_count += item.StockCount
+	//	sum_in_count += item.WarehousingCount
+	//}
+	//service.UpdateGoodByGoodId(out.GoodId, sum_count, sum_in_count, out.OrgId)
+	//
+	//
+	//service.UpdateStockFlowWarehouseOutById(id)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
@@ -2033,6 +2040,8 @@ func (c *StockManagerApiController) CreateCancelStock() {
 	}
 	if cancel_stock_id == 0 {
 		service.AddSigleCancelStock(&cancelStock)
+	} else {
+		service.UpdateSigleCancelStock(cancel_stock_id, storehouse_id)
 	}
 
 	dataBody := make(map[string]interface{}, 0)

service/manage_center_service.go

@@ -211,6 +211,12 @@ func GetDrugAutoWarehouseOutEight(patient_id int64, advicedate int64, drugid int
 	return detail, err
 }
 
+func GetDrugAutoWarehouseOutNight(patient_id int64, advicedate int64, drugid int64, adviceid int64) (night []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ?", patient_id, advicedate, drugid, adviceid).Find(&night).Error
+	return night, err
+}
+
 func UpdateDrugWarehouse(id int64, info models.DrugWarehouseInfo) error {
 	err := writeDb.Model(&models.DrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
 	return err
@@ -427,379 +433,386 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 
 	//查询该病人该药品是否有库存记录
 	info, _ := GetDrugAutoWarehouseOutEight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
+
+	list, _ := GetDrugAutoWarehouseOutNight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
+
 	storeHouseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
+	//退库
+	drug, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
 	//如果剩余数量 + 退库数量 < 总入库数量
-	if info.ID > 0 {
-		//查询该药品出库批次总入库数量
-		druginfo, error := GetDrugInfoSix(info.WarehouseInfoId, info.OrgId)
-		fmt.Println(error)
-		//退库
-		drug, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
-		var out_count int64  //该批次出库库存
-		var sum_count int64  //该批次总库存
-		var over_count int64 //剩余数量
-
-		over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
-		if info.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-			out_count = info.Count * drug.MinNumber
-
-		}
-		if info.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-			out_count = info.Count
-		}
+	if len(list) > 0 {
+		for _, its := range list {
+			//查询该药品出库批次总入库数量
+			druginfo, _ := GetDrugInfoSix(its.WarehouseInfoId, info.OrgId)
 
-		if info.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-			out_count = info.Count
-		}
+			var out_count int64  //该批次出库库存
+			var sum_count int64  //该批次总库存
+			var over_count int64 //剩余数量
 
-		if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-			sum_count = druginfo.WarehousingCount * drug.MinNumber
-		}
+			over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
+			if info.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				out_count = info.Count * drug.MinNumber
 
-		if druginfo.MaxUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-			sum_count = druginfo.WarehousingCount
-		}
+			}
+			if info.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				out_count = info.Count
+			}
 
-		if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-			sum_count = druginfo.WarehousingCount
-		}
+			if info.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				out_count = info.Count
+			}
 
-		fmt.Println("该批次剩余库存", over_count)
-		fmt.Println("该批次退库数量", out_count)
-		fmt.Println("该批次总入库数量", sum_count)
-		if (over_count + out_count) <= sum_count {
+			if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				sum_count = druginfo.WarehousingCount * drug.MinNumber
+			}
 
-			if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+			if druginfo.MaxUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				sum_count = druginfo.WarehousingCount
+			}
 
-				floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
-				prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+			if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				sum_count = druginfo.WarehousingCount
+			}
 
-				//退库
-				warehouseInfo := models.DrugWarehouseInfo{
-					StockMinNumber: prescribingNumber,
-				}
-				UpdateDrugWarehouse(info.WarehouseInfoId, warehouseInfo)
-
-				operation_time := time.Now().Unix()
-
-				ctime := time.Now().Unix()
-				timeStr := time.Now().Format("2006-01-02")
-				timeArr := strings.Split(timeStr, "-")
-				total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
-				total = total + 1
-				orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-				cancelStock := models.DrugCancelStock{
-					OrderNumber:  orderNumber,
-					OperaTime:    operation_time,
-					OrgId:        advice.UserOrgId,
-					Creater:      creater,
-					Ctime:        ctime,
-					Status:       1,
-					ReturnTime:   advice.AdviceDate,
-					Dealer:       info.Dealer,
-					Manufacturer: info.Manufacturer,
-					Type:         1,
-					StorehouseId: storeHouseConfig.DrugStorehouseOut,
-					IsCheck:      1,
-				}
-				AddSigleDrugCancelStock(&cancelStock)
-
-				manufactureName, _ := GetManufactureById(info.Manufacturer)
-				dealer, _ := GetDealerById(info.Dealer)
-				cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
-				cancelStockInfo := models.DrugCancelStockInfo{
-					OrderNumber:      cancelInfo.OrderNumber,
-					CancelStockId:    cancelInfo.ID,
-					DrugId:           info.DrugId,
-					Count:            info.Count,
-					Status:           1,
-					Ctime:            ctime,
-					OrgId:            advice.UserOrgId,
-					Type:             1,
-					Manufacturer:     manufactureName.ManufacturerName,
-					Dealer:           dealer.DealerName,
-					Total:            0,
-					RetailPrice:      info.RetailPrice,
-					RetailTotalPrice: info.RetailTotalPrice,
-					Price:            info.Price,
-					RegisterAccount:  "",
-					Remark:           info.Remark,
-					BatchNumber:      info.BatchNumber,
-					MaxUnit:          info.CountUnit,
-					ProductDate:      info.ProductDate,
-					ExpiryDate:       info.ExpiryDate,
-					BatchNumberId:    info.WarehouseInfoId,
-					StorehouseId:     storeHouseConfig.DrugStorehouseOut,
-					IsCheck:          1,
+			fmt.Println("该批次剩余库存", over_count)
+			fmt.Println("该批次退库数量", out_count)
+			fmt.Println("该批次总入库数量", sum_count)
+			if (over_count + out_count) <= sum_count {
+				if its.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+					//退库
+					warehouseInfo := models.DrugWarehouseInfo{
+						StockMinNumber: its.Count,
+					}
+					UpdateDrugWarehouse(its.WarehouseInfoId, warehouseInfo)
 				}
-
-				flow := models.DrugFlow{
-					WarehousingId:           0,
-					DrugId:                  info.DrugId,
-					Number:                  "",
-					BatchNumber:             info.BatchNumber,
-					Count:                   info.Count,
-					UserOrgId:               advice.UserOrgId,
-					PatientId:               0,
-					SystemTime:              info.SysRecordTime,
-					ConsumableType:          7,
-					IsSys:                   0,
-					WarehousingOrder:        "",
-					WarehouseOutId:          0,
-					WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-					IsEdit:                  0,
-					CancelStockId:           cancelStock.ID,
-					CancelOrderNumber:       cancelStock.OrderNumber,
-					Manufacturer:            info.Manufacturer,
-					Dealer:                  info.Dealer,
-					Creator:                 creater,
-					UpdateCreator:           0,
-					Status:                  1,
-					Ctime:                   time.Now().Unix(),
-					Mtime:                   0,
-					Price:                   info.Price,
-					WarehousingDetailId:     0,
-					WarehouseOutDetailId:    0,
-					CancelOutDetailId:       0,
-					ExpireDate:              info.ExpiryDate,
-					ProductDate:             info.ProductDate,
-					MaxUnit:                 info.CountUnit,
-					MinUnit:                 "",
-					AdviceId:                info.AdviceId,
-					StorehouseId:            storeHouseConfig.DrugStorehouseOut,
+				if its.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+					warehouseInfo := models.DrugWarehouseInfo{
+						StockMaxNumber: its.Count,
+					}
+					UpdateDrugWarehouseOne(its.WarehouseInfoId, warehouseInfo)
 				}
-				CreatedCancelStock(cancelStockInfo)
-				CreateDrugFlowOne(flow)
-
-				//删除出库记录
-				UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
-				//删除流水
-				UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
-			}
-			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
-				houseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
-				floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
-
-				prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
-
-				if advice.PrescribingNumberUnit == drug.MaxUnit {
+				if its.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
 					warehouseInfo := models.DrugWarehouseInfo{
-						StockMaxNumber: prescribingNumber,
+						StockMaxNumber: its.Count,
 					}
-					UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
-
+					UpdateDrugWarehouseOne(its.WarehouseInfoId, warehouseInfo)
 				}
 
-				operation_time := time.Now().Unix()
-				ctime := time.Now().Unix()
-				timeStr := time.Now().Format("2006-01-02")
-				timeArr := strings.Split(timeStr, "-")
-				total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
-				total = total + 1
-				orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-
-				cancelStock := models.DrugCancelStock{
-					OrderNumber:  orderNumber,
-					OperaTime:    operation_time,
-					OrgId:        advice.UserOrgId,
-					Creater:      creater,
-					Ctime:        ctime,
-					Status:       1,
-					ReturnTime:   advice.AdviceDate,
-					Dealer:       info.Dealer,
-					Manufacturer: info.Manufacturer,
-					Type:         1,
-					StorehouseId: houseConfig.DrugStorehouseOut,
-					IsCheck:      1,
-				}
-				AddSigleDrugCancelStock(&cancelStock)
-				fmt.Println("到这里了吗32222222222222222222222222222222222222222222222")
-
-				manufactureName, _ := GetManufactureById(info.Manufacturer)
-				dealer, _ := GetDealerById(info.Dealer)
-				cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
-				cancelStockInfo := models.DrugCancelStockInfo{
-					OrderNumber:      cancelInfo.OrderNumber,
-					CancelStockId:    cancelInfo.ID,
-					DrugId:           info.DrugId,
-					Count:            info.Count,
-					Status:           1,
-					Ctime:            ctime,
-					OrgId:            advice.UserOrgId,
-					Type:             1,
-					Manufacturer:     manufactureName.ManufacturerName,
-					Dealer:           dealer.DealerName,
-					Total:            0,
-					RetailPrice:      info.RetailPrice,
-					RetailTotalPrice: info.RetailTotalPrice,
-					Price:            info.Price,
-					RegisterAccount:  "",
-					Remark:           info.Remark,
-					BatchNumber:      info.BatchNumber,
-					MaxUnit:          info.CountUnit,
-					ProductDate:      info.ProductDate,
-					ExpiryDate:       info.ExpiryDate,
-					BatchNumberId:    info.WarehouseInfoId,
-					StorehouseId:     houseConfig.DrugStorehouseOut,
-					IsCheck:          1,
-				}
+			}
+		}
 
-				flow := models.DrugFlow{
-					WarehousingId:           0,
-					DrugId:                  info.DrugId,
-					Number:                  "",
-					BatchNumber:             info.BatchNumber,
-					Count:                   info.Count,
-					UserOrgId:               advice.UserOrgId,
-					PatientId:               0,
-					SystemTime:              info.SysRecordTime,
-					ConsumableType:          7,
-					IsSys:                   0,
-					WarehousingOrder:        "",
-					WarehouseOutId:          0,
-					WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-					IsEdit:                  0,
-					CancelStockId:           cancelStock.ID,
-					CancelOrderNumber:       cancelStock.OrderNumber,
-					Manufacturer:            info.Manufacturer,
-					Dealer:                  info.Dealer,
-					Creator:                 creater,
-					UpdateCreator:           0,
-					Status:                  1,
-					Ctime:                   time.Now().Unix(),
-					Mtime:                   0,
-					Price:                   info.Price,
-					WarehousingDetailId:     0,
-					WarehouseOutDetailId:    0,
-					CancelOutDetailId:       0,
-					ExpireDate:              info.ExpiryDate,
-					ProductDate:             info.ProductDate,
-					MaxUnit:                 info.CountUnit,
-					MinUnit:                 "",
-					AdviceId:                info.AdviceId,
-					StorehouseId:            houseConfig.DrugStorehouseOut,
-				}
-				CreatedCancelStock(cancelStockInfo)
-				CreateDrugFlowOne(flow)
-				//删除出库记录
-				UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
-				//删除流水
-				UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
+		floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+		prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+		if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+			operation_time := time.Now().Unix()
+
+			ctime := time.Now().Unix()
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+			cancelStock := models.DrugCancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        advice.UserOrgId,
+				Creater:      creater,
+				Ctime:        ctime,
+				Status:       1,
+				ReturnTime:   advice.AdviceDate,
+				Dealer:       info.Dealer,
+				Manufacturer: info.Manufacturer,
+				Type:         1,
+				StorehouseId: storeHouseConfig.DrugStorehouseOut,
+				IsCheck:      1,
+			}
+			AddSigleDrugCancelStock(&cancelStock)
+
+			manufactureName, _ := GetManufactureById(info.Manufacturer)
+			dealer, _ := GetDealerById(info.Dealer)
+			cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+			cancelStockInfo := models.DrugCancelStockInfo{
+				OrderNumber:      cancelInfo.OrderNumber,
+				CancelStockId:    cancelInfo.ID,
+				DrugId:           advice.DrugId,
+				Count:            prescribingNumber,
+				Status:           1,
+				Ctime:            ctime,
+				OrgId:            advice.UserOrgId,
+				Type:             1,
+				Manufacturer:     manufactureName.ManufacturerName,
+				Dealer:           dealer.DealerName,
+				Total:            0,
+				RetailPrice:      info.RetailPrice,
+				RetailTotalPrice: info.RetailTotalPrice,
+				Price:            info.Price,
+				RegisterAccount:  "",
+				Remark:           info.Remark,
+				BatchNumber:      info.BatchNumber,
+				MaxUnit:          advice.PrescribingNumberUnit,
+				ProductDate:      info.ProductDate,
+				ExpiryDate:       info.ExpiryDate,
+				BatchNumberId:    info.WarehouseInfoId,
+				StorehouseId:     storeHouseConfig.DrugStorehouseOut,
+				IsCheck:          1,
 			}
 
-			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+			flow := models.DrugFlow{
+				WarehousingId:           0,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   prescribingNumber,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               0,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 advice.PrescribingNumberUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            storeHouseConfig.DrugStorehouseOut,
+			}
+			CreatedCancelStock(cancelStockInfo)
+			CreateDrugFlowOne(flow)
 
-				houseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
-				floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+			//删除出库记录
+			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
+			//删除流水
+			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
+		}
+		if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+			houseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
+
+			operation_time := time.Now().Unix()
+			ctime := time.Now().Unix()
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+			cancelStock := models.DrugCancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        advice.UserOrgId,
+				Creater:      creater,
+				Ctime:        ctime,
+				Status:       1,
+				ReturnTime:   advice.AdviceDate,
+				Dealer:       info.Dealer,
+				Manufacturer: info.Manufacturer,
+				Type:         1,
+				StorehouseId: houseConfig.DrugStorehouseOut,
+				IsCheck:      1,
+			}
+			AddSigleDrugCancelStock(&cancelStock)
+			fmt.Println("到这里了吗32222222222222222222222222222222222222222222222")
+
+			manufactureName, _ := GetManufactureById(info.Manufacturer)
+			dealer, _ := GetDealerById(info.Dealer)
+			cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+			cancelStockInfo := models.DrugCancelStockInfo{
+				OrderNumber:      cancelInfo.OrderNumber,
+				CancelStockId:    cancelInfo.ID,
+				DrugId:           info.DrugId,
+				Count:            prescribingNumber,
+				Status:           1,
+				Ctime:            ctime,
+				OrgId:            advice.UserOrgId,
+				Type:             1,
+				Manufacturer:     manufactureName.ManufacturerName,
+				Dealer:           dealer.DealerName,
+				Total:            0,
+				RetailPrice:      info.RetailPrice,
+				RetailTotalPrice: info.RetailTotalPrice,
+				Price:            info.Price,
+				RegisterAccount:  "",
+				Remark:           info.Remark,
+				BatchNumber:      info.BatchNumber,
+				MaxUnit:          advice.PrescribingNumberUnit,
+				ProductDate:      info.ProductDate,
+				ExpiryDate:       info.ExpiryDate,
+				BatchNumberId:    info.WarehouseInfoId,
+				StorehouseId:     houseConfig.DrugStorehouseOut,
+				IsCheck:          1,
+			}
 
-				prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+			flow := models.DrugFlow{
+				WarehousingId:           0,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   prescribingNumber,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               0,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 advice.PrescribingNumberUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            houseConfig.DrugStorehouseOut,
+			}
+			CreatedCancelStock(cancelStockInfo)
+			CreateDrugFlowOne(flow)
+			//删除出库记录
+			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
+			//删除流水
+			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
+		}
 
-				if advice.PrescribingNumberUnit == drug.MaxUnit {
-					warehouseInfo := models.DrugWarehouseInfo{
-						StockMaxNumber: prescribingNumber,
-					}
-					UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
+		if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
 
-				}
+			houseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 
-				operation_time := time.Now().Unix()
-				ctime := time.Now().Unix()
-				timeStr := time.Now().Format("2006-01-02")
-				timeArr := strings.Split(timeStr, "-")
-				total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
-				total = total + 1
-				orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-
-				cancelStock := models.DrugCancelStock{
-					OrderNumber:  orderNumber,
-					OperaTime:    operation_time,
-					OrgId:        advice.UserOrgId,
-					Creater:      creater,
-					Ctime:        ctime,
-					Status:       1,
-					ReturnTime:   advice.AdviceDate,
-					Dealer:       info.Dealer,
-					Manufacturer: info.Manufacturer,
-					Type:         1,
-					StorehouseId: houseConfig.DrugStorehouseOut,
-					IsCheck:      1,
-				}
-				AddSigleDrugCancelStock(&cancelStock)
-				fmt.Println("到这里了吗32222222222222222222222222222222222222222222222")
-
-				manufactureName, _ := GetManufactureById(info.Manufacturer)
-				dealer, _ := GetDealerById(info.Dealer)
-				cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
-				cancelStockInfo := models.DrugCancelStockInfo{
-					OrderNumber:      cancelInfo.OrderNumber,
-					CancelStockId:    cancelInfo.ID,
-					DrugId:           info.DrugId,
-					Count:            info.Count,
-					Status:           1,
-					Ctime:            ctime,
-					OrgId:            advice.UserOrgId,
-					Type:             1,
-					Manufacturer:     manufactureName.ManufacturerName,
-					Dealer:           dealer.DealerName,
-					Total:            0,
-					RetailPrice:      info.RetailPrice,
-					RetailTotalPrice: info.RetailTotalPrice,
-					Price:            info.Price,
-					RegisterAccount:  "",
-					Remark:           info.Remark,
-					BatchNumber:      info.BatchNumber,
-					MaxUnit:          info.CountUnit,
-					ProductDate:      info.ProductDate,
-					ExpiryDate:       info.ExpiryDate,
-					BatchNumberId:    info.WarehouseInfoId,
-					StorehouseId:     houseConfig.DrugStorehouseOut,
-					IsCheck:          1,
+			if advice.PrescribingNumberUnit == drug.MaxUnit {
+				warehouseInfo := models.DrugWarehouseInfo{
+					StockMaxNumber: prescribingNumber,
 				}
+				UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
 
-				flow := models.DrugFlow{
-					WarehousingId:           0,
-					DrugId:                  info.DrugId,
-					Number:                  "",
-					BatchNumber:             info.BatchNumber,
-					Count:                   info.Count,
-					UserOrgId:               advice.UserOrgId,
-					PatientId:               0,
-					SystemTime:              info.SysRecordTime,
-					ConsumableType:          7,
-					IsSys:                   0,
-					WarehousingOrder:        "",
-					WarehouseOutId:          0,
-					WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-					IsEdit:                  0,
-					CancelStockId:           cancelStock.ID,
-					CancelOrderNumber:       cancelStock.OrderNumber,
-					Manufacturer:            info.Manufacturer,
-					Dealer:                  info.Dealer,
-					Creator:                 creater,
-					UpdateCreator:           0,
-					Status:                  1,
-					Ctime:                   time.Now().Unix(),
-					Mtime:                   0,
-					Price:                   info.Price,
-					WarehousingDetailId:     0,
-					WarehouseOutDetailId:    0,
-					CancelOutDetailId:       0,
-					ExpireDate:              info.ExpiryDate,
-					ProductDate:             info.ProductDate,
-					MaxUnit:                 info.CountUnit,
-					MinUnit:                 "",
-					AdviceId:                info.AdviceId,
-					StorehouseId:            houseConfig.DrugStorehouseOut,
-				}
-				CreatedCancelStock(cancelStockInfo)
-				CreateDrugFlowOne(flow)
-				//删除出库记录
-				UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
-				//删除流水
-				UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
 			}
+
+			operation_time := time.Now().Unix()
+			ctime := time.Now().Unix()
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+			cancelStock := models.DrugCancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        advice.UserOrgId,
+				Creater:      creater,
+				Ctime:        ctime,
+				Status:       1,
+				ReturnTime:   advice.AdviceDate,
+				Dealer:       info.Dealer,
+				Manufacturer: info.Manufacturer,
+				Type:         1,
+				StorehouseId: houseConfig.DrugStorehouseOut,
+				IsCheck:      1,
+			}
+			AddSigleDrugCancelStock(&cancelStock)
+			fmt.Println("到这里了吗32222222222222222222222222222222222222222222222")
+
+			manufactureName, _ := GetManufactureById(info.Manufacturer)
+			dealer, _ := GetDealerById(info.Dealer)
+			cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+			cancelStockInfo := models.DrugCancelStockInfo{
+				OrderNumber:      cancelInfo.OrderNumber,
+				CancelStockId:    cancelInfo.ID,
+				DrugId:           info.DrugId,
+				Count:            prescribingNumber,
+				Status:           1,
+				Ctime:            ctime,
+				OrgId:            advice.UserOrgId,
+				Type:             1,
+				Manufacturer:     manufactureName.ManufacturerName,
+				Dealer:           dealer.DealerName,
+				Total:            0,
+				RetailPrice:      info.RetailPrice,
+				RetailTotalPrice: info.RetailTotalPrice,
+				Price:            info.Price,
+				RegisterAccount:  "",
+				Remark:           info.Remark,
+				BatchNumber:      info.BatchNumber,
+				MaxUnit:          advice.PrescribingNumberUnit,
+				ProductDate:      info.ProductDate,
+				ExpiryDate:       info.ExpiryDate,
+				BatchNumberId:    info.WarehouseInfoId,
+				StorehouseId:     houseConfig.DrugStorehouseOut,
+				IsCheck:          1,
+			}
+
+			flow := models.DrugFlow{
+				WarehousingId:           0,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   prescribingNumber,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               0,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 advice.PrescribingNumberUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            houseConfig.DrugStorehouseOut,
+			}
+			CreatedCancelStock(cancelStockInfo)
+			CreateDrugFlowOne(flow)
+			//删除出库记录
+			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
+			//删除流水
+			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
 		}
+
 		//更新字典里面的库存
 		stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, advice.UserOrgId, advice.DrugId)
 		//查询改药品信息

service/stock_service.go

@@ -409,6 +409,11 @@ func AddSigleWarehouse(warehouse *models.Warehousing) error {
 	return err
 
 }
+func UpdateWarehouse(id int64, storehouse_id int64) error {
+
+	err := XTWriteDB().Model(&models.Warehousing{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"storehouse_id": storehouse_id}).Error
+	return err
+}
 
 func AddSigleDrugWarehouse(warehouse *models.DrugWarehouse) error {
 	err := writeDb.Create(&warehouse).Error
@@ -416,6 +421,11 @@ func AddSigleDrugWarehouse(warehouse *models.DrugWarehouse) error {
 
 }
 
+func UpdateSigleDrugWarehouse(id int64, storehosue_id int64) error {
+	err := XTWriteDB().Model(&models.DrugWarehouse{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"storehouse_id": storehosue_id}).Error
+	return err
+}
+
 func AddSigleSalesReturn(salesReturn *models.SalesReturn) error {
 	err := writeDb.Create(&salesReturn).Error
 	return err
@@ -1440,12 +1450,24 @@ func AddSigleWarehouseOut(warehouseOut *models.WarehouseOut) error {
 
 }
 
+func UpdateSingleWarehoseOut(id int64, storehouse_id int64) error {
+
+	err := XTWriteDB().Model(&models.WarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"storehouse_id": storehouse_id}).Error
+	return err
+}
+
 func AddSigleDrugWarehouseOut(warehouseOut *models.DrugWarehouseOut) error {
 	err := writeDb.Create(&warehouseOut).Error
 	return err
 
 }
 
+func UpdateSingleDrugWarehouseOut(id int64, storehouse_id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"storehouse_id": storehouse_id}).Error
+	return err
+}
+
 func CreateWarehousingOutInfo(warehouseOutInfo []*models.WarehouseOutInfo) (err error) {
 	if len(warehouseOutInfo) > 0 {
 		utx := writeDb.Begin()
@@ -1818,6 +1840,10 @@ func AddSigleCancelStock(cancelStock *models.CancelStock) error {
 	return err
 
 }
+func UpdateSigleCancelStock(id int64, storehouse_id int64) error {
+	err := XTWriteDB().Model(&models.CancelStock{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"storehouse_id": storehouse_id}).Error
+	return err
+}
 
 func GetLastCancelStockById(orgid int64) (models.CancelStock, error) {
 	stock := models.CancelStock{}
@@ -1853,6 +1879,11 @@ func AddSigleDrugCancelStock(cancelStock *models.DrugCancelStock) error {
 	err := writeDb.Create(&cancelStock).Error
 	return err
 }
+func UpdateSingleDrugCancelStock(id int64, storehouse_id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugCancelStock{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"storehouse_id": storehouse_id}).Error
+	return err
+}
 
 //func AddSigleDrugCancelStockTX(cancelStock *models.DrugCancelStock,tx *gorm.DB) error {
 //	err := tx.Create(&cancelStock).Error
@@ -4182,7 +4213,7 @@ func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.Warehou
 	}
 
 	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,n.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_warehouse_info as n on n.id=x.warehouse_info_id").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
 }
 
@@ -7043,7 +7074,7 @@ func FindLastWarehousing(order string) (info models.Warehousing, err error) {
 
 func UpdateWarehouseDetail(info *models.WarehousingInfo, id int64) error {
 
-	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "warehousing_unit": info.WarehousingUnit, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "license_number": info.LicenseNumber, "packing_price": info.PackingPrice}).Error
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "warehousing_unit": info.WarehousingUnit, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "license_number": info.LicenseNumber, "packing_price": info.PackingPrice, "register_number": info.RegisterNumber, "storehouse_id": info.StorehouseId}).Error
 	return err
 }
 
@@ -7184,7 +7215,7 @@ func UpdateDrugWarehouseInfoTwenty(id int64, info *models.DrugWarehouseInfo) err
 
 func UpdatedDrugWarehouseInfo(info *models.DrugWarehouseOutInfo, id int64) error {
 
-	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "count": info.Count, "count_unit": info.CountUnit, "price": info.Price, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "retail_total_price": info.RetailTotalPrice, "number": info.Number, "batch_number": info.BatchNumber, "admin_user_id": info.AdminUserId, "last_price": info.LastPrice, "stock_count": info.StockCount}).Error
+	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "count": info.Count, "count_unit": info.CountUnit, "price": info.Price, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "retail_total_price": info.RetailTotalPrice, "number": info.Number, "batch_number": info.BatchNumber, "admin_user_id": info.AdminUserId, "last_price": info.LastPrice, "stock_count": info.StockCount, "storehouse_id": info.StorehouseId}).Error
 	return err
 }
 
@@ -7293,7 +7324,7 @@ func GetCancelStockInfo(id int64, orgid int64) (stock []*models.CancelStockInfo,
 
 func ModifyCancelStockInfo(id int64, info *models.CancelStockInfo) error {
 
-	err := XTWriteDB().Model(&models.CancelStockInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "count": info.Count, "price": info.Price, "total": info.Total, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "number": info.Number, "register_account": info.RegisterAccount, "remark": info.Remark}).Error
+	err := XTWriteDB().Model(&models.CancelStockInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "count": info.Count, "price": info.Price, "total": info.Total, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "number": info.Number, "register_account": info.RegisterAccount, "remark": info.Remark, "storehouse_id": info.StorehouseId}).Error
 	return err
 }
 
@@ -7366,9 +7397,9 @@ func UpdateDrugSumCount(drugid int64, sum_count int64, sum_in_count int64, orgid
 	return err
 }
 
-func GetDrugStockWarehouseInfo(id int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
+func GetDrugStockWarehouseInfo(id int64, orgid int64, storehouse_id int64) (info []*models.DrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Where("id = ? and org_id = ? and status = 1 and is_check = 1", id, orgid).Find(&info).Error
+	err = XTReadDB().Where("id = ? and org_id = ? and status = 1 and is_check = 1 and storehouse_id = ?", id, orgid, storehouse_id).Find(&info).Error
 	return info, err
 }