From 1ba0dbfde5634c8bf2ec20891d6b226b996f6b59 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 02 九月 2026 14:24:38 +0800
Subject: [PATCH] refactor(mes): 优化MES生产扫码入库功能支持多类型扫码
---
docs/wm_transaction_query.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/docs/wm_transaction_query.md b/docs/wm_transaction_query.md
index 33b616f..c48c2b9 100644
--- a/docs/wm_transaction_query.md
+++ b/docs/wm_transaction_query.md
@@ -9,6 +9,7 @@
| 鏂规硶 | 璺緞 | 璇存槑 |
|------|------|------|
| GET | /mes/wm/transaction/page | 鍒嗛〉鏌ヨ搴撳瓨浜嬪姟娴佹按 |
+| GET | /mes/pro/batch/get-by-code | 鐐瑰嚮鎵规鍙锋煡璇㈢敓浜ф壒娆°�佹墭鐩樺強琚嬬爜淇℃伅 |
### 璇锋眰鍙傛暟
@@ -23,10 +24,37 @@
| bizType | Integer | 鍚� | 涓氬姟绫诲瀷 |
| bizCode | String | 鍚� | 涓氬姟鍗曞彿锛屾ā绯婂尮閰� |
| materialStockId | Long | 鍚� | 搴撳瓨璁板綍ID |
+| bagCode | String | 鍚� | 琚嬬爜锛屾ā绯婂尮閰嶏紙璐ㄦ銆侀攢鍞嚭搴撶瓑琚嬬爜绾ф祦姘达級 |
| startTime | String | 鍚� | 寮�濮嬫椂闂达紙鏍煎紡锛歽yyy-MM-dd HH:mm:ss锛� |
| endTime | String | 鍚� | 缁撴潫鏃堕棿锛堟牸寮忥細yyyy-MM-dd HH:mm:ss锛� |
| pageNo | Integer | 鏄� | 椤电爜锛岄粯璁�1 |
| pageSize | Integer | 鏄� | 姣忛〉鏉℃暟锛岄粯璁�10 |
+
+### 鎵规杩芥函鏌ヨ
+
+鐐瑰嚮娴佹按鍒楄〃涓殑鎵规鍙锋椂锛屼娇鐢ㄥ綋鍓嶈鐨� `batchCode` 璋冪敤浠ヤ笅鎺ュ彛锛�
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭～ | 璇存槑 |
+|------|------|------|------|
+| code | String | 鏄� | 鎵规鍙锋垨鎵规浜岀淮鐮佸唴瀹� |
+
+璇锋眰绀轰緥锛歚GET /mes/pro/batch/get-by-code?code={batchCode}`
+
+鎺ュ彛杩斿洖鐨勯噸鐐瑰瓧娈碉細
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| id | Long | 鐢熶骇鎵规ID |
+| code | String | 姝ｅ紡鎵规鍙� |
+| tempCode | String | 涓存椂鎵规鐮� |
+| itemCode | String | 鐗╂枡缂栫爜 |
+| itemName | String | 鐗╂枡鍚嶇О |
+| workers | Array | 鎵规浜哄憳閰嶇疆 |
+| pallets | Array | 鎵规涓嬬殑鎵樼洏鍒楄〃 |
+| bagTotal | Integer | 琚嬬爜鎬绘暟 |
+| bags | Array | 鎵规涓嬬殑琚嬬爜鍒楄〃 |
+
+璇ユ帴鍙ｅ悓鏃舵敮鎸佹寮忔壒娆″彿鍜屼复鏃舵壒娆＄爜銆傝嫢鎵规鍙蜂负绌猴紝涓嶆樉绀虹偣鍑诲叆鍙ｏ紱鑻ユ煡璇笉鍒扮敓浜ф壒娆★紝鎸夋帴鍙ｈ繑鍥炵殑涓氬姟閿欒鎻愮ず鐢ㄦ埛銆�
### 鍝嶅簲瀛楁
@@ -44,6 +72,8 @@
| quantity | BigDecimal | 鍙樺姩鏁伴噺锛堟鏁�=鍏ュ簱锛岃礋鏁�=鍑哄簱锛� |
| batchId | Long | 鎵规ID |
| batchCode | String | 鎵规鍙� |
+| bagCodeId | Long | 琚嬬爜ID锛堣鐮佺骇娴佹按闈炵┖锛� |
+| bagCode | String | 琚嬬爜锛堣鐮佺骇娴佹按闈炵┖锛屽璐ㄦ銆侀攢鍞嚭搴撱�佺Щ搴擄級 |
| warehouseId | Long | 浠撳簱ID |
| warehouseName | String | 浠撳簱鍚嶇О |
| locationId | Long | 搴撳尯ID |
@@ -111,6 +141,24 @@
| 121 | 澶栧崗鍙戞枡 | 澶栧崗鍙戞枡 |
| 122 | 澶栧崗鍏ュ簱 | 澶栧崗鍏ュ簱 |
+## 璋冪敤鏃跺簭
+
+1. 杩涘叆搴撳瓨浜嬪姟娴佹按椤甸潰鏃讹紝璋冪敤 `/mes/wm/transaction/page` 鑾峰彇娴佹按鍒楄〃銆�
+2. 鍒楄〃涓睍绀� `batchCode`锛涙壒娆″彿闈炵┖鏃跺厑璁哥偣鍑汇��
+3. 鐐瑰嚮鎵规鍙峰悗锛屽皢褰撳墠琛岀殑 `batchCode` 浣滀负 `code` 璋冪敤 `/mes/pro/batch/get-by-code`銆�
+4. 鏍规嵁杩斿洖缁撴灉灞曠ず鐢熶骇鎵规淇℃伅銆佹墭鐩樺垪琛ㄥ拰琚嬬爜鍒楄〃锛沗bagTotal` 鐢ㄤ簬鏄剧ず琚嬬爜鎬绘暟锛宍bags` 鐢ㄤ簬灞曠ず琚嬬爜鏄庣粏銆�
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|------|----------|------|
+| batchCode | 搴撳瓨娴佹按鍒楄〃 | 鎵规鍙烽潪绌烘椂浣滀负鍙偣鍑诲叆鍙� |
+| code | 鎵规璇︽儏 | 姝ｅ紡鎵规鍙� |
+| tempCode | 鎵规璇︽儏 | 涓存椂鎵规鐮侊紝鏈夊�兼椂灞曠ず |
+| bagTotal | 鎵规璇︽儏 | 灞曠ず璇ユ壒娆¤鐮佹�绘暟 |
+| bags[].code | 鎵规璇︽儏 | 灞曠ず琚嬬爜鏄庣粏 |
+| pallets | 鎵规璇︽儏 | 灞曠ず璇ユ壒娆″叧鑱旂殑鎵樼洏淇℃伅 |
+
## 鎼滅储鏉′欢
| 鏉′欢瀛楁 | 缁勪欢绫诲瀷 | 璇存槑 |
@@ -140,6 +188,7 @@
| 搴撳尯 | locationName | 100 | - |
| 搴撲綅 | areaName | 100 | - |
| 浜嬪姟鏃堕棿 | transactionTime | 160 | 鏍煎紡锛歽yyy-MM-dd HH:mm:ss |
+| 琚嬬爜 | bagCode | 150 | 琚嬬爜绾ф祦姘寸殑琚嬬爜锛涙壒娆�/琚嬬爜鍙户缁拷婧� |
## 涓氬姟瑙勫垯璇存槑
@@ -150,6 +199,7 @@
| 鏁伴噺鏄剧ず | quantity > 0 鏄剧ず缁胯壊锛宷uantity < 0 鏄剧ず绾㈣壊 |
| 绫诲瀷鏍囩 | 鍏ュ簱鏄剧ず缁胯壊 success 鏍囩锛屽嚭搴撴樉绀虹孩鑹� danger 鏍囩 |
| 涓氬姟鍗曞彿璺宠浆 | 鐐瑰嚮 bizCode 鍙烦杞埌瀵瑰簲涓氬姟鍗曟嵁璇︽儏椤� |
+| 琚嬬爜绛涢�� | 浼� bagCode 鍙煡鐪嬫寚瀹氳鐮佺殑瀹屾暣娴佽浆锛堣川妫�鏆傚瓨鍑哄簱/鍚堟牸鍏ュ簱/閿�鍞嚭搴撶瓑锛� |
## 鏉冮檺閰嶇疆
--
Gitblit v1.9.3