From 7c03ac9182b338a13dce52631b2924da7793dd5e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 17 十月 2026 18:36:50 +0800
Subject: [PATCH] feat(mes): 仓储物流单据跨模块关联字段支持手工填写
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesPageReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticeSaveReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeDO.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java | 13 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageLineServiceImpl.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptDO.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/MesWmOutsourceReceiptSaveReqVO.java | 12 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/MesWmOutsourceReceiptPageReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/MesWmOutsourceIssueSaveReqVO.java | 9 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptSaveReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java | 12 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java | 10 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/packages/MesWmPackageDO.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesSaveReqVO.java | 9 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueSaveReqVO.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptPageReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackagePageReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDO.java | 12 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticePageReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java | 12 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourceissue/MesWmOutsourceIssueMapper.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java | 13 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptMapper.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/MesWmOutsourceIssuePageReqVO.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDO.java | 12 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptMapper.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticePageReqVO.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesPageReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackageSaveReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourceissue/MesWmOutsourceIssueDO.java | 12 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java | 15 +-
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java | 13 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/line/MesWmPackageLineSaveReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/packages/MesWmPackageLineDO.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java | 2
49 files changed, 263 insertions(+), 55 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticePageReqVO.java
index 4eb2e14..b735751 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticePageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticePageReqVO.java
@@ -26,9 +26,15 @@
@Schema(description = "閲囪喘璁㈠崟缂栧彿", example = "1")
private Long purchaseOrderId;
+ @Schema(description = "閲囪喘璁㈠崟缂栫爜", example = "PO20260101")
+ private String purchaseOrderCode;
+
@Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1")
private Long vendorId;
+ @Schema(description = "渚涘簲鍟嗗悕绉�", example = "鏌愭煇渚涘簲鍟�")
+ private String vendorName;
+
@Schema(description = "鍒拌揣鏃ユ湡")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] arrivalDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticeSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticeSaveReqVO.java
index 1a08c85..d41121f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticeSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticeSaveReqVO.java
@@ -28,10 +28,12 @@
@Schema(description = "閲囪喘璁㈠崟缂栫爜", example = "PO20260101")
private String purchaseOrderCode;
- @Schema(description = "渚涘簲鍟嗙紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "渚涘簲鍟嗙紪鍙蜂笉鑳戒负绌�")
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1")
private Long vendorId;
+ @Schema(description = "渚涘簲鍟嗗悕绉帮紙鎵嬪伐濉啓锛�", example = "鏌愭煇渚涘簲鍟�")
+ private String vendorName;
+
@Schema(description = "鍒拌揣鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鍒拌揣鏃ユ湡涓嶈兘涓虹┖")
private LocalDateTime arrivalDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/MesWmOutsourceIssuePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/MesWmOutsourceIssuePageReqVO.java
index 5419da3..614d6b6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/MesWmOutsourceIssuePageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/MesWmOutsourceIssuePageReqVO.java
@@ -26,9 +26,15 @@
@Schema(description = "渚涘簲鍟咺D", example = "1")
private Long vendorId;
+ @Schema(description = "渚涘簲鍟嗗悕绉�", example = "鏌愭煇渚涘簲鍟�")
+ private String vendorName;
+
@Schema(description = "鐢熶骇宸ュ崟ID", example = "1")
private Long workOrderId;
+ @Schema(description = "鐢熶骇宸ュ崟鍙�", example = "WO202603010001")
+ private String workOrderCode;
+
@Schema(description = "鍙戞枡鏃ユ湡")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] issueDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/MesWmOutsourceIssueSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/MesWmOutsourceIssueSaveReqVO.java
index 3b5a02e..91c7335 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/MesWmOutsourceIssueSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/MesWmOutsourceIssueSaveReqVO.java
@@ -25,10 +25,15 @@
@Schema(description = "渚涘簲鍟咺D", example = "1")
private Long vendorId;
- @Schema(description = "鐢熶骇宸ュ崟ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鐢熶骇宸ュ崟ID涓嶈兘涓虹┖")
+ @Schema(description = "渚涘簲鍟嗗悕绉帮紙鎵嬪伐濉啓锛�", example = "鏌愭煇渚涘簲鍟�")
+ private String vendorName;
+
+ @Schema(description = "鐢熶骇宸ュ崟ID", example = "1")
private Long workOrderId;
+ @Schema(description = "鐢熶骇宸ュ崟鍙凤紙鎵嬪伐濉啓锛�", example = "WO202603010001")
+ private String workOrderCode;
+
@Schema(description = "鍙戞枡鏃ユ湡")
private LocalDateTime issueDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/MesWmOutsourceReceiptPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/MesWmOutsourceReceiptPageReqVO.java
index 714e035..772345f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/MesWmOutsourceReceiptPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/MesWmOutsourceReceiptPageReqVO.java
@@ -26,6 +26,9 @@
@Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1")
private Long vendorId;
+ @Schema(description = "渚涘簲鍟嗗悕绉�", example = "鏌愭煇渚涘簲鍟�")
+ private String vendorName;
+
@Schema(description = "鍏ュ簱鏃ユ湡")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] receiptDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/MesWmOutsourceReceiptSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/MesWmOutsourceReceiptSaveReqVO.java
index 3bc3566..cf812f1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/MesWmOutsourceReceiptSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/MesWmOutsourceReceiptSaveReqVO.java
@@ -22,14 +22,18 @@
@NotEmpty(message = "鍏ュ簱鍗曞悕绉颁笉鑳戒负绌�")
private String name;
- @Schema(description = "澶栧崗宸ュ崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "澶栧崗宸ュ崟涓嶈兘涓虹┖")
+ @Schema(description = "澶栧崗宸ュ崟缂栧彿", example = "1")
private Long workOrderId;
- @Schema(description = "渚涘簲鍟嗙紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "渚涘簲鍟嗕笉鑳戒负绌�")
+ @Schema(description = "澶栧崗宸ュ崟鍙凤紙鎵嬪伐濉啓锛�", example = "WO202603010001")
+ private String workOrderCode;
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1")
private Long vendorId;
+ @Schema(description = "渚涘簲鍟嗗悕绉帮紙鎵嬪伐濉啓锛�", example = "鏌愭煇渚涘簲鍟�")
+ private String vendorName;
+
@Schema(description = "鍏ュ簱鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鍏ュ簱鏃ユ湡涓嶈兘涓虹┖")
private LocalDateTime receiptDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackagePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackagePageReqVO.java
index 939b8bf..047f122 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackagePageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackagePageReqVO.java
@@ -26,6 +26,9 @@
@Schema(description = "瀹㈡埛 ID", example = "1")
private Long clientId;
+ @Schema(description = "瀹㈡埛鍚嶇О", example = "鏌愭煇瀹㈡埛")
+ private String clientName;
+
@Schema(description = "鐖剁 ID", example = "1024")
private Long parentId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackageSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackageSaveReqVO.java
index 77060e6..3ba8309 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackageSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/MesWmPackageSaveReqVO.java
@@ -37,6 +37,9 @@
@Schema(description = "瀹㈡埛 ID", example = "1")
private Long clientId;
+ @Schema(description = "瀹㈡埛鍚嶇О锛堟墜宸ュ～鍐欙級", example = "鏌愭煇瀹㈡埛")
+ private String clientName;
+
@Schema(description = "绠遍暱搴�", example = "60.00")
private BigDecimal length;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/line/MesWmPackageLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/line/MesWmPackageLineSaveReqVO.java
index 4c0b2e9..9b4844a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/line/MesWmPackageLineSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/vo/line/MesWmPackageLineSaveReqVO.java
@@ -36,10 +36,12 @@
@DecimalMin(value = "0.01", message = "瑁呯鏁伴噺蹇呴』澶т簬 0")
private BigDecimal quantity;
- @Schema(description = "鐢熶骇宸ュ崟 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鐢熶骇宸ュ崟涓嶈兘涓虹┖")
+ @Schema(description = "鐢熶骇宸ュ崟 ID", example = "1")
private Long workOrderId;
+ @Schema(description = "鐢熶骇宸ュ崟鍙凤紙鎵嬪伐濉啓锛�", example = "WO202603010001")
+ private String workOrderCode;
+
@Schema(description = "鏈夋晥鏈�")
private LocalDateTime expireDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptPageReqVO.java
index 27cdeef..606b3ac 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptPageReqVO.java
@@ -21,6 +21,9 @@
@Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
private Long workOrderId;
+ @Schema(description = "鐢熶骇宸ュ崟鍙�", example = "WO202603010001")
+ private String workOrderCode;
+
@Schema(description = "浜у搧鐗╂枡缂栧彿", example = "1")
private Long itemId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptSaveReqVO.java
index 19d8e34..1ff9117 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptSaveReqVO.java
@@ -25,6 +25,9 @@
@Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
private Long workOrderId;
+ @Schema(description = "鐢熶骇宸ュ崟鍙凤紙鎵嬪伐濉啓锛�", example = "WO202603010001")
+ private String workOrderCode;
+
@Schema(description = "鏀惰揣鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鏀惰揣鏃ユ湡涓嶈兘涓虹┖")
private LocalDateTime receiptDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesPageReqVO.java
index 3f65810..68b5a36 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesPageReqVO.java
@@ -26,6 +26,9 @@
@Schema(description = "瀹㈡埛缂栧彿", example = "1")
private Long clientId;
+ @Schema(description = "瀹㈡埛鍚嶇О", example = "鏌愭煇瀹㈡埛")
+ private String clientName;
+
@Schema(description = "鐘舵��", example = "0")
private Integer status;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesSaveReqVO.java
index 1c94e13..8d70411 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesSaveReqVO.java
@@ -22,9 +22,11 @@
@NotEmpty(message = "鍑哄簱鍗曞悕绉颁笉鑳戒负绌�")
private String name;
- @Schema(description = "瀹㈡埛ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "瀹㈡埛涓嶈兘涓虹┖")
+ @Schema(description = "瀹㈡埛ID", example = "1")
private Long clientId;
+
+ @Schema(description = "瀹㈡埛鍚嶇О锛堟墜宸ュ～鍐欙級", example = "鏌愭煇瀹㈡埛")
+ private String clientName;
@Schema(description = "閿�鍞鍗曞彿", example = "SO2026030001")
private String salesOrderCode;
@@ -36,6 +38,9 @@
@Schema(description = "鍙戣揣閫氱煡鍗旾D", example = "1")
private Long noticeId;
+ @Schema(description = "鍙戣揣閫氱煡鍗曞彿锛堟墜宸ュ～鍐欙級", example = "SN2026030001")
+ private String noticeCode;
+
@Schema(description = "鏀惰揣浜�", example = "寮犱笁")
private String contactName;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java
index 02fd583..6f3c7b5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java
@@ -19,9 +19,15 @@
@Schema(description = "宸ヤ綔绔� ID", example = "1")
private Long workstationId;
+ @Schema(description = "宸ヤ綔绔欏悕绉�", example = "鍖呰宸ヤ綅")
+ private String workstationName;
+
@Schema(description = "鐢熶骇宸ュ崟 ID", example = "1")
private Long workOrderId;
+ @Schema(description = "鐢熶骇宸ュ崟鍙�", example = "WO202603010001")
+ private String workOrderCode;
+
@Schema(description = "鐢熶骇浠诲姟 ID", example = "1")
private Long taskId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueSaveReqVO.java
index a4c7fb0..e51f246 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueSaveReqVO.java
@@ -28,9 +28,15 @@
@Schema(description = "鐢熶骇宸ュ崟 ID", example = "1")
private Long workOrderId;
+ @Schema(description = "鐢熶骇宸ュ崟鍙凤紙鎵嬪伐濉啓锛�", example = "WO202603010001")
+ private String workOrderCode;
+
@Schema(description = "宸ヤ綔绔� ID", example = "1")
private Long workstationId;
+ @Schema(description = "宸ヤ綔绔欏悕绉帮紙鎵嬪伐濉啓锛�", example = "鍖呰宸ヤ綅")
+ private String workstationName;
+
@Schema(description = "閫�鏂欑被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "閫�鏂欑被鍨嬩笉鑳戒负绌�")
private Integer type;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesPageReqVO.java
index 1008ffc..bbde8f5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesPageReqVO.java
@@ -35,6 +35,9 @@
@Schema(description = "瀹㈡埛 ID", example = "1")
private Long clientId;
+ @Schema(description = "瀹㈡埛鍚嶇О", example = "鏌愭煇瀹㈡埛")
+ private String clientName;
+
@Schema(description = "鐘舵��", example = "0")
private Integer status;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java
index b77d34f..588e87d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java
@@ -33,10 +33,12 @@
@Schema(description = "閿�鍞鍗曠紪鍙�", example = "SO202603010001")
private String salesOrderCode;
- @Schema(description = "瀹㈡埛 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "瀹㈡埛 ID 涓嶈兘涓虹┖")
+ @Schema(description = "瀹㈡埛 ID", example = "1")
private Long clientId;
+ @Schema(description = "瀹㈡埛鍚嶇О锛堟墜宸ュ～鍐欙級", example = "鏌愭煇瀹㈡埛")
+ private String clientName;
+
@Schema(description = "閫�璐ф棩鏈�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "閫�璐ф棩鏈熶笉鑳戒负绌�")
private LocalDate returnDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java
index d9ed267..8440e39 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java
@@ -22,4 +22,7 @@
@Schema(description = "渚涘簲鍟� ID", example = "1")
private Long vendorId;
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
+ private String vendorName;
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java
index 8932b98..0267843 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java
@@ -28,10 +28,12 @@
@Schema(description = "閲囪喘璁㈠崟缂栧彿", example = "PO20250226001")
private String purchaseOrderCode;
- @Schema(description = "渚涘簲鍟� ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "渚涘簲鍟� ID 涓嶈兘涓虹┖")
+ @Schema(description = "渚涘簲鍟� ID", example = "1")
private Long vendorId;
+ @Schema(description = "渚涘簲鍟嗗悕绉帮紙鎵嬪伐濉啓锛�", example = "鏌愭煇渚涘簲鍟�")
+ private String vendorName;
+
@Schema(description = "閫�璐ф棩鏈�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "閫�璐ф棩鏈熶笉鑳戒负绌�")
private LocalDateTime returnDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticePageReqVO.java
index f3ce710..c8a7043 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticePageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticePageReqVO.java
@@ -24,6 +24,9 @@
@Schema(description = "瀹㈡埛缂栧彿", example = "1")
private Long clientId;
+ @Schema(description = "瀹㈡埛鍚嶇О", example = "鏌愭煇瀹㈡埛")
+ private String clientName;
+
@Schema(description = "鐘舵��", example = "3")
private Integer status;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java
index 4ffa6e2..85ba399 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java
@@ -22,10 +22,12 @@
@NotEmpty(message = "閫氱煡鍗曞悕绉颁笉鑳戒负绌�")
private String name;
- @Schema(description = "瀹㈡埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "瀹㈡埛缂栧彿涓嶈兘涓虹┖")
+ @Schema(description = "瀹㈡埛缂栧彿", example = "1")
private Long clientId;
+ @Schema(description = "瀹㈡埛鍚嶇О锛堟墜宸ュ～鍐欙級", example = "鏌愭煇瀹㈡埛")
+ private String clientName;
+
@Schema(description = "閿�鍞鍗旾D", example = "1")
private Long saleOrderId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeDO.java
index 61b2011..0db1076 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeDO.java
@@ -53,6 +53,12 @@
*/
private Long vendorId;
/**
+ * 渚涘簲鍟嗗悕绉�
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱斾緵搴斿晢妗ｆ
+ */
+ private String vendorName;
+ /**
* 鍒拌揣鏃ユ湡
*/
private LocalDateTime arrivalDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourceissue/MesWmOutsourceIssueDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourceissue/MesWmOutsourceIssueDO.java
index 862bb49..d3c4654 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourceissue/MesWmOutsourceIssueDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourceissue/MesWmOutsourceIssueDO.java
@@ -46,12 +46,24 @@
*/
private Long vendorId;
/**
+ * 渚涘簲鍟嗗悕绉�
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱斾緵搴斿晢妗ｆ
+ */
+ private String vendorName;
+ /**
* 鐢熶骇宸ュ崟ID
*
* 鍏宠仈 {@link MesProWorkOrderDO#getId()}
*/
private Long workOrderId;
/**
+ * 鐢熶骇宸ュ崟鍙�
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱旂敓浜у伐鍗�
+ */
+ private String workOrderCode;
+ /**
* 鍙戞枡鏃ユ湡
*/
private LocalDateTime issueDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDO.java
index 333e1e9..f0ca4e4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDO.java
@@ -43,12 +43,24 @@
*/
private Long workOrderId;
/**
+ * 澶栧崗宸ュ崟缂栧彿
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱旂敓浜у伐鍗�
+ */
+ private String workOrderCode;
+ /**
* 渚涘簲鍟嗙紪鍙�
*
* 鍏宠仈 ERP 渚涘簲鍟� {@link cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO#getId()}
*/
private Long vendorId;
/**
+ * 渚涘簲鍟嗗悕绉�
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱斾緵搴斿晢妗ｆ
+ */
+ private String vendorName;
+ /**
* 鍏ュ簱鏃ユ湡
*/
private LocalDateTime receiptDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/packages/MesWmPackageDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/packages/MesWmPackageDO.java
index 38fabaa..6c7233a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/packages/MesWmPackageDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/packages/MesWmPackageDO.java
@@ -57,6 +57,12 @@
*/
private Long clientId;
/**
+ * 瀹㈡埛鍚嶇О
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱� CRM 瀹㈡埛妗ｆ
+ */
+ private String clientName;
+ /**
* 绠遍暱搴�
*/
private BigDecimal length;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/packages/MesWmPackageLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/packages/MesWmPackageLineDO.java
index bf432d7..85bcde0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/packages/MesWmPackageLineDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/packages/MesWmPackageLineDO.java
@@ -56,6 +56,12 @@
*/
private Long workOrderId;
/**
+ * 鐢熶骇宸ュ崟鍙�
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱旂敓浜у伐鍗�
+ */
+ private String workOrderCode;
+ /**
* 鏈夋晥鏈�
*/
private LocalDateTime expireDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptDO.java
index c9a99e4..4be4f3a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptDO.java
@@ -45,6 +45,12 @@
*/
private Long workOrderId;
/**
+ * 鐢熶骇宸ュ崟鍙�
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱旂敓浜у伐鍗�
+ */
+ private String workOrderCode;
+ /**
* 浜у搧鐗╂枡缂栧彿
*
* 鍏宠仈 {@link MesMdItemDO#getId()}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java
index 579af82..b94bb67 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java
@@ -46,6 +46,12 @@
*/
private Long clientId;
/**
+ * 瀹㈡埛鍚嶇О
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱� CRM 瀹㈡埛妗ｆ
+ */
+ private String clientName;
+ /**
* 閿�鍞鍗旾D
*/
private Long saleOrderId;
@@ -60,6 +66,12 @@
*/
private Long noticeId;
/**
+ * 鍙戣揣閫氱煡鍗曞彿
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱斿彂璐ч�氱煡鍗�
+ */
+ private String noticeCode;
+ /**
* 鍑哄簱鏃ユ湡
*/
private LocalDateTime salesDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDO.java
index c3330e9..84384fa 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDO.java
@@ -46,6 +46,12 @@
*/
private Long workOrderId;
/**
+ * 鐢熶骇宸ュ崟鍙�
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱旂敓浜у伐鍗�
+ */
+ private String workOrderCode;
+ /**
* 鐢熶骇浠诲姟 ID
*
* 鍏宠仈 {@link MesProTaskDO#getId()}
@@ -58,6 +64,12 @@
*/
private Long workstationId;
/**
+ * 宸ヤ綔绔欏悕绉�
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱斿伐浣滅珯妗ｆ
+ */
+ private String workstationName;
+ /**
* 閫�鏂欑被鍨�
*
* 瀛楀吀 {@link DictTypeConstants#MES_WM_RETURN_ISSUE_TYPE}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
index aa3bb74..86aad56 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
@@ -53,6 +53,12 @@
*/
private Long clientId;
/**
+ * 瀹㈡埛鍚嶇О
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱� CRM 瀹㈡埛妗ｆ
+ */
+ private String clientName;
+ /**
* 閫�璐ф棩鏈�
*/
private LocalDate returnDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java
index 02dba0b..1caede0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java
@@ -53,6 +53,12 @@
*/
private Long vendorId;
/**
+ * 渚涘簲鍟嗗悕绉�
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱� SRM 渚涘簲鍟嗘。妗�
+ */
+ private String vendorName;
+ /**
* 閫�璐ф棩鏈�
*/
private LocalDateTime returnDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java
index 4c69b80..837074a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java
@@ -42,6 +42,12 @@
*/
private Long clientId;
/**
+ * 瀹㈡埛鍚嶇О
+ *
+ * 鎵嬪伐濉啓鏃朵娇鐢紝涓嶅叧鑱� CRM 瀹㈡埛妗ｆ
+ */
+ private String clientName;
+ /**
* 閿�鍞鍗旾D
*/
private Long saleOrderId;
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 a2e6705..9a8aa35 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
@@ -18,7 +18,9 @@
.likeIfPresent(MesWmArrivalNoticeDO::getCode, reqVO.getCode())
.likeIfPresent(MesWmArrivalNoticeDO::getName, reqVO.getName())
.eqIfPresent(MesWmArrivalNoticeDO::getPurchaseOrderId, reqVO.getPurchaseOrderId())
+ .likeIfPresent(MesWmArrivalNoticeDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode())
.eqIfPresent(MesWmArrivalNoticeDO::getVendorId, reqVO.getVendorId())
+ .likeIfPresent(MesWmArrivalNoticeDO::getVendorName, reqVO.getVendorName())
.betweenIfPresent(MesWmArrivalNoticeDO::getArrivalDate, reqVO.getArrivalDate())
.eqIfPresent(MesWmArrivalNoticeDO::getStatus, reqVO.getStatus())
.orderByDesc(MesWmArrivalNoticeDO::getId));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourceissue/MesWmOutsourceIssueMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourceissue/MesWmOutsourceIssueMapper.java
index 94576a4..5f53ad5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourceissue/MesWmOutsourceIssueMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourceissue/MesWmOutsourceIssueMapper.java
@@ -20,7 +20,9 @@
.likeIfPresent(MesWmOutsourceIssueDO::getCode, reqVO.getCode())
.likeIfPresent(MesWmOutsourceIssueDO::getName, reqVO.getName())
.eqIfPresent(MesWmOutsourceIssueDO::getVendorId, reqVO.getVendorId())
+ .likeIfPresent(MesWmOutsourceIssueDO::getVendorName, reqVO.getVendorName())
.eqIfPresent(MesWmOutsourceIssueDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .likeIfPresent(MesWmOutsourceIssueDO::getWorkOrderCode, reqVO.getWorkOrderCode())
.betweenIfPresent(MesWmOutsourceIssueDO::getIssueDate, reqVO.getIssueDate())
.orderByDesc(MesWmOutsourceIssueDO::getId));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptMapper.java
index 8dd133d..07af9a5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptMapper.java
@@ -18,8 +18,10 @@
.likeIfPresent(MesWmOutsourceReceiptDO::getCode, reqVO.getCode())
.likeIfPresent(MesWmOutsourceReceiptDO::getName, reqVO.getName())
.eqIfPresent(MesWmOutsourceReceiptDO::getVendorId, reqVO.getVendorId())
+ .likeIfPresent(MesWmOutsourceReceiptDO::getVendorName, reqVO.getVendorName())
.eqIfPresent(MesWmOutsourceReceiptDO::getStatus, reqVO.getStatus())
.inIfPresent(MesWmOutsourceReceiptDO::getWorkOrderId, workOrderIds)
+ .likeIfPresent(MesWmOutsourceReceiptDO::getWorkOrderCode, reqVO.getWorkOrderCode())
.betweenIfPresent(MesWmOutsourceReceiptDO::getReceiptDate, reqVO.getReceiptDate())
.orderByDesc(MesWmOutsourceReceiptDO::getId));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java
index c8c246a..3378e0a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java
@@ -25,6 +25,7 @@
.likeIfPresent(MesWmPackageDO::getCode, reqVO.getCode())
.likeIfPresent(MesWmPackageDO::getSalesOrderCode, reqVO.getSalesOrderCode())
.eqIfPresent(MesWmPackageDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmPackageDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmPackageDO::getParentId, reqVO.getParentId())
.eqIfPresent(MesWmPackageDO::getInspectorUserId, reqVO.getInspectorUserId())
.eqIfPresent(MesWmPackageDO::getStatus, reqVO.getStatus())
@@ -39,15 +40,19 @@
.likeIfPresent(MesWmPackageDO::getCode, reqVO.getCode())
.likeIfPresent(MesWmPackageDO::getSalesOrderCode, reqVO.getSalesOrderCode())
.eqIfPresent(MesWmPackageDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmPackageDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmPackageDO::getParentId, reqVO.getParentId())
.eqIfPresent(MesWmPackageDO::getInspectorUserId, reqVO.getInspectorUserId())
.eqIfPresent(MesWmPackageDO::getStatus, reqVO.getStatus())
.orderByDesc(MesWmPackageDO::getId);
if (permittedClientIds != null) {
- if (CollUtil.isEmpty(permittedClientIds)) {
- return PageResult.empty();
- }
- wrapper.in(MesWmPackageDO::getClientId, permittedClientIds);
+ // 鎵嬪伐濉啓瀹㈡埛鍚嶇О锛堟湭鍏宠仈瀹㈡埛妗ｆ锛夌殑鍗曟嵁涓嶅睘浜庝换浣曞鎴锋潈闄愯寖鍥达紝濮嬬粓鍙
+ wrapper.and(w -> {
+ w.isNull(MesWmPackageDO::getClientId);
+ if (CollUtil.isNotEmpty(permittedClientIds)) {
+ w.or().in(MesWmPackageDO::getClientId, permittedClientIds);
+ }
+ });
}
return selectPage(reqVO, wrapper);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptMapper.java
index 00f5f02..f5da8f4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptMapper.java
@@ -18,6 +18,7 @@
.likeIfPresent(MesWmProductReceiptDO::getCode, reqVO.getCode())
.likeIfPresent(MesWmProductReceiptDO::getName, reqVO.getName())
.eqIfPresent(MesWmProductReceiptDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .likeIfPresent(MesWmProductReceiptDO::getWorkOrderCode, reqVO.getWorkOrderCode())
.eqIfPresent(MesWmProductReceiptDO::getItemId, reqVO.getItemId())
.orderByDesc(MesWmProductReceiptDO::getId));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
index 8c79c6e..52310eb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
@@ -23,6 +23,7 @@
.likeIfPresent(MesWmProductSalesDO::getCode, reqVO.getCode())
.likeIfPresent(MesWmProductSalesDO::getName, reqVO.getName())
.eqIfPresent(MesWmProductSalesDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmProductSalesDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmProductSalesDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesWmProductSalesDO::getSalesDate, reqVO.getShipmentDate())
.orderByDesc(MesWmProductSalesDO::getId));
@@ -36,14 +37,18 @@
.likeIfPresent(MesWmProductSalesDO::getCode, reqVO.getCode())
.likeIfPresent(MesWmProductSalesDO::getName, reqVO.getName())
.eqIfPresent(MesWmProductSalesDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmProductSalesDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmProductSalesDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesWmProductSalesDO::getSalesDate, reqVO.getShipmentDate())
.orderByDesc(MesWmProductSalesDO::getId);
if (permittedClientIds != null) {
- if (CollUtil.isEmpty(permittedClientIds)) {
- return PageResult.empty();
- }
- wrapper.in(MesWmProductSalesDO::getClientId, permittedClientIds);
+ // 鎵嬪伐濉啓瀹㈡埛鍚嶇О锛堟湭鍏宠仈瀹㈡埛妗ｆ锛夌殑鍗曟嵁涓嶅睘浜庝换浣曞鎴锋潈闄愯寖鍥达紝濮嬬粓鍙
+ wrapper.and(w -> {
+ w.isNull(MesWmProductSalesDO::getClientId);
+ if (CollUtil.isNotEmpty(permittedClientIds)) {
+ w.or().in(MesWmProductSalesDO::getClientId, permittedClientIds);
+ }
+ });
}
return selectPage(reqVO, wrapper);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java
index 1dab867..8c1279e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java
@@ -18,7 +18,9 @@
.likeIfPresent(MesWmReturnIssueDO::getCode, reqVO.getCode())
.likeIfPresent(MesWmReturnIssueDO::getName, reqVO.getName())
.eqIfPresent(MesWmReturnIssueDO::getWorkstationId, reqVO.getWorkstationId())
+ .likeIfPresent(MesWmReturnIssueDO::getWorkstationName, reqVO.getWorkstationName())
.eqIfPresent(MesWmReturnIssueDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .likeIfPresent(MesWmReturnIssueDO::getWorkOrderCode, reqVO.getWorkOrderCode())
.eqIfPresent(MesWmReturnIssueDO::getTaskId, reqVO.getTaskId())
.eqIfPresent(MesWmReturnIssueDO::getType, reqVO.getType())
.orderByDesc(MesWmReturnIssueDO::getId));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java
index 988d14d..28e8373 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java
@@ -24,6 +24,7 @@
.likeIfPresent(MesWmReturnSalesDO::getName, reqVO.getName())
.likeIfPresent(MesWmReturnSalesDO::getSalesOrderCode, reqVO.getSalesOrderCode())
.eqIfPresent(MesWmReturnSalesDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmReturnSalesDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmReturnSalesDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesWmReturnSalesDO::getReturnDate, reqVO.getReturnDate())
.orderByDesc(MesWmReturnSalesDO::getId));
@@ -38,14 +39,18 @@
.likeIfPresent(MesWmReturnSalesDO::getName, reqVO.getName())
.likeIfPresent(MesWmReturnSalesDO::getSalesOrderCode, reqVO.getSalesOrderCode())
.eqIfPresent(MesWmReturnSalesDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmReturnSalesDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmReturnSalesDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesWmReturnSalesDO::getReturnDate, reqVO.getReturnDate())
.orderByDesc(MesWmReturnSalesDO::getId);
if (permittedClientIds != null) {
- if (CollUtil.isEmpty(permittedClientIds)) {
- return PageResult.empty();
- }
- wrapper.in(MesWmReturnSalesDO::getClientId, permittedClientIds);
+ // 鎵嬪伐濉啓瀹㈡埛鍚嶇О锛堟湭鍏宠仈瀹㈡埛妗ｆ锛夌殑鍗曟嵁涓嶅睘浜庝换浣曞鎴锋潈闄愯寖鍥达紝濮嬬粓鍙
+ wrapper.and(w -> {
+ w.isNull(MesWmReturnSalesDO::getClientId);
+ if (CollUtil.isNotEmpty(permittedClientIds)) {
+ w.or().in(MesWmReturnSalesDO::getClientId, permittedClientIds);
+ }
+ });
}
return selectPage(reqVO, wrapper);
}
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 dfb626f..0c6b15a 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
@@ -19,6 +19,7 @@
.likeIfPresent(MesWmReturnVendorDO::getName, reqVO.getName())
.likeIfPresent(MesWmReturnVendorDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode())
.eqIfPresent(MesWmReturnVendorDO::getVendorId, reqVO.getVendorId())
+ .likeIfPresent(MesWmReturnVendorDO::getVendorName, reqVO.getVendorName())
.orderByDesc(MesWmReturnVendorDO::getId));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java
index 23f7af4..7cad04f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java
@@ -23,6 +23,7 @@
.likeIfPresent(MesWmSalesNoticeDO::getName, reqVO.getName())
.likeIfPresent(MesWmSalesNoticeDO::getSaleOrderCode, reqVO.getSaleOrderCode())
.eqIfPresent(MesWmSalesNoticeDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmSalesNoticeDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmSalesNoticeDO::getStatus, reqVO.getStatus())
.orderByDesc(MesWmSalesNoticeDO::getId));
}
@@ -40,15 +41,17 @@
.likeIfPresent(MesWmSalesNoticeDO::getName, reqVO.getName())
.likeIfPresent(MesWmSalesNoticeDO::getSaleOrderCode, reqVO.getSaleOrderCode())
.eqIfPresent(MesWmSalesNoticeDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmSalesNoticeDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmSalesNoticeDO::getStatus, reqVO.getStatus())
.orderByDesc(MesWmSalesNoticeDO::getId);
- // 瀹㈡埛鏉冮檺杩囨护
+ // 瀹㈡埛鏉冮檺杩囨护锛涙墜宸ュ～鍐欏鎴峰悕绉帮紙鏈叧鑱斿鎴锋。妗堬級鐨勫崟鎹笉灞炰簬浠讳綍瀹㈡埛鏉冮檺鑼冨洿锛屽缁堝彲瑙�
if (permittedClientIds != null) {
- if (CollUtil.isEmpty(permittedClientIds)) {
- // 绌哄垪琛ㄨ〃绀烘病鏈変换浣曟潈闄愶紝杩斿洖绌虹粨鏋�
- return PageResult.empty();
- }
- wrapper.in(MesWmSalesNoticeDO::getClientId, permittedClientIds);
+ wrapper.and(w -> {
+ w.isNull(MesWmSalesNoticeDO::getClientId);
+ if (CollUtil.isNotEmpty(permittedClientIds)) {
+ w.or().in(MesWmSalesNoticeDO::getClientId, permittedClientIds);
+ }
+ });
}
return selectPage(reqVO, wrapper);
}
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 d5bc3c3..09fa502 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
@@ -87,8 +87,10 @@
private void validateArrivalNoticeSaveData(MesWmArrivalNoticeSaveReqVO reqVO) {
// 鏍￠獙缂栫爜鍞竴
validateCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙渚涘簲鍟嗗瓨鍦紙ERP 閲囪喘渚涘簲鍟嗭級
- srmSupplierApi.getSupplier(reqVO.getVendorId());
+ // 鏍￠獙渚涘簲鍟嗗瓨鍦紙浠呭叧鑱斾緵搴斿晢妗ｆ鏃讹紱鎵嬪伐濉啓渚涘簲鍟嗗悕绉颁笉鏍￠獙锛�
+ if (reqVO.getVendorId() != null) {
+ srmSupplierApi.getSupplier(reqVO.getVendorId());
+ }
// 鏍￠獙閲囪喘璁㈠崟瀛樺湪
if (reqVO.getPurchaseOrderId() != null) {
ErpPurchaseOrderRespDTO purchaseOrder = purchaseOrderApi.getPurchaseOrder(reqVO.getPurchaseOrderId()).getCheckedData();
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java
index 44cf7ed..920d522 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java
@@ -261,10 +261,12 @@
if (saveReqVO.getVendorId() != null) {
srmSupplierApi.getSupplier(saveReqVO.getVendorId());
}
- // 鏍￠獙宸ュ崟瀛樺湪涓旂被鍨嬩负澶栧崗锛堜唬宸ワ級
- MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(saveReqVO.getWorkOrderId());
- if (ObjUtil.notEqual(workOrder.getType(), MesProWorkOrderTypeEnum.OUTSOURCE.getType())) {
- throw exception(WM_OUTSOURCE_ISSUE_WORK_ORDER_TYPE_INVALID);
+ // 鏍￠獙宸ュ崟瀛樺湪涓旂被鍨嬩负澶栧崗锛堜唬宸ワ級锛涗粎鍏宠仈鐢熶骇宸ュ崟鏃舵牎楠岋紝鎵嬪伐濉啓宸ュ崟鍙蜂笉鏍￠獙
+ if (saveReqVO.getWorkOrderId() != null) {
+ MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(saveReqVO.getWorkOrderId());
+ if (ObjUtil.notEqual(workOrder.getType(), MesProWorkOrderTypeEnum.OUTSOURCE.getType())) {
+ throw exception(WM_OUTSOURCE_ISSUE_WORK_ORDER_TYPE_INVALID);
+ }
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java
index 5761943..3bd691a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java
@@ -108,11 +108,11 @@
public PageResult<MesWmOutsourceReceiptDO> getOutsourceReceiptPage(MesWmOutsourceReceiptPageReqVO pageReqVO) {
List<Long> workOrderIds = null;
if (StrUtil.isNotBlank(pageReqVO.getWorkOrderCode())) {
+ // 宸ュ崟鍙锋棦鍙兘鏄叧鑱斿伐鍗曪紝涔熷彲鑳芥槸鎵嬪伐濉啓鏂囨湰锛氭壘鍒板伐鍗曟寜 ID 杩囨护锛屾壘涓嶅埌鍒欐寜鏂囨湰妯＄硦鍖归厤
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(pageReqVO.getWorkOrderCode());
- if (workOrder == null) {
- return PageResult.empty();
+ if (workOrder != null) {
+ workOrderIds = java.util.Collections.singletonList(workOrder.getId());
}
- workOrderIds = java.util.Collections.singletonList(workOrder.getId());
}
return outsourceReceiptMapper.selectPage(pageReqVO, workOrderIds);
}
@@ -308,8 +308,10 @@
private void validateOutsourceReceiptSaveData(Long id, MesWmOutsourceReceiptSaveReqVO reqVO) {
// 鏍￠獙缂栫爜鍞竴
validateCodeUnique(id, reqVO.getCode());
- // 鏍￠獙渚涘簲鍟嗗瓨鍦�
- srmSupplierApi.getSupplier(reqVO.getVendorId());
+ // 鏍￠獙渚涘簲鍟嗗瓨鍦紙浠呭叧鑱斾緵搴斿晢妗ｆ鏃讹紱鎵嬪伐濉啓渚涘簲鍟嗗悕绉颁笉鏍￠獙锛�
+ if (reqVO.getVendorId() != null) {
+ srmSupplierApi.getSupplier(reqVO.getVendorId());
+ }
// 鏍￠獙澶栧崗宸ュ崟瀛樺湪
if (reqVO.getWorkOrderId() != null) {
workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageLineServiceImpl.java
index 295fc61..104f90e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageLineServiceImpl.java
@@ -102,8 +102,10 @@
packageService.validatePackageStatusDraft(reqVO.getPackageId());
// 鏍￠獙浜у搧鐗╂枡瀛樺湪
mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
- // 鏍￠獙宸ュ崟宸茬‘璁�
- workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
+ // 鏍￠獙宸ュ崟宸茬‘璁わ紙浠呭叧鑱旂敓浜у伐鍗曟椂锛涙墜宸ュ～鍐欏伐鍗曞彿涓嶆牎楠岋級
+ if (reqVO.getWorkOrderId() != null) {
+ workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
+ }
}
private MesWmPackageLineDO validatePackageLineExists(Long id) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
index 9338217..6433915 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
@@ -392,15 +392,17 @@
private void validateProductSalesSaveData(Long id, MesWmProductSalesSaveReqVO reqVO) {
// 鏍￠獙缂栫爜鍞竴
validateCodeUnique(id, reqVO.getCode());
- // 鏍￠獙瀹㈡埛瀛樺湪
- customerApi.validateCustomer(reqVO.getClientId());
+ // 鏍￠獙瀹㈡埛瀛樺湪锛堜粎鍏宠仈瀹㈡埛妗ｆ鏃讹紱鎵嬪伐濉啓瀹㈡埛鍚嶇О涓嶆牎楠岋級
+ if (reqVO.getClientId() != null) {
+ customerApi.validateCustomer(reqVO.getClientId());
+ }
// 鏍￠獙鍙戣揣閫氱煡鍗�
if (reqVO.getNoticeId() != null) {
MesWmSalesNoticeDO notice = salesNoticeService.validateSalesNoticeExists(reqVO.getNoticeId());
if (ObjUtil.notEqual(notice.getStatus(), MesWmSalesNoticeStatusEnum.APPROVED.getStatus())) {
throw exception(WM_SALES_NOTICE_STATUS_NOT_APPROVED);
}
- if (ObjUtil.notEqual(notice.getClientId(), reqVO.getClientId())) {
+ if (reqVO.getClientId() != null && ObjUtil.notEqual(notice.getClientId(), reqVO.getClientId())) {
throw exception(WM_SALES_NOTICE_CLIENT_MISMATCH);
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
index bb4fb51..1450a6c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
@@ -273,7 +273,10 @@
*/
private void validateSaveData(MesWmReturnSalesSaveReqVO reqVO) {
validateCodeUnique(reqVO.getId(), reqVO.getCode());
- customerApi.validateCustomer(reqVO.getClientId());
+ // 鏍￠獙瀹㈡埛瀛樺湪锛堜粎鍏宠仈瀹㈡埛妗ｆ鏃讹紱鎵嬪伐濉啓瀹㈡埛鍚嶇О涓嶆牎楠岋級
+ if (reqVO.getClientId() != null) {
+ customerApi.validateCustomer(reqVO.getClientId());
+ }
}
}
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 18296c8..4b6b4b2 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
@@ -265,8 +265,10 @@
if (reqVO.getId() != null) {
oldReturnVendor = validateReturnVendorExistsAndPrepare(reqVO.getId());
}
- // 鏍￠獙渚涘簲鍟嗗瓨鍦�
- srmSupplierApi.getSupplier(reqVO.getVendorId());
+ // 鏍￠獙渚涘簲鍟嗗瓨鍦紙浠呭叧鑱斾緵搴斿晢妗ｆ鏃讹紱鎵嬪伐濉啓渚涘簲鍟嗗悕绉颁笉鏍￠獙锛�
+ if (reqVO.getVendorId() != null) {
+ srmSupplierApi.getSupplier(reqVO.getVendorId());
+ }
// 鏍￠獙缂栫爜鍞竴
validateCodeUnique(reqVO.getId(), reqVO.getCode());
return oldReturnVendor;
--
Gitblit v1.9.3