Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -410,9 +410,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
      * @date : 2024/2/26 10:36
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
-    @PostMapping({"goods_brand_list_by"})
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsBrandListBy(@RequestBody Map<String, Object> param) {
-        return commonService.goodsBrandListBy(param);
+    @PostMapping({"get_goods_brand_list_by"})
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsBrandListBy(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsBrandListBy(param);
     }
 
     /**
@@ -421,9 +421,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
      * @date : 2024/2/26 10:36
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
-    @PostMapping({"goods_category_list_by"})
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsCategoryListBy(@RequestBody Map<String, Object> param) {
-        return commonService.goodsCategoryListBy(param);
+    @PostMapping({"get_goods_category_list_by"})
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsCategoryListBy(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsCategoryListBy(param);
     }
 
     /**
@@ -432,9 +432,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
      * @date : 2024/2/26 10:36
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
-    @PostMapping({"goods_Series_list_by"})
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsSeriesListBy(@RequestBody Map<String, Object> param) {
-        return commonService.goodsSeriesListBy(param);
+    @PostMapping({"get_goods_Series_list_by"})
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsSeriesListBy(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsSeriesListBy(param);
     }
 
     /**
@@ -455,8 +455,8 @@ public class CommonController extends BaseController<Map<String, Object>> {
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
     @PostMapping({"get_goods_brand_no_page"})
-    public ResponseResultVO<List<Map<String, Object>>> goodsBrandListNoPage(@RequestBody Map<String, Object> param) {
-        return commonService.goodsBrandListNoPage(param);
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsBrandListNoPage(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsBrandListNoPage(param);
     }
     /**
      * @desc :  商品种类查询
@@ -475,9 +475,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
      * @date : 2024/2/26 10:36
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
-    @PostMapping({"unit_list_by"})
-    public ResponseResultVO<PageList<Map<String, Object>>> unitListBy(@RequestBody Map<String, Object> param) {
-        return commonService.unitListBy(param);
+    @PostMapping({"get_unit_list_by"})
+    public ResponseResultVO<PageList<Map<String, Object>>> getUnitListBy(@RequestBody Map<String, Object> param) {
+        return commonService.getUnitListBy(param);
     }
 
     /**

src/main/java/com/dk/mdm/model/vo/ivt/OutboundItemVO.java

@@ -205,7 +205,18 @@ public class OutboundItemVO {
     @ApiModelProperty(value = "片（已出库）")
     private  Integer outPiece;
 
+    /**
+     * 商品名称--skuid空的时候要取当前的名称
+     */
+    @ApiModelProperty(value = "商品名称")
+    private String skuName;
+
 
+    /**
+     * 商品型号--skuid空的时候要取当前的商品型号
+     */
+    @ApiModelProperty(value = "商品型号")
+    private String skuModel;
 
     /**
      * 企业ID

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -521,7 +521,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 王英杰
      * @date : 2024/3/1 9:20
      */
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsBrandListBy(Map<String, Object> param) {
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsBrandListBy(Map<String, Object> param) {
         // 校验分页参数
         if (param.get("pageSize") == null || param.get("currentPage") == null) {
             return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
@@ -544,7 +544,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 姜永辉
      * @date : 2024/3/1 9:20
      */
-    public ResponseResultVO<List<Map<String, Object>>> goodsBrandListNoPage(Map<String, Object> param) {
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsBrandListNoPage(Map<String, Object> param) {
         // 获取公司
         List<Map<String, Object>> list = commonMapper.getGoodsBrand(param);
         return ResponseResultUtil.success(list);
@@ -555,7 +555,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 王英杰
      * @date : 2024/3/1 9:20
      */
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsCategoryListBy(Map<String, Object> param) {
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsCategoryListBy(Map<String, Object> param) {
         // 校验分页参数
         if (param.get("pageSize") == null || param.get("currentPage") == null) {
             return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
@@ -578,7 +578,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 王英杰
      * @date : 2024/3/1 9:20
      */
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsSeriesListBy(Map<String, Object> param) {
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsSeriesListBy(Map<String, Object> param) {
         // 校验分页参数
         if (param.get("pageSize") == null || param.get("currentPage") == null) {
             return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
@@ -601,7 +601,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 王英杰
      * @date : 2024/3/1 9:20
      */
-    public ResponseResultVO<PageList<Map<String, Object>>> unitListBy(Map<String, Object> param) {
+    public ResponseResultVO<PageList<Map<String, Object>>> getUnitListBy(Map<String, Object> param) {
         // 校验分页参数
         if (param.get("pageSize") == null || param.get("currentPage") == null) {
             return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");