11月8日库存管理

conf/app.conf

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

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3911,6 +3911,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						err = ConsumablesDeliveryTotalSeven(adminInfo.Org.Id, patient_id, record_time, beforePrepares, adminInfo.AdminUser.Id, item.Count)
 						break
 					}
+
 					var last_total int64
 
 					//如果当前出库数量大于 最后一次出库数量，那么则需要去查询当前批次耗材的库存是否足够
@@ -4580,7 +4581,6 @@ func (c *DialysisAPIController) UpdateStockGoods() {
 //当前数据比上一次出库数据少
 func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time int64, goods []*models.DialysisBeforePrepareGoods, creater int64, count int64) (err error) {
 
-	fmt.Println("w我的中国馆公共区发电房阿道夫安抚安抚安抚安抚安抚安抚阿道夫阿道夫阿凡达阿道夫a", count)
 	//查询该患者当天已经出库的耗材信息
 	goods_yc, _ := service.FindConsumablesByDateThree(orgID, patient_id, record_time)
 	// 和新请求的出库数据进行对比，分出那些是继续出库的，那些是需要删除出库的
@@ -4619,7 +4619,6 @@ func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time in
 
 	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
 	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
-	fmt.Println("goodsy999999999999", goods_yc)
 
 	//退库
 	if len(goods_yc) > 0 {
@@ -4635,10 +4634,8 @@ func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time in
 //耗材出库删除
 func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut, patient_id int64, creater int64, count int64) (err error) {
 
-	fmt.Println("count2323223884584854854854u5454785487547845785478758487545475475487,count", count)
 	// 先根据相关信息查询当天该耗材的出库信息
 	warehouseOutInfos, err := service.FindStockOutInfoByStockTwo(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time, good_yc.PatientId)
-	fmt.Println("errr232323232323232323232323232", err)
 
 	if err != nil {
 		return err
@@ -4740,7 +4737,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 				PatientId:               patient_id,
 			}
 
-			service.UpdatedStockFlow(stockFlow)
+			service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, good_yc.GoodId)
 		}
 
 		if errOne != nil {
@@ -4807,7 +4804,8 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 				PatientId:               patient_id,
 				ReturnCount:             delete_count,
 			}
-			service.UpdatedStockFlow(stockFlow)
+			//service.UpdatedStockFlow(stockFlow)
+			service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, good_yc.GoodId)
 		}
 
 	}
@@ -4841,7 +4839,8 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 	// 删除出库完成后，要增加对应批次的库存数量
 	fmt.Println("deletecount2323232323232323232323232323", delete_count)
 	errThree := service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count)
-
+	errOne := service.UpDateWarehouStockFlowByStockDelete(warehouseOutInfos.WarehouseInfotId, record_time, good_yc.GoodId, delete_count, good_yc.PatientId)
+	fmt.Println("erron2332323232323232232323", errOne)
 	if errThree != nil {
 		return errThree
 	}
@@ -4994,14 +4993,17 @@ func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *mod
 		stockInInfo, _ := service.FindLastStockInInfoRecord(good_yc.GoodId, orgID)
 		warehouseOutInfo.Price = stockInInfo.Price
 		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+
 		if errOne != nil {
 			return errOne
 		}
 
-		//更改自动出库的表格
-
 		// 删除出库完成后，要增加对应批次的库存数量
-		fmt.Println("deletecount2323232323232323232323232323", delete_count)
+		fmt.Println("时间人秘股呢换药2232323223323223322323232323232323232323232323", delete_count)
+
+		// 删除出库完成后，要改变流水库存
+		errOne = service.UpDateWarehouStockFlowByStockDelete(ware.WarehouseInfotId, record_time, good_yc.GoodId, delete_count, good_yc.PatientId)
+		fmt.Println("erron2332323232323232232323", errOne)
 		errThree := service.UpDateWarehouseInfoByStockDelete(ware.WarehouseInfotId, delete_count)
 
 		if errThree != nil {

service/mobile_dialysis_service.go

@@ -1876,7 +1876,7 @@ func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64
 			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ?  AND count > 0 ", orgID, scheduleDate)
 		}).
 		Preload("AutomaticReduceDetail", func(db *gorm.DB) *gorm.DB {
-			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time).Group("patient_id,good_id")
+			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?  ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time).Group("patient_id,good_id")
 		}).Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)

service/patient_schedule_template_service.go

@@ -422,7 +422,7 @@ func SavePatientScheduleTemplateModeAndClearNextTwoWeekSchedules(templateMode *m
 	nextMonday, _ := utils.GetMondayAndSundayOfWeekDate(&nextWeek)
 	nextSecWeek := now.AddDate(0, 0, 14)
 	_, nextSecSunday := utils.GetMondayAndSundayOfWeekDate(&nextSecWeek)
-	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextMonday.Unix(), nextSecSunday.Unix()).Updates(map[string]interface{}{"status": 0, "mtime": now.Unix()}).Error
+	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextMonday.Unix(), nextSecSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
 	if disableErr != nil {
 		tx.Rollback()
 		return disableErr

service/patient_service.go

@@ -67,7 +67,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	offset := (page - 1) * limit
 
-	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 	return
 }
 

service/stock_service.go

@@ -3268,7 +3268,7 @@ func GetAutoMaticReduceDetail(orgid int64, patient_id int64, recordtime int64, g
 func DeleteAutoRedeceDetailTwo(orgid int64, patient_id int64, recordtime int64, goodid int64, goodtypeid int64) error {
 
 	detail := models.BloodAutomaticReduceDetail{}
-	err := XTWriteDB().Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? and good_type_id = ?", orgid, patient_id, recordtime, goodid, goodtypeid).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? and good_type_id = ?", orgid, patient_id, recordtime, goodid, goodtypeid).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
 	return err
 }
 
@@ -3277,6 +3277,12 @@ func UpDateWarehouseInfoByStockDelete(id int64, count int64) (err error) {
 	return err
 }
 
+func UpDateWarehouStockFlowByStockDelete(id int64, recordtime int64, good_id int64, count int64, patient_id int64) (err error) {
+
+	err = writeDb.Model(&models.VmStockFlow{}).Where("warehousing_id = ? and system_time = ? and good_id = ? and patient_id = ?", id, recordtime, good_id, patient_id).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
+	return err
+}
+
 func UpDateWarehouseInfoByStockDeleteOne(id int64, count int64) (err error) {
 	err = writeDb.Model(&models.WarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", count)).Error
 	return err
@@ -3957,7 +3963,7 @@ func GetStockFlowBatchNumber(id int64, goodid int64) (stock []*models.VmStockFlo
 
 func GetStockFlowBatchNumberOne(id int64, goodid int64) (stock []*models.VmStockFlowOne, err error) {
 
-	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status = 1 and count > 0")
 	table := XTReadDB().Table("xt_patients as t").Where("t.status = 1")
 	fmt.Println(table)
 	tableone := XTReadDB().Table("xt_good_information as o").Where("o.status = 1")
@@ -4118,6 +4124,12 @@ func UpdatedStockFlow(flow models.VmStockFlow) error {
 	return err
 }
 
+func UpdatedStockFlowOne(flow models.VmStockFlow, warehousing_id int64, patient_id int64, record_time int64, good_id int64) error {
+
+	err = XTWriteDB().Model(&flow).Where("warehousing_id = ? and patient_id = ? and system_time = ? and good_id = ? and status = 1", warehousing_id, patient_id, record_time, good_id).Updates(map[string]interface{}{"number": flow.Number, "license_number": flow.LicenseNumber, "count": flow.Count, "expire_date": flow.ExpireDate, "product_date": flow.ProductDate, "price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer}).Error
+	return err
+}
+
 func GetStockFlowIsExsit(warehousing_id int64, patient_id int64, record_time int64, good_id int64) (*models.VmStockFlow, error) {
 
 	stock := models.VmStockFlow{}

service/warhouse_service.go

@@ -1080,9 +1080,6 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 //耗材出库
 func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
 
-	fmt.Println("count23232323232323232323232323", count)
-	fmt.Println("hhhh2h3h3h2h23h32hh23h32h23", goods.Count)
-	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
 	var maxNumber int64 = 0
@@ -1098,7 +1095,6 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		return errors.New("库存数量不足")
 	}
 
-	// 将该批次的剩余库存数量转换为拆零数量
 	stock_number = warehouse.StockCount
 
 	//获取耗材信息
@@ -1186,7 +1182,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				PatientId:               patient_id,
 			}
 			//查询流水是否存在
-			exsit, errflow := GetStockFlowIsExsit(warehouseOut.ID, patient_id, record_time, goods.GoodId)
+			exsit, errflow := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
 
 			fmt.Println("什么数据233232323", errflow)
 			if errflow == gorm.ErrRecordNotFound {
@@ -1221,7 +1217,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
 				}
-				errFour := UpdatedStockFlow(flow)
+
+				errFour := UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
 				if errFour != nil {
 					return errFour
 				}
@@ -1253,7 +1250,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				PatientId:               patient_id,
 			}
 			//查询流水是否存在
-			exsit, errflow := GetStockFlowIsExsit(warehouseOut.ID, patient_id, record_time, goods.GoodId)
+			exsit, errflow := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
 
 			if errflow == gorm.ErrRecordNotFound {
 				CreateStockFlowOne(flow)
@@ -1286,7 +1283,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
 				}
-				UpdatedStockFlow(flow)
+				//UpdatedStockFlow(flow)
+				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
 				DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
 				CreateAutoReduceRecord(&details)
 			}
@@ -1404,7 +1402,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
 				}
-				UpdatedStockFlow(flow)
+				//UpdatedStockFlow(flow)
+				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
 			}
 
 		} else if errcodes == nil {
@@ -1469,7 +1468,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					IsSys:                   1,
 					PatientId:               patient_id,
 				}
-				UpdatedStockFlow(flow)
+				//UpdatedStockFlow(flow)
+				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
 			}
 		}