11月9日库存管理

controllers/gobal_config_api_controller.go

@@ -2231,7 +2231,7 @@ func (c *GobalConfigApiController) GetSingleOrderDetail() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 
 	list, err := service.GetSingleOrderDetail(id, orgId)
-	drugoutlist, _ := service.GetDrugWarehouseOutDetailSeventy(id, orgId)
+	drugoutlist, _ := service.GetDrugWarehouseOutDetailNighty(id, orgId)
 	dealerList, err := service.GetAllDealerList(orgId)
 	manufacturerList, err := service.GetAllManufacturerList(orgId)
 	drugFlowList, _ := service.GetDrugStockFlowDetail(start_time, orgId)

models/drug_stock.go

@@ -647,3 +647,52 @@ type DrugFlowNight struct {
 func (DrugFlowNight) TableName() string {
 	return "xt_drug_flow"
 }
+
+type DrugWarehouseOutInfoNight struct {
+	ID                      int64            `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64            `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64            `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64            `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64            `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string           `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64          `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64          `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64            `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64            `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64            `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64            `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64            `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64            `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string           `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64            `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string           `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64            `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64            `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64            `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64            `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64            `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64          `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64          `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number                  string           `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string           `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	WarehouseInfoId         int64            `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	AdviceId                int64            `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyCancelOutId       int64            `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64            `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64            `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	StorehouseId            int64            `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId   int64            `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId             int64            `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice               float64          `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount              string           `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId              int64            `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsCheck                 int64            `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Drug                    BaseDrugLibSeven `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+	OverCount               int64            `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	OrderId                 int64            `gorm:"column:order_id" json:"order_id" form:"order_id"`
+}
+
+func (DrugWarehouseOutInfoNight) TableName() string {
+	return "xt_drug_warehouse_out_info"
+}

service/gobal_config_service.go

@@ -902,6 +902,12 @@ func GetDrugWarehouseOutDetailSeventy(id int64, org_id int64) (info []*models.Dr
 	return info, err
 }
 
+func GetDrugWarehouseOutDetailNighty(id int64, org_id int64) (info []*models.DrugWarehouseOutInfoNight, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id in(?) and org_id = ? and status =1", id, org_id).Preload("Drug", "org_id = ? and status = 1", org_id).Find(&info).Error
+	return info, err
+}
+
 func GetDrugStockFlowDetail(record_time int64, orgid int64) (drugflow []*models.XtDrugAutomaticReduceDetail, err error) {
 
 	err = XTReadDB().Where("record_time = ? and org_id = ? and status = 1", record_time, orgid).Preload("XtBaseDrug", "status = 1").Find(&drugflow).Error
@@ -953,7 +959,7 @@ func GetDrugFlowListGroupById(id int64, orgid int64) (drugFlow []*models.DrugFlo
 
 func GetDrugFlowListGroupByIdOne(id int64, orgid int64) (drugFlow []*models.DrugFlow, err error) {
 
-	err = XTReadDB().Where("warehouse_out_id in(?) and user_org_id = ? and status = 1", id, orgid).Group("batch_number").Find(&drugFlow).Error
+	err = XTReadDB().Where("warehouse_out_id in(?) and user_org_id = ? and status = 1", id, orgid).Group("warehousing_detail_id").Find(&drugFlow).Error
 	return drugFlow, err
 }
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -215,6 +215,7 @@ type PrescriptionVM struct {
 	OxygenUptake               int64   `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
 	OxygenFlow                 string  `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
 	OxygenTime                 string  `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
+	DialysisRemark             string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
 }
 
 func (PrescriptionVM) TableName() string {