需求124 PDA-集运包裹验货

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/consItem/ConsItemMapper.java

@@ -85,4 +85,6 @@ public interface ConsItemMapper extends AbstractMapper<ConsItemDO> {
     }
 
     List<ConsItemBackVO> getConsItemBackVOList(ConsItemQueryVO query);
+
+    ConsItemBackVO getConsItemBack(ConsItemQueryVO consItemQueryVO);
 }

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

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.order.service.consInspectionDetails;
 
 import java.util.*;
 import javax.validation.*;
+
 import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.framework.mybatis.core.service.IService;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -20,25 +21,44 @@ public interface ConsInspectionDetailsService extends IService<ConsInspectionDet
 
     /**
      * 创建集运验货明细
+     *
      * @param createReqVO 创建信息
      * @return 编号
      */
     Long createConsInspectionDetails(@Valid ConsInspectionDetailsCreateReqVO createReqVO);
 
+
+    /**
+     * 一键打包保存
+     */
+    Long createPacking(ConsInspectionDetailsCreateReqVO createReqVO);
+
+    /**
+     * 新商品验货操作
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createGood(@Valid ConsInspectionDetailsCreateReqVO createReqVO);
+
+
     /**
      * 更新集运验货明细
+     *
      * @param updateReqVO 更新信息
      */
     void updateConsInspectionDetails(@Valid ConsInspectionDetailsUpdateReqVO updateReqVO);
 
     /**
      * 删除集运验货明细
+     *
      * @param id 编号
      */
     void deleteConsInspectionDetails(Long id);
 
     /**
      * 获得集运验货明细
+     *
      * @param id 编号
      * @return 集运验货明细
      */
@@ -46,6 +66,7 @@ public interface ConsInspectionDetailsService extends IService<ConsInspectionDet
 
     /**
      * 获得集运验货明细列表
+     *
      * @param ids 编号
      * @return 集运验货明细列表
      */
@@ -53,7 +74,8 @@ public interface ConsInspectionDetailsService extends IService<ConsInspectionDet
 
     /**
      * 获得集运验货明细分页
-     * @param page 分页查询
+     *
+     * @param page  分页查询
      * @param query 查询
      * @return 集运验货明细分页
      */
@@ -61,6 +83,7 @@ public interface ConsInspectionDetailsService extends IService<ConsInspectionDet
 
     /**
      * 获得集运验货明细列表, 用于 Excel 导出
+     *
      * @param query 查询
      * @return 集运验货明细列表
      */
@@ -70,4 +93,14 @@ public interface ConsInspectionDetailsService extends IService<ConsInspectionDet
      * 获取包裹验货商品明细通用属性集合
      */
     List<ConsInspectionDetailsUpdateReqVO> getConsInspectionDetailList(Long consItemId);
+
+    /**
+     * 一键打包
+     */
+    ConsItemBackVO packing(Long consItemId);
+
+    /**
+     * 完成验货
+     */
+    void completeInspection(Long consId);
 }

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

@@ -28,6 +28,8 @@ public class ConsItemBackVO {
     @ApiModelProperty(value = "", required = true)
     private Long id;
 
+    private Long consItemId;
+
     @ExcelProperty("")
     @ApiModelProperty(value = "", required = true)
     private Long consId;

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

@@ -13,6 +13,8 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ApiModel("管理后台 - 集运包裹明细查询 VO")
 public class ConsItemQueryVO {
 
+    private Long consItemId;
+
     @ApiModelProperty(value = "")
     private Long consId;
 

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

@@ -22,6 +22,19 @@
         and ci.cons_id = #{consId}
         order by ci.update_time desc
     </select>
+
+    <select id="getConsItemBack" resultType="cn.iocoder.yudao.module.order.vo.consItem.ConsItemBackVO">
+        SELECT ci.*,
+               if(#{lang} = 0, ep.title_zh, ep.title_en) as prod_name,
+               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
+          and ci.id = #{consItemId}
+        limit 1
+    </select>
+
     <sql id="myOrderQuery">
 
     </sql>

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

@@ -59,9 +59,6 @@ public class ConsInspectionDetailsController {
     @Resource
     private CustomerContactsService customerContactsService;
 
-    @Resource
-    private ConsMediaService consentMediaService;
-
     @Resource
     private CustomerService customerService;
 
@@ -80,6 +77,18 @@ public class ConsInspectionDetailsController {
         return success(consInspectionDetailsService.createConsInspectionDetails(createReqVO));
     }
 
+    @PostMapping("/createPacking")
+    @ApiOperation("一键打包保存")
+    public CommonResult<Long> createPacking(@RequestBody ConsInspectionDetailsCreateReqVO createReqVO) {
+        return success(consInspectionDetailsService.createPacking(createReqVO));
+    }
+
+    @PostMapping("/createGood")
+    @ApiOperation("新商品验货操作")
+    public CommonResult<Long> createGood(@RequestBody ConsInspectionDetailsCreateReqVO createReqVO) {
+        return success(consInspectionDetailsService.createGood(createReqVO));
+    }
+
     @PutMapping("/update")
     @ApiOperation("更新集运验货明细")
     public CommonResult<Boolean> updateConsInspectionDetails(@Valid @RequestBody ConsInspectionDetailsUpdateReqVO updateReqVO) {
@@ -151,4 +160,17 @@ public class ConsInspectionDetailsController {
     public CommonResult<List<ConsInspectionDetailsUpdateReqVO>> getConsInspectionDetailList(@RequestParam("consItemId") Long consItemId) {
         return success(consInspectionDetailsService.getConsInspectionDetailList(consItemId));
     }
+
+    @GetMapping("/packing")
+    @ApiOperation("一键打包")
+    public CommonResult<ConsItemBackVO> packing(@RequestParam("consItemId") Long consItemId) {
+        return success(consInspectionDetailsService.packing(consItemId));
+    }
+
+    @GetMapping("/completeInspection")
+    @ApiOperation("完成验货")
+    public CommonResult<Boolean> completeInspection(@RequestParam("consId") Long consId) {
+        consInspectionDetailsService.completeInspection(consId);
+        return success(true);
+    }
 }