diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java index 585abb9f..53ff0272 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java @@ -293,11 +293,9 @@ public class BdProductController extends BaseController { return AjaxResult.success(); } - /** * 查询产品规格 */ - @PostMapping("/get-product-specs") public AjaxResult getProductSpecs(@RequestBody ProductParams productParams) { List productIds = productParams.getProductIds(); @@ -358,7 +356,6 @@ public class BdProductController extends BaseController { /** * 查询产品规格(带是否赠品) */ - @PostMapping("/get-product-specs-gift") public AjaxResult getProductSpecsGift(@RequestBody ProductParams productParams) { List productGiftList = productParams.getProductGiftList(); @@ -422,7 +419,6 @@ public class BdProductController extends BaseController { /** * 查询产品规格 */ - @PostMapping("/get-product-code-specs") public AjaxResult getProductCodeSpecs(@RequestBody ProductParams productParams) { List productCodes = productParams.getProductCodes(); @@ -473,13 +469,11 @@ public class BdProductController extends BaseController { specsTypeParam.setSpecsList(resultSpecsList); specsTypeParamList.add(specsTypeParam); } - } productSpecsInfo.setSpecsTypeData(specsTypeParamList); } resultList.add(productSpecsInfo); } - return AjaxResult.success(resultList); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java index 04a12d8b..657531f5 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java @@ -248,4 +248,9 @@ public class ProductParams implements Serializable { */ private Date removalTime; + /** + * 仓储产品编号 + */ + private String wmsCode; + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java index 0853c390..35349755 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java @@ -102,7 +102,12 @@ public class BdProductServiceImpl extends ServiceImpl + @@ -74,6 +75,7 @@ +