11月9日库存管理

controllers/dialysis_api_controller.go

@@ -3785,6 +3785,15 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	}
 
+	if adminInfo.CurrentOrgId == 10395 {
+
+		if ultrafiltration_rate > 0 {
+			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate / 1000)
+
+			record.UltrafiltrationVolume = ultrafiltration_volume
+		}
+	}
+
 	if template.TemplateId == 47 || template.TemplateId == 54 {
 		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
 	}

controllers/drug_stock_api_contorller.go

@@ -3563,6 +3563,22 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 			}
 
 			Creator := c.GetAdminUserInfo().AdminUser.Id
+
+			//查询默认仓库
+
+			//查询默认仓库剩余多少库存
+			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
+			}
 			flow := &models.DrugFlow{
 				WarehousingId:           0,
 				DrugId:                  item.DrugId,
@@ -3596,24 +3612,10 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 				MaxUnit:                 item.MaxUnit,
 				MinUnit:                 item.MinUnit,
 				StorehouseId:            item.StorehouseId,
+				OverCount:               sum_count,
 			}
 			service.CreateDrugFlowTwo(flow)
-
-			//查询默认仓库
-
-			//查询默认仓库剩余多少库存
-			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)
 
 			drugInfolist, _ := service.GetDrugSumCountByStorehouseId(item.StorehouseId, item.OrgId, item.DrugId)
@@ -3630,7 +3632,6 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 				total_count += it.WarehousingCount
 				over_count += it.StockMaxNumber + it.StockMinNumber
 			}
-			fmt.Println("over_countwoowoowowow", over_count)
 			//查询该仓库是否有默认数据
 			_, errcode := service.GetDrugStockCount(item.StorehouseId, item.DrugId, item.OrgId)
 			if errcode == gorm.ErrRecordNotFound {
@@ -3772,11 +3773,6 @@ func (c *StockDrugApiController) CheckDrugOut() {
 			total_count += item.StockMaxNumber + item.StockMinNumber
 		}
 
-		//if it.CountUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
-		//	it.Count = it.Count * drup.MinNumber
-		//}
-		//out_count += it.Count
-
 		//出库数量累加
 		if it.CountUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
 			out_count = it.Count * drup.MinNumber
@@ -3820,7 +3816,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 			}
 			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
-
+		//更新基础库库存
 		service.UpdateBaseDrugSumTwo(it.DrugId, sum_count, it.OrgId)
 
 		////出库数量累加
@@ -3837,7 +3833,6 @@ func (c *StockDrugApiController) CheckDrugOut() {
 			out_count_one = it.Count
 		}
 
-		fmt.Println("out_count23233232323woede", out_count_one)
 		//增加出库数量
 		service.AddDrugCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, out_count_one)
 
@@ -3847,18 +3842,19 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		for _, its := range infolist {
 			over_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 		}
+		//更新剩余库存
 		service.UpdateDrugStockCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, over_count)
 	}
 
 	out := models.DrugWarehouseOut{
 		IsCheck: 1,
 	}
-
+	//更新审核状态
 	service.UpdateCheckDrugOut(out, warehouse_out_id)
-	info := models.DrugWarehouseOutInfo{
-		IsCheck: 1,
-	}
-	service.UpdateCheckDrugOutInfo(info, warehouse_out_id)
+	//info := models.DrugWarehouseOutInfo{
+	//	IsCheck: 1,
+	//}
+	//service.UpdateCheckDrugOutInfo(info, warehouse_out_id)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"warehousingOutInfoList": warehousingOutInfoList,
@@ -4056,77 +4052,20 @@ func (c *StockDrugApiController) CheckCancelDrugStock() {
 			}
 		}
 
-		//查询该批次的退库数量
-		drugFlow := models.DrugFlow{
-			ID:                        0,
-			WarehousingId:             its.BatchNumberId,
-			DrugId:                    its.DrugId,
-			Number:                    its.Number,
-			BatchNumber:               "",
-			Count:                     its.Count,
-			UserOrgId:                 its.OrgId,
-			PatientId:                 0,
-			SystemTime:                cancelDrugStock.ReturnTime,
-			ConsumableType:            4,
-			IsSys:                     0,
-			WarehousingOrder:          "",
-			WarehouseOutId:            0,
-			WarehouseOutOrderNumber:   "",
-			IsEdit:                    0,
-			CancelStockId:             0,
-			CancelOrderNumber:         its.OrderNumber,
-			Manufacturer:              manufacturer_id,
-			Dealer:                    dealer_id,
-			Creator:                   creater,
-			UpdateCreator:             0,
-			Status:                    1,
-			Ctime:                     time.Now().Unix(),
-			Mtime:                     0,
-			Price:                     its.Price,
-			WarehousingDetailId:       its.BatchNumberId,
-			WarehouseOutDetailId:      0,
-			CancelOutDetailId:         its.ID,
-			ExpireDate:                its.ExpiryDate,
-			ProductDate:               its.ProductDate,
-			MaxUnit:                   its.MaxUnit,
-			MinUnit:                   "",
-			StockMaxNumber:            0,
-			StockMinNumber:            0,
-			LastStockMaxNumber:        0,
-			LastStockMinNumber:        0,
-			AdviceId:                  0,
-			SupplyWarehouseId:         0,
-			SupplyCancelOutId:         0,
-			SupplyWarehouseDetailInfo: 0,
-			StorehouseId:              its.StorehouseId,
-			SecondWarehouseInfoId:     0,
-			AdminUserId:               0,
-			LastPrice:                 0,
-			StockCount:                "",
-			PharmacyId:                0,
-		}
-		service.CreateDrugFlowOne(drugFlow)
-
 		medical, _ := service.GetBaseDrugMedical(its.DrugId)
 		if its.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
 			var sum_cancel_count int64
 			sum_cancel_count += its.Count * medical.MinNumber
-			//退库数量增加
-			//service.ModifyAddCancelAddInfomation(its.DrugId,sum_cancel_count,its.OrgId,its.StorehouseId)
 			//出库数量减少
 			service.ModifyAddDrugOutReduceInfomation(its.DrugId, sum_cancel_count, its.OrgId, its.StorehouseId)
 		}
 
 		if its.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
-			//退库数量增加
-			//service.ModifyAddCancelAddInfomation(its.DrugId,its.Count,its.OrgId,its.StorehouseId)
 			//出库数量减少
 			service.ModifyAddDrugOutReduceInfomation(its.DrugId, its.Count, its.OrgId, its.StorehouseId)
 		}
 
 		if its.MaxUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
-			//退库数量增加
-			//service.ModifyAddCancelAddInfomation(its.DrugId,its.Count,its.OrgId,its.StorehouseId)
 			//出库数量减少
 			service.ModifyAddDrugOutReduceInfomation(its.DrugId, its.Count, its.OrgId, its.StorehouseId)
 		}
@@ -4159,7 +4098,7 @@ func (c *StockDrugApiController) CheckCancelDrugStock() {
 			}
 			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
-
+		//更新剩余库存
 		service.UpdateBaseDrugSumTwo(its.DrugId, sum_count, its.OrgId)
 
 		var cancel_count int64
@@ -4181,8 +4120,60 @@ func (c *StockDrugApiController) CheckCancelDrugStock() {
 			}
 			over_count += its.StockMaxNumber + its.StockMinNumber
 		}
+		//查询该批次的退库数量
+		drugFlow := models.DrugFlow{
+			ID:                        0,
+			WarehousingId:             its.BatchNumberId,
+			DrugId:                    its.DrugId,
+			Number:                    its.Number,
+			BatchNumber:               "",
+			Count:                     its.Count,
+			UserOrgId:                 its.OrgId,
+			PatientId:                 0,
+			SystemTime:                cancelDrugStock.ReturnTime,
+			ConsumableType:            4,
+			IsSys:                     0,
+			WarehousingOrder:          "",
+			WarehouseOutId:            0,
+			WarehouseOutOrderNumber:   "",
+			IsEdit:                    0,
+			CancelStockId:             0,
+			CancelOrderNumber:         its.OrderNumber,
+			Manufacturer:              manufacturer_id,
+			Dealer:                    dealer_id,
+			Creator:                   creater,
+			UpdateCreator:             0,
+			Status:                    1,
+			Ctime:                     time.Now().Unix(),
+			Mtime:                     0,
+			Price:                     its.Price,
+			WarehousingDetailId:       its.BatchNumberId,
+			WarehouseOutDetailId:      0,
+			CancelOutDetailId:         its.ID,
+			ExpireDate:                its.ExpiryDate,
+			ProductDate:               its.ProductDate,
+			MaxUnit:                   its.MaxUnit,
+			MinUnit:                   "",
+			StockMaxNumber:            0,
+			StockMinNumber:            0,
+			LastStockMaxNumber:        0,
+			LastStockMinNumber:        0,
+			AdviceId:                  0,
+			SupplyWarehouseId:         0,
+			SupplyCancelOutId:         0,
+			SupplyWarehouseDetailInfo: 0,
+			StorehouseId:              its.StorehouseId,
+			SecondWarehouseInfoId:     0,
+			AdminUserId:               0,
+			LastPrice:                 0,
+			StockCount:                "",
+			PharmacyId:                0,
+			OverCount:                 over_count,
+		}
+		service.CreateDrugFlowOne(drugFlow)
+		//增加退库数量 更新剩余库存
 		service.AddCancelSumCount(its.StorehouseId, its.DrugId, its.OrgId, cancel_count, over_count)
-
+		//更改审核状态
 		service.ModifyCancelStock(cancelstock_id, cancelStock, orgId)
 	}
 	//新增库存

controllers/his_api_controller.go

@@ -1621,10 +1621,6 @@ func (c *HisApiController) CreateHisPrescription() {
 										goodList, _ := service.GetAllAutoRecordByPatient(patient_id, recordDateTime)
 
 										for _, item := range goodList {
-											//回退库存
-											//service.ModefyWarehouseInfo(item.Count, item.WarehouseInfotId)
-
-											//service.ModifyReduceGoodSumCount(item.StorehouseId,item.Count,item.OrgId,item.GoodId)
 
 											goodListSix, _ := service.GetSumGoodList(item.OrgId, item.StorehouseId, item.GoodId)
 											var flush_count int64
@@ -1667,10 +1663,6 @@ func (c *HisApiController) CreateHisPrescription() {
 											goodList, _ := service.GetAllAutoRecordByPatient(patient_id, recordDateTime)
 
 											for _, item := range goodList {
-												//回退库存
-												//service.ModefyWarehouseInfo(item.Count, item.WarehouseInfotId)
-												//扣减出库数量
-												//service.ModifyReduceGoodSumCount(item.StorehouseId,item.Count,item.OrgId,item.GoodId)
 
 												goodListSix, _ := service.GetSumGoodList(item.OrgId, item.StorehouseId, item.GoodId)
 												var flush_count int64
@@ -2168,6 +2160,7 @@ func (c *HisApiController) CreateHisPrescription() {
 						}
 						sum_count += its.StockMaxNumber + its.StockMinNumber
 					}
+					//更新基础库存
 					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 					//剩余库存
 					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeConfig.DrugStorehouseOut, sum_count)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2923,12 +2923,8 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			if template.TemplateId == 6 && adminInfo.Org.Id != 9538 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
+
 			}
-			//if template.TemplateId == 6 && adminInfo.Org.Id ==9671{
-			//  dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
-			//  ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
-			//  record.UltrafiltrationRate = ultrafiltration_rate
-			//}
 
 			if template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 {
 
@@ -2947,10 +2943,9 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				ultrafiltration_rate = value
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
-			fmt.Println("hhh23232323223232323323232323", template.TemplateId)
+
 			if template.TemplateId == 41 || template.TemplateId == 47 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin) * 1000)
-				fmt.Println("prescritpin2332322323232323223", ultrafiltration_rate)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
@@ -2989,6 +2984,14 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
+	if adminInfo.Org.Id == 10395 {
+		if ultrafiltration_rate > 0 {
+			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate / 1000)
+			record.UltrafiltrationVolume = ultrafiltration_volume
+		}
+
+	}
+
 	if template.TemplateId == 47 || template.TemplateId == 54 {
 		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
 	}
@@ -6113,7 +6116,6 @@ func ConsumablesDeliveryTotalSix(orgID int64, patient_id int64, record_time int6
 				StorehouseId: houseConfig.StorehouseOutInfo,
 			}
 
-			fmt.Println("出库数量23333333333333333333333332😯😯😯😯", prepare.Count)
 			service.ConsumablesGoodDelivery(orgID, patient_id, record_time, &prepare, &out, newCount)
 
 			//增加出库数量
@@ -6150,7 +6152,7 @@ func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *mod
 		} else {
 			delete_count = ware.Count
 		}
-		// 在出库记录表里记录退库详情
+
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
@@ -6265,7 +6267,7 @@ func ConsumablesDeliveryDeleteNew(orgID int64, record_time int64, good_yc *model
 	//增加退库数量
 	service.UpdateSumAddCancelCount(orgID, good_yc.GoodId, houseConfig.StorehouseOutInfo, delete_count)
 
-	//扣减出库数量鸡
+	//扣减出库数量
 	service.ModifyAddGoodSumCount(houseConfig.StorehouseOutInfo, delete_count, orgID, good_yc.GoodId)
 	//查询剩余库存
 	goodList, _ := service.GetAllGoodSumCount(good_yc.GoodId, orgID)

controllers/patient_api_controller.go

@@ -751,14 +751,14 @@ func (c *PatientApiController) EditLapseto() {
 
 	err = service.EditPatientLapseto(&patient, &lapseto)
 
-	if lapseto.LapsetoType == 3 || lapseto.LapsetoType == 2 {
-		timeStr := time.Now().Format("2006-01-02")
-		timeLayout := "2006-01-02 15:04:05"
-		timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
-		timenow := timeStringToTime.Unix()
-		service.UpdateScheduleByDeathTime(id, timenow)
-		service.UpdateScheduleItemByPatientId(id)
-	}
+	//if lapseto.LapsetoType == 3 || lapseto.LapsetoType == 2 {
+	//	timeStr := time.Now().Format("2006-01-02")
+	//	timeLayout := "2006-01-02 15:04:05"
+	//	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+	//	timenow := timeStringToTime.Unix()
+	//	service.UpdateScheduleByDeathTime(id, timenow)
+	//	service.UpdateScheduleItemByPatientId(id)
+	//}
 
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeEditLapsetoFail)

controllers/self_drug_api_congtroller.go

@@ -106,6 +106,10 @@ func SelfDrugRouters() {
 	beego.Router("/api/stock/tosendgoodinfomation", &SelfDrugApiController{}, "Get:GetSendGoodInformation")
 	//药品脚本
 	beego.Router("/api/drug/getdruginitdatalist", &SelfDrugApiController{}, "Get:GetDrugInitDetailList")
+
+	//新数据
+	beego.Router("/api/stock/getnewpurchasestockquery", &SelfDrugApiController{}, "Get:GetGoodNewPurchaseStockQuery")
+	beego.Router("/api/stock/getpurchasenewdrugquery", &SelfDrugApiController{}, "Get:GetPurchaseNewDrugQuery")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -2658,6 +2662,7 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 				MaxUnit:                 min_unit,
 				MinUnit:                 min_unit,
 				StorehouseId:            storehouse_id,
+				OverCount:               sum_count,
 			}
 			if ord_total != new_total {
 				service.CreateDrugFlowOne(flow)
@@ -3608,3 +3613,351 @@ func (this *SelfDrugApiController) GetDrugInitDetailList() {
 		"msg": "1",
 	})
 }
+
+func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
+
+	good_type, _ := this.GetInt64("good_type")
+
+	keyword := this.GetString("keyword")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	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+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	var ids []int64
+	var goodIds []int64
+	infoList, _ := service.GetGoodWarehouseInfoByOrgIdTwo(orgId)
+	for _, it := range infoList {
+		goodIds = append(goodIds, it.GoodId)
+	}
+
+	manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+	for _, it := range manufacturers {
+		ids = append(ids, it.ID)
+	}
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
+
+	for _, item := range list {
+
+		//获取期初结余
+		low, _ := service.GetStartLastFLow(item.ID, orgId, startTime)
+
+		item.GoodStartFlowInfo = low
+
+		//获取期末结余
+		flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime)
+
+		item.GoodEndFlowInfo = flow
+
+		//获取期初结余数量
+		//infoList, _ := service.GetStartGoodWarehouseInfoList(item.ID, orgId, startTime)
+		//for _, it := range infoList {
+		//  item.WarehousingInfoStart = append(item.WarehousingInfoStart, it)
+		//}
+		//
+		////获取期末结余数量
+		//warehouseInfoList, _ := service.GetEndGoodWarehouseInfoList(item.ID, orgId, endTime)
+		//for _, it := range warehouseInfoList {
+		//  item.WarehousingInfoEnd = append(item.WarehousingInfoEnd, it)
+		//}
+
+		//获取期间增加
+		goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
+		for _, it := range goodWarehouseInfoList {
+			item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
+		}
+
+		//获取本期增加
+		WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
+		for _, it := range WarehouseInfoFlowList {
+			item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
+		}
+		//获取本期减少
+		reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
+		for _, it := range reduceWarehouseInfoList {
+			item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
+		}
+
+		//获取期中减少退库
+		lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
+		for _, it := range lowInfo {
+			item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
+		}
+		//
+		outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
+		for _, it := range outInfo {
+			item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
+		}
+
+		////获取期初结余
+		//info, _ := service.FindeStartFlowInfo(item.ID, orgId, startTime)
+		//for _, it := range info {
+		//  item.StartFlowInfo = append(item.StartFlowInfo, it)
+		//}
+		////获取期初结余
+		//flowOutInfo, _ := service.FindeStartFlowOutInfo(item.ID, orgId, startTime)
+		//for _, it := range flowOutInfo {
+		//  item.StartOutFlowInfo = append(item.StartOutFlowInfo, it)
+		//}
+		//
+		////获取期初退库
+		//cancelInfo, _ := service.FindeStartCancelInfo(item.ID, orgId, startTime)
+		//for _, it := range cancelInfo {
+		//  item.StartCancelFlowInfo = append(item.StartCancelFlowInfo, it)
+		//}
+
+		////获取期末结余
+		//flowInfo, _ := service.FindEndStartFlowInfo(item.ID, orgId, endTime)
+		//for _, it := range flowInfo {
+		//  item.EndFlowInfo = append(item.EndFlowInfo, it)
+		//}
+		//
+		////获取期末出库
+		//lowOutInfo, _ := service.FindeEndFLowOutInfo(item.ID, orgId, endTime)
+		//for _, it := range lowOutInfo {
+		//  item.EndFlowOutInfo = append(item.EndFlowOutInfo, it)
+		//}
+		//
+		////获取期末退库
+		//endCancelInfo, _ := service.FindEndCancelInfo(item.ID, orgId, endTime)
+		//for _, it := range endCancelInfo {
+		//  item.EndCancelFLowInfo = append(item.EndCancelFLowInfo, it)
+		//}
+
+		////期初盘赢
+		//inventory, _ := service.FindeStartStockInventoryProfit(item.ID, orgId, startTime)
+		//for _, it := range inventory {
+		//  item.WareStartStockInventoryProfit = append(item.WareStartStockInventoryProfit, it)
+		//}
+		////期初盘亏
+		//stockInventory, _ := service.FindStartStockInventoryLosses(item.ID, orgId, startTime)
+		//for _, it := range stockInventory {
+		//  item.WareStartStockInventoryLosses = append(item.WareStartStockInventoryLosses, it)
+		//}
+
+		////期末盘盈
+		//inventoryProfit, _ := service.FindeStartStockInventoryProfit(item.ID, orgId, endTime)
+		//for _, it := range inventoryProfit {
+		//  item.WareEndStockInventoryProfit = append(item.WareEndStockInventoryProfit, it)
+		//}
+		////期末盘亏
+		//inventoryLosses, _ := service.FindStartStockInventoryLosses(item.ID, orgId, endTime)
+		//for _, it := range inventoryLosses {
+		//  item.WareEndStockInventoryLosses = append(item.WareEndStockInventoryLosses, it)
+		//}
+
+		//期中盘盈
+		profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
+		for _, it := range profit {
+			item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
+		}
+		//期中盘亏
+		losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
+		for _, it := range losses {
+			item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
+		}
+	}
+
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"total":            total,
+	})
+}
+
+func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
+
+	good_type, _ := this.GetInt64("good_type")
+
+	keyword := this.GetString("keyword")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	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+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	var ids []int64
+	var infoIds []int64
+
+	manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+	for _, it := range manufacturers {
+		ids = append(ids, it.ID)
+	}
+	infoList, _ := service.GetDrugWarehouseInfoByOrgIdTwo(orgId)
+	for _, it := range infoList {
+		infoIds = append(infoIds, it.DrugId)
+	}
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	list, total, err := service.GetDrugNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, startTime, endTime, ids, infoIds)
+
+	for _, item := range list {
+
+		//获取期初结余
+		flow, _ := service.GetDrugStartFlow(item.ID, orgId, startTime)
+
+		item.DrugStatFlow = flow
+
+		//获取期末结余
+		endFlow, _ := service.GetDrugEndFlow(item.ID, orgId, endTime)
+
+		item.DrugEndFlow = endFlow
+		//获取期初结余入库数量
+		//startDrugInfo, _ := service.GetDrugWarehouseInfoStart(item.ID, orgId, startTime)
+		//for _, it := range startDrugInfo {
+		//  item.DrugWarehouseInfoStart = append(item.DrugWarehouseInfoStart, it)
+		//}
+		//
+		////获取期初结余出库数量
+		//flowOutList, _ := service.GetDrugFlowOut(item.ID, orgId, startTime)
+		//for _, it := range flowOutList {
+		//  item.DrugWarehouseOutInfoStart = append(item.DrugWarehouseOutInfoStart, it)
+		//}
+		//
+		////获取期初结余退库数量
+		//cancelInfo, _ := service.GetStartDrugFlowCancelInfo(item.ID, orgId, startTime)
+		//for _, it := range cancelInfo {
+		//  item.WareStartStockCancelInfo = append(item.WareStartStockCancelInfo, it)
+		//}
+		//
+		////获取期末结余入库数量
+		//drugwarehouseinfoend, _ := service.DrugWarehouseInfoEnd(item.ID, orgId, endTime)
+		//for _, it := range drugwarehouseinfoend {
+		//  item.DrugWarehouseInfoEnd = append(item.DrugWarehouseInfoEnd, it)
+		//}
+
+		////获取期末出库结余
+		//endDrugInfo, _ := service.DrugWarehouseOutInfoEnd(item.ID, orgId, endTime)
+		//for _, it := range endDrugInfo {
+		//  item.DrugWarehouseOutInfoEnd = append(item.DrugWarehouseOutInfoEnd, it)
+		//}
+		//
+		////获取期末退库数量
+		//flowCancelInfo, _ := service.GetEndDrugFlowCancelInfo(item.ID, orgId, endTime)
+		//for _, it := range flowCancelInfo {
+		//  item.WareEndStockCancelInfo = append(item.WareEndStockCancelInfo, it)
+		//}
+
+		//期中增加
+		drugWarehouse, _ := service.GetDrugWarehouseStartEnd(item.ID, orgId, startTime, endTime)
+		for _, it := range drugWarehouse {
+			item.DrugWarehouseInfoStartEnd = append(item.DrugWarehouseInfoStartEnd, it)
+		}
+
+		//期中减少
+		outInfo, _ := service.FindeDrugWarehouseOutInfo(item.ID, item.OrgId, startTime, endTime)
+		for _, it := range outInfo {
+			item.DrugWarehouseOutInfoStartEnd = append(item.DrugWarehouseOutInfoStartEnd, it)
+		}
+
+		//期中退库
+		cancelstartInfo, _ := service.FindStartEndDrugWarehouseOutInfo(item.ID, item.OrgId, startTime, endTime)
+		for _, it := range cancelstartInfo {
+			item.WareStartEndStockCancelInfo = append(item.WareStartEndStockCancelInfo, it)
+		}
+
+		////获取期初盘盈
+		//startProfit, _ := service.GetDrugFlowStartProfit(item.ID, orgId, startTime)
+		//for _, it := range startProfit {
+		//  item.WareStartStockInventoryProfit = append(item.WareStartStockInventoryProfit, it)
+		//}
+		////获取期初盘亏
+		//startLosses, _ := service.GetDrugFlowStartLosses(item.ID, orgId, startTime)
+		//for _, it := range startLosses {
+		//  item.WareStartStockInventoryLosses = append(item.WareStartStockInventoryLosses, it)
+		//}
+		////获取期末盘盈
+		//endProfit, _ := service.GetDrugFlowEndProfit(item.ID, orgId, endTime)
+		//for _, it := range endProfit {
+		//  item.WareEndStockInventoryProfit = append(item.WareEndStockInventoryProfit, it)
+		//}
+		////获取期末盘亏
+		//losses, _ := service.GetDrugFlowEndLosses(item.ID, orgId, endTime)
+		//for _, it := range losses {
+		//  item.WareEndStockInventoryLosses = append(item.WareEndStockInventoryLosses, it)
+		//}
+
+		//获取期中盘盈
+		profit, _ := service.GetDrugFlowStartEndProfit(item.ID, orgId, startTime, endTime)
+		for _, it := range profit {
+			item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
+		}
+
+		//获取期中盘亏
+		endLosses, _ := service.GetDrugFlowStartEndLosses(item.ID, orgId, startTime, endTime)
+		for _, it := range endLosses {
+			item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
+		}
+	}
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+		return
+	}
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"total":            total,
+		"drugTypeList":     drugTypeList,
+	})
+}

controllers/stock_in_api_controller.go

@@ -7046,7 +7046,7 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 		err := service.ConsumablesDeliveryThirty(orgId, item.SysRecordTime, item, &warehouseOut, item.Count, creater)
 		if err != nil {
 			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      item.OrgId,
+				UserOrgId:      orgId,
 				Errcode:        "调用出库接口报错",
 				GoodId:         item.GoodId,
 				Status:         1,
@@ -7069,7 +7069,7 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 		errs := service.UpdateSumGood(orgId, item.StorehouseId, item.GoodId, flush_count)
 		if errs != nil {
 			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      item.OrgId,
+				UserOrgId:      orgId,
 				Errcode:        "手动出库更新剩余出库失败",
 				GoodId:         item.GoodId,
 				Status:         1,
@@ -7096,7 +7096,7 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 		errsum := service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, orgId)
 		if errsum != nil {
 			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      item.OrgId,
+				UserOrgId:      orgId,
 				Errcode:        "基础库扣减库存报错",
 				GoodId:         item.GoodId,
 				Status:         1,
@@ -7313,15 +7313,35 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 
 	warehousing_info_id, _ := this.GetInt64("warehousing_info_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+	Creator := this.GetAdminUserInfo().AdminUser.Id
 	//查询默认仓库
 	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 	//更改审核状态
 	err := service.UpdateCheckWarehouseInfo(warehousing_info_id)
 	if err == nil {
 		list, _ := service.GetWarehouseInfoList(warehousing_info_id, orgId)
-		Creator := this.GetAdminUserInfo().AdminUser.Id
+
 		for _, item := range list {
 			service.UpdateWarehouseInfoByIdList(item.WarehousingCount, item.ID)
+
+			//查询该耗材剩余库存库
+			stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
+			var total_count int64
+			var sum_in_count int64
+			for _, it := range stockList {
+				total_count += it.StockCount
+				sum_in_count += it.WarehousingCount
+			}
+			//基础库插入数据
+			service.UpdateGoodInfoAddSumCount(item.GoodId, total_count, orgId, sum_in_count)
+
+			//查询该仓库是否有数据
+			_, errcode := service.GetGoodStockCount(orgId, item.StorehouseId, item.GoodId)
+			goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
+			var flush_count int64
+			for _, it := range goodList {
+				flush_count += it.StockCount
+			}
 			stockFlow := models.VmStockFlow{
 				WarehousingId:           item.WarehousingId,
 				GoodId:                  item.GoodId,
@@ -7359,29 +7379,11 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 				StockCount:              "",
 				BatchNumberCount:        item.WarehousingCount,
 				IsCheck:                 1,
+				OverCount:               flush_count,
 			}
 			//创建出库流水
 			service.CreateStockFlowOne(stockFlow)
 
-			orgId := this.GetAdminUserInfo().CurrentOrgId
-			//查询该耗材剩余库存库
-			stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
-			var total_count int64
-			var sum_in_count int64
-			for _, it := range stockList {
-				total_count += it.StockCount
-				sum_in_count += it.WarehousingCount
-			}
-			//基础库插入数据
-			service.UpdateGoodInfoAddSumCount(item.GoodId, total_count, orgId, sum_in_count)
-
-			//查询该仓库是否有数据
-			_, errcode := service.GetGoodStockCount(orgId, item.StorehouseId, item.GoodId)
-			goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
-			var flush_count int64
-			for _, it := range goodList {
-				flush_count += it.StockCount
-			}
 			if errcode == gorm.ErrRecordNotFound {
 
 				goodCount := models.XtGoodStockCount{
@@ -7480,16 +7482,7 @@ func (this *StockManagerApiController) CheckStockWarehouseInfo() {
 	var out_total_count int64
 	var dealer_id int64
 	for _, item := range list {
-		for _, items := range manufacturerlist {
-			if item.Manufacturer == items.ManufacturerName {
-				manufacturer_id = items.ID
-			}
-		}
-		for _, it := range dealerList {
-			if item.Dealer == it.DealerName {
-				dealer_id = it.ID
-			}
-		}
+
 		//查询该药品该批次的出库数量是否满足退库需求
 		outList, _ := service.GetWarehouseOutList(item.OrgId, item.GoodId, item.WarehouseInfoId)
 		for _, it := range outList {
@@ -7508,6 +7501,37 @@ func (this *StockManagerApiController) CheckStockWarehouseInfo() {
 			})
 			return
 		}
+	}
+
+	cancelStock := models.CancelStock{
+		IsCheck: 1,
+	}
+	service.CheckCancelStock(cancelStock, cancel_stock_id, orgId)
+
+	//回退库存
+	cancellist, _ := service.GetCancelStockInfoById(cancel_stock_id, orgId)
+	for _, item := range cancellist {
+		for _, items := range manufacturerlist {
+			if item.Manufacturer == items.ManufacturerName {
+				manufacturer_id = items.ID
+			}
+		}
+		for _, it := range dealerList {
+			if item.Dealer == it.DealerName {
+				dealer_id = it.ID
+			}
+		}
+		//回退库存
+		service.UpdateCancelStockNumber(item.Count, item.WarehouseInfoId, orgId)
+		//更新基础库库存
+		service.UpdateGoodSumCount(item.Count, item.GoodId, orgId)
+		goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
+		//退库数量增加
+		service.UpdateSumAddCancelCount(orgId, item.GoodId, item.StorehouseId, item.Count)
+		var flush_count int64
+		for _, it := range goodList {
+			flush_count += it.StockCount
+		}
 
 		stockFlow := models.VmStockFlow{
 			ID:                        0,
@@ -7550,29 +7574,11 @@ func (this *StockManagerApiController) CheckStockWarehouseInfo() {
 			AdminUserId:               0,
 			BuyPrice:                  item.Price,
 			StockCount:                "",
+			OverCount:                 flush_count,
 		}
+		//创建流水
 		service.CreateStockFlowOne(stockFlow)
-		service.ModifyAddCancelCount(item.Count, item.GoodId)
-	}
-
-	cancelStock := models.CancelStock{
-		IsCheck: 1,
-	}
-	service.CheckCancelStock(cancelStock, cancel_stock_id, orgId)
-
-	//回退库存
-	cancellist, _ := service.GetCancelStockInfoById(cancel_stock_id, orgId)
-	for _, item := range cancellist {
-		service.UpdateCancelStockNumber(item.Count, item.WarehouseInfoId, orgId)
-
-		service.UpdateGoodSumCount(item.Count, item.GoodId, orgId)
-		goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
-
-		service.UpdateSumAddCancelCount(orgId, item.GoodId, item.StorehouseId, item.Count)
-		var flush_count int64
-		for _, it := range goodList {
-			flush_count += it.StockCount
-		}
+		//更新剩余库存
 		errs := service.UpdateSumGood(orgId, item.StorehouseId, item.GoodId, flush_count)
 
 		//出库数量减少

models/new_stock_models.go

@@ -243,6 +243,11 @@ type GoodInfoTwenty struct {
 
 	WareStartEndStockInventoryProfit []*VmStockFlowTwenty //期间盘盈
 	WareStartEndStockInventoryLosses []*VmStockFlowTwenty //期间盘亏
+
+	//期初结余
+	GoodStartFlowInfo VmStockFlowTwenty
+	//期末结余
+	GoodEndFlowInfo VmStockFlowTwenty
 }
 
 func (GoodInfoTwenty) TableName() string {
@@ -357,6 +362,8 @@ type VmBaseDrugTwenty struct {
 	WareEndStockCancelInfo           []*DrugFlowTwenty //期末结余退库
 	WareStartEndStockCancelInfo      []*DrugFlowTwenty //期中减少退库
 
+	DrugStatFlow DrugFlowTwenty
+	DrugEndFlow  DrugFlowTwenty
 }
 
 func (VmBaseDrugTwenty) TableName() string {

service/manage_center_service.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"XT_New/models"
-	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
@@ -477,7 +476,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 
 			if (over_count + out_count) <= sum_count {
 				if its.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-					fmt.Println("进来1", its.Count)
+
 					//退库
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMinNumber: its.Count,
@@ -491,7 +490,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 
 				}
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-					fmt.Println("进来2", its.Count)
+
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
@@ -504,7 +503,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				}
 
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-					fmt.Println("进来3", its.Count)
+
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
@@ -576,6 +575,15 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				IsCheck:          1,
 			}
 
+			//查询剩余库存
+			stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, advice.UserOrgId, advice.DrugId)
+			var sum_count int64
+			for _, its := range stockInfo {
+				if its.MaxUnit == drug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * drug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
 			flow := models.DrugFlow{
 				WarehousingId:           info.WarehouseInfoId,
 				DrugId:                  info.DrugId,
@@ -610,6 +618,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				MinUnit:                 "",
 				AdviceId:                info.AdviceId,
 				StorehouseId:            storeHouseConfig.DrugStorehouseOut,
+				OverCount:               sum_count,
 			}
 			CreatedCancelStock(cancelStockInfo)
 			CreateDrugFlowOne(flow)
@@ -675,6 +684,15 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				StorehouseId:     houseConfig.DrugStorehouseOut,
 				IsCheck:          1,
 			}
+			//查询剩余库存
+			stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, advice.UserOrgId, advice.DrugId)
+			var sum_count int64
+			for _, its := range stockInfo {
+				if its.MaxUnit == drug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * drug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
 
 			flow := models.DrugFlow{
 				WarehousingId:           info.WarehouseInfoId,
@@ -710,6 +728,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				MinUnit:                 "",
 				AdviceId:                info.AdviceId,
 				StorehouseId:            houseConfig.DrugStorehouseOut,
+				OverCount:               sum_count,
 			}
 			CreatedCancelStock(cancelStockInfo)
 			CreateDrugFlowOne(flow)
@@ -775,6 +794,15 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				StorehouseId:     houseConfig.DrugStorehouseOut,
 				IsCheck:          1,
 			}
+			//查询剩余库存
+			stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, advice.UserOrgId, advice.DrugId)
+			var sum_count int64
+			for _, its := range stockInfo {
+				if its.MaxUnit == drug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * drug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
 
 			flow := models.DrugFlow{
 				WarehousingId:           info.WarehouseInfoId,
@@ -810,6 +838,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				MinUnit:                 "",
 				AdviceId:                info.AdviceId,
 				StorehouseId:            houseConfig.DrugStorehouseOut,
+				OverCount:               sum_count,
 			}
 			CreatedCancelStock(cancelStockInfo)
 			CreateDrugFlowOne(flow)

service/new_warehouse_service.go

@@ -269,6 +269,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				StorehouseId:            goods.StorehouseId,
 				BuyPrice:                warehouse.Price,
 				ProjectId:               goods.ProjectId,
+				OverCount:               sum_count,
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
@@ -521,6 +522,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				StorehouseId:            goods.StorehouseId,
 				BuyPrice:                warehouse.Price,
 				ProjectId:               goods.ProjectId,
+				OverCount:               sum_count,
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
@@ -1588,6 +1590,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				AdviceId:                advice.ID,
 				StorehouseId:            storeConfig.DrugStorehouseOut,
 				LastPrice:               warehouse.Price,
+				OverCount:               sum_count,
 			}
 			CreateDrugFlowOne(flow)
 			AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
@@ -1897,6 +1900,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				AdviceId:                advice.ID,
 				StorehouseId:            storeConfig.DrugStorehouseOut,
 				LastPrice:               warehouse.Price,
+				OverCount:               sum_count,
 			}
 			CreateDrugFlowOne(flow)
 

service/patient_service.go

@@ -730,7 +730,7 @@ func EditPatientLapseto(patient *models.Patients, lapseto *models.PatientLapseto
 		return
 	}
 	// 删除排班和排班模板信息
-	if lapseto.LapsetoType == 2 {
+	if lapseto.LapsetoType == 2 || lapseto.LapsetoType == 3 {
 		now := time.Now()
 		deleteScheduleErr := utx.Model(&models.PatientSchedule{}).Where("patient_id = ? AND schedule_date >= ? AND status = 1", patient.ID, lapseto.LapsetoTime).Updates(map[string]interface{}{
 			"status":       0,

service/self_drug_service.go

@@ -2561,3 +2561,77 @@ func CreateDrugStockCount(stockCount models.XtDrugStockCount) error {
 	err := XTWriteDB().Create(&stockCount).Error
 	return err
 }
+
+func GetGoodNewPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
+
+	db := XTReadDB().Model(&goodinfo).Where("status = 1 and total_count > 0")
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	if good_type > 0 {
+		db = db.Where("good_type_id = ?", good_type)
+	}
+
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(ids) > 0 {
+		db = db.Where("id in(?)", goodIds)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("good_name like ? or manufacturer in(?)", likeKey, ids)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&goodinfo).Error
+
+	return goodinfo, total, err
+}
+
+func GetStartLastFLow(goodid int64, orgid int64, startime int64) (models.VmStockFlowTwenty, error) {
+
+	flwo := models.VmStockFlowTwenty{}
+	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime < ?", goodid, orgid, startime).Last(&flwo).Error
+	return flwo, err
+}
+
+func GetEndLastFlow(goodid int64, orgid int64, endtime int64) (models.VmStockFlowTwenty, error) {
+	flwo := models.VmStockFlowTwenty{}
+	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime <= ?", goodid, orgid, endtime).Last(&flwo).Error
+	return flwo, err
+}
+
+func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, startime int64, endtime int64, ids []int64, infos []int64) (druginfo []*models.VmBaseDrugTwenty, total int64, err error) {
+
+	db := XTReadDB().Model(&druginfo).Where("status = 1")
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	if good_type > 0 {
+		db = db.Where("drug_type = ?", good_type)
+	}
+
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+
+	if len(keyword) > 0 {
+		db = db.Where("drug_name like ? or manufacturer in(?)", likeKey, ids)
+	}
+	if len(infos) > 0 {
+		db = db.Where("id in(?)", infos)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&druginfo).Error
+
+	return druginfo, total, err
+}
+
+func GetDrugStartFlow(drug_id int64, user_org_id int64, startime int64) (models.DrugFlowTwenty, error) {
+
+	flow := models.DrugFlowTwenty{}
+	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and ctime<? and status = 1", drug_id, user_org_id, startime).Last(&flow).Error
+	return flow, err
+}
+
+func GetDrugEndFlow(drug_id int64, user_org_id int64, endtime int64) (models.DrugFlowTwenty, error) {
+
+	flow := models.DrugFlowTwenty{}
+	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and ctime<=? and status = 1", drug_id, user_org_id, endtime).Last(&flow).Error
+	return flow, err
+}

service/stock_service.go

@@ -7496,9 +7496,18 @@ func GetDrugWarehouseOutListById(warehouse_out_id int64, orgId int64) (info []*m
 }
 
 func UpdateCheckDrugOut(out models.DrugWarehouseOut, id int64) error {
-
-	err := XTWriteDB().Model(&models.DrugWarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": out.IsCheck}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.DrugWarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": out.IsCheck}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
 	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("warehouse_out_id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7590,8 +7599,6 @@ func UpdateGoodInfoReduceSumCount(goodid int64, sum_count int64, orgid int64) er
 	tx.Commit()
 	return err
 
-	err = XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
-	return err
 }
 
 func UpdateGoodInfoAddSumCount(goodid int64, sum_count int64, orgid int64, sum_in_count int64) error {

service/warhouse_service.go

@@ -136,8 +136,82 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 
-	//查找药品信息
-	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+	var maxNumber int64 = 0
+	var minNumber int64 = 0
+
+	maxNumber = deliver_number / drup.MinNumber
+	minNumber = deliver_number % drup.MinNumber
+
+	if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+		minNumber = maxNumber
+	}
+
+	if drup.MaxUnit != drup.MinUnit {
+		if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
+			return errors.New("库存数量不足")
+		}
+	}
+
+	warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+
+	if warehouse.StockMaxNumber < 0 {
+		warehouse.StockMaxNumber = 0
+	}
+	if warehouse.StockMinNumber < 0 {
+		warehouse.StockMinNumber = 0
+	}
+
+	warehouse.Mtime = time.Now().Unix()
+
+	if warehouse.StockMinNumber < minNumber {
+
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+		warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+	} else {
+		if minNumber > 0 {
+			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+		}
+
+		if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+			if warehouse.StockMinNumber > 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 drup.MaxUnit != drup.MinUnit {
+		if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+			return errors.New("库存数量不足")
+		}
+	}
+	if warehouse.StockMinNumber <= 0 {
+		warehouse.StockMinNumber = 0
+	}
+
+	errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+
+	if errThree != nil {
+		return errThree
+	}
+
+	//查询剩余库存
+	stockInfo, _ := GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId)
+	var sum_count int64
+	for _, its := range stockInfo {
+		if its.MaxUnit == drup.MaxUnit {
+			its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+		}
+		sum_count += its.StockMaxNumber + its.StockMinNumber
+	}
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 
@@ -201,6 +275,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			WarehouseOutDetailId:    lastDrugOutInfo.ID,
 			LastPrice:               warehouse.Price,
+			OverCount:               sum_count,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -227,75 +302,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			return errTwo
 		}
 
-		var maxNumber int64 = 0
-		var minNumber int64 = 0
-		//var stock_max_number int64 = 0
-		//stock_max_number = warehouse.StockMaxNumber
-
-		maxNumber = deliver_number / drup.MinNumber
-		minNumber = deliver_number % drup.MinNumber
-
-		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
-			minNumber = maxNumber
-		}
-
-		if drup.MaxUnit != drup.MinUnit {
-			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
-				return errors.New("库存数量不足")
-			}
-		}
-
-		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-
-		if warehouse.StockMaxNumber < 0 {
-			warehouse.StockMaxNumber = 0
-		}
-		if warehouse.StockMinNumber < 0 {
-			warehouse.StockMinNumber = 0
-		}
-
-		warehouse.Mtime = time.Now().Unix()
-
-		if warehouse.StockMinNumber < minNumber {
-
-			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-		} else {
-			if minNumber > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
-			}
-
-			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
-				if warehouse.StockMinNumber > 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 drup.MaxUnit != drup.MinUnit {
-			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
-				return errors.New("库存数量不足")
-			}
-		}
-		if warehouse.StockMinNumber <= 0 {
-			warehouse.StockMinNumber = 0
-		}
-
-		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-
-		if errThree != nil {
-			return errThree
-		}
-
 		return nil
 	} else {
 
@@ -389,6 +395,16 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			return errThree
 		}
 
+		//查询剩余库存
+		stockInfo, _ := GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
 		drugflow := models.DrugFlow{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,
@@ -415,6 +431,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			WarehouseOutDetailId:    lastDrugOutInfo.ID,
 			LastPrice:               warehouse.Price,
+			OverCount:               sum_count,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -1270,7 +1287,6 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 			}
 		}
 
-		fmt.Println("goods999923932923923923223wode", goods)
 		for _, item := range goods {
 			var newCount int64 = 0
 			for _, it := range goodOne {
@@ -1287,9 +1303,9 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 				out_count += item.Count
 			}
 			cha_count = item.Count - out_count
-			fmt.Println("item.Count", item.Count)
-			fmt.Println("item.Count", out_count)
-			fmt.Println("cha_count2323223232323223", cha_count)
+			//fmt.Println("item.Count", item.Count)
+			//fmt.Println("item.Count", out_count)
+			//fmt.Println("cha_count2323223232323223", cha_count)
 			cha_count_two = out_count - item.Count
 
 			prepare := models.DialysisBeforePrepare{