历史排班

controllers/patient_dataconfig_api_controller.go

@@ -1276,11 +1276,9 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 
 	err = service.CreateDeviceValsualMap(deviceValsualMap)
 
-	if err != nil {
-		this.ServeSuccessJSON(map[string]interface{}{
-			"deviceValsualMap": deviceValsualMap,
-		})
-	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"deviceValsualMap": deviceValsualMap,
+	})
 
 }
 
@@ -1290,12 +1288,12 @@ func (this *PatientDataConfigAPIController) GetPatientSitemap() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
-	sitemap, err := service.GetPatientSitemap(patient_id, orgId)
-	if err != nil {
-		this.ServeSuccessJSON(map[string]interface{}{
-			"sitemap": sitemap,
-		})
-	}
+	sitemap, _ := service.GetPatientSitemap(patient_id, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sitemap": sitemap,
+	})
+
 }
 
 func (this *PatientDataConfigAPIController) UpdateSiteMap() {

models/stock_models.go

@@ -229,50 +229,51 @@ func (WarehouseOut) TableName() string {
 }
 
 type WarehouseOutInfo struct {
-	ID                      int64           `gorm:"column:id" json:"id"`
-	WarehouseOutId          int64           `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
-	WarehouseInfotId        int64           `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
-	GoodId                  int64           `gorm:"column:good_id" json:"good_id"`
-	GoodTypeId              int64           `gorm:"column:good_type_id" json:"good_type_id"`
-	WarehousingOutTarget    int64           `gorm:"column:warehousing_out_target" json:"warehousing_out_target"`
-	Count                   int64           `gorm:"column:count" json:"count"`
-	Price                   float64         `gorm:"column:price" json:"price"`
-	TotalPrice              float64         `gorm:"column:total_price" json:"total_price"`
-	ProductDate             int64           `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate              int64           `gorm:"column:expiry_date" json:"expiry_date"`
-	Mtime                   int64           `gorm:"column:mtime" json:"mtime"`
-	Ctime                   int64           `gorm:"column:ctime" json:"ctime"`
-	Status                  int64           `gorm:"column:status" json:"status"`
-	OrgId                   int64           `gorm:"column:org_id" json:"org_id"`
-	Remark                  string          `gorm:"column:remark" json:"remark"`
-	IsCancel                int64           `gorm:"column:is_cancel" json:"is_cancel"`
-	WarehouseOut            WarehouseOut    `ForeignKey:WarehouseOutId json:"WarehouseOut"`
-	WarehouseOutOrderNumber string          `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
-	GoodInfo                GoodInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
-	Type                    int64           `gorm:"column:type" json:"type"`
-	Dealer                  int64           `gorm:"column:dealer" json:"dealer"`
-	Manufacturer            int64           `gorm:"column:manufacturer" json:"manufacturer"`
-	IsSys                   int64           `gorm:"column:is_sys" json:"is_sys"`
-	SysRecordTime           int64           `gorm:"column:sys_record_time" json:"sys_record_time"`
-	PatientId               int64           `gorm:"column:patient_id" json:"patient_id"`
-	Number                  string          `gorm:"column:number" json:"number" form:"number"`
-	LicenseNumber           string          `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	ConsumableType          int64           `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	ProjectId               int64           `gorm:"column:project_id" json:"project_id" form:"project_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"`
-	BuyPrice                float64         `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	StockCount              string          `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	IsCheck                 int64           `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	RegisterNumber          string          `gorm:"column:register_number" json:"register_number" form:"register_number"`
-	WarehousingInfo         WarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId" `
-	VmStockFlow             VmStockFlow     `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId" json:"stock_flow"`
-	OverCount               int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
-	OrderId                 int64           `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ID                      int64                `gorm:"column:id" json:"id"`
+	WarehouseOutId          int64                `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
+	WarehouseInfotId        int64                `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
+	GoodId                  int64                `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId              int64                `gorm:"column:good_type_id" json:"good_type_id"`
+	WarehousingOutTarget    int64                `gorm:"column:warehousing_out_target" json:"warehousing_out_target"`
+	Count                   int64                `gorm:"column:count" json:"count"`
+	Price                   float64              `gorm:"column:price" json:"price"`
+	TotalPrice              float64              `gorm:"column:total_price" json:"total_price"`
+	ProductDate             int64                `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate              int64                `gorm:"column:expiry_date" json:"expiry_date"`
+	Mtime                   int64                `gorm:"column:mtime" json:"mtime"`
+	Ctime                   int64                `gorm:"column:ctime" json:"ctime"`
+	Status                  int64                `gorm:"column:status" json:"status"`
+	OrgId                   int64                `gorm:"column:org_id" json:"org_id"`
+	Remark                  string               `gorm:"column:remark" json:"remark"`
+	IsCancel                int64                `gorm:"column:is_cancel" json:"is_cancel"`
+	WarehouseOut            WarehouseOut         `ForeignKey:WarehouseOutId json:"WarehouseOut"`
+	WarehouseOutOrderNumber string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
+	GoodInfo                GoodInfo             `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	Type                    int64                `gorm:"column:type" json:"type"`
+	Dealer                  int64                `gorm:"column:dealer" json:"dealer"`
+	Manufacturer            int64                `gorm:"column:manufacturer" json:"manufacturer"`
+	IsSys                   int64                `gorm:"column:is_sys" json:"is_sys"`
+	SysRecordTime           int64                `gorm:"column:sys_record_time" json:"sys_record_time"`
+	PatientId               int64                `gorm:"column:patient_id" json:"patient_id"`
+	Number                  string               `gorm:"column:number" json:"number" form:"number"`
+	LicenseNumber           string               `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	ConsumableType          int64                `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	ProjectId               int64                `gorm:"column:project_id" json:"project_id" form:"project_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"`
+	BuyPrice                float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	StockCount              string               `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	IsCheck                 int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RegisterNumber          string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	WarehousingInfo         WarehousingInfo      `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId" `
+	VmStockFlow             VmStockFlow          `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId" json:"stock_flow"`
+	OverCount               int64                `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	OrderId                 int64                `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	WarehousingInfoNight    WarehousingInfoNight `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -1657,3 +1658,17 @@ type NewWarehousingInfo struct {
 func (NewWarehousingInfo) TableName() string {
 	return "xt_warehouse_info"
 }
+
+type WarehousingInfoNight struct {
+	ID              int64   `gorm:"column:id" json:"id"`
+	StockCount      int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	StorehouseId    int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	WarehouseInfoId int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice    float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	Price           float64 `gorm:"column:price" json:"price"`
+	Number          string  `gorm:"column:number" json:"number"`
+}
+
+func (WarehousingInfoNight) TableName() string {
+	return "xt_warehouse_info"
+}

service/stock_service.go

@@ -2939,6 +2939,7 @@ func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int6
 	}
 
 	db = db.Preload("WarehouseOut", "status = 1 AND org_id = ?", orgId)
+	db = db.Preload("WarehousingInfoNight", "status=1 and org_id = ?", orgId)
 	db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
 	db = db.Count(&total)
 	offset := (page - 1) * limit