11月9日库存管理

conf/app.conf

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

controllers/his_api_controller.go

@@ -3141,7 +3141,7 @@ func (c *HisApiController) DeleteProject() {
 					total_count_one += it.StockCount
 				}
 				//基础库插入数据
-				service.UpdateGoodInfoSumCount(project.ProjectId, total_count_one, project.UserOrgId)
+				service.UpdateGoodInfoSumCountSix(project.ProjectId, total_count_one, project.UserOrgId)
 
 				goodListOne, _ := service.GetSumGoodList(project.UserOrgId, houseConfig.StorehouseOutInfo, project.ProjectId)
 				var flush_count int64

controllers/secondary_order_api_contorller.go

@@ -278,8 +278,8 @@ func (this *SecondaryOrderApiController) AddStorehouse() {
 		return
 	}
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
 	var storehouse_status, admin_id int64
@@ -1322,7 +1322,7 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 					total_count += it.StockCount
 				}
 				//基础库插入数据
-				service.UpdateGoodInfoSumCount(item.ProjectId, total_count, orgId)
+				service.UpdateGoodInfoSumCountSix(item.ProjectId, total_count, orgId)
 			}
 		}
 	}

service/new_warehouse_service.go

@@ -789,6 +789,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 				WarehouseOutDetailId:    lastDrugOutInfo.ID,
 				OverCount:               sum_count,
 				AdviceId:                advice.ID,
+				LastPrice:               warehouse.Price,
 			}
 
 			CreateDrugFlowOne(drugflow)
@@ -882,7 +883,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
 				Mtime:                   0,
-				Price:                   warehouse.Price,
+				Price:                   warehouse.RetailPrice,
 				WarehousingDetailId:     warehouse.ID,
 				WarehouseOutDetailId:    0,
 				CancelOutDetailId:       lastDrugCancelStock.ID,
@@ -892,6 +893,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 				MinUnit:                 "",
 				AdviceId:                advice.ID,
 				StorehouseId:            storeConfig.DrugStorehouseOut,
+				LastPrice:               warehouse.Price,
 			}
 			CreateDrugFlowOne(flow)
 			AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
@@ -1365,7 +1367,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		}
 
 		//查询今日该药品该患者是否有出库数据
-		lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
+		lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
+		fmt.Println("lastDrugOutInfowwowowowoowowowowowowowowo", lastDrugOutInfo.ID)
 		if lastDrugOutInfo.ID == 0 {
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -1435,6 +1438,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				WarehouseOutDetailId:    lastDrugOutInfo.ID,
 				OverCount:               sum_count,
 				AdviceId:                advice.ID,
+				LastPrice:               warehouse.Price,
 			}
 
 			CreateDrugFlowOne(drugflow)
@@ -1528,7 +1532,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
 				Mtime:                   0,
-				Price:                   warehouse.Price,
+				Price:                   warehouse.RetailPrice,
 				WarehousingDetailId:     warehouse.ID,
 				WarehouseOutDetailId:    0,
 				CancelOutDetailId:       lastDrugCancelStock.ID,
@@ -1538,6 +1542,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				MinUnit:                 "",
 				AdviceId:                advice.ID,
 				StorehouseId:            storeConfig.DrugStorehouseOut,
+				LastPrice:               warehouse.Price,
 			}
 			CreateDrugFlowOne(flow)
 			AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
@@ -1645,6 +1650,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		//查询是否存在出库数据
 		_, errCode := GetSigleDrugWarehouseOutInfo(advice.PatientId, advice.AdviceDate, orgID)
 		if errCode == gorm.ErrRecordNotFound {
+			fmt.Println("j你俩3233223323232323233wo")
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
 				return errOne
@@ -1741,6 +1747,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				WarehouseOutDetailId:    lastDrugOutInfo.ID,
 				OverCount:               sum_count,
 				AdviceId:                advice.ID,
+				LastPrice:               warehouse.Price,
 			}
 
 			CreateDrugFlowOne(drugflow)
@@ -1831,7 +1838,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
 				Mtime:                   0,
-				Price:                   warehouse.Price,
+				Price:                   warehouse.RetailPrice,
 				WarehousingDetailId:     warehouse.ID,
 				WarehouseOutDetailId:    0,
 				CancelOutDetailId:       lastDrugCancelStock.ID,
@@ -1841,6 +1848,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				MinUnit:                 "",
 				AdviceId:                advice.ID,
 				StorehouseId:            storeConfig.DrugStorehouseOut,
+				LastPrice:               warehouse.Price,
 			}
 			CreateDrugFlowOne(flow)
 
@@ -1881,7 +1889,7 @@ func GetSigleDrugWarehouseOutInfo(patient_id int64, advice_date int64, orgid int
 
 	info := models.XtDrugWarehouseOutInfo{}
 	var err error
-	err = XTReadDB().Where("patient_id = ? and advice_date = ? and org_id = ? and status = 1", patient_id, advice_date, orgid).Find(&info).Error
+	err = XTReadDB().Where("patient_id = ? and sys_record_time = ? and org_id = ? and status = 1", patient_id, advice_date, orgid).Find(&info).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -1914,7 +1922,7 @@ func FindDrugAutoReduceRecordInfo(patient_id int64, advice_date int64, orgid int
 
 	detail := models.DrugAutomaticReduceDetail{}
 	var err error
-	err = XTReadDB().Where("patient_id = ? and advice_date = ? and org_id = ?", patient_id, advice_date, orgid).Find(&detail).Error
+	err = XTReadDB().Where("patient_id = ? and record_time = ? and org_id = ?", patient_id, advice_date, orgid).Find(&detail).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -1930,11 +1938,11 @@ func UpdateDrugAutoReduceRecordInfo(patient_id int64, record_date int64, drug_id
 	return err
 }
 
-func GetNewDrugWarehouseOutInfoSix(drugid int64, patient_id int64, record_date int64, org_id int64, advice_id int64) (models.DrugWarehouseOutInfo, error) {
+func GetNewDrugWarehouseOutInfoSix(drugid int64, patient_id int64, record_date int64, org_id int64, advice_id int64, warehouse_info_id int64) (models.DrugWarehouseOutInfo, error) {
 
 	info := models.DrugWarehouseOutInfo{}
 	var err error
-	err = XTReadDB().Where("drug_id = ? and patient_id = ? and sys_record_time = ? and org_id = ? and status = 1 and advice_id = ?", drugid, patient_id, record_date, org_id, advice_id).Find(&info).Error
+	err = XTReadDB().Where("drug_id = ? and patient_id = ? and sys_record_time = ? and org_id = ? and status = 1 and advice_id = ? and warehouse_info_id = ?", drugid, patient_id, record_date, org_id, advice_id, warehouse_info_id).Find(&info).Error
 
 	return info, err
 }

service/self_drug_service.go

@@ -1835,11 +1835,13 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 			db = db.Where("storehouse_id = ?", storehouse_id)
 		}
 		return db.Where("status = 1 and user_org_id = ?", orgId)
+
 	}).Preload("DrugStockCount", func(db *gorm.DB) *gorm.DB {
 		if storehouse_id > 0 {
 			db = db.Where("storehouse_id = ?", storehouse_id)
 		}
 		return db.Where("status = 1 and user_org_id = ?", orgId).Group("drug_id,storehouse_id")
+
 	}).Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Find(&drug).Error
 
 	return drug, total, err

service/stock_service.go

@@ -4784,7 +4784,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 and x.count > 0 and (x.consumable_type = 3 or x.consumable_type = 2")
+	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status = 1 and x.count > 0 and (x.consumable_type = 3 or x.consumable_type = 2)")
 	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")
@@ -7560,6 +7560,12 @@ func UpdateGoodInfoSumCount(goodid int64, sum_count int64, orgid int64) error {
 	return err
 }
 
+func UpdateGoodInfoSumCountSix(goodid int64, sum_count int64, orgid int64) error {
+
+	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 UpdateGoodInfoReduceSumCount(goodid int64, sum_count int64, orgid int64) error {
 	tx := XTWriteDB().Begin()
 	err = tx.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error

service/warhouse_service.go

@@ -200,6 +200,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			WarehouseOutDetailId:    lastDrugOutInfo.ID,
+			LastPrice:               warehouse.Price,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -413,6 +414,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			WarehouseOutDetailId:    lastDrugOutInfo.ID,
+			LastPrice:               warehouse.Price,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -614,6 +616,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			IsCheck:                 1,
+			LastPrice:               warehouse.Price,
 		}
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		lastDrugOutInfo, _ := FindLastDrugWarehouseOutInfo(orgID)
@@ -647,6 +650,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			WarehouseOutDetailId:    lastDrugOutInfo.ID,
+			LastPrice:               warehouse.Price,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -832,6 +836,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			WarehouseOutDetailId:    lastDrugOutInfo.ID,
+			LastPrice:               warehouse.Price,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -896,34 +901,6 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			return errThree
 		}
 
-		drugInfoList, _ := FindDrugWarehouseInfoList(advice.DrugId, orgID)
-		var drug_max_number int64
-		var drug_min_number int64
-		for _, item := range drugInfoList {
-			drug_max_number += item.StockMaxNumber
-			drug_min_number += item.StockMinNumber
-		}
-		drugFlushInfo := models.XtDrugWarehouseFlushInfo{
-			DrugMaxNumber:           drug_max_number,
-			UserOrgId:               orgID,
-			WarehouseOutId:          warehouseout.ID,
-			Type:                    1,
-			SystemTime:              advice.RecordDate,
-			PatientId:               advice.PatientId,
-			Ctime:                   time.Now().Unix(),
-			Mtime:                   0,
-			BatchNumberId:           warehouse.ID,
-			DrugId:                  advice.DrugId,
-			Count:                   stock_number,
-			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-			Creater:                 warehouseout.Creater,
-			DrugMinNumber:           drug_min_number,
-			Unit:                    drup.MinUnit,
-			AdviceId:                advice.ID,
-			Status:                  1,
-			WarehouseOutDetailId:    lastDrugOutInfo.ID,
-		}
-		CreatedDrugFlushInfo(drugFlushInfo)
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		prescribingNumber_two_temp := deliver_number - stock_number
 
@@ -5588,7 +5565,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			ProductDate:             advice.ProductDate,
 			ExpireDate:              advice.ExpiryDate,
 			Count:                   deliver_number,
-			Price:                   advice.Price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               advice.OrgId,
@@ -5651,7 +5628,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			ProductDate:             advice.ProductDate,
 			ExpireDate:              advice.ExpiryDate,
 			Count:                   stock_number,
-			Price:                   advice.Price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               advice.OrgId,