耗材参数

controllers/gobal_config_api_controller.go

@@ -85,6 +85,7 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/order/addorderconfig", &GobalConfigApiController{}, "Get:AddOrderConfig")
 	beego.Router("/api/order/getorderconfig", &GobalConfigApiController{}, "Get:GetOrderConfig")
 	beego.Router("/api/drugstock/getdrugautomaticlist", &GobalConfigApiController{}, "Get:GetDrugAutoMaticList")
+	beego.Router("/api/drugstock/getdrugwarehouseorderinfo", &GobalConfigApiController{}, "Get:GetDrugWarehuseOrderInfo")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1721,3 +1722,13 @@ func (c *GobalConfigApiController) GetDrugAutoMaticList() {
 		"drugList":   drugList,
 	})
 }
+
+func (c *GobalConfigApiController) GetDrugWarehuseOrderInfo() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	list, _ := service.GetDrugWarehuseOrderInfo(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/stock_in_api_controller.go

@@ -74,6 +74,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/good/postdruginformation", &StockManagerApiController{}, "Post:AddDrugInformation")
 
 	beego.Router("/api/good/initializtion", &StockManagerApiController{}, "Get:GetInitializtion")
+
+	beego.Router("/api/good/getwarehouseorderinfolist", &StockManagerApiController{}, "Get:GetWarehouseOrderInfolist")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -3475,3 +3477,14 @@ func (this *StockManagerApiController) GetInitializtion() {
 		"costClassifyList":          costClassifyList,
 	})
 }
+
+func (this *StockManagerApiController) GetWarehouseOrderInfolist() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	list, _ := service.GetWarehouseOrderInfoList(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

service/gobal_config_service.go

@@ -473,3 +473,9 @@ func GetAllBaseDrugList(orgid int64) (drug []*models.BaseDrugLib, err error) {
 	err = XTReadDB().Model(&drug).Where("org_id = ? and status = 1", orgid).Find(&drug).Error
 	return drug, err
 }
+
+func GetDrugWarehuseOrderInfo(orgid int64) (drug []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Group("drug_id").Find(&drug).Error
+	return drug, err
+}

service/stock_service.go

@@ -2506,3 +2506,9 @@ func FindAllDataConfigList(orgid int64, parentId int64) (dataconfig []*models.Da
 	err = XTReadDB().Model(&dataconfig).Where("(org_id = ? or org_id = 0) and parent_id = ? and status = 1", orgid, parentId).Find(&dataconfig).Error
 	return dataconfig, err
 }
+
+func GetWarehouseOrderInfoList(orgid int64) (list []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Model(&list).Where("org_id = ? and status = 1", orgid).Order("id asc").Group("good_id").Find(&list).Error
+	return list, err
+}