From dd637406e18a7afbf08d323c6ece913fe545b7ad Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 28 十月 2026 18:11:32 +0800
Subject: [PATCH] feat(mes): 增加盘号追溯功能和销售退货单优化
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 12 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailRespVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineRespVO.java | 3
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesReelTest.java | 97 +++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java | 2
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineReelTest.java | 62 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferLineController.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java | 22 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesDetailController.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java | 17 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java | 15 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesLineController.java | 10 +
sql/mysql/20261028_mdm_technical_parameters.sql | 13 +
production-rework-legacy-code.txt | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java | 12 +
yudao-server/src/main/resources/application-local.yaml | 4
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailRespVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java | 34 ++
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImplTest.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/line/MesWmTransferLineRespVO.java | 3
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmFinishedSaleBatchSqlTest.java | 42 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java | 10 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderImportExcelVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchRespVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java | 40 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java | 6
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java | 69 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java | 13 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeLineController.java | 10 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java | 3
sql/mysql/20261028_reel_history_audit.sql | 17 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java | 3
39 files changed, 566 insertions(+), 32 deletions(-)
diff --git a/production-rework-legacy-code.txt b/production-rework-legacy-code.txt
index ab4cc76..af12912 100644
--- a/production-rework-legacy-code.txt
+++ b/production-rework-legacy-code.txt
@@ -4,8 +4,12 @@
寰呭姙锛氬伐璧勮绠楀叕寮忓皻鏈笌瀹㈡埛纭锛涙湰娆′笉瀹炴柦宸ヨ祫璁$畻锛屽緟纭宸ュ簭銆佽澶囥�佸伐鏃跺畾棰濆拰杈呭姪宸ユ椂鐨勮绠楀彛寰勫悗鍐嶆敼閫犮��
+鏌ヨ鏉冮檺娓呯悊寰呭姙锛氬墠绔凡绉婚櫎涓�閮ㄥ垎璇︽儏鍏ュ彛銆侀攢鍞鍗曟煡鐪嬪強宸ヤ綔鍙版姤宸ヨ褰曞鏌ヨ鎸夐挳鏉冮檺鐨勪緷璧栵紝棣栭〉缁忚惀鍗$墖鎸夐〉闈㈣彍鍗曟帶鍒躲�傚叾浠栨煡璇㈡潈闄愪粛琚姙鐞嗐�佽缃�侀椤垫眹鎬诲強璺ㄩ〉闈㈠叆鍙e紩鐢紱鍦ㄩ�愰」瀹屾垚鏉冮檺鏇夸唬骞堕獙璇佷箣鍓嶏紝涓嶈鎵ц `sql/mysql/remove_query_button_permissions.sql`銆�
+
鐩樺彿杩芥函锛氭柊鐢熶骇浜у嚭鍗充娇鐗╂枡鏈惎鐢ㄦ櫘閫氭壒娆$鐞嗭紝涔熶細涓洪潪绌虹洏鍙峰垱寤哄唴閮ㄨ拷婧壒娆★紝搴撳瓨浠嶆寜鎵规鍒嗗紑锛涘簱瀛橀〉闈㈠拰鎷h揣閫夋嫨鍣ㄦ樉绀虹洏鍙凤紝閿�鍞嫞璐у強鍑哄簱鏃舵牳瀵归攢鍞槑缁嗙洏鍙枫�傚巻鍙叉棤鐩樺彿搴撳瓨淇濈暀绌哄�硷紝涓嶈嚜鍔ㄦ帹娴嬫垨鎷嗗垎锛涢攢鍞槑缁嗘湁鐩樺彿鏃讹紝杩欑被鏃у簱瀛樹笉鑳界洿鎺ヤ綔涓哄尮閰嶅簱瀛樺嚭搴擄紝闇�鍏堟牳瀹炲苟澶勭悊鍘嗗彶鏁版嵁銆傚唴閮ㄨ拷婧壒娆″彈鐜版湁搴撲綅鎵规娣锋斁瑙勫垯绾︽潫锛屾寮忎娇鐢ㄥ墠闇�楠岃瘉鐜板満搴撲綅閰嶇疆銆�
+鐩樺彿寰呮牳瀹烇細鏂板缓鎴栫紪杈戝叧鑱旈攢鍞鍗曠殑鍙戣揣閫氱煡鍗曡鏃讹紝椤绘槑纭�夋嫨閿�鍞槑缁嗗苟鏍¢獙璁㈠崟涓庣墿鏂欙紱鍘嗗彶鏃犲叧鑱旇涓嶄細鑷姩鎺ㄦ柇锛屽凡鐢熸垚鐨勪笅娓稿巻鍙插崟鎹粛闇�閫愮瑪鏍稿疄銆傚甫鐩樺彿鐨勯��璐ф壒娆¢』鍦ㄨ閿�鍞鍗曚腑鏈夋槑纭叧鑱旈攢鍞槑缁嗕笖宸插畬鎴愮殑瀹為檯鍑哄簱璁板綍锛屽苟鍦ㄤ笂鏋舵椂淇濈暀鎵规锛涘皻鏈褰曞叿浣撳嚭搴撴槑缁嗘垨绱鍙��鏁伴噺锛屽疄闄呴��璐ф暟閲忓拰鏉ユ簮浠嶉渶鏍稿疄銆傝皟鎷ㄤ笌搴撳瓨璋冩暣宸蹭繚鐣欒拷婧壒娆★紝浠嶉渶鏁版嵁搴撳強椤甸潰绔埌绔獙璇侊紱涓嶅緱鎸夌墿鏂欐垨琛岄『搴忔帹娴嬪巻鍙插叧鑱斻��
+
| 浣嶇疆 | 褰撳墠鐘舵�� | 鏀归�犳敞鎰忎簨椤� |
| --- | --- | --- |
| `MesProMpsController.mergeAndIssueMps` 鍜� `MesProMpsServiceImpl.mergeAndIssueMps` | 宸插仠鐢細鏃у叆鍙h繑鍥炲仠鐢ㄦ彁绀� | 鏂版帴鍙i�愭潯鎵归噺涓嬪彂锛涘巻鍙插悎骞跺伐鍗曞強鏄庣粏浠嶉渶淇濈暀鏌ヨ鍜屽彇娑堝吋瀹广�� |
diff --git a/sql/mysql/20261028_mdm_technical_parameters.sql b/sql/mysql/20261028_mdm_technical_parameters.sql
new file mode 100644
index 0000000..b43a3ed
--- /dev/null
+++ b/sql/mysql/20261028_mdm_technical_parameters.sql
@@ -0,0 +1,13 @@
+-- 娴嬭瘯搴撻〉闈㈣仈璋冿細琛ュ厖鐗╂枡鎶�鏈弬鏁板瓧娈点��
+-- 鍏堥�夋嫨鐩爣鏁版嵁搴擄紱宸插瓨鍦ㄦ椂璺宠繃锛屼笉瑕嗙洊鏃㈡湁鏁版嵁銆�
+-- MySQL 鐨� ALTER TABLE 浼氶殣寮忔彁浜わ紝鎵ц鍓嶈纭鏁版嵁搴撳強澶囦唤銆�
+SET @mdm_ddl = IF(
+ EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'mdm_item'
+ AND COLUMN_NAME = 'technical_parameters'),
+ 'SELECT ''mdm_item.technical_parameters 宸插瓨鍦紝璺宠繃'' AS message',
+ 'ALTER TABLE `mdm_item` ADD COLUMN `technical_parameters` TEXT NULL COMMENT ''鎶�鏈弬鏁�'''
+);
+PREPARE mdm_stmt FROM @mdm_ddl;
+EXECUTE mdm_stmt;
+DEALLOCATE PREPARE mdm_stmt;
diff --git a/sql/mysql/20261028_reel_history_audit.sql b/sql/mysql/20261028_reel_history_audit.sql
new file mode 100644
index 0000000..5926495
--- /dev/null
+++ b/sql/mysql/20261028_reel_history_audit.sql
@@ -0,0 +1,17 @@
+-- 鍙鎺掓煡锛氬叧鑱旈攢鍞鍗曚絾缂哄皯閿�鍞槑缁嗗叧鑱旂殑鍘嗗彶鍗曟嵁锛屼笉鑳芥寜鐗╂枡鑷姩鐚滄祴鐩樺彿銆�
+-- 璇峰湪鐩爣鏁版嵁搴撴墽琛屽苟閫愭潯鏍稿锛涙湰鑴氭湰涓嶄慨鏀规暟鎹��
+SELECT n.id AS notice_id, n.code AS notice_code, n.sale_order_id,
+ l.id AS notice_line_id, l.item_id, l.quantity, l.sale_order_item_id
+FROM mes_wm_sales_notice n
+JOIN mes_wm_sales_notice_line l ON l.notice_id = n.id
+WHERE n.deleted = b'0' AND l.deleted = b'0'
+ AND n.sale_order_id IS NOT NULL AND l.sale_order_item_id IS NULL
+ORDER BY n.id, l.id;
+
+SELECT s.id AS sales_id, s.code AS sales_code, s.sale_order_id,
+ l.id AS sales_line_id, l.notice_line_id, l.item_id, l.quantity, l.sale_order_item_id
+FROM mes_wm_product_sales s
+JOIN mes_wm_product_sales_line l ON l.sales_id = s.id
+WHERE s.deleted = b'0' AND l.deleted = b'0'
+ AND s.sale_order_id IS NOT NULL AND l.sale_order_item_id IS NULL
+ORDER BY s.id, l.id;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
index 3c92677..d42cea3 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
@@ -183,6 +183,18 @@
// 4. 缁勮鍝嶅簲
ErpSaleOrderRespVO saleOrderVO = BeanUtils.toBean(saleOrder, ErpSaleOrderRespVO.class);
saleOrderVO.setItems(itemVOList);
+ saleOrderVO.setNeedProduction(itemVOList.stream()
+ .anyMatch(item -> Integer.valueOf(1).equals(item.getNeedProduction())) ? 1 : 0);
+ if (saleOrder.getCustomerId() != null) {
+ MapUtils.findAndThen(customerApi.getCustomerMap(List.of(saleOrder.getCustomerId())),
+ saleOrder.getCustomerId(), customer -> saleOrderVO.setCustomerName(customer.getName()));
+ }
+ if (saleOrder.getCreator() != null && saleOrder.getCreator().matches("\\d+")) {
+ AdminUserRespDTO creator = adminUserApi.getUser(Long.valueOf(saleOrder.getCreator()));
+ if (creator != null) {
+ saleOrderVO.setCreatorName(creator.getNickname());
+ }
+ }
saleOrderVO.setAttachmentList(storageAttachmentApi.listAttachments("erp_sale_order", id));
return success(saleOrderVO);
}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderImportExcelVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderImportExcelVO.java
index 03527a9..b5383df 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderImportExcelVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderImportExcelVO.java
@@ -48,6 +48,10 @@
@Schema(description = "浜у搧鍚嶇О锛堜粎渚涘鐓э紝鍖归厤浠嶄互浜у搧缂栫爜涓哄噯锛�")
private String productName;
+ @ExcelProperty("鐩樺彿")
+ @Schema(description = "浜у搧鏄庣粏鐩樺彿锛屾墜宸ュ~鍐欙紝鏈�澶�128涓瓧绗�")
+ private String reelNo;
+
@ExcelProperty("鏁伴噺")
@Schema(description = "浜у搧鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED)
private BigDecimal count;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
index 04dc2d5..05ece24 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
@@ -285,6 +285,10 @@
}
ErpSaleOrderSaveReqVO.Item itemVO = new ErpSaleOrderSaveReqVO.Item();
itemVO.setProductId(item.getId());
+ if (row.getReelNo() != null && row.getReelNo().length() > 128) {
+ throw new IllegalArgumentException("浜у搧[" + row.getProductCode() + "]鐨勭洏鍙蜂笉鑳借秴杩�128涓瓧绗�");
+ }
+ itemVO.setReelNo(row.getReelNo());
itemVO.setProductUnitId(item.getUnitMeasureId());
// 鍗曚环锛氭湭濉啓鏃跺彇鐗╂枡鐨勯攢鍞环锛堜笌椤甸潰閫変骇鍝佸悗鐨勯粯璁ゅ�间竴鑷达級
itemVO.setProductPrice(row.getProductPrice() != null ? row.getProductPrice()
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
index 679b30e..aefce49 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
@@ -267,7 +267,7 @@
String value = detail.getValue();
String remark = detail.getRemark();
// 鏍煎紡鍖栦负 "鎸囨爣鍚嶇О:鍊�" 鎴� "鎸囨爣鍚嶇О:鍊�(澶囨敞)"
- String indicatorStr = indicatorName + ":" + value;
+ String indicatorStr = indicatorName + ":" + (StrUtil.isBlank(value) ? "鏈~鍐�" : value);
if (StrUtil.isNotBlank(remark)) {
indicatorStr += "(" + remark + ")";
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
index c8bc6a4..4eb8b36 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.mes.controller.admin.qc.rqc;
import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -60,6 +62,9 @@
@RequestMapping("/mes/qc/rqc")
@Validated
public class MesQcRqcController {
+
+ @Resource
+ private MesWmBatchService batchService;
@Resource
private MesQcRqcService rqcService;
@@ -154,8 +159,13 @@
convertSet(list, MesQcRqcDO::getInspectorUserId));
// 鎵归噺鏌ヨ妫�楠岄」鎸囨爣
Map<Long, String> indicatorSummaryMap = buildIndicatorSummaryMap(list);
+ Map<String, MesWmBatchDO> batchMap = new HashMap<>();
+ for (String code : convertSet(list, MesQcRqcDO::getBatchCode)) {
+ if (code != null && !code.isBlank()) batchMap.put(code, batchService.getBatchByCode(code));
+ }
// 鎷艰 VO
return BeanUtils.toBean(list, MesQcRqcRespVO.class, vo -> {
+ findAndThen(batchMap, vo.getBatchCode(), batch -> vo.setReelNo(batch.getReelNo()));
findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
findAndThen(unitMeasureMap, item.getUnitMeasureId(),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java
index ec0a04f..e7d5315 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java
@@ -44,6 +44,9 @@
@Schema(description = "鏉ユ簮鍗曟嵁琛� ID", example = "300")
private Long sourceLineId;
+ @Schema(description = "閫�璐ф壒娆$洏鍙�")
+ private String reelNo;
+
@Schema(description = "鏉ユ簮鍗曟嵁缂栫爜", example = "RT20250101001")
@ExcelProperty("鏉ユ簮鍗曟嵁缂栫爜")
private String sourceDocCode;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchRespVO.java
index 8ddd1c3..a044f6d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchRespVO.java
@@ -15,6 +15,9 @@
@Schema(description = "鎵规缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "BATCH20250314001")
private String code;
+ @Schema(description = "鐢熶骇杩芥函鐩樺彿")
+ private String reelNo;
+
@Schema(description = "鐗╂枡 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long itemId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java
index c07ca6d..ef6b6cc 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java
@@ -10,6 +10,8 @@
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDetailDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
@@ -55,6 +57,8 @@
private MesWmWarehouseLocationService locationService;
@Resource
private MesWmWarehouseAreaService areaService;
+ @Resource
+ private MesWmBatchService batchService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞嚭搴撴槑缁�")
@@ -118,8 +122,11 @@
convertSet(list, MesWmProductSalesDetailDO::getLocationId));
Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
convertSet(list, MesWmProductSalesDetailDO::getAreaId));
+ Map<Long, MesWmBatchDO> batchMap = batchService.getBatchMap(
+ convertSet(list, MesWmProductSalesDetailDO::getBatchId));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmProductSalesDetailRespVO.class, vo -> {
+ MapUtils.findAndThen(batchMap, vo.getBatchId(), batch -> vo.setReelNo(batch.getReelNo()));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesLineController.java
index 9601cc1..e678fae 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesLineController.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.productsales;
import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
@@ -28,6 +30,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -47,6 +50,8 @@
private MdmItemApi mdmItemApi;
@Resource
private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
@PostMapping("/create")
@@ -104,8 +109,13 @@
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
.stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
+ Map<Long, ErpSaleOrderItemRespDTO> saleItems = new HashMap<>();
+ for (Long itemId : convertSet(list, MesWmProductSalesLineDO::getSaleOrderItemId)) {
+ if (itemId != null) saleItems.put(itemId, saleOrderApi.getSaleOrderItem(itemId).getCheckedData());
+ }
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmProductSalesLineRespVO.class, vo -> {
+ MapUtils.findAndThen(saleItems, vo.getSaleOrderItemId(), item -> vo.setReelNo(item.getReelNo()));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailRespVO.java
index 716f2ce..125b37c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/detail/MesWmProductSalesDetailRespVO.java
@@ -46,6 +46,9 @@
@Schema(description = "鎵规鍙�", example = "BATCH001")
private String batchCode;
+ @Schema(description = "瀹為檯鎷h揣搴撳瓨鐩樺彿")
+ private String reelNo;
+
@Schema(description = "浠撳簱ID", example = "1")
private Long warehouseId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java
index 67e244b..5b67cb3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java
@@ -19,6 +19,12 @@
@Schema(description = "鍙戣揣閫氱煡鍗曡ID", example = "1")
private Long noticeLineId;
+ @Schema(description = "閿�鍞鍗曟槑缁咺D")
+ private Long saleOrderItemId;
+
+ @Schema(description = "閿�鍞槑缁嗙洏鍙�")
+ private String reelNo;
+
@Schema(description = "鐗╂枡ID", example = "1")
private Long itemId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesDetailController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesDetailController.java
index 4bf434f..16cf445 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesDetailController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesDetailController.java
@@ -10,6 +10,8 @@
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDetailDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
@@ -55,6 +57,8 @@
private MesWmWarehouseLocationService locationService;
@Resource
private MesWmWarehouseAreaService areaService;
+ @Resource
+ private MesWmBatchService batchService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞��璐ф槑缁�")
@@ -118,8 +122,11 @@
convertSet(list, MesWmReturnSalesDetailDO::getLocationId));
Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
convertSet(list, MesWmReturnSalesDetailDO::getAreaId));
+ Map<Long, MesWmBatchDO> batchMap = batchService.getBatchMap(
+ convertSet(list, MesWmReturnSalesDetailDO::getBatchId));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmReturnSalesDetailRespVO.class, vo -> {
+ MapUtils.findAndThen(batchMap, vo.getBatchId(), batch -> vo.setReelNo(batch.getReelNo()));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java
index 337f54e..480f97d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java
@@ -12,6 +12,8 @@
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
@@ -45,6 +47,8 @@
private MdmItemApi mdmItemApi;
@Resource
private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private MesWmBatchService batchService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞��璐у崟琛�")
@@ -110,13 +114,17 @@
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
.stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
+ Map<Long, MesWmBatchDO> batchMap = batchService.getBatchMap(
+ convertSet(list, MesWmReturnSalesLineDO::getBatchId));
// 2. 鏋勫缓缁撴灉
- return BeanUtils.toBean(list, MesWmReturnSalesLineRespVO.class, vo ->
+ return BeanUtils.toBean(list, MesWmReturnSalesLineRespVO.class, vo -> {
+ MapUtils.findAndThen(batchMap, vo.getBatchId(), batch -> vo.setReelNo(batch.getReelNo()));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
unitMeasure -> vo.setItemUnit(unitMeasure.getName()));
- }));
+ });
+ });
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailRespVO.java
index b41578b..df81f78 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailRespVO.java
@@ -48,6 +48,9 @@
@Schema(description = "鎵规鍙�", example = "B001")
private String batchCode;
+ @Schema(description = "涓婃灦鎵规鐩樺彿")
+ private String reelNo;
+
@Schema(description = "浠撳簱ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long warehouseId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java
index 15693e3..f2d0393 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java
@@ -51,6 +51,9 @@
@Schema(description = "鎵规鍙�", example = "B001")
private String batchCode;
+ @Schema(description = "閫�璐ф壒娆$洏鍙�")
+ private String reelNo;
+
@Schema(description = "璐ㄩ噺鐘舵��", example = "鍚堟牸")
private Integer qualityStatus;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeLineController.java
index ae452de..1aab963 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeLineController.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice;
import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
@@ -24,6 +26,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -43,6 +46,8 @@
private MdmItemApi mdmItemApi;
@Resource
private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鍙戣揣閫氱煡鍗曡")
@@ -99,8 +104,13 @@
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
.stream().collect(java.util.stream.Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
+ Map<Long, ErpSaleOrderItemRespDTO> saleItems = new HashMap<>();
+ for (Long itemId : convertSet(list, MesWmSalesNoticeLineDO::getSaleOrderItemId)) {
+ if (itemId != null) saleItems.put(itemId, saleOrderApi.getSaleOrderItem(itemId).getCheckedData());
+ }
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmSalesNoticeLineRespVO.class, vo -> {
+ MapUtils.findAndThen(saleItems, vo.getSaleOrderItemId(), item -> vo.setReelNo(item.getReelNo()));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineRespVO.java
index 93201b1..a89c5e1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineRespVO.java
@@ -19,6 +19,9 @@
@Schema(description = "閿�鍞鍗曟槑缁咺D", example = "1")
private Long saleOrderItemId;
+ @Schema(description = "閿�鍞槑缁嗙洏鍙�")
+ private String reelNo;
+
@Schema(description = "鐗╂枡缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long itemId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferLineController.java
index d12a956..d0a7690 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferLineController.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.transfer;
import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -42,6 +44,9 @@
@RequestMapping("/mes/wm/transfer-line")
@Validated
public class MesWmTransferLineController {
+
+ @Resource
+ private MesWmBatchService batchService;
@Resource
private MesWmTransferLineService transferLineService;
@@ -116,8 +121,10 @@
convertSet(list, MesWmTransferLineDO::getFromLocationId));
Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
convertSet(list, MesWmTransferLineDO::getFromAreaId));
+ Map<Long, MesWmBatchDO> batchMap = batchService.getBatchMap(convertSet(list, MesWmTransferLineDO::getBatchId));
// 鎷兼帴鏁版嵁
return BeanUtils.toBean(list, MesWmTransferLineRespVO.class, vo -> {
+ MapUtils.findAndThen(batchMap, vo.getBatchId(), batch -> vo.setReelNo(batch.getReelNo()));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/line/MesWmTransferLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/line/MesWmTransferLineRespVO.java
index fbf4f96..882a9e2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/line/MesWmTransferLineRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/line/MesWmTransferLineRespVO.java
@@ -37,6 +37,9 @@
@Schema(description = "鎵规鍙�")
private String batchCode;
+ @Schema(description = "璋冩嫧鎵规鐩樺彿")
+ private String reelNo;
+
@Schema(description = "绉诲嚭浠撳簱缂栧彿", example = "1")
private Long fromWarehouseId;
@Schema(description = "绉诲嚭浠撳簱鍚嶇О")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java
index a51d6da..36f617d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java
@@ -173,6 +173,12 @@
// 杩斿洖 ID 鏈�灏忕殑鎵规
query.orderByAsc(MesWmBatchDO::getId);
+ if (batch.getReelNo() != null) {
+ // 鏁版嵁搴撴帓搴忚鍒欏彲鑳藉拷鐣ュぇ灏忓啓鎴栨湯灏剧┖鏍硷紱鐩樺彿蹇呴』鎸夎緭鍏ュ�肩簿纭尮閰嶃��
+ return selectList(query).stream()
+ .filter(candidate -> batch.getReelNo().equals(candidate.getReelNo()))
+ .findFirst().orElse(null);
+ }
query.last("LIMIT 1");
return selectOne(query);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java
index cac3187..79d304c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java
@@ -3,6 +3,8 @@
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDetailDO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -14,6 +16,19 @@
@Mapper
public interface MesWmProductSalesDetailMapper extends BaseMapperX<MesWmProductSalesDetailDO> {
+ /** 鍙鍙璁㈠崟宸插畬鎴愬嚭搴撱�佷笖鏄庣‘鍏宠仈閿�鍞槑缁嗙殑瀹為檯鎷h揣鎵规銆� */
+ @Select("SELECT COUNT(*) FROM mes_wm_product_sales_detail d "
+ + "JOIN mes_wm_product_sales s ON s.id = d.sales_id AND s.deleted = 0 "
+ + "JOIN mes_wm_product_sales_line l ON l.id = d.line_id AND l.sales_id = s.id AND l.deleted = 0 "
+ + "JOIN erp_sale_order_items i ON i.id = l.sale_order_item_id AND i.order_id = s.sale_order_id AND i.deleted = 0 "
+ + "JOIN mes_wm_batch b ON b.id = d.batch_id AND b.deleted = 0 AND b.item_id = d.item_id "
+ + "WHERE d.deleted = 0 AND s.sale_order_id = #{orderId} AND s.status = #{finishedStatus} "
+ + "AND d.item_id = #{itemId} AND l.item_id = #{itemId} AND i.product_id = #{itemId} "
+ + "AND BINARY i.reel_no = BINARY b.reel_no "
+ + "AND d.batch_id = #{batchId}")
+ Long countFinishedSaleBatch(@Param("orderId") Long orderId, @Param("itemId") Long itemId,
+ @Param("batchId") Long batchId, @Param("finishedStatus") Integer finishedStatus);
+
default List<MesWmProductSalesDetailDO> selectListByLineId(Long lineId) {
return selectList(MesWmProductSalesDetailDO::getLineId, lineId);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 10ea662..31babdb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -696,6 +696,10 @@
ErrorCode WM_RETURN_SALES_LINE_NOT_EXISTS = new ErrorCode(1_040_713_100, "閿�鍞��璐у崟琛屼笉瀛樺湪");
ErrorCode WM_RETURN_SALES_DETAIL_NOT_EXISTS = new ErrorCode(1_040_713_200, "閿�鍞��璐у崟鏄庣粏涓嶅瓨鍦�");
ErrorCode WM_RETURN_SALES_DETAIL_QUANTITY_EXCEED = new ErrorCode(1_040_713_201, "涓婃灦鏄庣粏鎬绘暟閲忎笉鑳借秴杩囬��璐ц鏁伴噺");
+ ErrorCode WM_RETURN_SALES_DETAIL_SOURCE_MISMATCH = new ErrorCode(1_040_713_202, "閫�璐ф槑缁嗙殑鍗曟嵁鎴栫墿鏂欎笌閫�璐ц涓嶄竴鑷�");
+ ErrorCode WM_RETURN_SALES_DETAIL_BATCH_MISMATCH = new ErrorCode(1_040_713_203, "閫�璐ф槑缁嗘壒娆′笌閫�璐ц鎵规涓嶄竴鑷�");
+ ErrorCode WM_RETURN_SALES_REEL_MISMATCH = new ErrorCode(1_040_713_204, "璇烽�夋嫨鐩樺彿灞炰簬璇ラ攢鍞鍗曚骇鍝佹槑缁嗙殑鎵规");
+ ErrorCode WM_RETURN_SALES_BATCH_NOT_SHIPPED = new ErrorCode(1_040_713_205, "鎵�閫夌洏鍙锋壒娆℃湭鍦ㄨ閿�鍞鍗曚腑瀹屾垚鍑哄簱锛屼笉鑳戒綔涓洪��璐ф潵婧�");
// ========== MES 浠撳簱绠$悊-鐩樼偣鏂规/浠诲姟/缁撴灉锛�1-040-714-100锛� ==========
ErrorCode WM_STOCK_TAKING_PLAN_NOT_EXISTS = new ErrorCode(1_040_714_100, "鐩樼偣鏂规涓嶅瓨鍦�");
@@ -785,6 +789,8 @@
ErrorCode WM_SALES_NOTICE_LINE_NOT_EXISTS = new ErrorCode(1_040_720_010, "鍙戣揣閫氱煡鍗曡涓嶅瓨鍦�");
ErrorCode WM_SALES_NOTICE_LINE_EMPTY = new ErrorCode(1_040_720_011, "鍙戣揣閫氱煡鍗曡涓虹┖锛屼笉鑳芥彁浜�");
ErrorCode WM_SALES_NOTICE_LINE_NOT_MATCH = new ErrorCode(1_040_720_012, "鍙戣揣閫氱煡鍗曡涓嶅睘浜庢寚瀹氱殑鍙戣揣閫氱煡鍗�");
+ ErrorCode WM_SALES_NOTICE_LINE_SALE_ITEM_REQUIRED = new ErrorCode(1_040_720_013, "鍏宠仈閿�鍞鍗曠殑鍙戣揣琛屽繀椤婚�夋嫨閿�鍞鍗曟槑缁�");
+ ErrorCode WM_SALES_NOTICE_LINE_SALE_ITEM_MISMATCH = new ErrorCode(1_040_720_014, "閿�鍞鍗曟槑缁嗕笌鍙戣揣閫氱煡鍗曟垨鐗╂枡涓嶅尮閰�");
ErrorCode WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS = new ErrorCode(1_040_720_013, "閿�鍞鍗曚笉瀛樺湪");
ErrorCode WM_SALES_NOTICE_SALE_ORDER_ITEM_EMPTY = new ErrorCode(1_040_720_014, "閿�鍞鍗曟槑缁嗕负绌�");
ErrorCode WM_SALES_NOTICE_ALREADY_EXISTS = new ErrorCode(1_040_720_015, "璇ラ攢鍞鍗曞凡鐢熸垚鍙戣揣閫氱煡鍗曪紝涓嶈兘閲嶅鐢熸垚");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
index 616cb63..61fc8ed 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
@@ -7,6 +7,7 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import org.springframework.context.annotation.Lazy;
import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsSaveReqVO;
@@ -70,6 +71,7 @@
@Resource
private MesProMpsMapper mpsMapper;
@Resource
+ @Lazy
private ErpSaleOrderApi saleOrderApi;
@Resource
private PermissionApi permissionApi;
@@ -176,6 +178,8 @@
// 鏇存柊
MesProMpsDO updateObj = BeanUtils.toBean(updateReqVO, MesProMpsDO.class);
+ // 鐩樺彿鏄垱寤鸿鍒掓椂鐨勬潵婧愬揩鐓э紝缂栬緫鍏朵粬瀛楁涓嶈兘鏀瑰啓瀹冦��
+ updateObj.setReelNo(null);
mpsMapper.updateById(updateObj);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
index 948ebf5..22d2cd5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
@@ -122,6 +122,8 @@
// 3. 鏇存柊
MesProWorkOrderDO updateObj = BeanUtils.toBean(updateReqVO, MesProWorkOrderDO.class);
+ // 宸ュ崟鐩樺彿娌跨敤鍒涘缓鏃剁殑鏉ユ簮蹇収锛岄伩鍏嶄笌璁″垝鍜屽凡鐢熸垚鐨勪笅娓歌褰曚笉涓�鑷淬��
+ updateObj.setReelNo(null);
workOrderMapper.updateById(updateObj);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
index 86d79a9..1a9e1ab 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
@@ -115,6 +115,15 @@
.setTemplateId(templateId)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
+ if (Objects.equals(createReqVO.getSourceDocType(), MesBizTypeConstants.WM_RETURN_SALES)
+ && createReqVO.getSourceLineId() != null) {
+ var line = returnSalesLineService.validateReturnSalesLineExists(createReqVO.getSourceLineId());
+ if (!Objects.equals(line.getReturnId(), createReqVO.getSourceDocId())
+ || !Objects.equals(line.getItemId(), createReqVO.getItemId())) {
+ throw exception(WM_RETURN_SALES_DETAIL_SOURCE_MISMATCH);
+ }
+ rqc.setBatchCode(line.getBatchCode());
+ }
rqcMapper.insert(rqc);
// 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
@@ -125,7 +134,7 @@
@Override
public void updateRqc(MesQcRqcSaveReqVO updateReqVO) {
// 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
- validateRqcStatusPrepare(updateReqVO.getId());
+ MesQcRqcDO existingRqc = validateRqcStatusPrepare(updateReqVO.getId());
// 1.2 鏍¢獙鏁版嵁
validateRqcSaveData(updateReqVO);
@@ -134,6 +143,8 @@
updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 涓嶅厑璁镐慨鏀规潵婧愬崟鎹�
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
+ if (Objects.equals(existingRqc.getSourceDocType(), MesBizTypeConstants.WM_RETURN_SALES)
+ && existingRqc.getSourceLineId() != null) updateObj.setBatchCode(null);
rqcMapper.updateById(updateObj);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
index d4a42da..ef8e9ff 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
@@ -399,7 +399,7 @@
} else {
// 鍑哄簱鏃舵牎楠屾壒娆″瓨鍦�
if (batchId != null) {
- batchService.validateBatchExists(batchId, reqVO.getItemId());
+ batchCode = batchService.validateBatchExists(batchId, reqVO.getItemId()).getCode();
}
}
@@ -457,16 +457,16 @@
* @return 鎵规璁板綍锛堢墿鏂欐湭鍚敤鎵规绠$悊鏃惰繑鍥� null锛�
*/
private MesWmBatchDO resolveBatch(MesWmMaterialStockAdjustReqVO reqVO, MesMdmItemDO item) {
- // 1. 鐗╂枡鏈惎鐢ㄦ壒娆$鐞嗭紝杩斿洖 null
- if (Boolean.FALSE.equals(item.getIsBatchManaged())) {
- return null;
- }
-
- // 2. 浼犲叆 batchId锛屾牎楠屽苟杩斿洖宸叉湁鎵规
+ // 鍗充娇鐗╂枡鏈惎鐢ㄦ櫘閫氭壒娆$鐞嗭紝涔熻淇濈暀骞舵牎楠岀洏鍙疯拷婧壒娆°��
if (reqVO.getBatchId() != null) {
return batchService.validateBatchExists(reqVO.getBatchId(), reqVO.getItemId());
}
+ // 1. 鏈寚瀹氳拷婧壒娆′笖鐗╂枡鏈惎鐢ㄦ壒娆$鐞嗭紝杩斿洖 null
+ if (Boolean.FALSE.equals(item.getIsBatchManaged())) {
+ return null;
+ }
+
// 3. 鏈紶 batchId锛岃嚜鍔ㄥ垱寤烘壒娆�
MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO()
.setItemId(reqVO.getItemId())
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
index 30303e7..92444cb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
@@ -64,10 +64,13 @@
@Override
public Long createProductSalesLine(MesWmProductSalesLineSaveReqVO createReqVO) {
// 鏍¢獙鏁版嵁
- validateLineSaveData(createReqVO);
+ MesWmSalesNoticeLineDO noticeLine = validateLineSaveData(createReqVO);
// 鏂板
MesWmProductSalesLineDO line = BeanUtils.toBean(createReqVO, MesWmProductSalesLineDO.class);
+ if (noticeLine != null) {
+ line.setSaleOrderItemId(noticeLine.getSaleOrderItemId());
+ }
productSalesLineMapper.insert(line);
return line.getId();
}
@@ -78,10 +81,13 @@
MesWmProductSalesLineDO oldLine = validateProductSalesLineExists(updateReqVO.getId());
// 鏍¢獙鏁版嵁
updateReqVO.setSalesId(oldLine.getSalesId());
- validateLineSaveData(updateReqVO);
+ MesWmSalesNoticeLineDO noticeLine = validateLineSaveData(updateReqVO);
// 鏇存柊
MesWmProductSalesLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductSalesLineDO.class);
+ if (noticeLine != null) {
+ updateObj.setSaleOrderItemId(noticeLine.getSaleOrderItemId());
+ }
productSalesLineMapper.updateById(updateObj);
// 妫�鏌ユ槸鍚﹂渶瑕佸垱寤� OQC 妫�楠屽崟锛氫粠涓嶉渶瑕佹楠屽彉涓洪渶瑕佹楠�
@@ -98,6 +104,8 @@
MesWmProductSalesLineDO line = new MesWmProductSalesLineDO();
line.setId(updateReqVO.getId());
line.setItemId(updateReqVO.getItemId());
+ line.setSaleOrderItemId(updateObj.getSaleOrderItemId() != null
+ ? updateObj.getSaleOrderItemId() : oldLine.getSaleOrderItemId());
line.setBatchCode(updateReqVO.getBatchCode());
line.setQuantity(updateReqVO.getQuantity());
@@ -181,15 +189,16 @@
/**
* 鏍¢獙淇濆瓨鏃剁殑鍏宠仈鏁版嵁
*/
- private void validateLineSaveData(MesWmProductSalesLineSaveReqVO reqVO) {
+ private MesWmSalesNoticeLineDO validateLineSaveData(MesWmProductSalesLineSaveReqVO reqVO) {
// 鏍¢獙涓诲崟瀛樺湪涓斾负鑽夌鐘舵��
MesWmProductSalesDO sales = productSalesService.validateProductSalesExistsAndDraft(reqVO.getSalesId());
// 鏍¢獙鐗╂枡瀛樺湪
mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
// 鏍¢獙鍏宠仈鍙戣揣閫氱煡鍗曡锛堝瓨鍦ㄦ�� + 褰掑睘 + 瀛楁涓�鑷存�э級
- validateSalesNoticeLine(sales, reqVO);
+ MesWmSalesNoticeLineDO noticeLine = validateSalesNoticeLine(sales, reqVO);
// 鏍规嵁 batchCode 瑙f瀽 batchId
fillBatchId(reqVO);
+ return noticeLine;
}
/**
@@ -198,7 +207,7 @@
* @param sales 鍑哄簱鍗�
* @param reqVO 鍑哄簱琛岃姹�
*/
- private void validateSalesNoticeLine(MesWmProductSalesDO sales, MesWmProductSalesLineSaveReqVO reqVO) {
+ private MesWmSalesNoticeLineDO validateSalesNoticeLine(MesWmProductSalesDO sales, MesWmProductSalesLineSaveReqVO reqVO) {
Long noticeLineId = reqVO.getNoticeLineId();
// 鎯呭喌涓�锛氬鏋滃嚭搴撳崟鍏宠仈浜嗗彂璐ч�氱煡鍗曪紝鍒欏繀椤诲叧鑱斿彂璐ч�氱煡鍗曡
if (sales.getNoticeId() != null) {
@@ -220,13 +229,14 @@
&& ObjUtil.notEqual(reqVO.getBatchCode(), noticeLine.getBatchCode())) {
throw exception(WM_PRODUCT_SALES_LINE_NOTICE_LINE_BATCH_MISMATCH);
}
- return;
+ return noticeLine;
}
// 鎯呭喌浜岋細濡傛灉鍑哄簱鍗曟病鏈夊叧鑱斿彂璐ч�氱煡鍗曪紝鍒欎笉鍏佽鍏宠仈鍙戣揣閫氱煡鍗曡
if (noticeLineId != null) {
throw exception(WM_PRODUCT_SALES_LINE_SALES_NOTICE_LINE_NOT_ALLOWED);
}
+ return null;
}
@Override
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java
index 32f0981..0e08f25 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java
@@ -65,7 +65,11 @@
@Override
public void updateReturnSalesDetail(MesWmReturnSalesDetailSaveReqVO updateReqVO) {
// 鏍¢獙瀛樺湪
- validateReturnSalesDetailExists(updateReqVO.getId());
+ MesWmReturnSalesDetailDO oldDetail = validateReturnSalesDetailExists(updateReqVO.getId());
+ if (ObjUtil.notEqual(oldDetail.getLineId(), updateReqVO.getLineId())
+ || ObjUtil.notEqual(oldDetail.getReturnId(), updateReqVO.getReturnId())) {
+ throw exception(WM_RETURN_SALES_DETAIL_SOURCE_MISMATCH);
+ }
// 鏍¢獙淇濆瓨鏁版嵁
validateReturnSalesDetailSaveData(updateReqVO);
@@ -134,8 +138,14 @@
private void validateReturnSalesDetailSaveData(MesWmReturnSalesDetailSaveReqVO reqVO) {
// 鏍¢獙鐖舵暟鎹瓨鍦�
MesWmReturnSalesLineDO line = returnSalesLineService.validateReturnSalesLineExists(reqVO.getLineId());
+ if (ObjUtil.notEqual(line.getReturnId(), reqVO.getReturnId())
+ || ObjUtil.notEqual(line.getItemId(), reqVO.getItemId())) {
+ throw exception(WM_RETURN_SALES_DETAIL_SOURCE_MISMATCH);
+ }
// 鏍¢獙閫�璐у崟涓哄緟涓婃灦鐘舵��
validateReturnSalesStatusApproved(line.getReturnId());
+ // 涓婃灦浣跨敤閫�璐ц鐨勬壒娆★紱鑻ヨ娌℃湁鎸囧畾鎵规锛屽厑璁告樉寮忛�夋嫨灞炰簬璇ョ墿鏂欑殑鎵规銆�
+ fillBatchId(reqVO, line);
// 鏍¢獙浠撳簱銆佸簱鍖恒�佸簱浣嶇殑鍏宠仈鍏崇郴
warehouseAreaService.validateWarehouseAreaExists(
reqVO.getWarehouseId(), reqVO.getLocationId(), reqVO.getAreaId());
@@ -144,8 +154,6 @@
// 鏍¢獙鏄庣粏鎬绘暟閲忎笉瓒呰繃琛屾暟閲忥紙鎺掗櫎鑷韩锛�
validateDetailQuantityNotExceed(reqVO.getLineId(), reqVO.getQuantity(), reqVO.getId(), line);
- // 鏍规嵁 batchCode 瑙f瀽 batchId锛堝繀椤诲湪娣锋斁瑙勫垯鏍¢獙涔嬪墠锛屽洜涓哄畠渚濊禆 batchId锛�
- fillBatchId(reqVO);
}
/**
@@ -173,13 +181,25 @@
/**
* 鏍规嵁 batchCode 瑙f瀽骞跺洖濉� batchId
*/
- private void fillBatchId(MesWmReturnSalesDetailSaveReqVO reqVO) {
- if (StrUtil.isBlank(reqVO.getBatchCode())) {
- return;
+ private void fillBatchId(MesWmReturnSalesDetailSaveReqVO reqVO, MesWmReturnSalesLineDO line) {
+ MesWmBatchDO batch = null;
+ if (StrUtil.isNotBlank(reqVO.getBatchCode())) {
+ batch = batchService.getBatchByCode(reqVO.getBatchCode());
+ if (batch == null) throw exception(WM_BATCH_NOT_EXISTS);
+ if (reqVO.getBatchId() != null && ObjUtil.notEqual(batch.getId(), reqVO.getBatchId())) {
+ throw exception(WM_RETURN_SALES_DETAIL_BATCH_MISMATCH);
+ }
+ } else if (reqVO.getBatchId() != null || line.getBatchId() != null) {
+ batch = batchService.validateBatchExists(
+ reqVO.getBatchId() != null ? reqVO.getBatchId() : line.getBatchId(), reqVO.getItemId());
}
- MesWmBatchDO batch = batchService.getBatchByCode(reqVO.getBatchCode());
if (batch != null) {
+ if (ObjUtil.notEqual(batch.getItemId(), reqVO.getItemId())
+ || (line.getBatchId() != null && ObjUtil.notEqual(line.getBatchId(), batch.getId()))) {
+ throw exception(WM_RETURN_SALES_DETAIL_BATCH_MISMATCH);
+ }
reqVO.setBatchId(batch.getId());
+ reqVO.setBatchCode(batch.getCode());
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
index d56b908..c80507d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
@@ -2,16 +2,21 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLineSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales.MesWmReturnSalesLineMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesDetailMapper;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import jakarta.annotation.Resource;
@@ -26,6 +31,8 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.MD_ITEM_BATCH_REQUIRED;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_SALES_LINE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_SALES_REEL_MISMATCH;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_SALES_BATCH_NOT_SHIPPED;
/**
* MES 閿�鍞��璐у崟琛� Service 瀹炵幇绫�
@@ -46,6 +53,10 @@
private MesMdmItemService mdmItemService;
@Resource
private MesWmBatchService batchService;
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
+ @Resource
+ private MesWmProductSalesDetailMapper productSalesDetailMapper;
@Resource
@Lazy
private MesWmReturnSalesDetailService returnSalesDetailService;
@@ -82,9 +93,27 @@
*/
private void validateLineSaveData(MesWmReturnSalesLineSaveReqVO reqVO) {
// 鏍¢獙閫�璐у崟瀛樺湪 + 鑽夌鐘舵��
- returnSalesService.validateReturnSalesExistsAndPrepare(reqVO.getReturnId());
+ MesWmReturnSalesDO returnSales = returnSalesService.validateReturnSalesExistsAndPrepare(reqVO.getReturnId());
// 鏍¢獙鐗╂枡瀛樺湪 + 鎵规绠$悊
- validateItemBatchManagement(reqVO.getReturnId(), reqVO.getItemId(), reqVO.getBatchId());
+ MesWmBatchDO batch = validateItemBatchManagement(returnSales, reqVO.getItemId(), reqVO.getBatchId());
+ if (batch != null) {
+ reqVO.setBatchCode(batch.getCode());
+ }
+ if (returnSales.getSaleOrderId() != null) {
+ var items = saleOrderApi.getSaleOrderItemList(returnSales.getSaleOrderId()).getCheckedData();
+ var reelNumbers = items.stream().filter(item -> Objects.equals(reqVO.getItemId(), item.getProductId()))
+ .map(item -> item.getReelNo()).filter(StrUtil::isNotBlank).toList();
+ if (!reelNumbers.isEmpty() && (batch == null || !reelNumbers.contains(batch.getReelNo())
+ || (StrUtil.isNotBlank(batch.getSalesOrderCode())
+ && !Objects.equals(returnSales.getSalesOrderCode(), batch.getSalesOrderCode())))) {
+ throw exception(WM_RETURN_SALES_REEL_MISMATCH);
+ }
+ if (!reelNumbers.isEmpty() && productSalesDetailMapper.countFinishedSaleBatch(
+ returnSales.getSaleOrderId(), reqVO.getItemId(), batch.getId(),
+ MesWmProductSalesStatusEnum.FINISHED.getStatus()) == 0) {
+ throw exception(WM_RETURN_SALES_BATCH_NOT_SHIPPED);
+ }
+ }
}
@Override
@@ -154,7 +183,7 @@
* @param itemId 鐗╂枡ID
* @param batchId 鎵规ID
*/
- private void validateItemBatchManagement(Long returnId, Long itemId, Long batchId) {
+ private MesWmBatchDO validateItemBatchManagement(MesWmReturnSalesDO returnSales, Long itemId, Long batchId) {
MesMdmItemDO item = mdmItemService.validateItemExistsAndEnable(itemId);
// 濡傛灉鐗╂枡鍚敤浜嗘壒娆$鐞嗭紝鍒欏繀椤婚�夋嫨鎵规
if (Boolean.TRUE.equals(item.getIsBatchManaged()) && batchId == null) {
@@ -163,9 +192,9 @@
// 鏍¢獙鎵规瀛樺湪涓斿睘浜庡綋鍓嶇墿鏂欏拰瀹㈡埛
if (batchId != null) {
// 浠庣埗鍗曡幏鍙栧鎴稩D锛屾牎楠屾壒娆″綊灞�
- MesWmReturnSalesDO returnSales = returnSalesService.validateReturnSalesExistsAndPrepare(returnId);
- batchService.validateBatchExists(batchId, itemId, returnSales.getClientId(), null);
+ return batchService.validateBatchExists(batchId, itemId, returnSales.getClientId(), null);
}
+ return null;
}
@Override
@@ -192,6 +221,7 @@
.setItemId(sourceLine.getItemId())
.setQuantity(unqualifiedQuantity)
.setBatchId(sourceLine.getBatchId())
+ .setBatchCode(sourceLine.getBatchCode())
.setRqcId(sourceLine.getRqcId())
.setRqcCheckFlag(sourceLine.getRqcCheckFlag())
.setQualityStatus(MesWmQualityStatusEnum.FAIL.getStatus())
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
index 7f40f15..94373e8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.line.MesWmSalesNoticeLinePageReqVO;
@@ -40,6 +41,8 @@
private MesWmBatchService batchService;
@Resource
private MesMdmItemService mdmItemService;
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
@Override
public Long createSalesNoticeLine(MesWmSalesNoticeLineSaveReqVO createReqVO) {
@@ -59,6 +62,9 @@
MesWmSalesNoticeLineDO line = validateSalesNoticeLineExists(updateReqVO.getId());
// 鏍¢獙鏁版嵁
updateReqVO.setNoticeId(line.getNoticeId());
+ if (updateReqVO.getSaleOrderItemId() == null) {
+ updateReqVO.setSaleOrderItemId(line.getSaleOrderItemId());
+ }
validateLineSaveData(updateReqVO);
// 鏇存柊
@@ -120,6 +126,17 @@
private void validateLineSaveData(MesWmSalesNoticeLineSaveReqVO reqVO) {
// 鏍¢獙鐖跺崟鎹瓨鍦ㄤ笖涓鸿崏绋跨姸鎬�
validateNoticeStatusDraft(reqVO.getNoticeId());
+ MesWmSalesNoticeDO notice = salesNoticeService.getSalesNotice(reqVO.getNoticeId());
+ if (notice.getSaleOrderId() != null && reqVO.getSaleOrderItemId() == null) {
+ throw exception(WM_SALES_NOTICE_LINE_SALE_ITEM_REQUIRED);
+ }
+ if (reqVO.getSaleOrderItemId() != null) {
+ var saleItem = saleOrderApi.getSaleOrderItem(reqVO.getSaleOrderItemId()).getCheckedData();
+ if (saleItem == null || !ObjUtil.equal(notice.getSaleOrderId(), saleItem.getOrderId())
+ || !ObjUtil.equal(reqVO.getItemId(), saleItem.getProductId())) {
+ throw exception(WM_SALES_NOTICE_LINE_SALE_ITEM_MISMATCH);
+ }
+ }
// 鏍¢獙鐗╂枡瀛樺湪
if (reqVO.getItemId() != null) {
mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImplTest.java
index a81317b..98a1815 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImplTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImplTest.java
@@ -83,7 +83,7 @@
public void testNonBatchManagedItemUsesDistinctTraceBatchesForReels() {
when(mdmItemService.validateItemExists(10L)).thenReturn(new MesMdmItemDO().setId(10L)
.setName("浜у搧").setIsBatchManaged(false));
- when(autoCodeRecordService.generateAutoCode(anyString())).thenReturn("TRACE-1", "TRACE-2");
+ when(autoCodeRecordService.generateAutoCode(anyString())).thenReturn("TRACE-1", "TRACE-2", "TRACE-3");
MesWmBatchGenerateReqVO first = new MesWmBatchGenerateReqVO().setItemId(10L)
.setWorkOrderId(20L).setReelNo("PAN-1");
MesWmBatchGenerateReqVO second = new MesWmBatchGenerateReqVO().setItemId(10L)
@@ -95,6 +95,9 @@
assertNotEquals(a.getId(), b.getId());
assertEquals(a.getId(), batchService.getOrGenerateBatchCode(first).getId());
assertEquals("PAN-2", batchMapper.selectById(b.getId()).getReelNo());
+ MesWmBatchDO caseVariant = batchService.getOrGenerateBatchCode(new MesWmBatchGenerateReqVO()
+ .setItemId(10L).setWorkOrderId(20L).setReelNo("pan-1"));
+ assertNotEquals(a.getId(), caseVariant.getId());
assertNull(batchService.getOrGenerateBatchCode(new MesWmBatchGenerateReqVO().setItemId(10L)));
}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java
new file mode 100644
index 0000000..0601d87
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java
@@ -0,0 +1,69 @@
+package cn.iocoder.yudao.module.mes.service.wm.productsales;
+
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.line.MesWmProductSalesLineSaveReqVO;
+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.MesWmSalesNoticeLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesLineMapper;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
+import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeLineService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.math.BigDecimal;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MesWmProductSalesLineReelTest {
+ @InjectMocks private MesWmProductSalesLineServiceImpl service;
+ @Mock private MesWmProductSalesLineMapper mapper;
+ @Mock private MesWmProductSalesService salesService;
+ @Mock private MesWmSalesNoticeLineService noticeService;
+ @Mock private MesMdmItemService itemService;
+ @Mock private MesQcOqcService oqcService;
+
+ private MesWmProductSalesLineSaveReqVO request() {
+ var req = new MesWmProductSalesLineSaveReqVO();
+ req.setSalesId(1L);
+ req.setNoticeLineId(2L);
+ req.setItemId(3L);
+ req.setQuantity(BigDecimal.ONE);
+ when(salesService.validateProductSalesExistsAndDraft(1L))
+ .thenReturn(MesWmProductSalesDO.builder().id(1L).noticeId(4L).build());
+ when(noticeService.validateSalesNoticeLineExists(2L, 4L))
+ .thenReturn(MesWmSalesNoticeLineDO.builder().id(2L).itemId(3L)
+ .quantity(BigDecimal.ONE).saleOrderItemId(5L).build());
+ return req;
+ }
+
+ @Test
+ void createRetainsSalesItemForReelGuard() {
+ service.createProductSalesLine(request());
+ var line = ArgumentCaptor.forClass(MesWmProductSalesLineDO.class);
+ verify(mapper).insert(line.capture());
+ assertEquals(5L, line.getValue().getSaleOrderItemId());
+ }
+
+ @Test
+ void enablingInspectionRetainsSalesItemForOqc() {
+ var req = request();
+ req.setId(6L);
+ req.setOqcCheckFlag(true);
+ when(mapper.selectById(6L)).thenReturn(MesWmProductSalesLineDO.builder()
+ .id(6L).salesId(1L).oqcCheckFlag(false).build());
+ when(salesService.getProductSales(1L)).thenReturn(MesWmProductSalesDO.builder().id(1L).build());
+ when(oqcService.createOqcFromProductSales(eq(1L), any(), any(), any())).thenReturn(7L);
+ service.updateProductSalesLine(req);
+ var line = ArgumentCaptor.forClass(MesWmProductSalesLineDO.class);
+ verify(oqcService).createOqcFromProductSales(eq(1L), line.capture(), any(), any());
+ assertEquals(5L, line.getValue().getSaleOrderItemId());
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmFinishedSaleBatchSqlTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmFinishedSaleBatchSqlTest.java
new file mode 100644
index 0000000..d17dddd
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmFinishedSaleBatchSqlTest.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.mes.service.wm.returnsales;
+
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesDetailMapper;
+import org.apache.ibatis.annotations.Select;
+import org.junit.jupiter.api.Test;
+
+import java.sql.DriverManager;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/** 楠岃瘉瀹為檯鍑哄簱鍏宠仈鏌ヨ涓嶄細鎶婂叾浠栬鍗曘�佸緟鍑哄簱鍗曟垨鍏朵粬鐩樺彿褰撲綔閫�璐ф潵婧愩�� */
+class MesWmFinishedSaleBatchSqlTest {
+ @Test
+ void checksFinishedOrderItemAndBatch() throws Exception {
+ try (var c = DriverManager.getConnection("jdbc:h2:mem:reel_source;MODE=MySQL;DB_CLOSE_DELAY=-1")) {
+ var st = c.createStatement();
+ st.execute("CREATE TABLE mes_wm_product_sales (id BIGINT, sale_order_id BIGINT, status INT, deleted INT)");
+ st.execute("CREATE TABLE mes_wm_product_sales_line (id BIGINT, sales_id BIGINT, sale_order_item_id BIGINT, item_id BIGINT, deleted INT)");
+ st.execute("CREATE TABLE mes_wm_product_sales_detail (id BIGINT, sales_id BIGINT, line_id BIGINT, item_id BIGINT, batch_id BIGINT, deleted INT)");
+ st.execute("CREATE TABLE erp_sale_order_items (id BIGINT, order_id BIGINT, product_id BIGINT, reel_no VARCHAR(128), deleted INT)");
+ st.execute("CREATE TABLE mes_wm_batch (id BIGINT, item_id BIGINT, reel_no VARCHAR(128), deleted INT)");
+ st.execute("INSERT INTO mes_wm_product_sales VALUES (1, 7, 5, 0), (2, 7, 1, 0), (3, 8, 5, 0)");
+ st.execute("INSERT INTO erp_sale_order_items VALUES (11, 7, 3, 'P1', 0), (12, 8, 3, 'P1', 0), (13, 7, 3, 'P2', 0)");
+ st.execute("INSERT INTO mes_wm_batch VALUES (21, 3, 'P1', 0), (22, 3, 'P2', 0)");
+ st.execute("INSERT INTO mes_wm_product_sales_line VALUES (31, 1, 11, 3, 0), (32, 2, 13, 3, 0), (33, 3, 12, 3, 0), (34, 1, 13, 3, 0)");
+ st.execute("INSERT INTO mes_wm_product_sales_detail VALUES (41, 1, 31, 3, 21, 0), (42, 2, 32, 3, 22, 0), (43, 3, 33, 3, 21, 0), (44, 1, 34, 3, 21, 0)");
+ String sql = MesWmProductSalesDetailMapper.class.getMethod("countFinishedSaleBatch", Long.class,
+ Long.class, Long.class, Integer.class).getAnnotation(Select.class).value()[0]
+ // H2 鐨勫瓧绗︿覆姣旇緝榛樿鍖哄垎澶у皬鍐欙紱MySQL 鐨� BINARY 璇硶鍦ㄧ湡瀹炲簱鍗曠嫭楠岃瘉銆�
+ .replace("BINARY i.reel_no", "i.reel_no").replace("BINARY b.reel_no", "b.reel_no")
+ .replace("#{orderId}", "?").replace("#{finishedStatus}", "?")
+ .replace("#{itemId}", "?").replace("#{batchId}", "?");
+ try (var query = c.prepareStatement(sql)) {
+ query.setLong(1, 7); query.setInt(2, 5); query.setLong(3, 3);
+ query.setLong(4, 3); query.setLong(5, 3); query.setLong(6, 21);
+ try (var rows = query.executeQuery()) { rows.next(); assertEquals(1, rows.getInt(1)); }
+ query.setLong(6, 22);
+ try (var rows = query.executeQuery()) { rows.next(); assertEquals(0, rows.getInt(1)); }
+ }
+ }
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesReelTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesReelTest.java
new file mode 100644
index 0000000..4d32b20
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesReelTest.java
@@ -0,0 +1,97 @@
+package cn.iocoder.yudao.module.mes.service.wm.returnsales;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.detail.MesWmReturnSalesDetailSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLineSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales.MesWmReturnSalesDetailMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales.MesWmReturnSalesLineMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesDetailMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MesWmReturnSalesReelTest {
+ @InjectMocks private MesWmReturnSalesDetailServiceImpl details;
+ @InjectMocks private MesWmReturnSalesLineServiceImpl lines;
+ @Mock private MesWmReturnSalesLineService lineService;
+ @Mock private MesWmReturnSalesService returnService;
+ @Mock private MesWmReturnSalesDetailMapper detailMapper;
+ @Mock private MesWmReturnSalesLineMapper lineMapper;
+ @Mock private MesWmProductSalesDetailMapper productSalesDetailMapper;
+ @Mock private MesWmWarehouseAreaService areaService;
+ @Mock private MesWmMaterialStockService stockService;
+ @Mock private MesWmBatchService batchService;
+ @Mock private MesMdmItemService itemService;
+ @Mock private ErpSaleOrderApi saleOrderApi;
+
+ @Test
+ void resolvesBatchBeforeCheckingMixingAndKeepsSource() {
+ var req = new MesWmReturnSalesDetailSaveReqVO();
+ req.setLineId(1L); req.setReturnId(2L); req.setItemId(3L);
+ req.setBatchCode("B1"); req.setQuantity(BigDecimal.ONE); req.setAreaId(4L);
+ when(lineService.validateReturnSalesLineExists(1L)).thenReturn(MesWmReturnSalesLineDO.builder()
+ .returnId(2L).itemId(3L).batchId(5L).quantity(BigDecimal.TEN).build());
+ when(returnService.validateReturnSalesExists(2L)).thenReturn(MesWmReturnSalesDO.builder()
+ .status(MesWmReturnSalesStatusEnum.APPROVED.getStatus()).build());
+ when(batchService.getBatchByCode("B1")).thenReturn(MesWmBatchDO.builder().id(5L).itemId(3L).code("B1").build());
+ when(detailMapper.selectListByLineId(1L)).thenReturn(List.of());
+ details.createReturnSalesDetail(req);
+ verify(stockService).checkAreaMixingRule(4L, 3L, 5L);
+ assertEquals(5L, req.getBatchId());
+ }
+
+ @Test
+ void rejectsDifferentBatchForSameReturnLine() {
+ var req = new MesWmReturnSalesDetailSaveReqVO();
+ req.setLineId(1L); req.setReturnId(2L); req.setItemId(3L); req.setBatchCode("B2");
+ when(lineService.validateReturnSalesLineExists(1L)).thenReturn(MesWmReturnSalesLineDO.builder()
+ .returnId(2L).itemId(3L).batchId(5L).build());
+ when(returnService.validateReturnSalesExists(2L)).thenReturn(MesWmReturnSalesDO.builder()
+ .status(MesWmReturnSalesStatusEnum.APPROVED.getStatus()).build());
+ when(batchService.getBatchByCode("B2")).thenReturn(MesWmBatchDO.builder().id(6L).itemId(3L).build());
+ assertThrows(ServiceException.class, () -> details.createReturnSalesDetail(req));
+ verifyNoInteractions(stockService);
+ }
+
+ @Test
+ void returnOrderWithReelsRequiresMatchingBatch() {
+ var req = new MesWmReturnSalesLineSaveReqVO();
+ req.setReturnId(2L); req.setItemId(3L); req.setBatchId(5L);
+ when(returnService.validateReturnSalesExistsAndPrepare(2L)).thenReturn(MesWmReturnSalesDO.builder()
+ .saleOrderId(7L).clientId(8L).build());
+ when(itemService.validateItemExistsAndEnable(3L)).thenReturn(MesMdmItemDO.builder().isBatchManaged(false).build());
+ var batch = MesWmBatchDO.builder().id(5L).itemId(3L).code("B1").reelNo("OTHER").build();
+ when(batchService.validateBatchExists(5L, 3L, 8L, null)).thenReturn(batch);
+ var item = new ErpSaleOrderItemRespDTO(); item.setProductId(3L); item.setReelNo("REEL-1");
+ when(saleOrderApi.getSaleOrderItemList(7L)).thenReturn(CommonResult.success(List.of(item)));
+ assertThrows(ServiceException.class, () -> lines.createReturnSalesLine(req));
+ batch.setReelNo("REEL-1");
+ when(productSalesDetailMapper.countFinishedSaleBatch(eq(7L), eq(3L), eq(5L), anyInt())).thenReturn(0L, 1L);
+ assertThrows(ServiceException.class, () -> lines.createReturnSalesLine(req));
+ lines.createReturnSalesLine(req);
+ assertEquals("B1", req.getBatchCode());
+ verify(lineMapper).insert(any(MesWmReturnSalesLineDO.class));
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineReelTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineReelTest.java
new file mode 100644
index 0000000..4a96d91
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineReelTest.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.mes.service.wm.salesnotice;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.line.MesWmSalesNoticeLineSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeLineMapper;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static cn.iocoder.yudao.module.mes.enums.wm.MesWmSalesNoticeStatusEnum.PREPARE;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MesWmSalesNoticeLineReelTest {
+ @InjectMocks private MesWmSalesNoticeLineServiceImpl service;
+ @Mock private MesWmSalesNoticeService noticeService;
+ @Mock private MesWmSalesNoticeLineMapper mapper;
+ @Mock private ErpSaleOrderApi saleOrderApi;
+ @Mock private MesMdmItemService itemService;
+
+ private MesWmSalesNoticeLineSaveReqVO request() {
+ var req = new MesWmSalesNoticeLineSaveReqVO();
+ req.setNoticeId(1L);
+ req.setItemId(3L);
+ when(noticeService.getSalesNotice(1L)).thenReturn(MesWmSalesNoticeDO.builder()
+ .id(1L).saleOrderId(2L).status(PREPARE.getStatus()).build());
+ return req;
+ }
+
+ @Test
+ void linkedNoticeRequiresExplicitSalesItem() {
+ var req = request();
+ assertThrows(ServiceException.class, () -> service.createSalesNoticeLine(req));
+ verifyNoInteractions(saleOrderApi);
+ }
+
+ @Test
+ void linkedNoticeRequiresMatchingOrderAndProduct() {
+ var req = request();
+ req.setSaleOrderItemId(4L);
+ var item = new ErpSaleOrderItemRespDTO();
+ item.setOrderId(2L);
+ item.setProductId(99L);
+ when(saleOrderApi.getSaleOrderItem(4L)).thenReturn(CommonResult.success(item));
+ assertThrows(ServiceException.class, () -> service.createSalesNoticeLine(req));
+ item.setProductId(3L);
+ service.createSalesNoticeLine(req);
+ var saved = ArgumentCaptor.forClass(MesWmSalesNoticeLineDO.class);
+ verify(mapper).insert(saved.capture());
+ assertEquals(4L, saved.getValue().getSaleOrderItemId());
+ }
+}
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 908ee89..d5de923 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -68,9 +68,9 @@
primary: master
datasource:
master:
- url: jdbc:mysql://localhost:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # 鏈湴鑱旇皟娴嬭瘯搴�
+ url: jdbc:mysql://36.213.150.237:10000/mom-ntsh?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # 鏈湴鑱旇皟娴嬭瘯搴�
username: root
- password: 123456
+ password: xd@123456..
# Redis 閰嶇疆銆俁edisson 榛樿鐨勯厤缃冻澶熶娇鐢紝涓�鑸笉闇�瑕佽繘琛岃皟浼�
data:
--
Gitblit v1.9.3