diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/vendor/vo/MesMdVendorPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/vendor/vo/MesMdVendorPageReqVO.java index fc5d275..738b93c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/vendor/vo/MesMdVendorPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/vendor/vo/MesMdVendorPageReqVO.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; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/vendor/MesMdVendorMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/vendor/MesMdVendorMapper.java index 92b9b9f..3c83759 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/vendor/MesMdVendorMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/vendor/MesMdVendorMapper.java @@ -22,7 +22,7 @@ public interface MesMdVendorMapper extends BaseMapperX { .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 { default List selectListByStatus(Integer status) { return selectList(MesMdVendorDO::getStatus, status); } - } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java index d2c9c9c..38119a9 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java @@ -34,4 +34,8 @@ public interface MesWmArrivalNoticeMapper extends BaseMapperX return selectOne(MesWmItemReceiptDO::getCode, code); } + default Long selectCountByVendorId(Long vendorId) { + return selectCount(MesWmItemReceiptDO::getVendorId, vendorId); + } + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java index 51a3b6e..67d5a68 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java @@ -22,4 +22,8 @@ public interface MesWmReturnVendorMapper extends BaseMapperX 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); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java index 5ba21c0..1302c58 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java @@ -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); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java index 823e1c4..a4dacb2 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java @@ -108,4 +108,12 @@ public interface MesWmArrivalNoticeService { */ List getArrivalNoticeListByStatus(Integer status); + /** + * 查询指定供应商的到货通知单数量 + * + * @param vendorId 供应商编号 + * @return 数量 + */ + Long getArrivalNoticeCountByVendorId(Long vendorId); + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java index 55b1f0b..35dccb5 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java @@ -213,4 +213,9 @@ public class MesWmArrivalNoticeServiceImpl implements MesWmArrivalNoticeService } } + @Override + public Long getArrivalNoticeCountByVendorId(Long vendorId) { + return arrivalNoticeMapper.selectCountByVendorId(vendorId); + } + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java index 16dc6ca..5a60933 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java @@ -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); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java index f038da7..6c7a816 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java @@ -85,4 +85,12 @@ public interface MesWmItemReceiptService { */ MesWmItemReceiptDO validateItemReceiptEditable(Long id); + /** + * 查询指定供应商的采购入库单数量 + * + * @param vendorId 供应商编号 + * @return 数量 + */ + Long getItemReceiptCountByVendorId(Long vendorId); + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java index 86450ea..69f46eb 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java @@ -228,4 +228,9 @@ public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService { } } + @Override + public Long getItemReceiptCountByVendorId(Long vendorId) { + return itemReceiptMapper.selectCountByVendorId(vendorId); + } + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorService.java index 3c6f32f..edb8688 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorService.java @@ -93,4 +93,12 @@ public interface MesWmReturnVendorService { */ Boolean checkReturnVendorQuantity(Long id); + /** + * 查询指定供应商的退货单数量 + * + * @param vendorId 供应商编号 + * @return 数量 + */ + Long getReturnVendorCountByVendorId(Long vendorId); + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java index 337e915..c07582a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java @@ -208,4 +208,9 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService { return returnVendor; } + @Override + public Long getReturnVendorCountByVendorId(Long vendorId) { + return returnVendorMapper.selectCountByVendorId(vendorId); + } + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java index 283e900..85288c6 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java @@ -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()));