✨ feat(mes): 新增批次号字段并重命名收货地址字段

YunaiV
1 parent f5e56fd9
Showing 11 changed files with 45 additions and 67 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDetailDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesLineMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
@@ -13,13 +13,9 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProd
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesSaveReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesShippingReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
 import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
-import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
 import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService;
 import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -37,7 +33,6 @@ import java.util.*;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 @Tag(name = "管理后台 - MES 销售出库单")
@@ -52,10 +47,6 @@ public class MesWmProductSalesController {
     @Resource
     private MesMdClientService clientService;
     @Resource
-    private MesMdItemService itemService;
-    @Resource
-    private MesWmProductSalesLineService productSalesLineService;
-    @Resource
     private MesWmSalesNoticeService salesNoticeService;
     @PostMapping("/create")
@@ -167,35 +158,6 @@ public class MesWmProductSalesController {
         return success(true);
     }
-    // TODO @AI：是不是有需要？有需要在提供；
-    @GetMapping("/get-item")
-    @Operation(summary = "根据客户 ID 获取曾出库的产品清单（去重）")
-    @Parameter(name = "clientId", description = "客户 ID", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:query')")
-    public CommonResult<List<MesMdItemDO>> getItemByClientId(@RequestParam("clientId") Long clientId) {
-        // 1. 查询该客户的所有出库单
-        List<MesWmProductSalesDO> salesList = productSalesService.getProductSalesListByClientId(clientId);
-        if (CollUtil.isEmpty(salesList)) {
-            return success(Collections.emptyList());
-        }
-        // 2. 查询所有行，提取去重的 itemId
-        List<Long> salesIds = convertList(salesList, MesWmProductSalesDO::getId);
-        Set<Long> itemIds = new LinkedHashSet<>();
-        for (Long salesId : salesIds) {
-            List<MesWmProductSalesLineDO> lines = productSalesLineService.getProductSalesLineListBySalesId(salesId);
-            for (MesWmProductSalesLineDO line : lines) {
-                if (line.getItemId() != null) {
-                    itemIds.add(line.getItemId());
-                }
-            }
-        }
-        if (itemIds.isEmpty()) {
-            return success(Collections.emptyList());
-        }
-        // 3. 返回物料列表
-        return success(new ArrayList<>(itemService.getItemMap(itemIds).values()));
-    }
-
     // ==================== 拼接 VO ====================
     private List<MesWmProductSalesRespVO> buildRespVOList(List<MesWmProductSalesDO> list) {
@@ -60,7 +60,7 @@ public class MesWmProductSalesRespVO {
     @Schema(description = "收货地址", example = "北京市朝阳区XX路XX号")
     @ExcelProperty("收货地址")
-    private String address;
+    private String contactAddress;
     @Schema(description = "承运商", example = "顺丰快递")
     @ExcelProperty("承运商")
@@ -43,7 +43,7 @@ public class MesWmProductSalesSaveReqVO {
     private String contactTelephone;
     @Schema(description = "收货地址", example = "北京市朝阳区XX路XX号")
-    private String address;
+    private String contactAddress;
     @Schema(description = "承运商", example = "顺丰快递")
     private String carrier;
@@ -43,6 +43,9 @@ public class MesWmProductSalesDetailRespVO {
     @Schema(description = "批次ID", example = "1")
     private Long batchId;
+    @Schema(description = "批次号", example = "BATCH001")
+    private String batchCode;
+
     @Schema(description = "仓库ID", example = "1")
     private Long warehouseId;
@@ -35,6 +35,9 @@ public class MesWmProductSalesDetailSaveReqVO {
     @Schema(description = "批次ID", example = "1")
     private Long batchId;
+    @Schema(description = "批次号", example = "BATCH001")
+    private String batchCode;
+
     @Schema(description = "仓库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "仓库不能为空")
     private Long warehouseId;
@@ -69,11 +69,10 @@ public class MesWmProductSalesDO extends BaseDO {
      * 联系电话
      */
     private String contactTelephone;
-    // TODO @AI：改成 contactAddress
     /**
      * 收货地址
      */
-    private String address;
+    private String contactAddress;
     /**
      * 承运商
@@ -68,7 +68,12 @@ public class MesWmProductSalesDetailDO extends BaseDO {
      * 关联 {@link MesWmBatchDO#getId()}
      */
     private Long batchId;
-    // TODO @AI：增加 batchCode 字段
+    /**
+     * 批次号
+     *
+     * 关联 {@link MesWmBatchDO#getCode()}
+     */
+    private String batchCode;
     /**
      * 仓库ID
      *
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
@@ -30,4 +31,9 @@ public interface MesWmProductSalesLineMapper extends BaseMapperX&lt;MesWmProductSal
                 .orderByDesc(MesWmProductSalesLineDO::getId));
     }
+    default void updateQualityStatusByIds(List<Long> ids, Integer qualityStatus) {
+        update(new MesWmProductSalesLineDO().setQualityStatus(qualityStatus),
+                new LambdaUpdateWrapper<MesWmProductSalesLineDO>().in(MesWmProductSalesLineDO::getId, ids));
+    }
+
 }
@@ -78,11 +78,11 @@ public interface MesWmProductSalesLineService {
     void updateProductSalesLineWhenOqcFinish(Long id, Long oqcId, Integer checkResult);
     /**
-     * 更新行的质量状态
+     * 批量更新行的质量状态
      *
-     * @param id 行 ID
+     * @param ids 行 ID 列表
      * @param qualityStatus 质量状态
      */
-    void updateProductSalesLineQualityStatus(Long id, Integer qualityStatus);
+    void updateProductSalesLineQualityStatus(List<Long> ids, Integer qualityStatus);
 }
@@ -155,9 +155,11 @@ public class MesWmProductSalesLineServiceImpl implements MesWmProductSalesLineSe
     }
     @Override
-    public void updateProductSalesLineQualityStatus(Long id, Integer qualityStatus) {
-        productSalesLineMapper.updateById(new MesWmProductSalesLineDO()
-                .setId(id).setQualityStatus(qualityStatus));
+    public void updateProductSalesLineQualityStatus(List<Long> ids, Integer qualityStatus) {
+        if (CollUtil.isEmpty(ids)) {
+            return;
+        }
+        productSalesLineMapper.updateQualityStatusByIds(ids, qualityStatus);
     }
 }
@@ -58,11 +58,8 @@ public class MesWmProductSalesServiceImpl implements MesWmProductSalesService {
     @Override
     public Long createProductSales(MesWmProductSalesSaveReqVO createReqVO) {
-        // TODO @AI：增加 validateXXXSaveData；
-        // 校验编码唯一
-        validateCodeUnique(null, createReqVO.getCode());
-        // 校验客户存在
-        clientService.validateClientExists(createReqVO.getClientId());
+        // 校验数据
+        validateProductSalesSaveData(null, createReqVO);
         // 插入
         MesWmProductSalesDO sales = BeanUtils.toBean(createReqVO, MesWmProductSalesDO.class);
@@ -75,11 +72,8 @@ public class MesWmProductSalesServiceImpl implements MesWmProductSalesService {
     public void updateProductSales(MesWmProductSalesSaveReqVO updateReqVO) {
         // 校验存在 + 草稿状态
         validateProductSalesExistsAndDraft(updateReqVO.getId());
-        // TODO @AI：增加 validateXXXSaveData；（校验数据）
-        // 校验编码唯一
-        validateCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
-        // 校验客户存在
-        clientService.validateClientExists(updateReqVO.getClientId());
+        // 校验数据
+        validateProductSalesSaveData(updateReqVO.getId(), updateReqVO);
         // 更新
         MesWmProductSalesDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductSalesDO.class);
@@ -130,14 +124,11 @@ public class MesWmProductSalesServiceImpl implements MesWmProductSalesService {
         boolean needOqc = CollectionUtils.anyMatch(lines,
                 line -> Boolean.TRUE.equals(line.getOqcCheckFlag()));
         if (needOqc) {
-            // 初始化 OQC 行的质量状态为"待检验"
-            // TODO @AI：改成批量更新接口?productSalesLineService 提供一个？【对齐：这个是否为必须？！】
-            for (MesWmProductSalesLineDO line : lines) {
-                if (Boolean.TRUE.equals(line.getOqcCheckFlag())) {
-                    productSalesLineService.updateProductSalesLineQualityStatus(
-                            line.getId(), MesWmQualityStatusEnum.PENDING.getStatus());
-                }
-            }
+            // 批量初始化 OQC 行的质量状态为"待检验"
+            List<Long> oqcLineIds = convertList(
+                    CollectionUtils.filterList(lines, line -> Boolean.TRUE.equals(line.getOqcCheckFlag())),
+                    MesWmProductSalesLineDO::getId);
+            productSalesLineService.updateProductSalesLineQualityStatus(oqcLineIds, MesWmQualityStatusEnum.PENDING.getStatus());
             // 需要检验，进入待检测
             productSalesMapper.updateById(new MesWmProductSalesDO()
                     .setId(id).setStatus(MesWmProductSalesStatusEnum.CONFIRMED.getStatus()));
@@ -266,6 +257,13 @@ public class MesWmProductSalesServiceImpl implements MesWmProductSalesService {
         return productSalesMapper.selectListByClientId(clientId);
     }
+    private void validateProductSalesSaveData(Long id, MesWmProductSalesSaveReqVO reqVO) {
+        // 校验编码唯一
+        validateCodeUnique(id, reqVO.getCode());
+        // 校验客户存在
+        clientService.validateClientExists(reqVO.getClientId());
+    }
+
     private MesWmProductSalesDO validateProductSalesExists(Long id) {
         MesWmProductSalesDO sales = productSalesMapper.selectById(id);
         if (sales == null) {