✨ feat(mes): 更新供应商相关逻辑，添加英文名称及引用校验功能

重构供应商数据模型，替换供应商等级为英文名称，并在相关服务中添加对供应商引用的校验逻辑，以确保数据一致性和完整性。

✨ feat(mes): 更新供应商相关逻辑，添加英文名称及引用校验功能
重构供应商数据模型，替换供应商等级为英文名称，并在相关服务中添加对供应商引用的校验逻辑，以确保数据一致性和完整性。
YunaiV
1 parent 832e8feb
Showing 18 changed files with 114 additions and 36 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/vendor/vo/MesMdVendorPageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/vendor/MesMdVendorMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/client/MesMdClientServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/vendor/MesMdVendorServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java
@@ -21,8 +21,8 @@ public class MesMdVendorPageReqVO extends PageParam {
     @Schema(description = "供应商简称", example = "海力德")
     private String nickname;
-    @Schema(description = "供应商等级", example = "A")
-    private String level;
+    @Schema(description = "供应商英文名称", example = "HLD")
+    private String englishName;
     @Schema(description = "状态", example = "0")
     private Integer status;
@@ -22,7 +22,7 @@ public interface MesMdVendorMapper extends BaseMapperX&lt;MesMdVendorDO&gt; {
                 .eqIfPresent(MesMdVendorDO::getCode, reqVO.getCode())
                 .likeIfPresent(MesMdVendorDO::getName, reqVO.getName())
                 .likeIfPresent(MesMdVendorDO::getNickname, reqVO.getNickname())
-                .eqIfPresent(MesMdVendorDO::getLevel, reqVO.getLevel())
+                .likeIfPresent(MesMdVendorDO::getEnglishName, reqVO.getEnglishName())
                 .eqIfPresent(MesMdVendorDO::getStatus, reqVO.getStatus())
                 .orderByDesc(MesMdVendorDO::getId));
     }
@@ -42,5 +42,4 @@ public interface MesMdVendorMapper extends BaseMapperX&lt;MesMdVendorDO&gt; {
     default List<MesMdVendorDO> selectListByStatus(Integer status) {
         return selectList(MesMdVendorDO::getStatus, status);
     }
-
 }
@@ -34,4 +34,8 @@ public interface MesWmArrivalNoticeMapper extends BaseMapperX&lt;MesWmArrivalNotice
         return selectList(MesWmArrivalNoticeDO::getStatus, status);
     }
+    default Long selectCountByVendorId(Long vendorId) {
+        return selectCount(MesWmArrivalNoticeDO::getVendorId, vendorId);
+    }
+
 }
@@ -26,4 +26,8 @@ public interface MesWmItemReceiptMapper extends BaseMapperX&lt;MesWmItemReceiptDO&gt; 
         return selectOne(MesWmItemReceiptDO::getCode, code);
     }
+    default Long selectCountByVendorId(Long vendorId) {
+        return selectCount(MesWmItemReceiptDO::getVendorId, vendorId);
+    }
+
 }
@@ -22,4 +22,8 @@ public interface MesWmReturnVendorMapper extends BaseMapperX&lt;MesWmReturnVendorDO
                 .orderByDesc(MesWmReturnVendorDO::getId));
     }
+    default Long selectCountByVendorId(Long vendorId) {
+        return selectCount(MesWmReturnVendorDO::getVendorId, vendorId);
+    }
+
 }
@@ -65,6 +65,7 @@ public interface ErrorCodeConstants {
     ErrorCode MD_VENDOR_NAME_DUPLICATE = new ErrorCode(1_040_104_002, "供应商名称已存在");
     ErrorCode MD_VENDOR_NICKNAME_DUPLICATE = new ErrorCode(1_040_104_003, "供应商简称已存在");
     ErrorCode MD_VENDOR_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_040_104_004, "导入供应商数据不能为空");
+    ErrorCode MD_VENDOR_HAS_REFERENCE = new ErrorCode(1_040_104_005, "该供应商已被其他业务引用，无法删除");
     // ========== MES 基础数据-车间（1-040-105-000） ==========
     ErrorCode MD_WORKSHOP_NOT_EXISTS = new ErrorCode(1_040_105_000, "车间不存在");
@@ -12,13 +12,15 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum MesMdAutoCodeRuleCodeEnum {
-    ITEM_CODE("MD_ITEM_CODE", "物料编码"),
-    SN_CODE("WM_SN_CODE", "SN 码"),
-    PACKAGE_CODE("WM_PACKAGE_CODE", "装箱单编码"),
-    BATCH_CODE("WM_BATCH_CODE", "批次编码"),
-    TASK_CODE("PRO_TASK_CODE", "生产任务编码"),
+    MD_ITEM_CODE("MD_ITEM_CODE", "物料编码"),
+    MD_VENDOR_CODE("MD_VENDOR_CODE", "供应商编码"),
+    WM_SN_CODE("WM_SN_CODE", "SN 码"),
+    WM_PACKAGE_CODE("WM_PACKAGE_CODE", "装箱单编码"),
+    WM_BATCH_CODE("WM_BATCH_CODE", "批次编码"),
+    PRO_TASK_CODE("PRO_TASK_CODE", "生产任务编码"),
     QC_IQC_CODE("QC_IQC_CODE", "来料检验单编码"),
     QC_IPQC_CODE("QC_IPQC_CODE", "过程检验单编码"),
+    QC_OQC_CODE("QC_OQC_CODE", "出货检验单编码"),
     QC_RQC_CODE("QC_RQC_CODE", "退货检验单编码");
     /**
@@ -46,12 +46,8 @@ public class MesMdClientServiceImpl implements MesMdClientService {
     @Override
     public Long createClient(MesMdClientSaveReqVO createReqVO) {
-        // 校验编码唯一
-        validateClientCodeUnique(null, createReqVO.getCode());
-        // 校验名称唯一
-        validateClientNameUnique(null, createReqVO.getName());
-        // 校验简称唯一
-        validateClientNicknameUnique(null, createReqVO.getNickname());
+        // 校验数据
+        validateClientSaveData(createReqVO);
         // 插入
         MesMdClientDO client = BeanUtils.toBean(createReqVO, MesMdClientDO.class);
@@ -67,18 +63,23 @@ public class MesMdClientServiceImpl implements MesMdClientService {
     public void updateClient(MesMdClientSaveReqVO updateReqVO) {
         // 校验存在
         validateClientExists(updateReqVO.getId());
-        // 校验编码唯一
-        validateClientCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
-        // 校验名称唯一
-        validateClientNameUnique(updateReqVO.getId(), updateReqVO.getName());
-        // 校验简称唯一
-        validateClientNicknameUnique(updateReqVO.getId(), updateReqVO.getNickname());
+        // 校验数据
+        validateClientSaveData(updateReqVO);
         // 更新
         MesMdClientDO updateObj = BeanUtils.toBean(updateReqVO, MesMdClientDO.class);
         clientMapper.updateById(updateObj);
     }
+    private void validateClientSaveData(MesMdClientSaveReqVO reqVO) {
+        // 校验编码唯一
+        validateClientCodeUnique(reqVO.getId(), reqVO.getCode());
+        // 校验名称唯一
+        validateClientNameUnique(reqVO.getId(), reqVO.getName());
+        // 校验简称唯一
+        validateClientNicknameUnique(reqVO.getId(), reqVO.getNickname());
+    }
+
     @Override
     public void deleteClient(Long id) {
         // 校验存在
@@ -13,8 +13,12 @@ import cn.iocoder.yudao.module.mes.controller.admin.md.vendor.vo.MesMdVendorSave
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.md.vendor.MesMdVendorMapper;
 import cn.iocoder.yudao.module.mes.enums.wm.BarcodeBizTypeEnum;
+import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
 import cn.iocoder.yudao.module.mes.service.wm.barcode.MesWmBarcodeService;
+import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService;
+import cn.iocoder.yudao.module.mes.service.wm.returnvendor.MesWmReturnVendorService;
 import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -43,15 +47,20 @@ public class MesMdVendorServiceImpl implements MesMdVendorService {
     @Resource
     private MesWmBarcodeService barcodeService;
+    @Resource
+    @Lazy
+    private MesWmItemReceiptService itemReceiptService;
+    @Resource
+    @Lazy
+    private MesWmArrivalNoticeService arrivalNoticeService;
+    @Resource
+    @Lazy
+    private MesWmReturnVendorService returnVendorService;
     @Override
     public Long createVendor(MesMdVendorSaveReqVO createReqVO) {
-        // 校验编码唯一
-        validateVendorCodeUnique(null, createReqVO.getCode());
-        // 校验名称唯一
-        validateVendorNameUnique(null, createReqVO.getName());
-        // 校验简称唯一
-        validateVendorNicknameUnique(null, createReqVO.getNickname());
+        // 校验数据
+        validateVendorSaveData(createReqVO);
         // 插入
         MesMdVendorDO vendor = BeanUtils.toBean(createReqVO, MesMdVendorDO.class);
@@ -67,12 +76,8 @@ public class MesMdVendorServiceImpl implements MesMdVendorService {
     public void updateVendor(MesMdVendorSaveReqVO updateReqVO) {
         // 校验存在
         validateVendorExists(updateReqVO.getId());
-        // 校验编码唯一
-        validateVendorCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
-        // 校验名称唯一
-        validateVendorNameUnique(updateReqVO.getId(), updateReqVO.getName());
-        // 校验简称唯一
-        validateVendorNicknameUnique(updateReqVO.getId(), updateReqVO.getNickname());
+        // 校验数据
+        validateVendorSaveData(updateReqVO);
         // 更新
         MesMdVendorDO updateObj = BeanUtils.toBean(updateReqVO, MesMdVendorDO.class);
@@ -83,6 +88,8 @@ public class MesMdVendorServiceImpl implements MesMdVendorService {
     public void deleteVendor(Long id) {
         // 校验存在
         validateVendorExists(id);
+        // 校验是否被其他业务引用
+        validateVendorNotReferenced(id);
         // 删除
         vendorMapper.deleteById(id);
     }
@@ -96,6 +103,15 @@ public class MesMdVendorServiceImpl implements MesMdVendorService {
         return vendor;
     }
+    private void validateVendorSaveData(MesMdVendorSaveReqVO reqVO) {
+        // 校验编码唯一
+        validateVendorCodeUnique(reqVO.getId(), reqVO.getCode());
+        // 校验名称唯一
+        validateVendorNameUnique(reqVO.getId(), reqVO.getName());
+        // 校验简称唯一
+        validateVendorNicknameUnique(reqVO.getId(), reqVO.getNickname());
+    }
+
     private void validateVendorCodeUnique(Long id, String code) {
         MesMdVendorDO vendor = vendorMapper.selectByCode(code);
         if (vendor == null) {
@@ -129,6 +145,14 @@ public class MesMdVendorServiceImpl implements MesMdVendorService {
         }
     }
+    private void validateVendorNotReferenced(Long id) {
+        if (itemReceiptService.getItemReceiptCountByVendorId(id) > 0
+                || arrivalNoticeService.getArrivalNoticeCountByVendorId(id) > 0
+                || returnVendorService.getReturnVendorCountByVendorId(id) > 0) {
+            throw exception(MD_VENDOR_HAS_REFERENCE);
+        }
+    }
+
     @Override
     public MesMdVendorDO getVendor(Long id) {
         return vendorMapper.selectById(id);
@@ -70,7 +70,7 @@ public class MesProTaskServiceImpl implements MesProTaskService {
         // 2.1 构建任务 DO
         MesProTaskDO task = BeanUtils.toBean(createReqVO, MesProTaskDO.class)
                 .setName(buildTaskName(item.getName(), createReqVO.getQuantity()))
-                .setCode(autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.TASK_CODE.getCode()))
+                .setCode(autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.PRO_TASK_CODE.getCode()))
                 .setStatus(MesProTaskStatusEnum.PREPARE.getStatus());
         // 2.2 插入
         taskMapper.insert(task);
@@ -108,4 +108,12 @@ public interface MesWmArrivalNoticeService {
      */
     List<MesWmArrivalNoticeDO> getArrivalNoticeListByStatus(Integer status);
+    /**
+     * 查询指定供应商的到货通知单数量
+     *
+     * @param vendorId 供应商编号
+     * @return 数量
+     */
+    Long getArrivalNoticeCountByVendorId(Long vendorId);
+
 }
@@ -213,4 +213,9 @@ public class MesWmArrivalNoticeServiceImpl implements MesWmArrivalNoticeService 
         }
     }
+    @Override
+    public Long getArrivalNoticeCountByVendorId(Long vendorId) {
+        return arrivalNoticeMapper.selectCountByVendorId(vendorId);
+    }
+
 }
@@ -183,7 +183,7 @@ public class MesWmBatchServiceImpl implements MesWmBatchService {
         }
         // 3.2 情况二：生成新批次
-        String batchCode = autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.BATCH_CODE.getCode());
+        String batchCode = autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.WM_BATCH_CODE.getCode());
         batch.setCode(batchCode);
         batchMapper.insert(batch);
@@ -85,4 +85,12 @@ public interface MesWmItemReceiptService {
      */
     MesWmItemReceiptDO validateItemReceiptEditable(Long id);
+    /**
+     * 查询指定供应商的采购入库单数量
+     *
+     * @param vendorId 供应商编号
+     * @return 数量
+     */
+    Long getItemReceiptCountByVendorId(Long vendorId);
+
 }
@@ -228,4 +228,9 @@ public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
         }
     }
+    @Override
+    public Long getItemReceiptCountByVendorId(Long vendorId) {
+        return itemReceiptMapper.selectCountByVendorId(vendorId);
+    }
+
 }
@@ -93,4 +93,12 @@ public interface MesWmReturnVendorService {
      */
     Boolean checkReturnVendorQuantity(Long id);
+    /**
+     * 查询指定供应商的退货单数量
+     *
+     * @param vendorId 供应商编号
+     * @return 数量
+     */
+    Long getReturnVendorCountByVendorId(Long vendorId);
+
 }
@@ -208,4 +208,9 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
         return returnVendor;
     }
+    @Override
+    public Long getReturnVendorCountByVendorId(Long vendorId) {
+        return returnVendorMapper.selectCountByVendorId(vendorId);
+    }
+
 }
@@ -41,7 +41,7 @@ public class MesWmSnServiceImpl implements MesWmSnService {
         String uuid = IdUtil.fastSimpleUUID();
         // 批量生成 SN 码
         for (int i = 0; i < reqVO.getCount(); i++) {
-            String snCode = autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.SN_CODE.getCode());
+            String snCode = autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.WM_SN_CODE.getCode());
             sns.add(new MesWmSnDO().setUuid(uuid).setCode(snCode)
                     .setItemId(reqVO.getItemId()).setBatchCode(reqVO.getBatchCode())
                     .setWorkOrderId(reqVO.getWorkOrderId()));