11月8日库存管理

controllers/drug_stock_api_contorller.go

@@ -628,26 +628,31 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
 					drugflow := &models.DrugFlow{
-						WarehousingOrder: warehousing.WarehousingOrder,
-						WarehousingId:    id,
-						DrugId:           drug_id,
-						Number:           number,
-						ProductDate:      productDates,
-						ExpireDate:       expiryDates,
-						Count:            warehousing_count,
-						Price:            last_price,
-						Status:           1,
-						Ctime:            ctime,
-						UserOrgId:        adminUserInfo.CurrentOrgId,
-						Manufacturer:     manufacturer,
-						Dealer:           dealer,
-						BatchNumber:      batch_number,
-						MaxUnit:          max_unit,
-						MinUnit:          min_unit,
-						ConsumableType:   1,
-						IsEdit:           1,
-						Creator:          adminUserInfo.AdminUser.Id,
-						IsSys:            0,
+						WarehousingOrder:    warehousing.WarehousingOrder,
+						WarehousingId:       warehouse.ID,
+						DrugId:              drug_id,
+						Number:              number,
+						ProductDate:         productDates,
+						ExpireDate:          expiryDates,
+						Count:               warehousing_count,
+						Price:               last_price,
+						Status:              1,
+						Ctime:               ctime,
+						UserOrgId:           adminUserInfo.CurrentOrgId,
+						Manufacturer:        manufacturer,
+						Dealer:              dealer,
+						BatchNumber:         batch_number,
+						MaxUnit:             max_unit,
+						MinUnit:             min_unit,
+						ConsumableType:      1,
+						IsEdit:              1,
+						Creator:             adminUserInfo.AdminUser.Id,
+						IsSys:               0,
+						WarehousingDetailId: id,
+					}
+
+					if max_unit == min_unit {
+						drugflow.MaxUnit = min_unit
 					}
 
 					drugFlow = append(drugFlow, drugflow)
@@ -750,23 +755,27 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 			//比较大小(加)
 			// 如果当前的入库数量 大于 历史入库数量
 			if item.WarehousingCount > warehouseInfo.WarehousingCount {
+				fmt.Println("大于333333333333333333333333")
 				total = item.WarehousingCount - warehouseInfo.WarehousingCount
 				item.StockMaxNumber = warehouseInfo.StockMaxNumber + total
 				errs = service.UpDateDrugWarehousingInfo(item)
 				if len(drugFlow) > 0 {
 					for _, it := range drugFlow {
 						flow := models.DrugFlow{
-							Count:        item.StockMaxNumber,
+							Count:        it.Count,
 							Manufacturer: it.Manufacturer,
 							Dealer:       it.Dealer,
 							Number:       it.Number,
 							BatchNumber:  it.BatchNumber,
 							Price:        it.Price,
+							MaxUnit:      info.MaxUnit,
+							ExpireDate:   it.ExpireDate,
 						}
 						if info.MaxUnit == info.MinUnit {
 							flow.MaxUnit = info.MinUnit
 						}
-						parseDateErr := service.UpdateDrugFlow(flow, item.DrugId, warehouseInfo.WarehousingId)
+
+						parseDateErr := service.UpdateDrugFlowNight(flow, it.DrugId, it.WarehousingDetailId)
 						fmt.Println(parseDateErr)
 
 					}
@@ -781,13 +790,19 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				errs = service.UpDateDrugWarehousingInfo(item)
 				if len(drugFlow) > 0 {
 					for _, it := range drugFlow {
-						fmt.Println(it)
 						flow := models.DrugFlow{
-							Count:   item.StockMaxNumber,
-							MaxUnit: item.MaxUnit,
-							MinUnit: item.MinUnit,
+							Count:       it.Count,
+							MaxUnit:     it.MaxUnit,
+							MinUnit:     it.MinUnit,
+							Number:      it.Number,
+							BatchNumber: it.BatchNumber,
+							Price:       it.Price,
+							ExpireDate:  it.ExpireDate,
 						}
-						parseDateErr := service.UpdateDrugFlow(flow, item.DrugId, warehouseInfo.WarehousingId)
+						if info.MaxUnit == info.MinUnit {
+							flow.MaxUnit = info.MinUnit
+						}
+						parseDateErr := service.UpdateDrugFlowNight(flow, it.DrugId, it.WarehousingDetailId)
 						fmt.Println(parseDateErr)
 					}
 				}
@@ -810,6 +825,24 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 					MinUnit:      item.MinUnit,
 					RetailPrice:  item.RetailPrice,
 				}
+				if len(drugFlow) > 0 {
+					for _, it := range drugFlow {
+						flow := models.DrugFlow{
+							Count:       it.Count,
+							MaxUnit:     it.MaxUnit,
+							MinUnit:     it.MinUnit,
+							Number:      it.Number,
+							BatchNumber: it.BatchNumber,
+							Price:       it.Price,
+							ExpireDate:  it.ExpireDate,
+						}
+						if info.MaxUnit == info.MinUnit {
+							flow.MaxUnit = info.MinUnit
+						}
+						parseDateErr := service.UpdateDrugFlowNight(flow, it.DrugId, it.WarehousingDetailId)
+						fmt.Println(parseDateErr)
+					}
+				}
 				errs = service.UpDateDrugWarehousingInfoTwo(item.ID, warehouseinfo)
 			}
 		}

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -710,8 +710,15 @@ func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
 func (c *StaffScheduleApiController) GetSolutionSchedule() {
 
 	orgId := c.GetMobileAdminUserInfo().Org.Id
-	solution, _ := service.GetSolutionSchedule(orgId)
+	scheduleDate := c.GetString("start_time")
+	zoneid, _ := c.GetInt64("zoneid")
+	classtype, _ := c.GetInt64("classtype")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", scheduleDate+" 00:00:00", loc)
+	fmt.Println("时间错2332233323223", theTime.Unix())
+	schedule, _ := service.GetSolutionScheduleBySchedule(orgId, zoneid, classtype, theTime.Unix())
 	c.ServeSuccessJSON(map[string]interface{}{
-		"solution": solution,
+		"schedule": schedule,
 	})
 }

controllers/stock_in_api_controller.go

@@ -303,14 +303,32 @@ func (c *StockManagerApiController) CreateWarehouse() {
 		}
 	}
 
-	//入库单创建成功
-	errs := service.CreateWarehousingInfo(warehousingInfo)
-	for _, its := range stockFlow {
-		warehousinginfo, _ := service.GetLastWarehousingInfo(its.GoodId)
-		its.WarehousingDetailId = warehousinginfo.ID
+	for _, item := range warehousingInfo {
+		service.CreatedWarehouseingDetail(item)
+		warehousinginfo, _ := service.GetLastWarehousingInfo(item.GoodId)
+		flow := models.VmStockFlow{
+			WarehousingOrder:    item.WarehousingOrder,
+			WarehousingId:       item.WarehousingId,
+			GoodId:              item.GoodId,
+			Number:              item.Number,
+			ProductDate:         item.ProductDate,
+			ExpireDate:          item.ExpiryDate,
+			Count:               item.StockCount,
+			Price:               item.Price,
+			Status:              1,
+			Ctime:               ctime,
+			UserOrgId:           item.OrgId,
+			Manufacturer:        item.Manufacturer,
+			Dealer:              item.Dealer,
+			LicenseNumber:       item.LicenseNumber,
+			IsEdit:              1,
+			Creator:             adminUserInfo.AdminUser.Id,
+			SystemTime:          operation_time,
+			ConsumableType:      1,
+			WarehousingDetailId: warehousinginfo.ID,
+		}
+		service.CreateStockFlowOne(flow)
 	}
-	//创建入库单流水
-	service.CreateStockFlow(stockFlow)
 
 	info, _ := service.FindLastWarehousingInfo(warehousing.WarehousingOrder)
 
@@ -328,12 +346,6 @@ func (c *StockManagerApiController) CreateWarehouse() {
 		fmt.Println(parseDateErr)
 	}
 
-	if errs != nil {
-		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-		return
-	}
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":               "入库成功",
 		"warehousing_order": warehousing_order,
@@ -695,17 +707,18 @@ func (c *StockManagerApiController) EditWarehouse() {
 
 				service.UpdateWarehouseInfoByGoodId(goodinfo, item.ID)
 
-				flowStock := models.VmStockFlow{
-					Count:         item.WarehousingCount,
-					Number:        item.Number,
-					ProductDate:   item.ProductDate,
-					ExpireDate:    item.ExpiryDate,
-					Price:         item.Price,
-					Manufacturer:  item.Manufacturer,
-					Dealer:        item.Dealer,
-					LicenseNumber: info.LicenseNumber,
-				}
-				service.UpdatedStockFlowByGoodIdOne(item.WarehousingId, item.GoodId, flowStock)
+				//flowStock := models.VmStockFlow{
+				//	Count:         item.WarehousingCount,
+				//	Number:        item.Number,
+				//	ProductDate:   item.ProductDate,
+				//	ExpireDate:    item.ExpiryDate,
+				//	Price:         item.Price,
+				//	Manufacturer:  item.Manufacturer,
+				//	Dealer:        item.Dealer,
+				//	LicenseNumber: info.LicenseNumber,
+				//}
+				//fmt.Println("大于233232322323233232232323233232233223")
+				//service.UpdatedStockFlowByGoodIdOne(item.WarehousingId, item.GoodId, flowStock)
 				//改变库存
 				good, _ := service.GetLastInfoMationById(info.GoodId)
 				warhouseCount := strconv.FormatInt(total, 10)
@@ -758,9 +771,16 @@ func (c *StockManagerApiController) EditWarehouse() {
 	if len(stockFlow) > 0 {
 		for _, item := range stockFlow {
 			flow := models.VmStockFlow{
-				Count: item.Count,
-			}
-			parseDateErr := service.UpdateStockFlow(flow, item.GoodId, item.WarehousingId)
+				Count:         item.Count,
+				Number:        item.Number,
+				ProductDate:   item.ProductDate,
+				ExpireDate:    item.ExpireDate,
+				Price:         item.Price,
+				Manufacturer:  item.Manufacturer,
+				Dealer:        item.Dealer,
+				LicenseNumber: item.LicenseNumber,
+			}
+			parseDateErr := service.UpdatedStockFlowByGoodIdOne(item.WarehousingId, item.GoodId, flow)
 			fmt.Println(parseDateErr)
 		}
 	}
@@ -2034,7 +2054,7 @@ func (c *StockManagerApiController) CreateCancelStock() {
 	}
 
 	var cancelStockInfos []*models.CancelStockInfo
-	var stockFLow []*models.VmStockFlow
+	//var stockFLow []*models.VmStockFlow
 	if dataBody["cancelStock"] != nil && reflect.TypeOf(dataBody["cancelStock"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["cancelStock"].([]interface{})
 		if len(thisStockIn) > 0 {
@@ -2131,48 +2151,48 @@ func (c *StockManagerApiController) CreateCancelStock() {
 				}
 				cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
-				list, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
-
-				var manufacturer_id int64
-
-				for _, items := range list {
-					if manufacturer == items.ManufacturerName {
-						manufacturer_id = items.ID
-					}
-				}
-
-				flow := &models.VmStockFlow{
-					WarehousingId:           0,
-					GoodId:                  good_id,
-					Number:                  number,
-					LicenseNumber:           "",
-					Count:                   count,
-					UserOrgId:               adminUserInfo.CurrentOrgId,
-					PatientId:               0,
-					SystemTime:              time.Now().Unix(),
-					ConsumableType:          4,
-					IsSys:                   0,
-					WarehousingOrder:        "",
-					WarehouseOutId:          0,
-					WarehouseOutOrderNumber: "",
-					IsEdit:                  0,
-					CancelStockId:           cancelStock.ID,
-					CancelOrderNumber:       cancelStock.OrderNumber,
-					Manufacturer:            manufacturer_id,
-					Dealer:                  0,
-					Creator:                 adminUserInfo.AdminUser.Id,
-					UpdateCreator:           0,
-					Status:                  1,
-					Ctime:                   time.Now().Unix(),
-					Mtime:                   0,
-					Price:                   price,
-					WarehousingDetailId:     0,
-					WarehouseOutDetailId:    0,
-					CancelOutDetailId:       0,
-					ProductDate:             productDates,
-					ExpireDate:              expiryDates,
-				}
-				stockFLow = append(stockFLow, flow)
+				//list, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+				//
+				//var manufacturer_id int64
+
+				//for _, items := range list {
+				//	if manufacturer == items.ManufacturerName {
+				//		manufacturer_id = items.ID
+				//	}
+				//}
+
+				//flow := &models.VmStockFlow{
+				//	WarehousingId:           0,
+				//	GoodId:                  good_id,
+				//	Number:                  number,
+				//	LicenseNumber:           "",
+				//	Count:                   count,
+				//	UserOrgId:               adminUserInfo.CurrentOrgId,
+				//	PatientId:               0,
+				//	SystemTime:              time.Now().Unix(),
+				//	ConsumableType:          4,
+				//	IsSys:                   0,
+				//	WarehousingOrder:        "",
+				//	WarehouseOutId:          0,
+				//	WarehouseOutOrderNumber: "",
+				//	IsEdit:                  0,
+				//	CancelStockId:           cancelStock.ID,
+				//	CancelOrderNumber:       cancelStock.OrderNumber,
+				//	Manufacturer:            manufacturer_id,
+				//	Dealer:                  0,
+				//	Creator:                 adminUserInfo.AdminUser.Id,
+				//	UpdateCreator:           0,
+				//	Status:                  1,
+				//	Ctime:                   time.Now().Unix(),
+				//	Mtime:                   0,
+				//	Price:                   price,
+				//	WarehousingDetailId:     0,
+				//	WarehouseOutDetailId:    0,
+				//	CancelOutDetailId:       0,
+				//	ProductDate:             productDates,
+				//	ExpireDate:              expiryDates,
+				//}
+				//stockFLow = append(stockFLow, flow)
 			}
 		}
 	}
@@ -2208,17 +2228,50 @@ func (c *StockManagerApiController) CreateCancelStock() {
 
 			item.CancelStockId = listcancel.ID
 			errs := service.CreateCancelStockInfoOne(item)
+			list, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 
-			if len(stockFLow) > 0 {
-
-				for _, items := range stockFLow {
-					cancelStockInfo, _ := service.GetLastCancelStockInfoByGoodId(item.GoodId)
-					items.CancelStockId = listcancel.ID
-					items.CancelOutDetailId = cancelStockInfo.ID
+			var manufacturer_id int64
 
+			for _, items := range list {
+				if item.Manufacturer == items.ManufacturerName {
+					manufacturer_id = items.ID
 				}
-				service.CreateStockFlow(stockFLow)
 			}
+			flow := models.VmStockFlow{
+				WarehousingId:           0,
+				GoodId:                  item.GoodId,
+				Number:                  item.Number,
+				LicenseNumber:           "",
+				Count:                   item.Count,
+				UserOrgId:               adminUserInfo.CurrentOrgId,
+				PatientId:               0,
+				SystemTime:              time.Now().Unix(),
+				ConsumableType:          4,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: "",
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            manufacturer_id,
+				Dealer:                  0,
+				Creator:                 adminUserInfo.AdminUser.Id,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   item.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ProductDate:             item.ProductDate,
+				ExpireDate:              item.ExpiryDate,
+			}
+			cancelStockInfo, _ := service.GetLastCancelStockInfoByGoodId(item.GoodId)
+			flow.CancelStockId = cancelStockInfo.CancelStockId
+			flow.CancelOutDetailId = cancelStockInfo.ID
+			service.CreateStockFlowOne(flow)
 			if errs != nil {
 				utils.ErrorLog(errs.Error())
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
@@ -2315,7 +2368,21 @@ func (this *StockManagerApiController) DeleteCancelStock() {
 	}
 
 	idArray := strings.Split(ids, ",")
+	//获取
+	list, _ := service.GetCancelWarehosueInfo(idArray)
+	for _, item := range list {
+		info, _ := service.GetCancelStockById(item.WarehouseInfoId)
+		warehousingInfo := models.WarehousingInfo{
+			StockCount: info.Count,
+		}
+		//扣减库存
+		service.ModefyWarehouseInfoNight(warehousingInfo, info.WarehouseInfoId)
+		//删除流水
+		service.UpdatedStockFlowByCancelId(info.ID, info.GoodId)
+	}
+	//获取
 	err := service.DeleteCancelStock(idArray)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -2332,8 +2399,19 @@ func (this *StockManagerApiController) DeleteCancelStockInfo() {
 		return
 	}
 
+	//改变库存
+	info, _ := service.GetCancelStockById(id)
+
+	warehousingInfo := models.WarehousingInfo{
+		StockCount: info.Count,
+	}
+	//扣减库存
+	service.ModefyWarehouseInfoNight(warehousingInfo, info.WarehouseInfoId)
+	//删除详情
 	err := service.UpDateCancleStockStatus(id)
-	service.UpdatedStockFlowByCancelId(id)
+	//删除流水
+	err = service.UpdatedStockFlowByCancelId(id, info.GoodId)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -2637,7 +2715,6 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 		if len(stockFlow) > 0 {
 			for _, itemcancel := range stockFlow {
-				fmt.Println("hhh233232323323233223323232我的时间")
 				//查询是否存在
 				stockInfo, errcode := service.IsExsitStockFlow(itemcancel.GoodId, itemcancel.CancelOrderNumber)
 				if errcode == gorm.ErrRecordNotFound {
@@ -2668,8 +2745,6 @@ func (c *StockManagerApiController) EditCancelStock() {
 			for _, it := range list {
 				all_total += it.Count
 			}
-			fmt.Println("最后一次出库233223323233223", info.Count)
-			fmt.Println("当前出库23323223232323323", item.Count)
 
 			//比较退库库数量和最后一次退库库数据大小
 			//退库(加)
@@ -2709,6 +2784,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 			}
 			if item.Count == info.Count {
 				errs = service.UpDateCancelStockInfo(item)
+
 			}
 		}
 	}
@@ -2727,6 +2803,8 @@ func (c *StockManagerApiController) EditCancelStock() {
 					Price:         itemcancel.Price,
 					LicenseNumber: itemcancel.LicenseNumber,
 					Number:        itemcancel.Number,
+					ExpireDate:    itemcancel.ExpireDate,
+					ProductDate:   itemcancel.ProductDate,
 				}
 				service.UpdateStockFlowThree(stockInfo.ID, flow)
 			}

models/patient_models.go

@@ -1550,3 +1550,19 @@ type VmDialysisPrescription struct {
 func (VmDialysisPrescription) TableName() string {
 	return "xt_dialysis_prescription"
 }
+
+type XtScheduleList struct {
+	UserOrgId        int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId      int64              `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId            int64              `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId        int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate     int64              `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType     int64              `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek     int64              `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId           int64              `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	DialysisSolution VmDialysisSolution `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"vmsolution"`
+}
+
+func (XtScheduleList) TableName() string {
+	return "xt_schedule"
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -119,7 +119,7 @@ func GetAllName(orgId int64, appid int64) (list []AdminUserListTwo, err error) {
 
 func GetPatientCoursesRecords(orgID int64, id []string) (records []*models.PatientDiseaseCourse, err error) {
 	db := p_service.XTReadDB()
-	err = db.Model(&models.PatientDiseaseCourse{}).Where("org_id = ? and id in(?) and status = 1", orgID, id).Order("record_time desc").Find(&records).Error
+	err = db.Model(&models.PatientDiseaseCourse{}).Where("org_id = ? and id in(?) and status = 1", orgID, id).Order("record_time asc").Find(&records).Error
 	return
 }
 

service/schedule_service.go

@@ -1108,3 +1108,26 @@ func GetSolutionSchedule(orgid int64) (solution []*models.VmDialysisSolution, er
 	}).Find(&solution).Error
 	return solution, err
 }
+
+func GetSolutionScheduleBySchedule(orgid int64, zonid int64, classtype int64, schedule_date int64) (schedule []*models.XtScheduleList, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status = 1")
+	if orgid > 0 {
+		db = db.Where("user_org_id =?", orgid)
+	}
+	if zonid > 0 {
+		db = db.Where("partition_id = ?", zonid)
+	}
+	if classtype > 0 {
+		db = db.Where("schedule_type = ?", classtype)
+	}
+	if schedule_date > 0 {
+		db = db.Where("schedule_date = ?", schedule_date)
+	}
+	err = db.Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("created_time asc").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1", orgid).Order("id asc")
+		})
+	}).Find(&schedule).Error
+	return schedule, err
+}

service/stock_service.go

@@ -659,12 +659,6 @@ func UpdateDrugFlowTens(patientid int64, warehouse_out_number string, drug_id in
 	return flow, err
 }
 
-func UpdateDrugFlowTen(patientid int64, warehouse_out_number string, drug_id int64) (models.DrugFlow, error) {
-	flow := models.DrugFlow{}
-	err := XTWriteDB().Model(&flow).Where("patient_id =? and warehouse_out_order_number = ? and drug_id = ? and status = 1", patientid, warehouse_out_number, drug_id).Updates(map[string]interface{}{"status": 0}).Error
-	return flow, err
-}
-
 func CreateDrugFlowTwo(flow *models.DrugFlow) error {
 
 	err := XTWriteDB().Create(&flow).Error
@@ -683,6 +677,12 @@ func GetLastWarehousingInfo(goodid int64) (models.WarehousingInfo, error) {
 	return info, err
 }
 
+func CreatedWarehouseingDetail(info *models.WarehousingInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
 func FindFirstWarehousingInfoByStock(good_id int64, good_type_id int64) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0", good_id, good_type_id).Order("ctime").First(&info).Error
 	return info, err
@@ -2406,6 +2406,12 @@ func FindAllDrugCancelList(orgId int64, page int64, limit int64, startTime int64
 	return
 }
 
+func GetCancelWarehosueInfo(ids []string) (info []*models.CancelStockInfo, err error) {
+
+	err = XTReadDB().Where("id IN(?) and status = 1", ids).Find(&info).Error
+	return info, err
+}
+
 func DeleteCancelStock(ids []string) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Model(&models.CancelStock{}).Where("id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
@@ -2418,11 +2424,6 @@ func DeleteCancelStock(ids []string) (err error) {
 		ut.Rollback()
 		return
 	}
-	err = ut.Model(&models.VmStockFlow{}).Where("cancel_stock_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
-	if err != nil {
-		ut.Rollback()
-		return
-	}
 	ut.Commit()
 	return
 }
@@ -2458,9 +2459,21 @@ func UpDateCancleStockStatus(id int64) (err error) {
 	return
 }
 
-func UpdatedStockFlowByCancelId(id int64) (err error) {
+func GetCancelStockById(id int64) (models.CancelStockInfo, error) {
+	info := models.CancelStockInfo{}
+	err := XTReadDB().Model(&info).Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func ModefyWarehouseInfoNight(info models.WarehousingInfo, id int64) error {
+
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", info.StockCount)).Error
+	return err
+}
 
-	err = XTWriteDB().Model(&models.CancelStockInfo{}).Where("cancel_out_detail_id = ? and status = 0", id).Updates(map[string]interface{}{"status": 0}).Error
+func UpdatedStockFlowByCancelId(id int64, good_id int64) (err error) {
+
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("cancel_out_detail_id = ? and status = 1 and good_id = ?", id, good_id).Updates(map[string]interface{}{"status": 0}).Error
 	return
 }
 
@@ -4941,14 +4954,14 @@ func UpdateStockFlow(flow models.VmStockFlow, goodid int64, warehousing_id int64
 func UpdateDrugFlow(flow models.DrugFlow, drugid int64, warehousing_id int64) error {
 
 	drugFlow := models.DrugFlow{}
-	err := XTWriteDB().Model(&drugFlow).Where("drug_id = ? and warehousing_id= ? and status = 1", drugid, warehousing_id).Updates(map[string]interface{}{"count": flow.Count, "max_unit": flow.MaxUnit, "min_unit": flow.MinUnit}).Error
+	err := XTWriteDB().Model(&drugFlow).Where("drug_id = ? and warehousing_id= ? and status = 1", drugid, warehousing_id).Updates(map[string]interface{}{"count": flow.Count, "max_unit": flow.MaxUnit, "min_unit": flow.MinUnit, "price": flow.Price, "expire_date": flow.ExpireDate}).Error
 	return err
 }
 
 func UpdateDrugFlowNight(flow models.DrugFlow, drugid int64, warehousing_id int64) error {
 
 	drugFlow := models.DrugFlow{}
-	err := XTWriteDB().Model(&drugFlow).Where("drug_id = ? and warehousing_id= ? and status = 1", drugid, warehousing_id).Updates(map[string]interface{}{"count": flow.Count, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "number": flow.Number, "batch_number": flow.BatchNumber, "price": flow.Price}).Error
+	err := XTWriteDB().Model(&drugFlow).Where("drug_id = ? and warehousing_detail_id= ? and status = 1", drugid, warehousing_id).Updates(map[string]interface{}{"count": flow.Count, "max_unit": flow.MaxUnit, "min_unit": flow.MinUnit, "price": flow.Price, "expire_date": flow.ExpireDate}).Error
 	return err
 }
 
@@ -5364,13 +5377,6 @@ func GetCurrentWarehosueInfo(id int64) (info []*models.DrugWarehouseInfo, err er
 	return info, err
 }
 
-func GetCurrentWarehosueInfoOne(id int64) (models.DrugWarehouseInfo, error) {
-
-	info := models.DrugWarehouseInfo{}
-	err := XTReadDB().Model(&info).Where("id=?", id).Find(&info).Error
-	return info, err
-}
-
 func ModifyDrugWarehouseInfo(info *models.DrugWarehouseInfo, id int64) error {
 
 	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber, "stock_min_number": info.StockMinNumber}).Error
@@ -5477,12 +5483,6 @@ func UpdateWarehouseInfoByGoodIdOne(info models.WarehousingInfo, id int64) error
 	return err
 }
 
-func UpdatedStockFlowByGoodId(warehousing_id int64, good_id int64, flow models.VmStockFlow) error {
-
-	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, good_id).Updates(map[string]interface{}{"count": flow.Count}).Error
-	return err
-}
-
 func UpdatedStockFlowByGoodIdOne(warehousing_id int64, good_id int64, flow models.VmStockFlow) error {
 
 	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, good_id).Updates(map[string]interface{}{"count": flow.Count, "number": flow.Number, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate, "Price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "license_number": flow.LicenseNumber}).Error
@@ -5536,15 +5536,9 @@ func IsExsitStockFlow(goodid int64, cancel_order_number string) (*models.VmStock
 	return &flow, nil
 }
 
-func UpdateStockFlowTwo(id int64, flow models.VmStockFlow) error {
-
-	err := XTWriteDB().Model(&flow).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"count": flow.Count}).Error
-	return err
-}
-
 func UpdateStockFlowThree(id int64, flow models.VmStockFlow) error {
 
-	err := XTWriteDB().Model(&flow).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"count": flow.Count, "manufacturer": flow.Count, "dealer": flow.Dealer, "number": flow.Number, "license_number": flow.LicenseNumber, "price": flow.Price}).Error
+	err := XTWriteDB().Model(&flow).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"count": flow.Count, "manufacturer": flow.Count, "dealer": flow.Dealer, "number": flow.Number, "license_number": flow.LicenseNumber, "price": flow.Price, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate}).Error
 	return err
 }
 
@@ -5575,33 +5569,6 @@ func ModifyDrugWarehouseOutInfoOne(info models.DrugWarehouseOutInfo, drugid int6
 	return err
 }
 
-func GetDrugWarehouseOutInfoByWarehosueId(drugid int64, patientid int64, recorddate int64, warehosueinfoid int64) (*models.DrugWarehouseOutInfo, error) {
-	info := models.DrugWarehouseOutInfo{}
-	err := XTReadDB().Model(&info).Where("drug_id = ? and patient_id = ? and sys_record_time = ? and warehouse_info_id  = ? and status = 1", drugid, patientid, recorddate, warehosueinfoid).Find(&info).Error
-	if err == gorm.ErrRecordNotFound {
-		return nil, err
-	}
-	if err != nil {
-		return nil, err
-	}
-	return &info, nil
-}
-
-func GetDrugFlowRecord(warehouse_out_order_number string, drugid int64, patientid int64) (*models.DrugFlow, error) {
-
-	drugFlow := models.DrugFlow{}
-
-	err := XTReadDB().Where("warehouse_out_order_number = ? and drug_id =? and patient_id = ? and status = 1", warehouse_out_order_number, drugid, patientid).Find(&drugFlow).Error
-
-	if err == gorm.ErrRecordNotFound {
-		return nil, err
-	}
-	if err != nil {
-		return nil, err
-	}
-	return &drugFlow, nil
-}
-
 func ModifyDrugFlow(flow models.DrugFlow, warehouse_out_order_number string, drugid int64, patient_id int64) error {
 
 	err := XTWriteDB().Model(&flow).Where("warehouse_out_order_number = ? and drug_id = ? and patient_id = ? and status = 1", warehouse_out_order_number, drugid, patient_id).Updates(map[string]interface{}{"count": flow.Count, "max_unit": flow.MaxUnit}).Error
@@ -5614,28 +5581,6 @@ func ModifyDrugFlowOne(flow models.DrugFlow, warehouse_out_order_number string,
 	return err
 }
 
-func GetDrugAutoReduceRecordOne(drugid int64, patientid int64, recorddate int64) (detail []*models.DrugAutomaticReduceDetail, err error) {
-
-	err = XTReadDB().Model(&detail).Where("drug_id = ? and patient_id = ? and record_time  = ? and status = 1", drugid, patientid, recorddate).Find(&detail).Error
-
-	return detail, err
-}
-
-func GetDrugAutoReduceRecord(drugid int64, patientid int64, recorddate int64) (*models.DrugAutomaticReduceDetail, error) {
-
-	detail := models.DrugAutomaticReduceDetail{}
-
-	err := XTReadDB().Model(&detail).Where("drug_id = ? and patient_id = ? and record_time  = ? and status = 1", drugid, patientid, recorddate).Find(&detail).Error
-
-	if err == gorm.ErrRecordNotFound {
-		return nil, err
-	}
-	if err != nil {
-		return nil, err
-	}
-	return &detail, nil
-}
-
 func ModifyAutoMaticReduce(auto models.DrugAutomaticReduceDetail, patientid int64, recordate int64, drugid int64) error {
 
 	err := XTWriteDB().Model(&auto).Where("patient_id = ? and record_time = ? and drug_id = ? and status = 1", patientid, recordate, drugid).Updates(map[string]interface{}{"count": auto.Count, "count_unit": auto.CountUnit}).Error