耗材参数

controllers/stock_in_api_controller.go

@@ -64,6 +64,7 @@ func StockManagerApiRegistRouters() {
 
 	beego.Router("/api/warehouseout/user", &StockManagerApiController{}, "get:GetUserDetailInfo")
 
+	beego.Router("/api/warehouseout/postsearchstock", &StockManagerApiController{}, "Get:PostSearchStock")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -1960,3 +1961,18 @@ func (this *StockManagerApiController) GetUserDetailInfo() {
 	}
 
 }
+
+func (this *StockManagerApiController) PostSearchStock() {
+
+	keyword := this.GetString("keyword")
+	fmt.Println("keyword2222222222222", keyword)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	stock, err := service.PostSearchStock(keyword, orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"stock": stock,
+	})
+}

service/stock_service.go

@@ -1163,6 +1163,7 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, star
 			return db.Where("org_id = ? AND status = 1 and sys_record_time>=? and  sys_record_time<=?", orgId, startime, endtime)
 		})
 	}
+
 	db = db.Where("xt_good_information.org_id = ? AND xt_good_information.status = 1", orgId)
 	db = db.Group("xt_good_information.id")
 	db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
@@ -1182,7 +1183,8 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, star
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
 		db = db.Joins("join xt_goods_type on xt_goods_type.id = xt_good_information.good_type_id  AND xt_goods_type.org_id = ? AND xt_goods_type.status = 1", orgId)
-		db = db.Where("xt_good_information.good_code LIKE ? OR xt_good_information.specification_name LIKE ? OR xt_goods_type.type_name LIKE ?", likeKey, likeKey, likeKey).Group("xt_good_information.id")
+		db = db.Where("xt_good_information.good_code LIKE ? OR xt_good_information.specification_name LIKE ? OR xt_good_information.good_name LIKE ? OR xt_goods_type.type_name LIKE ?", likeKey, likeKey, likeKey, likeKey).Group("xt_good_information.id")
+
 	}
 
 	if type_name > 0 {
@@ -2077,3 +2079,14 @@ func GetAllStockOutUserDetail(patient_id int64, orgId int64, record_time int64)
 	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND record_date = ? AND status = 1", patient_id, orgId, record_time).Find(&goodUser).Error
 	return
 }
+
+func PostSearchStock(keyword string, orgid int64) (goods []*models.GoodsType, err error) {
+
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Model(&goods)
+	if len(keyword) > 0 {
+		db = db.Where("type_name like ?", likeKey)
+	}
+	err = db.Where("org_id = ? and status =1", orgid).Find(&goods).Error
+	return goods, err
+}