需求124 PDA-集运包裹验货

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/cons/ConsService.java

@@ -131,4 +131,9 @@ public interface ConsService extends IService<ConsDO> {
      * @param query
      */
     void editAndUpdateConsRetiredWarehouseDeal(ConsRetiredWarehouseCreateReqVO query);
+
+    /**
+     * 并箱
+     */
+    void deleteBox(Long id);
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/consInspectionDetails/ConsInspectionDetailsService.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.order.dal.dataobject.consInspectionDetails.ConsIn
 import cn.iocoder.yudao.module.order.vo.consInspectionDetails.ConsInspectionDetailsCreateReqVO;
 import cn.iocoder.yudao.module.order.vo.consInspectionDetails.ConsInspectionDetailsQueryVO;
 import cn.iocoder.yudao.module.order.vo.consInspectionDetails.ConsInspectionDetailsUpdateReqVO;
+import cn.iocoder.yudao.module.order.vo.consItem.ConsItemBackVO;
 
 /**
  * 集运验货明细 Service 接口
@@ -64,4 +65,9 @@ public interface ConsInspectionDetailsService extends IService<ConsInspectionDet
      * @return 集运验货明细列表
      */
     List<ConsInspectionDetailsDO> getConsInspectionDetailsList(ConsInspectionDetailsQueryVO query);
+
+    /**
+     * 获取包裹验货商品明细通用属性集合
+     */
+    List<ConsInspectionDetailsUpdateReqVO> getConsInspectionDetailList(Long consItemId);
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/consInspectionDetails/InspectionDetails.java

@@ -77,17 +77,36 @@ public class InspectionDetails {
     @ApiModelProperty(value = "材质")
     private String material;
 
+    @ApiModelProperty(value = "品牌中文")
+    private String brandNameZh;
 
+    @ApiModelProperty(value = "品牌英文")
+    private String brandNameEn;
 
+    @ApiModelProperty(value = "品牌名称")
+    private String brandName;
 
     @ApiModelProperty(value = "产品中文标题")
-    private String prodTitleZh;
+    private String prodNameZh;
 
     @ApiModelProperty(value = "产品英文标题")
-    private String prodTitleEn;
+    private String prodNameEn;
 
-    @ApiModelProperty(value = "品牌名称")
-    private String brandName;
+    @ApiModelProperty(value = "材质英文")
+    private String materialLabelEn;
+
+    @ApiModelProperty(value = "材质中文")
+    private String materialLabelZh;
+
+    @ApiModelProperty(value = "商品特性中文")
+    private String prodAttrNamesZh;
+
+    @ApiModelProperty(value = "商品特性英文")
+    private String prodAttrNamesEn;
 
+    @ApiModelProperty(value = "用途特性英文")
+    private String usageNamesZh;
 
+    @ApiModelProperty(value = "用途特性英文")
+    private String usageNamesEn;
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/consItem/ConsItemBackVO.java

@@ -43,6 +43,9 @@ public class ConsItemBackVO {
     @ApiModelProperty(value = "英文商品名")
     private String prodEnName;
 
+    @ApiModelProperty(value = "产品中文标题")
+    private String prodNameZh;
+
     @ExcelProperty("品牌")
     @ApiModelProperty(value = "品牌")
     private Long brand;

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/consItem/ConsItemMapper.xml

@@ -14,7 +14,8 @@
     <select id="getConsItemBackVOList" resultType="cn.iocoder.yudao.module.order.vo.consItem.ConsItemBackVO" parameterType="cn.iocoder.yudao.module.order.vo.consItem.ConsItemQueryVO">
         SELECT ci.*,
             if(#{lang} = 0, ep.title_zh, ep.title_en) as prod_name,
-               ep.title_en as prodEnName
+               ep.title_en as prodEnName,
+               ep.title_zh as prodNameZh
         FROM ecw_cons_item ci
             left join ecw_product ep on ci.prod_id = ep.id
         WHERE ci.deleted = 0

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/cons/ConsController.java

@@ -267,4 +267,18 @@ public class ConsController {
         consService.editAndUpdateConsRetiredWarehouseDeal(query);
         return success(true);
     }
+
+    @DeleteMapping("/deleteBox")
+    @ApiOperation("并箱")
+    public CommonResult<Boolean> deleteBox(@RequestParam("id") Long id) {
+        consService.deleteBox(id);
+        return success(true);
+    }
+
+    @PostMapping("/deleteBoxList")
+    @ApiOperation("批量并箱")
+    public CommonResult<Boolean> deleteBoxList(@RequestBody List<Long> ids) {
+        ids.forEach(id -> consService.deleteBox(id));
+        return success(true);
+    }
 }

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/cons/ConsInspectionDetailsController.java

@@ -24,6 +24,7 @@ import cn.iocoder.yudao.module.order.vo.consInspectionDetails.*;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemBackVO;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemQueryVO;
 import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationUpdateReqVO;
+import cn.iocoder.yudao.module.order.vo.order.OrderWarehouseInWithAttrVO;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang3.StringUtils;
@@ -145,4 +146,9 @@ public class ConsInspectionDetailsController {
         return success(consBackVO);
     }
 
+    @GetMapping("/getConsInspectionDetailList")
+    @ApiOperation("获取包裹验货商品明细通用属性集合")
+    public CommonResult<List<ConsInspectionDetailsUpdateReqVO>> getConsInspectionDetailList(@RequestParam("consItemId") Long consItemId) {
+        return success(consInspectionDetailsService.getConsInspectionDetailList(consItemId));
+    }
 }