11月8日库存管理

conf/app.conf

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

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -309,13 +309,11 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 func (this *StaffScheduleApiController) DeleteSchedule() {
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
-	err := service.DeleteSchedule(id)
+
 	org_id := this.GetMobileAdminUserInfo().Org.Id
-	schedule, _ := service.GetSchedule(org_id, id)
-	if schedule == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeScheduleNotExist)
-		return
-	}
+	err := service.DeleteSchedule(id)
+	schedule, _ := service.GetScheduleNight(org_id, id)
+
 	redis := service.RedisClient()
 
 	//处方
@@ -339,9 +337,10 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 
 	keySeven := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
 	redis.Set(keySeven, "", time.Second)
-	fmt.Println(err)
+
 	defer redis.Close()
 	fmt.Println(err)
+
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "ok"
 	this.ServeSuccessJSON(returnData)

service/schedule_service.go

@@ -242,6 +242,16 @@ func GetSchedule(orgID, id int64) (*models.Schedule, error) {
 	return &schedule, nil
 }
 
+func GetScheduleNight(orgID, id int64) (*models.Schedule, error) {
+	var schedule models.Schedule
+	var err error
+	err = readDb.Model(&models.Schedule{}).Where("id = ? and user_org_id=?", id, orgID).First(&schedule).Error
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+}
+
 func UpdateSchedule(m *models.Schedule) error {
 	utx := XTWriteDB().Begin()
 	err := utx.Save(&m).Error

service/stock_service.go

@@ -2424,6 +2424,11 @@ 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
 }
@@ -5377,6 +5382,13 @@ 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
@@ -5483,6 +5495,12 @@ 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,6 +5554,12 @@ 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, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate}).Error
@@ -5569,6 +5593,33 @@ 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
@@ -5581,6 +5632,28 @@ 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