diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index a3ea2bd59..c966fd71b 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -410,7 +410,7 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { v := batchItemList[0].(*dao.StoreSkuNameExt2) var skus []*dao.StoreSkuExt - sql2 := ` + sql2 := ` SELECT a.id sku_id, a.spec_quality sku_spec_quality, a.spec_unit sku_spec_unit, a.status sku_status, a.comment, b.stock, b.price bind_price, b.unit_price,b.jd_sync_status,b.mtwm_id,b.mtwm_sync_status,b.ebai_id,b.ebai_sync_status, b.status store_sku_status,b.location_code @@ -766,6 +766,9 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, upcs []strin sql += " AND t4.location_code LIKE ? " sqlParams = append(sqlParams, "%"+params["minStock"].(string)+"%") } + if params["isLocationCode"] != "" && params["isLocationCode"] != nil { + sql += " AND (t4.location_code = '' OR t4.location_code = 'EMPTY_VALUE') " + } return sql, sqlParams, err } diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index 0cd697738..723a0459f 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -100,6 +100,7 @@ func (c *StoreSkuController) GetStoreSkus() { // @Param minStock query int false "最小库存" // @Param maxStock query int false "最大库存" // @Param locationCode query string false "货架码" +// @Param isLocationCode query bool false "是否有货架码" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /GetStoresSkus [get,post]