11月8日库存管理

controllers/schedule_api_controller.go

@@ -2033,12 +2033,24 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 	week_time, _ := this.GetInt64("week_time")
 	start_time, _ := this.GetInt64("start_time")
 	end_time, _ := this.GetInt64("end_time")
-	//zone, _ := this.GetInt64("zone")
+	record_date := this.GetString("record_date")
+
 	zons := this.GetString("zone")
 	zone := strings.Split(zons, ",")
 	adminUserInfo := this.GetAdminUserInfo()
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTIme int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
 
-	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId, zone)
+	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId, zone, theStartTIme)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
@@ -2354,7 +2366,6 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 
 	week_type, _ := this.GetInt64("week_type", -1)
 	week_time, _ := this.GetInt64("week_time")
-	//zone, _ := this.GetInt64("zone")
 	zones := this.GetString("zone")
 	zone := strings.Split(zones, ",")
 	thisTime := time.Now()

controllers/stock_in_api_controller.go

@@ -2493,8 +2493,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 		}
 	}
 	var errs error
-	fmt.Println("出库22322333223", cancelStockInfos)
-	fmt.Println("更新23232323232323233", upDateCancelStockInfos)
+
 	if len(cancelStockInfos) > 0 {
 
 		for _, item := range cancelStockInfos {
@@ -2519,9 +2518,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 			if item.Count <= infolist.WarehousingCount {
 
 				errs := service.CreateCancelStockInfo(cancelStockInfos)
-				if len(stockFlow) > 0 {
-					service.CreateStockFlow(stockFlow)
-				}
+
 				if errs != nil {
 					utils.ErrorLog(errs.Error())
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
@@ -2535,6 +2532,23 @@ func (c *StockManagerApiController) EditCancelStock() {
 			}
 
 		}
+
+		if len(stockFlow) > 0 {
+			for _, itemcancel := range stockFlow {
+
+				//查询是否存在
+				stockInfo, errcode := service.IsExsitStockFlow(itemcancel.GoodId, itemcancel.CancelOrderNumber)
+				if errcode == gorm.ErrRecordNotFound {
+
+				} else {
+					flow := models.VmStockFlow{
+						Count: itemcancel.Count,
+					}
+					service.UpdateStockFlowTwo(stockInfo.ID, flow)
+				}
+			}
+			//service.CreateStockFlow(stockFlow)
+		}
 	}
 
 	if len(upDateCancelStockInfos) > 0 {
@@ -2542,14 +2556,13 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 			//获取该批次最后一套出库记录
 			info, _ := service.GetLastCancelInfo(item.WarehouseInfoId, item.GoodId)
-			fmt.Println("info232332322332233223", info.Count, item.Count)
+
 			//比较出库数量和最后一次出库数据大小
 			//退库(加)
 			if item.Count < info.Count {
 				var total = info.Count - item.Count
 				errs = service.UpDateCancelStockInfo(item)
 
-				service.CreateStockFlow(stockFlow)
 				warehouseinfo, _ := service.GetWarehouseInfoById(item.WarehouseInfoId)
 				if (warehouseinfo.StockCount + total) > warehouseinfo.StockCount {
 					c.ServeSuccessJSON(map[string]interface{}{
@@ -2566,9 +2579,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 			}
 			//(减)
 			if item.Count > info.Count {
-
 				errs = service.UpDateCancelStockInfo(item)
-				service.CreateStockFlow(stockFlow)
 				//查询该批次入库的值
 				infolist, _ := service.GetWarehouseInfoById(item.WarehouseInfoId)
 				if item.Count > infolist.WarehousingCount {
@@ -2592,15 +2603,21 @@ func (c *StockManagerApiController) EditCancelStock() {
 				errs = service.UpDateCancelStockInfo(item)
 			}
 		}
-		if errs != nil {
-			utils.ErrorLog(errs.Error())
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-			return
-		}
+	}
+	if len(stockFlow) > 0 {
+		for _, itemcancel := range stockFlow {
 
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "3",
-		})
+			//查询是否存在
+			stockInfo, errcode := service.IsExsitStockFlow(itemcancel.GoodId, itemcancel.CancelOrderNumber)
+			if errcode == gorm.ErrRecordNotFound {
+
+			} else {
+				flow := models.VmStockFlow{
+					Count: itemcancel.Count,
+				}
+				service.UpdateStockFlowTwo(stockInfo.ID, flow)
+			}
+		}
 	}
 
 	if errs != nil {

service/schedule_service.go

@@ -626,7 +626,7 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date = ?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date =?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ? and user_org_id = ? ", scheduleDate, orgid).Preload("DialysisPrescription", "status = 1 and record_date =? and user_org_id = ?", scheduleDate, orgid).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
 	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
 		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
@@ -814,7 +814,7 @@ func UpdateNewScheduleTemplateStatus(id int64, org_id int64) (err error) {
 	return
 }
 
-func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string) (schedules []*models.WeekScheduleSix, err error) {
+func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string, record_date int64) (schedules []*models.WeekScheduleSix, err error) {
 
 	db := readDb.Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
@@ -838,14 +838,14 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 	err = db.
 		Preload("DeviceZone", "status = 1 ").
 		Preload("DeviceNumber", "status = 1 ").
-		Preload("XtAssessmentBeforeDislysis", "status = 1").
+		Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date = ?", record_date).
 		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Order("id asc")
 		}).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Order("id asc")
 	}).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1").Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		return db.Where("status =1 and parent_id = 0 and advice_date = ?", record_date).Preload("ChildDoctorAdvice", "status = 1 and advice_date = ?", record_date)
+	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", record_date).Joins("JOIN xt_patients as p ON p.id = s.patient_id").
 		Select("s.id,s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
 		Order("s.partition_id desc").
 		Find(&schedules).Error

service/stock_service.go

@@ -5128,3 +5128,21 @@ func UpdateDrugCancelStockInfo(info *models.DrugCancelStockInfo) error {
 	err := XTWriteDB().Save(&info).Error
 	return err
 }
+
+func IsExsitStockFlow(goodid int64, cancel_order_number string) (*models.VmStockFlow, error) {
+	flow := models.VmStockFlow{}
+	err := XTReadDB().Where("good_id = ? and cancel_order_number = ? and status = 1", goodid, cancel_order_number).Find(&flow).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	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
+}