From a0b4de611e3b1986b2713c6a161cc1613ec31a5b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 11:42:13 +0800
Subject: [PATCH] feat(mes): 采购入库简化为确认入库并自动生成入库单
---
docs/project-business/data/flows.json | 18 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java | 138 +++++++++++---
docs/project-business/mermaid/05-quality-flow.mmd | 1
docs/project-business/mermaid/03-purchase-flow.mmd | 27 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineService.java | 9 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java | 14 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java | 231 +++++++++++++++++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java | 18 +
docs/project-business/data/objects.json | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 9 +
docs/project-business/index.html | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java | 8
14 files changed, 453 insertions(+), 61 deletions(-)
diff --git a/docs/project-business/data/flows.json b/docs/project-business/data/flows.json
index 5c34ba9..15d020d 100644
--- a/docs/project-business/data/flows.json
+++ b/docs/project-business/data/flows.json
@@ -67,11 +67,11 @@
"name": "閲囪喘娴佺▼",
"mermaid": "mermaid/03-purchase-flow.mmd",
"color": "#5fc79e",
- "summary": "渚涘簲鍟嗘。妗�(澶氳仈绯讳汉/澶氶摱琛屄峰惈閾惰琛屽彿) 鈫� 璇环姣斾环(浜у搧脳渚涘簲鍟嗘í鍚戞姤浠凤紝鎸変骇鍝侀�変腑鏍�) 鈫� 纭鍚庢寜涓爣渚涘簲鍟嗘媶閲囪喘璁㈠崟鑽夌骞惰蛋鐜版湁 BPM 鈫� 纭鏀惰揣鐢熸垚 MES 鍒拌揣閫氱煡 鈫� IQC(鍚堟牸/鐗归噰鍏ュ簱路閫�璐�/鎶ュ簾) 鈫� 閲囪喘鍏ュ簱鍥炲啓璁㈠崟涓庣敵璇� 鈫� 鏉ョエ(AI OCR) 鈫� 浠樻鍗� BPM 鈫� 渚涘簲鍟嗗線鏉ュ璐︺��",
+ "summary": "渚涘簲鍟嗘。妗�(澶氳仈绯讳汉/澶氶摱琛屄峰惈閾惰琛屽彿) 鈫� 閲囪喘鐢宠(涓嶈浠锋牸路涓嶅~渚涘簲鍟�)瀹℃壒閫氳繃鍚庯紝閲囪喘鍛樺湪璇环姣斾环椤电殑寰呭鐞嗗垪琛ㄥ喅瀹氾細鍙戣捣璇环姣斾环纭浠锋牸锛屾垨閫変緵搴斿晢鐩存帴鐢熸垚闆堕噾棰濆彴璐﹁崏绋� 鈫� 纭鏀惰揣鐢熸垚 MES 鍒拌揣閫氱煡 鈫� IQC(鍚堟牸/鐗归噰鍏ュ簱路閫�璐�/鎶ュ簾) 鈫� 閲囪喘鍏ュ簱鍥炲啓璁㈠崟涓庣敵璇� 鈫� 鏉ョエ(AI OCR) 鈫� 浠樻鍗� BPM 鈫� 渚涘簲鍟嗗線鏉ュ璐︺��",
"steps": [
{
"stage": "瀵绘簮",
- "action": "渚涘簲鍟嗘。妗堢淮鎶ゅ涓仈绯讳汉涓庡涓摱琛岃处鎴�(鍚摱琛岃鍙�)锛涙柊澧炶浠峰崟鏃朵竴骞跺綍鍏ヤ骇鍝伱楀弬涓庝緵搴斿晢鎶ヤ环骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屽垪琛ㄧ洿鎺ョ‘璁ゅ悗鎸変腑鏍囦緵搴斿晢鐢熸垚閲囪喘璁㈠崟鑽夌",
+ "action": "渚涘簲鍟嗘。妗堢淮鎶ゅ涓仈绯讳汉涓庡涓摱琛岃处鎴�(鍚摱琛岃鍙�)锛涜浠峰崟鍙寜閲囪喘鐢宠鏄庣粏涓�閿彂璧凤紝涔熷彲鐙珛鏂板缓锛涘綍鍏ヤ骇鍝伱楀弬涓庝緵搴斿晢鎶ヤ环骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屽鏍搁�氳繃鍚庣‘璁よ浆璁㈠崟",
"roles": [
"閲囪喘鍛�",
"渚涘簲鍟嗙鐞嗗憳"
@@ -79,7 +79,15 @@
},
{
"stage": "鐢宠",
- "action": "閲囪喘鐢宠(CGSQ)鎻愪氦 BPM锛岄┏鍥炲彲閲嶇疆鍥炶崏绋匡紱閫氳繃涓旀湁渚涘簲鍟嗚嚜鍔ㄧ敓鎴愯鍗�",
+ "action": "閲囪喘鐢宠(CGSQ)鍙浜у搧/鍗曚綅/鏁伴噺/闇�姹傛棩鏈燂紝涓嶅惈浠讳綍浠锋牸瀛楁锛屼篃涓嶅~渚涘簲鍟嗕笌鏄惁璐ㄦ锛涙彁浜� BPM锛岄┏鍥炲彲閲嶇疆鍥炶崏绋匡紱瀹℃壒閫氳繃浠呮敼鐘舵�侊紝涓嶈嚜鍔ㄧ敓鎴愬彴璐�",
+ "roles": [
+ "閲囪喘鍛�",
+ "瀹℃壒浜�"
+ ]
+ },
+ {
+ "stage": "浠锋牸纭",
+ "action": "瀹℃壒閫氳繃鍚庨噰璐憳鍦ㄣ�岃浠锋瘮浠枫�嶉〉鐨勩�岄噰璐敵璇峰緟澶勭悊銆嶉〉绛撅紙甯︽暟閲忚鏍囷紝鏈夊緟澶勭悊鏃堕粯璁ゅ睍绀猴級涓簩閫変竴锛氣憼闇�瑕佹瘮浠封啋鍙戣捣璇环锛岀敓鎴愯浠峰崟鑽夌骞跺洖鍐欑敵璇凤紱璇环瀹℃牳閫氳繃鍚庣‘璁よ浆璁㈠崟锛屾寜涓爣渚涘簲鍟嗘媶鍒嗙敓鎴愬彴璐︼紝浠锋牸鍙栦腑鏍囨姤浠凤紱鈶′笉闇�瑕佹瘮浠封啋鐩存帴鐢熸垚闆堕噾棰濄�佹棤渚涘簲鍟嗗彴璐﹁崏绋匡紝鐢遍噰璐憳鍦ㄥ彴璐﹁ˉ褰曚緵搴斿晢/鍗曚环/绋庣巼锛涘彴璐︽彁浜ゅ鎵规椂鍚庣鏍¢獙渚涘簲鍟嗐�佷粯娆炬棩鏈熶笌姣忔潯鏄庣粏鍗曚环锛岀己鍝潯灏辨姤鍝潯锛岃ˉ榻愬悗鎵嶈兘鎻愪氦銆傞噰璐敵璇烽〉鏈韩涓嶅啀鎻愪緵杩欎袱涓寜閽�傝浠峰彇娑堟垨鍒犻櫎浼氭竻绌虹敵璇风殑璇环鍏宠仈锛岀敵璇烽噸鏂板嚭鐜板湪寰呭鐞嗗垪琛�",
"roles": [
"閲囪喘鍛�",
"瀹℃壒浜�"
@@ -94,7 +102,7 @@
},
{
"stage": "鏀惰揣",
- "action": "纭鏀惰揣鐢熸垚鍒拌揣閫氱煡(0鈫掑緟璐ㄦ2/寰呭叆搴�3鈫�4)锛涢渶妫�鐗╂枡鑷姩鍒涘缓 IQC",
+ "action": "纭鏀惰揣鐢熸垚鍒拌揣閫氱煡(0鈫掑緟璐ㄦ2/寰呭叆搴�3鈫�4)锛涢渶妫�鐗╂枡鐢卞簱绠″湪鍒拌揣閫氱煡鐐广�屾墽琛岃川妫�銆嶆墠鐢熸垚 IQC锛屼笉鐐瑰垯涓嶇敓鎴愩�佷篃涓嶈兘鍏ュ簱锛涙棤闇�妫�楠岀殑鎻愪氦鍗宠嚜鍔ㄧ敓鎴愰噰璐叆搴撳崟",
"roles": [
"浠撶",
"IQC 璐ㄦ鍛�"
@@ -102,7 +110,7 @@
},
{
"stage": "鍏ュ簱",
- "action": "IQC 鍚堟牸/鐗归噰鈫掗噰璐叆搴�(寰呬笂鏋垛啋寰呮墽琛屸啋瀹屾垚)搴撳瓨+锛屽洖鍐欒鍗� inCount/inStatus 涓庣敵璇锋槑缁�",
+ "action": "IQC 鍚堟牸/鐗归噰鈫掔郴缁熻嚜鍔ㄧ敓鎴愰噰璐叆搴撳崟(寰呭叆搴�0)鈫掑簱绠℃牳瀵规暟閲忋�侀�夊叆搴撲粨搴�/搴撳尯/搴撲綅鍚庣偣銆岀‘璁ゅ叆搴撱�嶄竴姝ュ畬鎴�(鈫掑畬鎴�4)锛屽簱瀛�+锛屽洖鍐欒鍗� inCount/inStatus 涓庣敵璇锋槑缁嗭紱涓嶅啀鏈夋彁浜�/鎵ц涓婃灦/鍒拌揣閫氱煡鎵ц鍏ュ簱姝ラ",
"roles": [
"浠撶"
]
diff --git a/docs/project-business/data/objects.json b/docs/project-business/data/objects.json
index 0bbe339..e65e43c 100644
--- a/docs/project-business/data/objects.json
+++ b/docs/project-business/data/objects.json
@@ -199,8 +199,9 @@
"name": "璇环姣斾环",
"module": "渚涘簲鍟嗙鐞�",
"table": "srm_inquiry",
- "doc": "XJ缂栧彿锛岃崏绋�0鈫掑凡杞鍗�20鈫掑凡鍙栨秷30(10璇环涓负鍘嗗彶鐘舵��)锛涙柊澧�/缂栬緫鏃朵竴骞跺綍鍏ヤ骇鍝佽脳鍙備笌渚涘簲鍟嗘姤浠�(srm_inquiry_quote)骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屾棤闇�鍗曠嫭鐨勬姤浠�/姣斾环姝ラ锛岀‘璁ゅ悗鎸変腑鏍囦緵搴斿晢鎷嗗垎鐢熸垚閲囪喘璁㈠崟鑽夌骞惰褰� srm_inquiry_order",
+ "doc": "XJ缂栧彿锛岃崏绋�0鈫掕浠蜂腑10鈫掑鏍镐腑40鈫掑鏍搁�氳繃50鈫掑凡杞鍗�20/宸插彇娑�30/瀹℃牳鏈�氳繃60锛涘彲鐢遍噰璐敵璇锋槑缁嗕竴閿彂璧�(璁板綍 purchaseRequestId/purchaseRequestNo 骞跺洖鍐欑敵璇� inquiryId/inquiryNo)锛屼篃鍙嫭绔嬫柊寤猴紱鏂板/缂栬緫鏃朵竴骞跺綍鍏ヤ骇鍝佽脳鍙備笌渚涘簲鍟嗘姤浠�(srm_inquiry_quote)骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屽鏍搁�氳繃鍚庣‘璁よ浆璁㈠崟锛屾寜涓爣渚涘簲鍟嗘媶鍒嗙敓鎴愰噰璐彴璐﹁崏绋垮苟璁板綍 srm_inquiry_order锛涘彇娑堟垨鍒犻櫎浼氭竻绌洪噰璐敵璇风殑璇环鍏宠仈",
"upstream": [
+ "閲囪喘鐢宠(鍙��)",
"渚涘簲鍟�",
"涓绘暟鎹�(鐗╂枡)"
],
@@ -227,12 +228,13 @@
"name": "閲囪喘鐢宠",
"module": "杩涢攢瀛�",
"table": "erp_purchase_request",
- "doc": "CGSQ缂栧彿锛孊PM 瀹℃壒锛岄�氳繃鍚庢湁渚涘簲鍟嗚嚜鍔ㄧ敓鎴愯鍗�",
+ "doc": "CGSQ缂栧彿锛屽彧璁颁骇鍝�/鍗曚綅/鏁伴噺/闇�姹傛棩鏈燂紝琛ㄥご涓庢槑缁嗗潎涓嶅惈浠锋牸瀛楁锛屼笉濉緵搴斿晢銆佷笉濉槸鍚﹁川妫�锛堣川妫�鍦ㄥ彴璐︾幆鑺傜‘瀹氾級锛汢PM 瀹℃壒锛岄�氳繃鍚庝粎鏀圭姸鎬侊紝閲囪喘鍛樺埌銆岃浠锋瘮浠枫�嶉〉鐨勩�岄噰璐敵璇峰緟澶勭悊銆嶄腑鍐冲畾銆屽彂璧疯浠枫�嶆垨銆岀洿鎺ョ敓鎴愬彴璐︺�嶏細鍙戣捣璇环鏃跺洖鍐� inquiryId/inquiryNo锛岃浠风‘璁ゅ悗鐢熸垚鍙拌处骞跺洖鍐� orderId/orderNo锛涚洿鎺ョ敓鎴愭椂涓洪浂閲戦鍙拌处鑽夌锛屼环鏍肩敱閲囪喘鍛樿ˉ褰�",
"upstream": [
"鐢熶骇缂哄彛(浜哄伐)"
],
"downstream": [
- "閲囪喘璁㈠崟"
+ "璇环姣斾环(鍙��)",
+ "閲囪喘鍙拌处"
],
"keywords": "閲囪喘鐢宠 璇疯喘 request"
},
@@ -240,7 +242,7 @@
"name": "閲囪喘璁㈠崟",
"module": "杩涢攢瀛�",
"table": "erp_purchase_order",
- "doc": "鑿滃崟鍚嶃�岄噰璐彴璐︺�嶏紝CGDD缂栧彿锛孊PM 瀹℃壒(鑽夌0鈫掑鎵逛腑15鈫掑凡瀹℃牳20)锛屽叆搴撶姸鎬�:鏈�0閮ㄥ垎1鍏ㄩ儴2锛涜〃澶村惈閲囪喘绫诲瀷(鐢熶骇/鍔炲叕鐢ㄥ搧/鍏朵粬)銆佸悎鍚屽彿(鎵嬪伐杈撳叆涓嶈嚜鍔ㄧ敓鎴�)銆侀」鐩悕绉般�佷粯娆炬棩鏈�(蹇呭~锛岃秴30澶╄处鏈熸爣绾�)銆佷粯娆炬柟寮�(鐢垫眹/姹囩エ/鐜伴噾/鎵嬫満鏀粯)锛涙槑缁嗕骇鍝佺紪鍙峰揩鐓� MDM 鐗╂枡缂栫爜锛涙潵婧愬彲涓洪噰璐敵璇枫�佽浠锋瘮浠风‘璁ょ敓鎴愮殑鑽夌鎴栭攢鍞鍗�/鐢熶骇宸ュ崟(鏉ユ簮鍗曞彿鍥炴函)锛涘崟浠蜂负鍚◣鍗曚环锛屼环绋庡悎璁�=鍗曚环脳鏁伴噺锛岀◣棰濅粠鍚◣閲戦涓弽绠�(涓嶅啀棰濆鍔犵◣)",
+ "doc": "鑿滃崟鍚嶃�岄噰璐彴璐︺�嶏紝CGDD缂栧彿锛孊PM 瀹℃壒(鑽夌0鈫掑鎵逛腑15鈫掑凡瀹℃牳20)锛屽叆搴撶姸鎬�:鏈�0閮ㄥ垎1鍏ㄩ儴2锛涜〃澶村惈閲囪喘绫诲瀷(鐢熶骇/鍔炲叕鐢ㄥ搧/鍏朵粬)銆佸悎鍚屽彿(鎵嬪伐杈撳叆涓嶈嚜鍔ㄧ敓鎴�)銆侀」鐩悕绉般�佷粯娆炬棩鏈�(蹇呭~锛岃秴30澶╄处鏈熸爣绾�)銆佷粯娆炬柟寮�(鐢垫眹/姹囩エ/鐜伴噾/鎵嬫満鏀粯)锛涙槑缁嗕骇鍝佺紪鍙峰揩鐓� MDM 鐗╂枡缂栫爜锛涙潵婧愬彲涓洪噰璐敵璇枫�佽浠锋瘮浠风‘璁ょ敓鎴愮殑鑽夌鎴栭攢鍞鍗�/鐢熶骇宸ュ崟(鏉ユ簮鍗曞彿鍥炴函)锛涘崟浠蜂负鍚◣鍗曚环锛屼环绋庡悎璁�=鍗曚环脳鏁伴噺锛岀◣棰濅粠鍚◣閲戦涓弽绠�(涓嶅啀棰濆鍔犵◣)锛涢噰璐敵璇风洿鎺ョ敓鎴愮殑鑽夌涓洪浂閲戦涓旀棤渚涘簲鍟嗭紝鎻愪氦瀹℃壒鍓嶅繀椤昏ˉ榻愪緵搴斿晢銆佷粯娆炬棩鏈熶笌鏄庣粏鍗曚环(鍚庣閫愰」鏍¢獙骞舵姤鍏蜂綋缂哄彛)",
"upstream": [
"閲囪喘鐢宠",
"璇环姣斾环(纭涓爣)"
@@ -497,7 +499,7 @@
"name": "鍒拌揣閫氱煡鍗�",
"module": "浠撳偍",
"table": "mes_wm_arrival_notice",
- "doc": "閲囪喘璁㈠崟纭鏀惰揣鐢熸垚锛岃崏绋�0鈫掑緟璐ㄦ2鈫掑緟鍏ュ簱3鈫掑畬鎴�4锛涜〃澶村甫閲囪喘鍚堝悓鍙�(閫夋嫨閲囪喘璁㈠崟鑷姩甯﹀叆锛屾崲璐у埌璐ф部鐢ㄥ師閫�璐у崟鍚堝悓鍙�)锛屽彲鎸夊悎鍚屽彿妫�绱�",
+ "doc": "閲囪喘璁㈠崟纭鏀惰揣鐢熸垚锛岃崏绋�0鈫掑緟璐ㄦ2鈫掑緟鍏ュ簱3鈫掑畬鎴�4锛涙棤闇�妫�楠屾垨 IQC 瀹屾垚鍚庤嚜鍔ㄧ敓鎴愰噰璐叆搴撳崟锛涜〃澶村甫閲囪喘鍚堝悓鍙�(閫夋嫨閲囪喘璁㈠崟鑷姩甯﹀叆锛屾崲璐у埌璐ф部鐢ㄥ師閫�璐у崟鍚堝悓鍙�)锛屽彲鎸夊悎鍚屽彿妫�绱�",
"upstream": [
"閲囪喘璁㈠崟",
"渚涘簲鍟嗛��璐�(鎹㈣揣)"
@@ -512,7 +514,7 @@
"name": "閲囪喘鍏ュ簱鍗�",
"module": "浠撳偍",
"table": "mes_wm_item_receipt",
- "doc": "鑽夌0鈫掑緟涓婃灦2鈫掑緟鎵ц3鈫掑畬鎴�4锛屽畬鎴愬悗搴撳瓨+骞跺洖鍐� ERP inCount/inStatus",
+ "doc": "鍒拌揣閫氱煡鎻愪氦鎴� IQC 鍚堟牸鍚庤嚜鍔ㄧ敓鎴愶紙寰呭叆搴�0锛夛紝搴撶鏍稿鏁伴噺骞堕�夋嫨浠撳簱/搴撳尯/搴撲綅鍚庝竴姝ャ�岀‘璁ゅ叆搴撱�嶏紙瀹屾垚4锛夛紝瀹屾垚鍚庡簱瀛�+骞跺洖鍐� ERP inCount/inStatus锛涙棫娴佺▼鐨勫緟涓婃灦2/寰呮墽琛�3 鍗曟嵁浠嶅彲纭鍏ュ簱",
"upstream": [
"鍒拌揣閫氱煡"
],
diff --git a/docs/project-business/index.html b/docs/project-business/index.html
index 7677881..10c661b 100644
--- a/docs/project-business/index.html
+++ b/docs/project-business/index.html
@@ -1544,7 +1544,7 @@
"name": "鍒拌揣閫氱煡鍗�",
"module": "浠撳偍",
"table": "mes_wm_arrival_notice",
- "doc": "閲囪喘璁㈠崟纭鏀惰揣鐢熸垚锛岃崏绋�0鈫掑緟璐ㄦ2鈫掑緟鍏ュ簱3鈫掑畬鎴�4锛涜〃澶村甫閲囪喘鍚堝悓鍙�(閫夋嫨閲囪喘璁㈠崟鑷姩甯﹀叆锛屾崲璐у埌璐ф部鐢ㄥ師閫�璐у崟鍚堝悓鍙�)锛屽彲鎸夊悎鍚屽彿妫�绱�",
+ "doc": "閲囪喘璁㈠崟纭鏀惰揣鐢熸垚锛岃崏绋�0鈫掑緟璐ㄦ2鈫掑緟鍏ュ簱3鈫掑畬鎴�4锛涙棤闇�妫�楠屾垨 IQC 瀹屾垚鍚庤嚜鍔ㄧ敓鎴愰噰璐叆搴撳崟锛涜〃澶村甫閲囪喘鍚堝悓鍙�(閫夋嫨閲囪喘璁㈠崟鑷姩甯﹀叆锛屾崲璐у埌璐ф部鐢ㄥ師閫�璐у崟鍚堝悓鍙�)锛屽彲鎸夊悎鍚屽彿妫�绱�",
"upstream": [
"閲囪喘璁㈠崟",
"渚涘簲鍟嗛��璐�(鎹㈣揣)"
@@ -1559,7 +1559,7 @@
"name": "閲囪喘鍏ュ簱鍗�",
"module": "浠撳偍",
"table": "mes_wm_item_receipt",
- "doc": "鑽夌0鈫掑緟涓婃灦2鈫掑緟鎵ц3鈫掑畬鎴�4锛屽畬鎴愬悗搴撳瓨+骞跺洖鍐� ERP inCount/inStatus",
+ "doc": "鍒拌揣閫氱煡鎻愪氦鎴� IQC 鍚堟牸鍚庤嚜鍔ㄧ敓鎴愶紙寰呭叆搴�0锛夛紝搴撶鏍稿鏁伴噺骞堕�夋嫨浠撳簱/搴撳尯/搴撲綅鍚庝竴姝ャ�岀‘璁ゅ叆搴撱�嶏紙瀹屾垚4锛夛紝瀹屾垚鍚庡簱瀛�+骞跺洖鍐� ERP inCount/inStatus锛涙棫娴佺▼鐨勫緟涓婃灦2/寰呮墽琛�3 鍗曟嵁浠嶅彲纭鍏ュ簱",
"upstream": [
"鍒拌揣閫氱煡"
],
@@ -2032,7 +2032,7 @@
},
{
"stage": "鏀惰揣",
- "action": "纭鏀惰揣鐢熸垚鍒拌揣閫氱煡(0鈫掑緟璐ㄦ2/寰呭叆搴�3鈫�4)锛涢渶妫�鐗╂枡鑷姩鍒涘缓 IQC",
+ "action": "纭鏀惰揣鐢熸垚鍒拌揣閫氱煡(0鈫掑緟璐ㄦ2/寰呭叆搴�3鈫�4)锛涢渶妫�鐗╂枡鐢卞簱绠″湪鍒拌揣閫氱煡鐐广�屾墽琛岃川妫�銆嶆墠鐢熸垚 IQC锛屼笉鐐瑰垯涓嶇敓鎴愩�佷篃涓嶈兘鍏ュ簱锛涙棤闇�妫�楠岀殑鎻愪氦鍗宠嚜鍔ㄧ敓鎴愰噰璐叆搴撳崟",
"roles": [
"浠撶",
"IQC 璐ㄦ鍛�"
@@ -2040,7 +2040,7 @@
},
{
"stage": "鍏ュ簱",
- "action": "IQC 鍚堟牸/鐗归噰鈫掗噰璐叆搴�(寰呬笂鏋垛啋寰呮墽琛屸啋瀹屾垚)搴撳瓨+锛屽洖鍐欒鍗� inCount/inStatus 涓庣敵璇锋槑缁�",
+ "action": "IQC 鍚堟牸/鐗归噰鈫掔郴缁熻嚜鍔ㄧ敓鎴愰噰璐叆搴撳崟(寰呭叆搴�0)鈫掑簱绠℃牳瀵规暟閲忋�侀�夊叆搴撲粨搴�/搴撳尯/搴撲綅鍚庣偣銆岀‘璁ゅ叆搴撱�嶄竴姝ュ畬鎴�(鈫掑畬鎴�4)锛屽簱瀛�+锛屽洖鍐欒鍗� inCount/inStatus 涓庣敵璇锋槑缁嗭紱涓嶅啀鏈夋彁浜�/鎵ц涓婃灦/鍒拌揣閫氱煡鎵ц鍏ュ簱姝ラ",
"roles": [
"浠撶"
]
@@ -2855,10 +2855,12 @@
C4 --> C3
C3 -->|纭鏀惰揣| C5[鍒拌揣閫氱煡鍗暵疯崏绋�0鈫掑緟璐ㄦ2鈫掑緟鍏ュ簱3鈫掑畬鎴�4]
C5 -->|鐗╂枡闇�妫�楠屄疯嚜鍔ㄥ垱寤簗 C6[IQC 鏉ユ枡妫�楠宂
- C6 -->|鍚堟牸1鎴栫壒閲�2 鍙叆搴搢 C7[閲囪喘鍏ュ簱鍗暵疯崏绋�0鈫掑緟涓婃灦2鈫掑緟鎵ц3鈫掑畬鎴�4]
+ C5 -.->|鏃犻渶妫�楠屄锋彁浜ゅ嵆鑷姩鐢熸垚鍏ュ簱鍗晐 C7
+ C6 -->|鍚堟牸1鎴栫壒閲�2路鍏ㄩ儴闇�妫�琛屽畬鎴愬悗鑷姩鐢熸垚鍏ュ簱鍗晐 C7[閲囪喘鍏ュ簱鍗暵峰緟鍏ュ簱0鈫掑畬鎴�4路搴撶鏍稿鏁伴噺鍚庝竴姝ョ‘璁ゅ叆搴揮
C6 -->|涓嶅悎鏍奸��璐�3| C8[渚涘簲鍟嗛��璐疯崏绋库啋瀹℃壒涓�(BPM 閲囪喘鈫掕川閲忊啋浠撳簱)鈫掑緟鎷h揣鈫掑緟鎵ц鈫掑畬鎴惵峰簱瀛樻墸鍑忥紱閫�娆锯啋璐熸暟鍐茬孩浠樻鍗曪紱鎹㈣揣鈫掑埌璐ч�氱煡+IQC 閲嶆柊鍏ュ簱]
C6 -->|涓嶅悎鏍兼姤搴�4| C9[NCR 涓嶅悎鏍煎搧澶勭疆]
C7 -->|鍥炲啓 inCount 涓� inStatus 鏈叆搴�0閮ㄥ垎1鍏ㄩ儴2| C3
+ C7 -.->|纭鍏ュ簱鏃堕�夋暣鍗曞叆搴撲粨搴�/搴撳尯/搴撲綅路鑷姩鎸夎鐢熸垚鍏ュ簱鏄庣粏涓庢壒娆÷蜂笉鍐嶆墽琛屼笂鏋秥 C7NOTE[搴撳瓨浜嬪姟路搴撳瓨+路鍒拌揣閫氱煡瀹屾垚]
C7 -->|鍥炲啓鐢宠鏄庣粏 inCount| C1
C3 -->|璁㈠崟鎬讳环鎺у埗| C10[閲囪喘鏉ョエ FPD路绱閲戦鈮よ鍗曟�讳环]
C10 -->|浠樻鍗曞繀椤诲叧鑱旀潵绁▅ C11[浠樻鍗� FKD路瀹℃壒涓�15鈫掑凡瀹℃牳20路绱浠樻鈮ゆ潵绁ㄩ噾棰漖
diff --git a/docs/project-business/mermaid/03-purchase-flow.mmd b/docs/project-business/mermaid/03-purchase-flow.mmd
index 2b151a7..f4d25c8 100644
--- a/docs/project-business/mermaid/03-purchase-flow.mmd
+++ b/docs/project-business/mermaid/03-purchase-flow.mmd
@@ -1,21 +1,32 @@
flowchart TD
- S1[渚涘簲鍟嗘。妗� srm_supplier路澶氳仈绯讳汉/澶氶摱琛屽惈閾惰琛屽彿] --> S2[璇环姣斾环 srm_inquiry路鑽夌0鈫掑凡杞鍗�20]
- S2 -->|鏂板鏃朵竴骞跺綍鍏ヤ骇鍝伱椾緵搴斿晢鎶ヤ环骞堕�夊畾涓爣路鍒楄〃鐩存帴纭| S3[鎸変腑鏍囦緵搴斿晢鎷嗗垎鐢熸垚閲囪喘璁㈠崟鑽夌]
- S3 -->|鎻愪氦| C3
- C1[閲囪喘鐢宠 CGSQ路鑽夌0鈫掑鎵逛腑10] -->|鎻愪氦BPM| C2{瀹℃壒}
+ S1[渚涘簲鍟嗘。妗� srm_supplier路澶氳仈绯讳汉/澶氶摱琛屽惈閾惰琛屽彿] --> S2[璇环姣斾环 srm_inquiry路鑽夌0鈫掕浠蜂腑10鈫掑鏍镐腑40鈫掑鏍搁�氳繃50鈫掑凡杞鍗�20/宸插彇娑�30]
+ C1[閲囪喘鐢宠 CGSQ路鍙浜у搧/鏁伴噺/闇�姹傛棩鏈熉蜂笉璁颁环鏍悸蜂笉濉緵搴斿晢路涓嶅~鏄惁璐ㄦ路鑽夌0鈫掑鎵逛腑10] -->|鎻愪氦BPM| C2{瀹℃壒}
C2 -->|椹冲洖30鈫掑彲閲嶇疆鍥炶崏绋縷 C1
- C2 -->|閫氳繃20涓旀湁渚涘簲鍟喡疯嚜鍔ㄧ敓鎴恷 C3[閲囪喘鍙拌处 CGDD路閲囪喘绫诲瀷/鍚堝悓鍙�/椤圭洰/浠樻鏃ユ湡/浠樻鏂瑰紡路瀹℃壒涓�15鈫掑凡瀹℃牳20]
- C2 -->|閫氳繃20鏃犱緵搴斿晢| C4[鎵嬪姩鎸囧畾渚涘簲鍟嗙敓鎴愯鍗昡
+ C2 -->|閫氳繃20路浠呮敼鐘舵�佷笉鐢熸垚鍙拌处| C2A{閲囪喘鍛樺湪鈥滆浠锋瘮浠封�濋〉鐨勨�滈噰璐敵璇峰緟澶勭悊鈥濋〉绛�(甯﹁鏍嚶锋湁寰呭鐞嗘椂榛樿灞曠ず)涓喅瀹殅
+ C2A -->|闇�瑕佽浠锋瘮浠仿峰彂璧疯浠穦 S2
+ S2 -->|鎸夌敵璇锋槑缁嗙敓鎴愯浠峰崟鑽夌路鍥炲啓鐢宠 inquiryId/inquiryNo| S2
+ S2 -->|琛ュ厖渚涘簲鍟喢椾骇鍝佹姤浠峰苟閫夊畾涓爣路鎻愪氦瀹℃牳| S2B{璇环瀹℃牳}
+ S2B -->|閫氳繃50路纭杞鍗晐 C3
+ S2B -->|椹冲洖60鈫掑彲鏀瑰悗閲嶆彁| S2
+ S2 -->|鍙栨秷/鍒犻櫎路娓呯┖鐢宠璇环鍏宠仈| C2A
+ C2A -->|涓嶉渶瑕佹瘮浠仿风敓鎴愬彴璐 C4[鐩存帴鐢熸垚闆堕噾棰澛锋棤渚涘簲鍟嗗彴璐﹁崏绋縘
C4 --> C3
+ C3[閲囪喘鍙拌处 CGDD路浠锋牸鏉ヨ嚜涓爣鎶ヤ环鎴栭噰璐憳琛ュ綍路閲囪喘绫诲瀷/鍚堝悓鍙�/椤圭洰/浠樻鏃ユ湡/浠樻鏂瑰紡路鑽夌0鈫掑鎵逛腑15鈫掑凡瀹℃牳20]
C3 -->|纭鏀惰揣| C5[鍒拌揣閫氱煡鍗暵疯崏绋�0鈫掑緟璐ㄦ2鈫掑緟鍏ュ簱3鈫掑畬鎴�4]
- C5 -->|鐗╂枡闇�妫�楠屄疯嚜鍔ㄥ垱寤簗 C6[IQC 鏉ユ枡妫�楠宂
- C6 -->|鍚堟牸1鎴栫壒閲�2 鍙叆搴搢 C7[閲囪喘鍏ュ簱鍗暵疯崏绋�0鈫掑緟涓婃灦2鈫掑緟鎵ц3鈫掑畬鎴�4]
+ C5 -->|鐗╂枡闇�妫�楠屄峰簱绠$偣銆屾墽琛岃川妫�銆嶆墠鍒涘缓| C6[IQC 鏉ユ枡妫�楠宂
+ C5 -.->|涓嶇偣鎵ц璐ㄦ鍒欎笉鐢熸垚 IQC路鍗曟嵁鍋滃湪寰呰川妫�路涓嶈兘鍏ュ簱| C6
+ C5 -.->|鏃犻渶妫�楠屄锋彁浜ゅ嵆鑷姩鐢熸垚鍏ュ簱鍗晐 C7
+ C6 -->|鍚堟牸1鎴栫壒閲�2路鍏ㄩ儴闇�妫�琛屽畬鎴愬悗鑷姩鐢熸垚鍏ュ簱鍗晐 C7[閲囪喘鍏ュ簱鍗暵峰緟鍏ュ簱0鈫掑畬鎴�4路搴撶鏍稿鏁伴噺鍚庝竴姝ョ‘璁ゅ叆搴揮
C6 -->|涓嶅悎鏍奸��璐�3| C8[渚涘簲鍟嗛��璐疯崏绋库啋瀹℃壒涓�(BPM 閲囪喘鈫掕川閲忊啋浠撳簱)鈫掑緟鎷h揣鈫掑緟鎵ц鈫掑畬鎴惵峰簱瀛樻墸鍑忥紱閫�娆锯啋璐熸暟鍐茬孩浠樻鍗曪紱鎹㈣揣鈫掑埌璐ч�氱煡+IQC 閲嶆柊鍏ュ簱]
C6 -->|涓嶅悎鏍兼姤搴�4| C9[NCR 涓嶅悎鏍煎搧澶勭疆]
C7 -->|鍥炲啓 inCount 涓� inStatus 鏈叆搴�0閮ㄥ垎1鍏ㄩ儴2| C3
+ C7 -.->|纭鍏ュ簱鏃堕�夋暣鍗曞叆搴撲粨搴�/搴撳尯/搴撲綅路鑷姩鎸夎鐢熸垚鍏ュ簱鏄庣粏涓庢壒娆÷蜂笉鍐嶆墽琛屼笂鏋秥 C7NOTE[搴撳瓨浜嬪姟路搴撳瓨+路鍒拌揣閫氱煡瀹屾垚]
C7 -->|鍥炲啓鐢宠鏄庣粏 inCount| C1
C3 -->|璁㈠崟鎬讳环鎺у埗| C10[閲囪喘鏉ョエ FPD路绱閲戦鈮よ鍗曟�讳环]
C10 -->|浠樻鍗曞繀椤诲叧鑱旀潵绁▅ C11[浠樻鍗� FKD路瀹℃壒涓�15鈫掑凡瀹℃牳20路绱浠樻鈮ゆ潵绁ㄩ噾棰漖
C3 --> S6[渚涘簲鍟嗗線鏉ヂ疯鍗曟祦姘村惈宸插紑绁�/鏈紑绁╙
C10 --> S6
C11 --> S6
+ C2 -.->|浠诲姟鍒嗛厤鍒板鎵逛汉鍗冲彂绔欏唴淇÷烽搩閾涚偣鍑荤洿杈惧緟鍔炰换鍔 N1[BPM 寰呭姙閫氱煡 bpm_task_assigned路瀹℃壒涓績路鎵�鏈夋祦绋嬮�氱敤路浠诲姟鑷姩閫氳繃/宸茬粨鏉熶笉鍙慮
+ S2B -.->|鍚屼笂| N1
+ C3 -.->|鍚屼笂| N1
diff --git a/docs/project-business/mermaid/05-quality-flow.mmd b/docs/project-business/mermaid/05-quality-flow.mmd
index b882a96..44684fd 100644
--- a/docs/project-business/mermaid/05-quality-flow.mmd
+++ b/docs/project-business/mermaid/05-quality-flow.mmd
@@ -1,5 +1,6 @@
flowchart TD
T1[鍒拌揣閫氱煡鍗� 鎴� 澶栧崗鍏ュ簱鍗昡 --> A1[IQC 鏉ユ枡妫�楠屄疯崏绋�0鈫掑畬鎴�4]
+ T1 -.->|鍒拌揣閫氱煡锛氬簱绠$偣銆屾墽琛岃川妫�銆嶆墠鐢熸垚 IQC路涓嶇偣涓嶇敓鎴愪篃涓嶈兘鍏ュ簱| A1
T2[鎶ュ伐鍚庝骇鍑鸿路鐢辫川閲忛儴闂ㄦ墜宸ユ柊寤� IPQC] --> A2[IPQC 杩囩▼妫�楠屄疯崏绋�0鈫掑畬鎴�4]
T2 -.->|鏂板缓鏃剁粦瀹氱敓浜у伐鍗暵峰伐搴忕敱宸ュ崟宸ヨ壓璺嚎甯﹀嚭路鍗婃垚鍝佺敱璇ュ伐搴忎骇鍑虹墿鏂欏甫鍑郝风洏鍙锋墜宸ュ綍鍏 A2
A2 -.->|鏂板缓/缂栬緫路閫夊伐浣嶆寜宸ュ簭甯﹀嚭璇ュ伐搴忕淮鎶ょ殑鑷畾涔夊伐璧勫瓧娈德锋暟鍊�/鏂囨湰/涓嬫媺/甯冨皵鎺т欢鎸夊瓧娈电被鍨嬪喅瀹殀 QWF[宸ヨ祫瀛楁濉啓路鐢辫川妫�濉啓路鎶ュ伐瀹℃壒閲嶇畻宸ヨ祫浼樺厛鍙栨鍊悸锋湭濉洖閫�宸ュ簭鍥哄畾鍊糫
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
index 8f35b03..c2414c8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
@@ -114,6 +114,14 @@
return success(true);
}
+ @PostMapping("/create-iqc")
+ @Operation(summary = "鎵ц璐ㄦ锛氫负鍒拌揣閫氱煡鍗曠殑闇�妫�琛岀敓鎴愭潵鏂欐楠屽崟")
+ @Parameter(name = "id", description = "鍒拌揣閫氱煡鍗曠紪鍙�", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-arrival-notice:update')")
+ public CommonResult<Integer> createArrivalNoticeIqc(@RequestParam("id") Long id) {
+ return success(arrivalNoticeService.createIqcForArrivalNotice(id));
+ }
+
@PostMapping("/generate-from-purchase-order")
@Operation(summary = "鏍规嵁閲囪喘璁㈠崟鐢熸垚鍒拌揣閫氱煡鍗�")
@Parameter(name = "purchaseOrderId", description = "閲囪喘璁㈠崟缂栧彿", required = true)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
index 0e62517..8cf3289 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
@@ -127,14 +127,30 @@
}
@PutMapping("/finish")
- @Operation(summary = "鎵ц鍏ュ簱")
+ @Operation(summary = "鎵ц鍏ュ簱锛堟棫娴佺▼锛屽凡鐢辩‘璁ゅ叆搴撳彇浠o級")
@Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:finish')")
+ @Deprecated
public CommonResult<Boolean> finishItemReceipt(@RequestParam("id") Long id) {
itemReceiptService.finishItemReceipt(id);
return success(true);
}
+ @PutMapping("/confirm")
+ @Operation(summary = "纭鍏ュ簱锛氭牳瀵规暟閲忓悗涓�姝ュ畬鎴愬叆搴�")
+ @Parameter(name = "id", description = "閲囪喘鍏ュ簱鍗曠紪鍙�", required = true)
+ @Parameter(name = "warehouseId", description = "鍏ュ簱浠撳簱缂栧彿", required = true)
+ @Parameter(name = "locationId", description = "鍏ュ簱搴撳尯缂栧彿", required = true)
+ @Parameter(name = "areaId", description = "鍏ュ簱搴撲綅缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:finish')")
+ public CommonResult<Boolean> confirmItemReceipt(@RequestParam("id") Long id,
+ @RequestParam(value = "warehouseId", required = false) Long warehouseId,
+ @RequestParam(value = "locationId", required = false) Long locationId,
+ @RequestParam(value = "areaId", required = false) Long areaId) {
+ itemReceiptService.confirmItemReceipt(id, warehouseId, locationId, areaId);
+ return success(true);
+ }
+
@PutMapping("/cancel")
@Operation(summary = "鍙栨秷閲囪喘鍏ュ簱鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true)
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 d300820..0ead565 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
@@ -590,6 +590,9 @@
ErrorCode WM_ARRIVAL_NOTICE_NO_LINE = new ErrorCode(1_040_704_006, "鑷冲皯闇�瑕佷竴鏉¤椤圭洰");
ErrorCode WM_ARRIVAL_NOTICE_VENDOR_MISMATCH = new ErrorCode(1_040_704_007, "鍒拌揣閫氱煡鍗曠殑渚涘簲鍟嗕笌褰撳墠鍗曟嵁涓嶄竴鑷�");
ErrorCode WM_ARRIVAL_NOTICE_ALREADY_EXISTS = new ErrorCode(1_040_704_008, "璇ラ噰璐鍗曞凡鐢熸垚鍒拌揣閫氱煡鍗曪紝涓嶈兘閲嶅鐢熸垚");
+ ErrorCode WM_ARRIVAL_NOTICE_NO_IQC_LINE = new ErrorCode(1_040_704_009, "鍒拌揣閫氱煡鍗曟病鏈夐渶瑕佹楠岀殑鏄庣粏琛岋紝鏃犻渶鐢熸垚鏉ユ枡妫�楠屽崟");
+ ErrorCode WM_ARRIVAL_NOTICE_IQC_ALREADY_CREATED = new ErrorCode(1_040_704_010, "鍒拌揣閫氱煡鍗曠殑闇�妫�琛屽凡鍏ㄩ儴鐢熸垚鏉ユ枡妫�楠屽崟");
+ ErrorCode WM_ARRIVAL_NOTICE_IQC_CREATE_FAILED = new ErrorCode(1_040_704_011, "鐢熸垚鏉ユ枡妫�楠屽崟澶辫触");
ErrorCode WM_ARRIVAL_NOTICE_LINE_NOT_EXISTS = new ErrorCode(1_040_704_100, "鍒拌揣閫氱煡鍗曡涓嶅瓨鍦�");
ErrorCode WM_ARRIVAL_NOTICE_LINE_NOT_MATCH = new ErrorCode(1_040_704_101, "鍒拌揣閫氱煡鍗曡涓嶅睘浜庢寚瀹氱殑鍒拌揣閫氱煡鍗�");
@@ -613,6 +616,12 @@
ErrorCode WM_ITEM_RECEIPT_DETAIL_NOT_EXISTS = new ErrorCode(1_040_705_200, "閲囪喘鍏ュ簱鏄庣粏涓嶅瓨鍦�");
ErrorCode WM_ITEM_RECEIPT_DETAIL_QUANTITY_EXCEED = new ErrorCode(1_040_705_202, "涓婃灦鏄庣粏鎬绘暟閲忎笉鑳借秴杩囪鍏ュ簱鏁伴噺");
ErrorCode WM_ITEM_RECEIPT_BATCH_REQUIRED = new ErrorCode(1_040_705_203, "鐗╂枡銆恵}-{}銆戝凡寮�鍚壒娆$鐞嗭紝涓婃灦鏄庣粏鐨勬壒娆″彿涓嶈兘涓虹┖");
+ ErrorCode WM_ITEM_RECEIPT_CONFIRM_STATUS_ERROR = new ErrorCode(1_040_705_009, "閲囪喘鍏ュ簱鍗曞綋鍓嶇姸鎬佷笉鍏佽纭鍏ュ簱");
+ ErrorCode WM_ITEM_RECEIPT_CONFIRM_LOCATION_REQUIRED = new ErrorCode(1_040_705_010, "纭鍏ュ簱蹇呴』閫夋嫨鍏ュ簱浠撳簱銆佸簱鍖哄拰搴撲綅");
+ ErrorCode WM_ITEM_RECEIPT_CONFIRM_LOCATION_MISMATCH = new ErrorCode(1_040_705_011, "鍏ュ簱浠撳簱銆佸簱鍖恒�佸簱浣嶇殑灞傜骇涓嶅尮閰�");
+ ErrorCode WM_ITEM_RECEIPT_CONFIRM_QUANTITY_INVALID = new ErrorCode(1_040_705_013, "鍏ュ簱鏁伴噺蹇呴』澶т簬 0");
+ ErrorCode WM_ITEM_RECEIPT_CONFIRM_BATCH_GENERATE_FAILED = new ErrorCode(1_040_705_014, "鐢熸垚鐗╂枡鎵规澶辫触");
+ ErrorCode WM_ITEM_RECEIPT_CONFIRM_DETAIL_MISSING = new ErrorCode(1_040_705_015, "鏃ф祦绋嬬殑寰呮墽琛屽叆搴撳崟缂哄皯涓婃灦鏄庣粏");
// ========== MES 浠撳簱绠$悊-棰嗘枡鐢宠鍗曪紙1-040-706-000锛� ==========
ErrorCode WM_MATERIAL_REQUEST_NOT_EXISTS = new ErrorCode(1_040_706_000, "棰嗘枡鐢宠鍗曚笉瀛樺湪");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java
index 0613c95..cad48d8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java
@@ -64,6 +64,14 @@
void submitArrivalNotice(Long id);
/**
+ * 鎵ц璐ㄦ锛氫负寰呰川妫�鐨勫埌璐ч�氱煡鍗曠殑闇�妫�琛岀敓鎴愭潵鏂欐楠屽崟锛圛QC锛�
+ *
+ * @param id 鍒拌揣閫氱煡鍗曠紪鍙�
+ * @return 鏈鏂板缓鐨勬潵鏂欐楠屽崟鏁伴噺
+ */
+ Integer createIqcForArrivalNotice(Long id);
+
+ /**
* IQC 妫�楠屽畬鎴愬悗鍥炲啓鍒拌揣閫氱煡鍗曪紙鏇存柊琛� + 灏濊瘯鎺ㄨ繘涓昏〃鐘舵�侊級
*
* @param id 鍒拌揣閫氱煡鍗曠紪鍙�
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 c5ac05f..a8b6e3c 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
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -22,6 +23,7 @@
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
+import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
@@ -30,6 +32,7 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -73,6 +76,10 @@
@Resource
@Lazy
private MesQcIqcService iqcService;
+
+ @Resource
+ @Lazy
+ private MesWmItemReceiptService itemReceiptService;
@Override
public Long createArrivalNotice(MesWmArrivalNoticeSaveReqVO createReqVO) {
@@ -161,34 +168,72 @@
}
// 2. 妫�鏌ユ墍鏈夎鐨� iqcCheckFlag锛氬鏋滄湁闇�瑕佹楠岀殑琛岋紝杩涘叆寰呰川妫�鐘舵��
+ // 娉ㄦ剰锛氭潵鏂欐楠屽崟涓嶅湪鎻愪氦鏃剁敓鎴愶紝鐢卞簱绠$偣鍑汇�屾墽琛岃川妫�銆嶆椂閫氳繃 createIqcForArrivalNotice 鐢熸垚
boolean needCheck = CollectionUtils.anyMatch(lines,
line -> Boolean.TRUE.equals(line.getIqcCheckFlag()));
if (needCheck) {
- // 2.1 闇�瑕佹楠岋紝杩涘叆寰呰川妫�
arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
.setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus()));
- // 2.2 涓洪渶瑕佽川妫�鐨勮鑷姩鍒涘缓 IQC 妫�楠屽崟
- for (MesWmArrivalNoticeLineDO line : lines) {
- if (Boolean.TRUE.equals(line.getIqcCheckFlag()) && line.getIqcId() == null) {
- try {
- Long iqcId = iqcService.createIqcFromArrivalNotice(
- id, line, notice.getCode(), notice.getVendorId());
- // 鏇存柊琛屼笂鐨� iqcId
- arrivalNoticeLineService.updateArrivalNoticeLineIqcId(line.getId(), iqcId);
- log.info("[submitArrivalNotice][鍒拌揣閫氱煡鍗�({}) 琛�({}) 鑷姩鍒涘缓 IQC 妫�楠屽崟({})]",
- id, line.getId(), iqcId);
- } catch (Exception e) {
- log.warn("[submitArrivalNotice][鍒拌揣閫氱煡鍗�({}) 琛�({}) 鍒涘缓 IQC 澶辫触: {}]",
- id, line.getId(), e.getMessage());
- // 缁х画澶勭悊鍏朵粬琛岋紝涓嶄腑鏂祦绋�
- }
- }
- }
return;
}
- // 涓嶉渶瑕佹楠岋紝鐩存帴杩涘叆寰呭叆搴�
+ // 涓嶉渶瑕佹楠岋紝鐩存帴杩涘叆寰呭叆搴擄紝骞惰嚜鍔ㄧ敓鎴愰噰璐叆搴撳崟浜ょ粰搴撶纭鍏ュ簱
arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
.setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus()));
+ autoGenerateItemReceipt(notice);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Integer createIqcForArrivalNotice(Long id) {
+ // 1. 鏍¢獙鍒拌揣閫氱煡鍗曞瓨鍦ㄤ笖涓哄緟璐ㄦ鐘舵��
+ MesWmArrivalNoticeDO notice = validateArrivalNoticeExists(id);
+ if (ObjUtil.notEqual(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus(), notice.getStatus())) {
+ String statusName = Arrays.stream(MesWmArrivalNoticeStatusEnum.values())
+ .filter(item -> ObjUtil.equal(item.getStatus(), notice.getStatus()))
+ .map(MesWmArrivalNoticeStatusEnum::getName).findFirst()
+ .orElse(String.valueOf(notice.getStatus()));
+ throw new ServiceException(WM_ARRIVAL_NOTICE_STATUS_NOT_PENDING_QC.getCode(),
+ "鍒拌揣閫氱煡鍗昜" + notice.getCode() + "]褰撳墠鐘舵�佷负[" + statusName + "]锛屽彧鏈夈�屽緟璐ㄦ銆嶇姸鎬佹墠鑳芥墽琛岃川妫�銆�"
+ + "璇峰埛鏂板垪琛ㄧ‘璁ゅ崟鎹姸鎬侊紱鑻ヨ鍗曟嵁宸叉墽琛岃繃璐ㄦ锛岃鐩存帴鍒般�愯川閲忕鐞� - IQC妫�楠屻�戝綍鍏ユ娴嬬粨鏋溿��");
+ }
+ // 2. 鏍¢獙闇�妫�琛�
+ List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(id);
+ List<MesWmArrivalNoticeLineDO> needCheckLines = lines.stream()
+ .filter(line -> Boolean.TRUE.equals(line.getIqcCheckFlag()))
+ .toList();
+ if (needCheckLines.isEmpty()) {
+ throw new ServiceException(WM_ARRIVAL_NOTICE_NO_IQC_LINE.getCode(),
+ "鍒拌揣閫氱煡鍗昜" + notice.getCode() + "]鐨勬槑缁嗚鍧囦负銆屼笉闇�妫�楠屻�嶏紝鏃犻渶鐢熸垚鏉ユ枡妫�楠屽崟銆�"
+ + "璇风洿鎺ュ埌璇ュ崟鎹墽琛屽叆搴擄紱鑻ユ湰搴旀楠岋紝璇锋牳瀵归噰璐鍗曡鐨勬楠屾爣璇嗭紙璇ユ爣璇嗙敱閲囪喘璁㈠崟甯﹀叆锛屽埌璐ч�氱煡鍗曚笂涓嶅彲淇敼锛夈��");
+ }
+ List<MesWmArrivalNoticeLineDO> pendingLines = needCheckLines.stream()
+ .filter(line -> line.getIqcId() == null)
+ .toList();
+ if (pendingLines.isEmpty()) {
+ throw new ServiceException(WM_ARRIVAL_NOTICE_IQC_ALREADY_CREATED.getCode(),
+ "鍒拌揣閫氱煡鍗昜" + notice.getCode() + "]鐨� " + needCheckLines.size()
+ + " 鏉¢渶妫�琛屽潎宸茬敓鎴愭潵鏂欐楠屽崟锛屾棤闇�閲嶅鐢熸垚銆傝鐩存帴鍒般�愯川閲忕鐞� - IQC妫�楠屻�戝綍鍏ユ娴嬬粨鏋滐紱"
+ + "濡傞渶閲嶆柊鐢熸垚锛岃鍏堝垹闄ゅ師妫�楠屽崟銆�");
+ }
+ // 3. 閫愯鐢熸垚鏉ユ枡妫�楠屽崟
+ int createdCount = 0;
+ for (MesWmArrivalNoticeLineDO line : pendingLines) {
+ Long iqcId;
+ try {
+ iqcId = iqcService.createIqcFromArrivalNotice(id, line, notice.getCode(), notice.getVendorId());
+ } catch (Exception ex) {
+ log.error("[createIqcForArrivalNotice][鍒拌揣閫氱煡鍗�({}) 琛�({}) 鍒涘缓 IQC 澶辫触]", id, line.getId(), ex);
+ throw new ServiceException(WM_ARRIVAL_NOTICE_IQC_CREATE_FAILED.getCode(),
+ "鍒拌揣閫氱煡鍗昜" + notice.getCode() + "]鐨勬槑缁嗚锛堢墿鏂橧D=" + line.getItemId()
+ + "锛夌敓鎴愭潵鏂欐楠屽崟澶辫触锛�" + ex.getMessage()
+ + "銆傝绋嶅悗閲嶈瘯锛涜嫢鎸佺画澶辫触锛岃鍒般�愯川閲忕鐞� - IQC妫�楠屻�戞墜宸ユ柊寤烘楠屽崟銆�");
+ }
+ arrivalNoticeLineService.updateArrivalNoticeLineIqcId(line.getId(), iqcId);
+ createdCount++;
+ log.info("[createIqcForArrivalNotice][鍒拌揣閫氱煡鍗�({}) 琛�({}) 鐢熸垚 IQC 妫�楠屽崟({})]",
+ id, line.getId(), iqcId);
+ }
+ return createdCount;
}
@Override
@@ -206,6 +251,47 @@
// 鍚屾椂璁ゅ彲浠撳簱宸茬‘璁ょ殑鏉ユ枡閫�璐э紱淇濈暀鍘熷涓嶅悎鏍肩粨璁恒��
arrivalDispositionService.refresh(id);
+ // 3.1 鍒ゆ柇鏄惁鎵�鏈夐渶妫�琛岄兘宸插畬鎴愯川妫�
+ List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(id);
+ boolean hasUnchecked = CollectionUtils.anyMatch(lines,
+ line -> Boolean.TRUE.equals(line.getIqcCheckFlag()) && line.getIqcCheckResult() == null);
+ if (hasUnchecked) {
+ log.info("[updateArrivalNoticeWhenIqcFinish][鍒拌揣閫氱煡鍗�({}) 杩樻湁鏈畬鎴愭楠岀殑琛岋紝鏆備笉鏇存柊鐘舵�乚", id);
+ return;
+ }
+
+ // 3.2 鍒ゆ柇鏄惁鎵�鏈夐渶妫�琛岄兘鍙互鍏ュ簱锛堝悎鏍兼垨鐗归噰锛�
+ boolean hasNonInbound = CollectionUtils.anyMatch(lines,
+ line -> Boolean.TRUE.equals(line.getIqcCheckFlag())
+ && !MesQcCheckResultEnum.canInbound(line.getIqcCheckResult()));
+ if (hasNonInbound) {
+ log.info("[updateArrivalNoticeWhenIqcFinish][鍒拌揣閫氱煡鍗�({}) 瀛樺湪涓嶅彲鍏ュ簱鐨勮锛堥��璐�/鎶ュ簾锛夛紝鐘舵�佷繚鎸佸緟璐ㄦ]", id);
+ return;
+ }
+
+ // 3.3 鎵�鏈夎妫�楠屽畬鎴愪笖鍙叆搴擄紝鏇存柊涓昏〃鐘舵�� PENDING_QC 鈫� PENDING_RECEIPT
+ arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
+ .setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus()));
+ // 3.4 璐ㄦ鍚堟牸鍚庣洿鎺ョ敓鎴愰噰璐叆搴撳崟锛堝緟鍏ュ簱锛夛紝搴撶鍙渶鏍稿鏁伴噺骞剁‘璁ゅ叆搴�
+ autoGenerateItemReceipt(notice);
+ }
+
+ /**
+ * 鍒拌揣閫氱煡鍗曡繘鍏ャ�屽緟鍏ュ簱銆嶅悗鑷姩鐢熸垚閲囪喘鍏ュ簱鍗曘��
+ * 搴撶鏃犻渶鍐嶅洖鍒板埌璐ч�氱煡鐐广�屾墽琛屽叆搴撱�嶏紝鐩存帴鍒般�愰噰璐叆搴撱�戞牳瀵规暟閲忓苟纭鍏ュ簱鍗冲彲銆�
+ */
+ private void autoGenerateItemReceipt(MesWmArrivalNoticeDO notice) {
+ try {
+ Long receiptId = itemReceiptService.generateItemReceiptFromArrivalNotice(notice.getId());
+ log.info("[autoGenerateItemReceipt][鍒拌揣閫氱煡鍗�({}) 宸茶嚜鍔ㄧ敓鎴愰噰璐叆搴撳崟({})]",
+ notice.getId(), receiptId);
+ } catch (ServiceException ex) {
+ log.error("[autoGenerateItemReceipt][鍒拌揣閫氱煡鍗�({}) 鑷姩鐢熸垚閲囪喘鍏ュ簱鍗曞け璐",
+ notice.getId(), ex);
+ throw new ServiceException(ex.getCode(),
+ "鍒拌揣閫氱煡鍗昜" + notice.getCode() + "]杞叆寰呭叆搴撳悗鑷姩鐢熸垚閲囪喘鍏ュ簱鍗曞け璐ワ細" + ex.getMessage()
+ + "銆傛湰娆℃搷浣滄湭鐢熸晥锛岃绋嶅悗閲嶈瘯锛涜嫢鎸佺画澶辫触璇疯仈绯荤鐞嗗憳銆�");
+ }
}
@Override
@@ -362,21 +448,11 @@
arrivalNoticeLineService.createArrivalNoticeLineFromPurchaseOrderItem(line);
}
- // 7. 濡傛灉鏈夐渶瑕佽川妫�鐨勮锛屾洿鏂扮姸鎬佷负寰呰川妫�骞惰嚜鍔ㄥ垱寤� IQC 鍗�
+ // 7. 濡傛灉鏈夐渶瑕佽川妫�鐨勮锛屾洿鏂扮姸鎬佷负寰呰川妫�
+ // 娉ㄦ剰锛氭潵鏂欐楠屽崟涓嶅湪鐢熸垚鏃跺垱寤猴紝鐢卞簱绠$偣鍑汇�屾墽琛岃川妫�銆嶆椂閫氳繃 createIqcForArrivalNotice 鐢熸垚
if (hasNeedQc) {
arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
.setId(notice.getId()).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus()));
- // 涓洪渶瑕佽川妫�鐨勮鑷姩鍒涘缓 IQC 妫�楠屽崟
- List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(notice.getId());
- for (MesWmArrivalNoticeLineDO line : lines) {
- if (Boolean.TRUE.equals(line.getIqcCheckFlag())) {
- Long iqcId = iqcService.createIqcFromArrivalNotice(
- notice.getId(), line, notice.getCode(), notice.getVendorId());
- arrivalNoticeLineService.updateArrivalNoticeLineIqcId(line.getId(), iqcId);
- log.info("[generateArrivalNoticeFromPurchaseOrder][鍒拌揣閫氱煡鍗�({}) 琛�({}) 鑷姩鍒涘缓 IQC 妫�楠屽崟({})]",
- notice.getId(), line.getId(), iqcId);
- }
- }
}
return notice.getId();
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineService.java
index 1af3ad6..7d6fdb1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineService.java
@@ -67,6 +67,15 @@
void deleteItemReceiptLineByReceiptId(Long receiptId);
/**
+ * 鍥炲啓鍏ュ簱鍗曡鐨勬壒娆★紙纭鍏ュ簱鏃惰嚜鍔ㄧ敓鎴愭壒娆″悗璋冪敤锛屼笉鏍¢獙鐖跺崟鎹姸鎬侊級
+ *
+ * @param id 琛岀紪鍙�
+ * @param batchId 鎵规缂栧彿
+ * @param batchCode 鎵规缂栫爜
+ */
+ void updateItemReceiptLineBatch(Long id, Long batchId, String batchCode);
+
+ /**
* 鏍规嵁鍒拌揣閫氱煡鍗曡鍒涘缓鍏ュ簱鍗曡锛堝唴閮ㄦ柟娉曪紝涓嶆牎楠岋級
*
* @param line 鍏ュ簱鍗曡
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java
index 91b03fc..b50f289 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java
@@ -134,6 +134,13 @@
}
@Override
+ public void updateItemReceiptLineBatch(Long id, Long batchId, String batchCode) {
+ // 鍐呴儴鏂规硶锛氱‘璁ゅ叆搴撴椂鑷姩鐢熸垚鎵规鍚庡洖鍐欙紝涓嶅仛鐖跺崟鎹姸鎬佹牎楠�
+ itemReceiptLineMapper.updateById(new MesWmItemReceiptLineDO()
+ .setId(id).setBatchId(batchId).setBatchCode(batchCode));
+ }
+
+ @Override
public void createItemReceiptLineFromArrivalNoticeLine(MesWmItemReceiptLineDO line) {
// 鍐呴儴鏂规硶锛屼笉鍋氭牎楠岋紝鐩存帴鎻掑叆
itemReceiptLineMapper.insert(line);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
index 487d2b6..591b684 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
@@ -73,9 +73,23 @@
*
* @param id 缂栧彿
*/
+ @Deprecated
void finishItemReceipt(Long id);
/**
+ * 纭鍏ュ簱锛堢畝鍖栨祦绋嬶級锛氭牳瀵规暟閲忓悗涓�姝ュ畬鎴愬叆搴�
+ *
+ * 鍏佽浠庤崏绋裤�佹棫娴佺▼鐨勫緟涓婃灦锛堥潪瀹℃壒涓級銆佸緟鎵ц鍏ュ簱 鐩存帴瀹屾垚锛�
+ * 閫愯琛ラ綈鎵规涓庝笂鏋舵槑缁嗭紝鎸夋墍閫変粨搴�/搴撳尯/搴撲綅鐢熸垚搴撳瓨浜嬪姟锛屽苟鎶婂崟鎹疆涓哄凡瀹屾垚銆�
+ *
+ * @param id 閲囪喘鍏ュ簱鍗曠紪鍙�
+ * @param warehouseId 鍏ュ簱浠撳簱缂栧彿
+ * @param locationId 鍏ュ簱搴撳尯缂栧彿
+ * @param areaId 鍏ュ簱搴撲綅缂栧彿
+ */
+ void confirmItemReceipt(Long id, Long warehouseId, Long locationId, Long areaId);
+
+ /**
* 鍙栨秷閲囪喘鍏ュ簱鍗曪紙浠绘剰闈炲凡瀹屾垚/宸插彇娑堢姸鎬� 鈫� 宸插彇娑堬級
*
* @param id 缂栧彿
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
index b2b7b01..83d2a04 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
@@ -4,17 +4,28 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchGenerateReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptLineDO;
+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;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt.MesWmItemReceiptMapper;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmItemReceiptStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
@@ -42,6 +53,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -94,6 +106,15 @@
@Resource
private MdmItemApi mdmItemApi;
+
+ @Resource
+ private MesWmWarehouseService warehouseService;
+ @Resource
+ private MesWmWarehouseLocationService warehouseLocationService;
+ @Resource
+ private MesWmWarehouseAreaService warehouseAreaService;
+ @Resource
+ private MesWmBatchService batchService;
@Override
public Long createItemReceipt(MesWmItemReceiptSaveReqVO createReqVO) {
@@ -229,6 +250,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ @Deprecated
public void finishItemReceipt(Long id) {
// 1. 鏍¢獙瀛樺湪
MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
@@ -236,23 +258,222 @@
throw exception(WM_ITEM_RECEIPT_STATUS_ERROR);
}
- // 2. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堝鍔犲簱瀛� + 璁板綍娴佹按锛�
+ // 2. 瀹屾垚鍏ュ簱锛堝簱瀛樹簨鍔� + 鐘舵�� + 鍒拌揣閫氱煡 + 閲囪喘璁㈠崟鍥炲啓锛�
+ completeItemReceipt(receipt);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void confirmItemReceipt(Long id, Long warehouseId, Long locationId, Long areaId) {
+ // 1. 鏍¢獙鍗曟嵁瀛樺湪
+ MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
+ // 2. 鏍¢獙鐘舵�侊細鑽夌銆佹棫娴佺▼鐨勫緟涓婃灦锛堜笖涓嶅湪 BPM 瀹℃壒涓級銆佸緟鎵ц鍏ュ簱 鍧囧厑璁哥‘璁�
+ validateItemReceiptConfirmable(receipt);
+ // 3. 鏍¢獙琛�
+ List<MesWmItemReceiptLineDO> lines = itemReceiptLineService.getItemReceiptLineListByReceiptId(id);
+ if (CollUtil.isEmpty(lines)) {
+ throw exception(WM_ITEM_RECEIPT_NO_LINE);
+ }
+ // 4. 鏍¢獙鍏ュ簱浣嶇疆锛堜粨搴� / 搴撳尯 / 搴撲綅锛夌殑灞傜骇鍏崇郴
+ validateConfirmLocation(receipt.getCode(), warehouseId, locationId, areaId);
+ // 5. 閫愯鏍¢獙鍏ュ簱鏁伴噺锛屽苟涓哄惎鐢ㄦ壒娆$鐞嗕絾杩樻病鎵规鐨勭墿鏂欒ˉ榻愭壒娆�
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertList(lines, MesWmItemReceiptLineDO::getItemId));
+ for (MesWmItemReceiptLineDO line : lines) {
+ validateConfirmLineQuantity(receipt.getCode(), line, itemMap);
+ fillLineBatch(receipt, line, itemMap);
+ }
+ // 6. 琛ラ綈涓婃灦鏄庣粏锛氭病鏈夋槑缁嗙殑琛屾寜鈥滆鍏ュ簱鏁伴噺 + 鎵�閫変綅缃�濈敓鎴愪竴鏉★紱宸叉湁鏄庣粏鐨勪繚鎸佸師鏍�
+ createDetailsForConfirm(receipt, lines, warehouseId, locationId, areaId);
+
+ // 7. 瀹屾垚鍏ュ簱锛堝簱瀛樹簨鍔� + 鐘舵�� + 鍒拌揣閫氱煡 + 閲囪喘璁㈠崟鍥炲啓锛�
+ completeItemReceipt(receipt);
+ }
+
+ /**
+ * 瀹屾垚鍏ュ簱锛氬垱寤哄簱瀛樹簨鍔°�佹洿鏂板崟鎹笌鍏宠仈鍗曟嵁鐘舵��
+ */
+ private void completeItemReceipt(MesWmItemReceiptDO receipt) {
+ // 1. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堝鍔犲簱瀛� + 璁板綍娴佹按锛�
createTransactionList(receipt);
- // 3. 鏇存柊鍏ュ簱鍗曠姸鎬�
+ // 2. 鏇存柊鍏ュ簱鍗曠姸鎬�
itemReceiptMapper.updateById(new MesWmItemReceiptDO()
- .setId(id).setStatus(MesWmItemReceiptStatusEnum.FINISHED.getStatus()));
+ .setId(receipt.getId()).setStatus(MesWmItemReceiptStatusEnum.FINISHED.getStatus()));
- // 4. 鏇存柊鍏宠仈鐨勫埌璐ч�氱煡鍗曠姸鎬�
+ // 3. 鏇存柊鍏宠仈鐨勫埌璐ч�氱煡鍗曠姸鎬�
if (receipt.getNoticeId() != null) {
arrivalNoticeService.finishArrivalNotice(receipt.getNoticeId());
}
- // 5. 鍥炲啓 ERP 閲囪喘璁㈠崟鐨勫叆搴撴暟閲�
+ // 4. 鍥炲啓 ERP 閲囪喘璁㈠崟鐨勫叆搴撴暟閲�
updateErpPurchaseOrderInCount(receipt);
}
/**
+ * 鏍¢獙閲囪喘鍏ュ簱鍗曟槸鍚﹀厑璁哥‘璁ゅ叆搴�
+ *
+ * 鑽夌锛堟柊娴佺▼锛夈�佹棫娴佺▼鐨勫緟涓婃灦锛堟棤 BPM 瀹℃壒锛夈�佸緟鎵ц鍏ュ簱锛堟棫娴佺▼宸蹭笂鏋讹級閮藉厑璁革紱
+ * 瀹℃壒涓殑鍗曟嵁蹇呴』绛夊鎵圭粨鏉燂紝宸插畬鎴�/宸插彇娑堢殑涓嶅厑璁搞��
+ */
+ private void validateItemReceiptConfirmable(MesWmItemReceiptDO receipt) {
+ MesWmItemReceiptStatusEnum status = Arrays.stream(MesWmItemReceiptStatusEnum.values())
+ .filter(item -> ObjUtil.equal(item.getStatus(), receipt.getStatus()))
+ .findFirst().orElse(null);
+ String statusName = status != null ? status.getName() : String.valueOf(receipt.getStatus());
+
+ // 1. BPM 瀹℃壒涓殑鍗曟嵁涓嶅厑璁哥洿鎺ュ叆搴擄紝鍚﹀垯浼氱粫杩囧鎵�
+ if (ObjUtil.equal(MesWmItemReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())
+ && StrUtil.isNotBlank(receipt.getProcessInstanceId())) {
+ throw new ServiceException(WM_ITEM_RECEIPT_CONFIRM_STATUS_ERROR.getCode(),
+ "閲囪喘鍏ュ簱鍗昜" + receipt.getCode() + "]姝e湪瀹℃壒涓紙褰撳墠鐘舵�侊細" + statusName + "锛夛紝涓嶈兘纭鍏ュ簱銆�"
+ + "璇风瓑寰呭鎵归�氳繃鍚庡啀纭鍏ュ簱锛涜嫢瀹℃壒宸查┏鍥烇紝璇锋寜瀹℃壒鎰忚淇敼鍚庨噸鏂版彁浜ゃ��");
+ }
+ // 2. 宸插畬鎴� / 宸插彇娑堜笉鍏佽閲嶅纭
+ if (ObjUtil.equal(MesWmItemReceiptStatusEnum.FINISHED.getStatus(), receipt.getStatus())
+ || ObjUtil.equal(MesWmItemReceiptStatusEnum.CANCELED.getStatus(), receipt.getStatus())) {
+ throw new ServiceException(WM_ITEM_RECEIPT_CONFIRM_STATUS_ERROR.getCode(),
+ "閲囪喘鍏ュ簱鍗昜" + receipt.getCode() + "]褰撳墠鐘舵�佷负[" + statusName + "]锛屼笉鑳界‘璁ゅ叆搴撱��"
+ + "鍙湁鑽夌銆佸緟涓婃灦鎴栧緟鎵ц鍏ュ簱鐨勫崟鎹彲浠ョ‘璁ゅ叆搴擄紝璇峰埛鏂板垪琛ㄧ‘璁ゅ崟鎹姸鎬併��");
+ }
+ }
+
+ /**
+ * 鏍¢獙纭鍏ュ簱鏃堕�夋嫨鐨勪粨搴� / 搴撳尯 / 搴撲綅
+ */
+ private void validateConfirmLocation(String receiptCode, Long warehouseId, Long locationId, Long areaId) {
+ if (warehouseId == null || locationId == null || areaId == null) {
+ throw new ServiceException(WM_ITEM_RECEIPT_CONFIRM_LOCATION_REQUIRED.getCode(),
+ "閲囪喘鍏ュ簱鍗昜" + receiptCode + "]纭鍏ュ簱鍓嶅繀椤婚�夋嫨鍏ュ簱浠撳簱銆佸簱鍖哄拰搴撲綅锛堝綋鍓�"
+ + "浠撳簱=" + (warehouseId != null ? warehouseId : "鏈�夋嫨")
+ + "锛屽簱鍖�=" + (locationId != null ? locationId : "鏈�夋嫨")
+ + "锛屽簱浣�=" + (areaId != null ? areaId : "鏈�夋嫨")
+ + "锛夈�傝鐐瑰嚮銆岀‘璁ゅ叆搴撱�嶏紝鍦ㄥ脊绐椾腑渚濇閫夋嫨浠撳簱銆佸簱鍖恒�佸簱浣嶅悗閲嶆柊鎻愪氦銆�");
+ }
+ MesWmWarehouseDO warehouse = warehouseService.getWarehouse(warehouseId);
+ if (warehouse == null) {
+ throw new ServiceException(WM_ITEM_RECEIPT_CONFIRM_LOCATION_REQUIRED.getCode(),
+ "鎵�閫夊叆搴撲粨搴�(ID=" + warehouseId + ")涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎锛屾棤娉曠‘璁ゅ叆搴撱��"
+ + "璇峰埛鏂伴〉闈㈠悗閲嶆柊閫夋嫨浠撳簱銆佸簱鍖恒�佸簱浣嶃��");
+ }
+ MesWmWarehouseLocationDO location = warehouseLocationService.getWarehouseLocation(locationId);
+ if (location == null) {
+ throw new ServiceException(WM_ITEM_RECEIPT_CONFIRM_LOCATION_REQUIRED.getCode(),
+ "鎵�閫夊叆搴撳簱鍖�(ID=" + locationId + ")涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎锛屾棤娉曠‘璁ゅ叆搴撱��"
+ + "璇峰埛鏂伴〉闈㈠悗閲嶆柊閫夋嫨浠撳簱銆佸簱鍖恒�佸簱浣嶃��");
+ }
+ MesWmWarehouseAreaDO area = warehouseAreaService.getWarehouseArea(areaId);
+ if (area == null) {
+ throw new ServiceException(WM_ITEM_RECEIPT_CONFIRM_LOCATION_REQUIRED.getCode(),
+ "鎵�閫夊叆搴撳簱浣�(ID=" + areaId + ")涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎锛屾棤娉曠‘璁ゅ叆搴撱��"
+ + "璇峰埛鏂伴〉闈㈠悗閲嶆柊閫夋嫨浠撳簱銆佸簱鍖恒�佸簱浣嶃��");
+ }
+ // 浠撳簱 鈫� 搴撳尯 鈫� 搴撲綅 鐨勫眰绾у繀椤讳竴鑷�
+ if (ObjUtil.notEqual(location.getWarehouseId(), warehouse.getId())) {
+ MesWmWarehouseDO locationWarehouse = warehouseService.getWarehouse(location.getWarehouseId());
+ throw new ServiceException(WM_ITEM_RECEIPT_CONFIRM_LOCATION_MISMATCH.getCode(),
+ "鍏ュ簱浠撳簱涓庡簱鍖轰笉鍖归厤锛氭墍閫変粨搴揫" + warehouse.getName() + "]锛屽簱鍖篬" + location.getName()
+ + "]灞炰簬浠撳簱[" + (locationWarehouse != null ? locationWarehouse.getName()
+ : "ID=" + location.getWarehouseId()) + "]銆傝閲嶆柊閫夋嫨鍚屼竴浠撳簱涓嬬殑搴撳尯銆�");
+ }
+ if (ObjUtil.notEqual(area.getLocationId(), location.getId())) {
+ MesWmWarehouseLocationDO areaLocation = warehouseLocationService.getWarehouseLocation(area.getLocationId());
+ throw new ServiceException(WM_ITEM_RECEIPT_CONFIRM_LOCATION_MISMATCH.getCode(),
+ "鍏ュ簱搴撳尯涓庡簱浣嶄笉鍖归厤锛氭墍閫夊簱鍖篬" + location.getName() + "]锛屽簱浣峓" + area.getName()
+ + "]灞炰簬搴撳尯[" + (areaLocation != null ? areaLocation.getName()
+ : "ID=" + area.getLocationId()) + "]銆傝閲嶆柊閫夋嫨鍚屼竴搴撳尯涓嬬殑搴撲綅銆�");
+ }
+ }
+
+ /**
+ * 鏍¢獙鍗曡鍏ュ簱鏁伴噺
+ */
+ private void validateConfirmLineQuantity(String receiptCode, MesWmItemReceiptLineDO line,
+ Map<Long, MdmItemRespDTO> itemMap) {
+ if (line.getReceivedQuantity() != null && line.getReceivedQuantity().compareTo(BigDecimal.ZERO) > 0) {
+ return;
+ }
+ MdmItemRespDTO item = itemMap.get(line.getItemId());
+ String itemText = item != null ? item.getCode() + " " + item.getName() : "ID=" + line.getItemId();
+ throw new ServiceException(WM_ITEM_RECEIPT_CONFIRM_QUANTITY_INVALID.getCode(),
+ "閲囪喘鍏ュ簱鍗昜" + receiptCode + "]鐨勭墿鏂欒[" + itemText + "]鍏ュ簱鏁伴噺涓篬"
+ + (line.getReceivedQuantity() != null ? line.getReceivedQuantity().toPlainString() : "绌�")
+ + "]锛屽繀椤诲ぇ浜� 0 鎵嶈兘鍏ュ簱銆傝缂栬緫璇ョ墿鏂欒锛屾牳瀵瑰苟濉啓瀹為檯鏀惰揣鏁伴噺鍚庨噸璇曘��");
+ }
+
+ /**
+ * 涓哄惎鐢ㄦ壒娆$鐞嗕絾杩樻病鏈夋壒娆$殑鐗╂枡琛岃ˉ榻愭壒娆�
+ *
+ * 鐢卞埌璐ч�氱煡鍗曠敓鎴愮殑鍏ュ簱琛屼笉浼氶鍏堢敓鎴愭壒娆★紝杩欓噷鍦ㄧ‘璁ゅ叆搴撴椂缁熶竴鐢熸垚锛�
+ * 閬垮厤搴撶閫愯鎵撳紑鐗╂枡琛屼繚瀛樹竴娆°��
+ */
+ private void fillLineBatch(MesWmItemReceiptDO receipt, MesWmItemReceiptLineDO line,
+ Map<Long, MdmItemRespDTO> itemMap) {
+ MdmItemRespDTO item = itemMap.get(line.getItemId());
+ if (item == null || !Boolean.TRUE.equals(item.getIsBatchManaged()) || line.getBatchId() != null) {
+ return;
+ }
+ MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO();
+ batchReqVO.setItemId(line.getItemId()).setProduceDate(line.getProductionDate())
+ .setExpireDate(line.getExpireDate()).setLotNumber(line.getLotNumber())
+ .setVendorId(receipt.getVendorId()).setReceiptDate(receipt.getReceiptDate())
+ .setPurchaseOrderCode(receipt.getPurchaseOrderCode());
+ MesWmBatchDO batch;
+ try {
+ batch = batchService.getOrGenerateBatchCode(batchReqVO);
+ } catch (ServiceException ex) {
+ // 鎵规閰嶇疆瑕佹眰鐨勫瓧娈碉紙鐢熶骇鏃ユ湡銆佹湁鏁堟湡銆佺敓浜ф壒鍙风瓑锛夋病鏈夊~锛氭妸琛屼笂涓嬫枃琛ヨ繘鎻愮ず
+ throw new ServiceException(WM_ITEM_RECEIPT_CONFIRM_BATCH_GENERATE_FAILED.getCode(),
+ "鐗╂枡[" + item.getCode() + " " + item.getName() + "]鐢熸垚鎵规澶辫触锛�" + ex.getMessage()
+ + "銆傝缂栬緫閲囪喘鍏ュ簱鍗曢噷璇ョ墿鏂欑殑鐗╂枡琛岋紝琛ュ厖鎵规瑕佹眰鐨勫瓧娈碉紙鐢熶骇鏃ユ湡銆佹湁鏁堟湡銆佺敓浜ф壒鍙凤級鍚庨噸璇曘��");
+ }
+ if (batch == null) {
+ return;
+ }
+ line.setBatchId(batch.getId()).setBatchCode(batch.getCode());
+ itemReceiptLineService.updateItemReceiptLineBatch(line.getId(), batch.getId(), batch.getCode());
+ }
+
+ /**
+ * 纭鍏ュ簱鏃惰ˉ榻愪笂鏋舵槑缁嗭細娌℃湁鏄庣粏鐨勮鎸夎鍏ュ簱鏁伴噺鐢熸垚涓�鏉℃槑缁嗭紝宸叉湁鏄庣粏鐨勬牎楠屾暟閲忓悎璁�
+ */
+ private void createDetailsForConfirm(MesWmItemReceiptDO receipt, List<MesWmItemReceiptLineDO> lines,
+ Long warehouseId, Long locationId, Long areaId) {
+ for (MesWmItemReceiptLineDO line : lines) {
+ List<MesWmItemReceiptDetailDO> details = itemReceiptDetailService
+ .getItemReceiptDetailListByLineId(line.getId());
+ if (CollUtil.isEmpty(details)) {
+ // 鏃ф祦绋嬧�滃緟鎵ц鍏ュ簱鈥濈殑鍗曟嵁搴斿綋宸茬粡鏈変笂鏋舵槑缁嗭紝缂轰簡璇存槑鏁版嵁涓嶅畬鏁�
+ if (ObjUtil.equal(MesWmItemReceiptStatusEnum.APPROVED.getStatus(), receipt.getStatus())) {
+ throw new ServiceException(WM_ITEM_RECEIPT_CONFIRM_DETAIL_MISSING.getCode(),
+ "閲囪喘鍏ュ簱鍗昜" + receipt.getCode() + "]澶勪簬鏃ф祦绋嬬殑銆屽緟鎵ц鍏ュ簱銆嶇姸鎬侊紝浣嗙墿鏂欒(ID="
+ + line.getId() + ")娌℃湁涓婃灦鏄庣粏锛屾棤娉曠‘璁ゅ叆搴撱��"
+ + "璇峰皢璇ュ崟鎹彇娑堝悗閲嶆柊鐢熸垚锛屾垨鑱旂郴绠$悊鍛樿ˉ榻愪笂鏋舵槑缁嗐��");
+ }
+ MesWmItemReceiptDetailSaveReqVO detailReqVO = new MesWmItemReceiptDetailSaveReqVO();
+ detailReqVO.setReceiptId(receipt.getId()).setLineId(line.getId())
+ .setItemId(line.getItemId()).setQuantity(line.getReceivedQuantity())
+ .setBatchId(line.getBatchId())
+ .setWarehouseId(warehouseId).setLocationId(locationId).setAreaId(areaId);
+ itemReceiptDetailService.createItemReceiptDetail(detailReqVO);
+ continue;
+ }
+ // 宸叉湁涓婃灦鏄庣粏锛堟棫娴佺▼锛夛細鏁伴噺鍚堣蹇呴』涓庤鍏ュ簱鏁伴噺涓�鑷�
+ BigDecimal totalDetailQty = CollectionUtils.getSumValue(details,
+ MesWmItemReceiptDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
+ if (line.getReceivedQuantity() == null || totalDetailQty.compareTo(line.getReceivedQuantity()) != 0) {
+ MdmItemRespDTO item = mdmItemApi.getItem(line.getItemId()).getCheckedData();
+ String itemText = item != null ? item.getCode() + " " + item.getName() : "ID=" + line.getItemId();
+ throw new ServiceException(WM_ITEM_RECEIPT_DETAIL_QUANTITY_MISMATCH.getCode(),
+ "閲囪喘鍏ュ簱鍗昜" + receipt.getCode() + "]鐨勭墿鏂欒[" + itemText + "]涓婃灦鏄庣粏鏁伴噺鍚堣涓篬"
+ + totalDetailQty.toPlainString() + "]锛屼笌琛屽叆搴撴暟閲廩"
+ + (line.getReceivedQuantity() != null ? line.getReceivedQuantity().toPlainString() : "绌�")
+ + "]涓嶄竴鑷达紝鏃犳硶纭鍏ュ簱銆傝鍦ㄧ墿鏂欒涓婃牳瀵瑰叆搴撴暟閲忥紝鎴栧彇娑堣鍗曟嵁鍚庢寜绠�鍖栨祦绋嬮噸鏂扮敓鎴愩��");
+ }
+ }
+ }
+
+ /**
* 鍥炲啓 ERP 閲囪喘璁㈠崟鐨勫叆搴撴暟閲�
*/
private void updateErpPurchaseOrderInCount(MesWmItemReceiptDO receipt) {
--
Gitblit v1.9.3