耗材参数

controllers/stock_in_api_controller.go

@@ -85,6 +85,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/getstockoutlist", &StockManagerApiController{}, "Get:GetStockOutList")
 
 	beego.Router("/api/good/getstockdrugcount", &StockManagerApiController{}, "Get:GetStockDrugCount")
+
+	beego.Router("/api/good/getorderdetialbyorderid", &StockManagerApiController{}, "Get:GetOrderDetialByOrderId")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -3774,3 +3776,13 @@ func (this *StockManagerApiController) GetStockDrugCount() {
 		"autoCount": autoCount,
 	})
 }
+
+func (this *StockManagerApiController) GetOrderDetialByOrderId() {
+
+	id, _ := this.GetInt64("id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetOrderDetialByOrderId(id, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

models/stock_models.go

@@ -357,4 +357,37 @@ type VmWarehouseOutInfo struct {
 type VmWarehouseInfo struct {
 	GoodId int64 `gorm:"column:good_id" json:"good_id"`
 	Count  int64 `gorm:"column:count" json:"count"`
+	OrgId  int64 `gorm:"column:org_id" json:"org_id"`
+}
+
+type WarehouseOutInfoOne 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"`
+	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
+	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"`
+	GoodName                string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	SpecificationName       string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	MinNumber               int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingPrice            float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	MinUnit                 string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 }

service/stock_service.go

@@ -2848,3 +2848,18 @@ func GetOutStockTotalCountFour(startime int64, endtime int64, orgid int64) (auto
 	return autoMatic, err
 
 }
+
+func GetOrderDetialByOrderId(id int64, orgid int64) (out []*models.WarehouseOutInfoOne, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if id > 0 {
+		db = db.Where("x.warehouse_out_id = ?", id)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
+	return out, err
+}