From 32d4cecdfada2f5aded1fde68d4b3e393cd15bb7 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 02 九月 2026 09:37:43 +0800
Subject: [PATCH] fix(mes): 生产退料单行"需要质检"放宽必填并兜底默认为不需要质检
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java | 3 +--
docs/return_issue_integration.md | 13 +++++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java | 8 +++++++-
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/docs/return_issue_integration.md b/docs/return_issue_integration.md
index 495f006..c623632 100644
--- a/docs/return_issue_integration.md
+++ b/docs/return_issue_integration.md
@@ -103,3 +103,16 @@
- 鍚庣宸插仛鍏煎锛氬鏋滃墠绔殏鏃朵笉鏀癸紝鏃ф暟鎹紙warehouseId=铏氭嫙搴擄級浠嶈兘閫氳繃浜嬪姟娴佹按鍙嶆煡鍘熷浠撳簱锛屼笉浼氭姤閿�
- 鍓嶇鏀瑰畬鍚庯紝鏂扮殑閫�鏂欏崟 detail 搴斾紶瀹為檯浠撳簱鐨勫簱浣嶏紝閫昏緫鏇存竻鏅�
- 宸插瓨鍦ㄧ殑鏃ч��鏂欐暟鎹笉鍙楀奖鍝嶏紙鍙嶆煡鍏滃簳锛�
+
+## 閫�鏂欏崟琛�"闇�瑕佽川妫�"瀛楁璋冩暣锛�2026-09-01锛�
+
+### 鍙樻洿鍐呭
+
+閫�鏂欏崟琛岋紙`/mes/wm-return-issue-line/create`銆乣/mes/wm-return-issue-line/update`锛夌殑 `rqcCheckFlag`锛堟槸鍚﹂渶瑕佽川妫�锛�**鐢卞繀濉敼涓洪�夊～**锛�
+- 鏂板琛屾椂锛氬墠绔湭浼犺瀛楁锛屽悗绔粯璁ゆ寜 `false`锛堜笉闇�瑕佽川妫�锛夊鐞嗭紝涓嶅啀鎻愮ず"鏄惁闇�瑕佽川妫�涓嶈兘涓虹┖"
+- 缂栬緫琛屾椂锛氬墠绔湭浼犺瀛楁锛屽悗绔部鐢ㄨ琛屽師鍊硷紝涓嶄細璇鐩�
+
+### 鍓嶇淇敼鐐�
+
+- 鐢熶骇宸ヤ綔鍙� - 閫�鏂�"娣诲姞鐗╂枡"寮圭獥涓殑"闇�瑕佽川妫�"瀛楁**鍙互涓嶅啀瑕佹眰蹇呭～**锛屼笉濉嵆榛樿涓�"涓嶉渶瑕佽川妫�"
+- 鍓嶇涓嶄紶璇ュ瓧娈靛嵆鍙甯告彁浜わ紝鏃犻渶棰濆鏀瑰姩锛涘闇�淇濈暀"闇�瑕佽川妫�"閫夐」锛屼粛鍙甯镐紶 `true`/`false`
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java
index 39822f9..197efe5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java
@@ -39,8 +39,7 @@
@Schema(description = "鎵规缂栫爜", example = "BCH20260330001")
private String batchCode;
- @Schema(description = "鏄惁闇�瑕佽川妫�", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
- @NotNull(message = "鏄惁闇�瑕佽川妫�涓嶈兘涓虹┖")
+ @Schema(description = "鏄惁闇�瑕佽川妫�", example = "false")
private Boolean rqcCheckFlag;
@Schema(description = "澶囨敞", example = "澶囨敞")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java
index fcf0034..8d1d856 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java
@@ -52,6 +52,8 @@
// 鎻掑叆
MesWmReturnIssueLineDO line = BeanUtils.toBean(createReqVO, MesWmReturnIssueLineDO.class);
+ // 鍏滃簳锛氬墠绔湭浼犻渶瑕佽川妫�鏃堕粯璁や笉闇�瑕佽川妫�
+ line.setRqcCheckFlag(Boolean.TRUE.equals(line.getRqcCheckFlag()));
line.setQualityStatus(calculateQualityStatus(line.getRqcCheckFlag(), issue.getType())); // 璐ㄩ噺鐘舵�佽嚜鍔ㄨ祴鍊�
issueLineMapper.insert(line);
return line.getId();
@@ -60,12 +62,16 @@
@Override
public void updateReturnIssueLine(MesWmReturnIssueLineSaveReqVO updateReqVO) {
// 鏍￠獙瀛樺湪
- validateReturnIssueLineExists(updateReqVO.getId());
+ MesWmReturnIssueLineDO line = validateReturnIssueLineExists(updateReqVO.getId());
// 鏍￠獙鏁版嵁
MesWmReturnIssueDO issue = validateReturnIssueLineSaveData(updateReqVO);
// 鏇存柊
MesWmReturnIssueLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueLineDO.class);
+ // 鍏滃簳锛氱紪杈戞椂鏈紶闇�瑕佽川妫�瀛楁锛屾部鐢ㄥ師鍊硷紝閬垮厤璇鐩�
+ if (updateObj.getRqcCheckFlag() == null) {
+ updateObj.setRqcCheckFlag(line.getRqcCheckFlag());
+ }
updateObj.setQualityStatus(calculateQualityStatus(updateObj.getRqcCheckFlag(), issue.getType())); // 璐ㄩ噺鐘舵�佽嚜鍔ㄨ祴鍊�
issueLineMapper.updateById(updateObj);
}
--
Gitblit v1.9.3