From 23b9f641e2c9f434dc43fe1187203de055e5982c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 05 一月 2024 16:57:20 +0800
Subject: [PATCH] #
---
zy-asrs-openapi/src/main/webapp/views/md/getOrderStatus.md | 151 +++++++++++++++
zy-asrs-openapi/src/main/webapp/views/generateOrderPakOut.html | 10
zy-asrs-openapi/src/main/webapp/views/md/getOrderType.md | 4
zy-asrs-openapi/src/main/webapp/views/md/generateOrderPakIn.md | 28 +-
zy-asrs-openapi/src/main/webapp/views/index.html | 6
zy-asrs-openapi/src/main/webapp/views/getOrderList.html | 10
zy-asrs-openapi/src/main/webapp/views/md/generateOrderPakOut.md | 32 +-
zy-asrs-openapi/src/main/webapp/views/getOrderType.html | 6
zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html | 10
zy-asrs-openapi/src/main/webapp/views/md/getOrderList.md | 165 ++++++++++++++++
zy-asrs-openapi/src/main/webapp/views/createMat.html | 10
zy-asrs-openapi/src/main/webapp/views/md/createMat.md | 142 ++++++++++++++
zy-asrs-openapi/src/main/webapp/views/getOrderStatus.html | 10
13 files changed, 535 insertions(+), 49 deletions(-)
diff --git a/zy-asrs-openapi/src/main/webapp/views/generatePakIn.html b/zy-asrs-openapi/src/main/webapp/views/createMat.html
similarity index 93%
copy from zy-asrs-openapi/src/main/webapp/views/generatePakIn.html
copy to zy-asrs-openapi/src/main/webapp/views/createMat.html
index fda466b..32d6883 100644
--- a/zy-asrs-openapi/src/main/webapp/views/generatePakIn.html
+++ b/zy-asrs-openapi/src/main/webapp/views/createMat.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>API寮�鏀惧钩鍙� - 鐢熸垚鍏ュ簱</title>
+ <title>API寮�鏀惧钩鍙� - 娣诲姞鐗╂枡淇℃伅</title>
<link rel="stylesheet" href="../static/css/element.css">
<link rel="stylesheet" href="../static/css/common.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -23,7 +23,11 @@
<div><el-button type="text" @click="switchPage('reportApiManage.html')">涓婃姤API绠＄悊</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('getOrderType.html')">鑾峰彇璁㈠崟绫诲瀷</el-button></div>
- <div><el-button type="text" @click="switchPage('generatePakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderStatus.html')">鑾峰彇璁㈠崟鐘舵�佸垪琛�</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderList.html')">鑾峰彇璁㈠崟鍒楄〃</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakOut.html')">鐢熸垚鍑哄簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('createMat.html')">娣诲姞鐗╂枡淇℃伅</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>
</div>
@@ -70,7 +74,7 @@
},
introduceClick() {
$.ajax({
- url: "md/generatePakIn.md",
+ url: "md/createMat.md",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
diff --git a/zy-asrs-openapi/src/main/webapp/views/generatePakIn.html b/zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html
similarity index 93%
rename from zy-asrs-openapi/src/main/webapp/views/generatePakIn.html
rename to zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html
index fda466b..3976790 100644
--- a/zy-asrs-openapi/src/main/webapp/views/generatePakIn.html
+++ b/zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>API寮�鏀惧钩鍙� - 鐢熸垚鍏ュ簱</title>
+ <title>API寮�鏀惧钩鍙� - 鐢熸垚鍏ュ簱璁㈠崟</title>
<link rel="stylesheet" href="../static/css/element.css">
<link rel="stylesheet" href="../static/css/common.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -23,7 +23,11 @@
<div><el-button type="text" @click="switchPage('reportApiManage.html')">涓婃姤API绠＄悊</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('getOrderType.html')">鑾峰彇璁㈠崟绫诲瀷</el-button></div>
- <div><el-button type="text" @click="switchPage('generatePakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderStatus.html')">鑾峰彇璁㈠崟鐘舵�佸垪琛�</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderList.html')">鑾峰彇璁㈠崟鍒楄〃</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakOut.html')">鐢熸垚鍑哄簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('createMat.html')">娣诲姞鐗╂枡淇℃伅</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>
</div>
@@ -70,7 +74,7 @@
},
introduceClick() {
$.ajax({
- url: "md/generatePakIn.md",
+ url: "md/generateOrderPakIn.md",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
diff --git a/zy-asrs-openapi/src/main/webapp/views/generatePakIn.html b/zy-asrs-openapi/src/main/webapp/views/generateOrderPakOut.html
similarity index 93%
copy from zy-asrs-openapi/src/main/webapp/views/generatePakIn.html
copy to zy-asrs-openapi/src/main/webapp/views/generateOrderPakOut.html
index fda466b..5901e82 100644
--- a/zy-asrs-openapi/src/main/webapp/views/generatePakIn.html
+++ b/zy-asrs-openapi/src/main/webapp/views/generateOrderPakOut.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>API寮�鏀惧钩鍙� - 鐢熸垚鍏ュ簱</title>
+ <title>API寮�鏀惧钩鍙� - 鐢熸垚鍑哄簱璁㈠崟</title>
<link rel="stylesheet" href="../static/css/element.css">
<link rel="stylesheet" href="../static/css/common.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -23,7 +23,11 @@
<div><el-button type="text" @click="switchPage('reportApiManage.html')">涓婃姤API绠＄悊</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('getOrderType.html')">鑾峰彇璁㈠崟绫诲瀷</el-button></div>
- <div><el-button type="text" @click="switchPage('generatePakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderStatus.html')">鑾峰彇璁㈠崟鐘舵�佸垪琛�</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderList.html')">鑾峰彇璁㈠崟鍒楄〃</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakOut.html')">鐢熸垚鍑哄簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('createMat.html')">娣诲姞鐗╂枡淇℃伅</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>
</div>
@@ -70,7 +74,7 @@
},
introduceClick() {
$.ajax({
- url: "md/generatePakIn.md",
+ url: "md/generateOrderPakOut.md",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
diff --git a/zy-asrs-openapi/src/main/webapp/views/generatePakIn.html b/zy-asrs-openapi/src/main/webapp/views/getOrderList.html
similarity index 93%
copy from zy-asrs-openapi/src/main/webapp/views/generatePakIn.html
copy to zy-asrs-openapi/src/main/webapp/views/getOrderList.html
index fda466b..ccd4650 100644
--- a/zy-asrs-openapi/src/main/webapp/views/generatePakIn.html
+++ b/zy-asrs-openapi/src/main/webapp/views/getOrderList.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>API寮�鏀惧钩鍙� - 鐢熸垚鍏ュ簱</title>
+ <title>API寮�鏀惧钩鍙� - 鑾峰彇璁㈠崟鍒楄〃</title>
<link rel="stylesheet" href="../static/css/element.css">
<link rel="stylesheet" href="../static/css/common.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -23,7 +23,11 @@
<div><el-button type="text" @click="switchPage('reportApiManage.html')">涓婃姤API绠＄悊</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('getOrderType.html')">鑾峰彇璁㈠崟绫诲瀷</el-button></div>
- <div><el-button type="text" @click="switchPage('generatePakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderStatus.html')">鑾峰彇璁㈠崟鐘舵�佸垪琛�</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderList.html')">鑾峰彇璁㈠崟鍒楄〃</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakOut.html')">鐢熸垚鍑哄簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('createMat.html')">娣诲姞鐗╂枡淇℃伅</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>
</div>
@@ -70,7 +74,7 @@
},
introduceClick() {
$.ajax({
- url: "md/generatePakIn.md",
+ url: "md/getOrderList.md",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
diff --git a/zy-asrs-openapi/src/main/webapp/views/generatePakIn.html b/zy-asrs-openapi/src/main/webapp/views/getOrderStatus.html
similarity index 93%
copy from zy-asrs-openapi/src/main/webapp/views/generatePakIn.html
copy to zy-asrs-openapi/src/main/webapp/views/getOrderStatus.html
index fda466b..e172d5f 100644
--- a/zy-asrs-openapi/src/main/webapp/views/generatePakIn.html
+++ b/zy-asrs-openapi/src/main/webapp/views/getOrderStatus.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>API寮�鏀惧钩鍙� - 鐢熸垚鍏ュ簱</title>
+ <title>API寮�鏀惧钩鍙� - 鑾峰彇璁㈠崟鐘舵�佸垪琛�</title>
<link rel="stylesheet" href="../static/css/element.css">
<link rel="stylesheet" href="../static/css/common.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -23,7 +23,11 @@
<div><el-button type="text" @click="switchPage('reportApiManage.html')">涓婃姤API绠＄悊</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('getOrderType.html')">鑾峰彇璁㈠崟绫诲瀷</el-button></div>
- <div><el-button type="text" @click="switchPage('generatePakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderStatus.html')">鑾峰彇璁㈠崟鐘舵�佸垪琛�</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderList.html')">鑾峰彇璁㈠崟鍒楄〃</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakOut.html')">鐢熸垚鍑哄簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('createMat.html')">娣诲姞鐗╂枡淇℃伅</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>
</div>
@@ -70,7 +74,7 @@
},
introduceClick() {
$.ajax({
- url: "md/generatePakIn.md",
+ url: "md/getOrderStatus.md",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
diff --git a/zy-asrs-openapi/src/main/webapp/views/getOrderType.html b/zy-asrs-openapi/src/main/webapp/views/getOrderType.html
index d96a3cd..177b976 100644
--- a/zy-asrs-openapi/src/main/webapp/views/getOrderType.html
+++ b/zy-asrs-openapi/src/main/webapp/views/getOrderType.html
@@ -23,7 +23,11 @@
<div><el-button type="text" @click="switchPage('reportApiManage.html')">涓婃姤API绠＄悊</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('getOrderType.html')">鑾峰彇璁㈠崟绫诲瀷</el-button></div>
- <div><el-button type="text" @click="switchPage('generatePakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderStatus.html')">鑾峰彇璁㈠崟鐘舵�佸垪琛�</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderList.html')">鑾峰彇璁㈠崟鍒楄〃</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakOut.html')">鐢熸垚鍑哄簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('createMat.html')">娣诲姞鐗╂枡淇℃伅</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>
</div>
diff --git a/zy-asrs-openapi/src/main/webapp/views/index.html b/zy-asrs-openapi/src/main/webapp/views/index.html
index 2a6e8e2..ee2ee3f 100644
--- a/zy-asrs-openapi/src/main/webapp/views/index.html
+++ b/zy-asrs-openapi/src/main/webapp/views/index.html
@@ -23,7 +23,11 @@
<div><el-button type="text" @click="switchPage('reportApiManage.html')">涓婃姤API绠＄悊</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('getOrderType.html')">鑾峰彇璁㈠崟绫诲瀷</el-button></div>
- <div><el-button type="text" @click="switchPage('generatePakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderStatus.html')">鑾峰彇璁㈠崟鐘舵�佸垪琛�</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderList.html')">鑾峰彇璁㈠崟鍒楄〃</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakOut.html')">鐢熸垚鍑哄簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('createMat.html')">娣诲姞鐗╂枡淇℃伅</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>
</div>
diff --git a/zy-asrs-openapi/src/main/webapp/views/md/createMat.md b/zy-asrs-openapi/src/main/webapp/views/md/createMat.md
new file mode 100644
index 0000000..c50a327
--- /dev/null
+++ b/zy-asrs-openapi/src/main/webapp/views/md/createMat.md
@@ -0,0 +1,142 @@
+## 娣诲姞鐗╂枡淇℃伅
+
+- **鎺ュ彛璇存槑锛�** 娣诲姞鐗╂枡淇℃伅
+- **鎺ュ彛鍦板潃锛�** /api/createMat
+
+#### 璇锋眰鍙傛暟
+
+鍙傛暟鍚嶇О |绫诲瀷 |鍑虹幇瑕佹眰 |鎻忚堪
+:---- |:--- |:------ |:---
+Header | |蹇呭～ |璇锋眰鎶ユ枃澶�
+ appkey |string |蹇呭～ |瀵嗛挜绠＄悊涓敓鎴恆ppkey
+Body | |蹇呭～ |
+ mats |array | |
+  matnr |string |蹇呭～ |鐗╂枡缂栧彿
+  maktx |string |鍙�� |鐗╂枡鍚嶇О
+  firstTag |string |鍙�� |涓�绾у垎绫�
+  secondTag |string |鍙�� |浜岀骇鍒嗙被
+  name |string |鍙�� |鐗╂枡鍒悕
+  specs |string |鍙�� |瑙勬牸
+  model |string |鍙�� |鍨嬪彿
+  color |string |鍙�� |棰滆壊
+  brand |string |鍙�� |鍝佺墝
+  unit |string |鍙�� |鍗曚綅
+  price |double |鍙�� |鍗曚环
+  sku |string |鍙�� |sku
+  units |double |鍙�� |鍗曚綅閲�
+  barcode |string |鍙�� |鏉＄爜
+  origin |string |鍙�� |浜у湴
+  manu |string |鍙�� |鍘傚
+  manuDate |string |鍙�� |鐢熶骇鏃ユ湡
+  itemNum |string |鍙�� |鍝侀」鏁�
+  weight |double |鍙�� |閲嶉噺
+  length |double |鍙�� |闀垮害
+  volume |double |鍙�� |浣撶Н
+  threeCode |string |鍙�� |涓夋柟缂栫爜
+  supp |string |鍙�� |渚涘簲鍟�
+  suppCode |string |鍙�� |渚涘簲鍟嗙紪鐮�
+  deadTime |string |鍙�� |淇濊川鏈�
+  status |int |鍙�� |鐘舵�亄0:绂佺敤,1:姝ｅ父}
+  memo |string |鍙�� |澶囨敞
+ sign |string |鍙�� |绛惧悕
+
+
+璇锋眰绀轰緥锛�
+
+```
+{
+ "Header":{
+ "appkey":"6cfb9f11935b4d0e1740f41598970c97",
+ },
+ "Body":{
+ "mats": [
+ {
+ "firstTag": "娴嬭瘯浜岀骇鍒嗙被1",
+ "secondTag": "娴嬭瘯涓夌骇鍒嗙被1",
+ "matnr": "test001",
+ "maktx": "娴嬭瘯鐗╂枡1",
+ "name": "",
+ "specs": "",
+ "model": "",
+ "color": "",
+ "brand": "",
+ "unit": "",
+ "price": "",
+ "sku": "",
+ "units": "",
+ "barcode": "",
+ "origin": "",
+ "manu": "",
+ "manuDate": "",
+ "itemNum": "",
+ "weight": "",
+ "length": "",
+ "volume": "",
+ "threeCode": "",
+ "supp": "",
+ "suppCode": "",
+ "deadTime": "",
+ "status": 1,
+ "memo": ""
+ },
+ {
+ "firstTag": "娴嬭瘯浜岀骇鍒嗙被1",
+ "secondTag": "娴嬭瘯涓夌骇鍒嗙被1",
+ "matnr": "test002",
+ "maktx": "娴嬭瘯鐗╂枡2",
+ "name": "",
+ "specs": "",
+ "model": "",
+ "color": "",
+ "brand": "",
+ "unit": "",
+ "price": "",
+ "sku": "",
+ "units": "",
+ "barcode": "",
+ "origin": "",
+ "manu": "",
+ "manuDate": "",
+ "itemNum": "",
+ "weight": "",
+ "length": "",
+ "volume": "",
+ "threeCode": "",
+ "supp": "",
+ "suppCode": "",
+ "deadTime": "",
+ "status": 1,
+ "memo": ""
+ }
+ ],
+ "sign": "8a7036cfe218e12f50f9107e9eb4a437"
+ }
+}
+
+```
+
+
+#### 杩斿洖缁撴灉
+
+鍙傛暟鍚嶇О |绫诲瀷 |鍑虹幇瑕佹眰 |鎻忚堪
+:---- |:--- |:------ |:---
+code |int |蹇呭～ |鍝嶅簲鐮侊紝浠ｇ爜瀹氫箟璇疯鈥滈檮褰旳 鍝嶅簲鍚楄鏄庘��
+msg |string |蹇呭～ |
+data |object |鍙�� |杩斿洖娣诲姞鎴愬姛鐨勭墿鏂欐暟閲�
+
+绀轰緥锛�
+
+```
+{
+ "msg": "鎿嶄綔鎴愬姛",
+ "code": 200,
+ "data": 2
+}
+```
+
+## 闄勫綍A 鍝嶅簲鐮佽鏄�
+
+鍝嶅簲鐮� |璇存槑
+:---- |:---
+200 |澶勭悊鎴愬姛
+500 |绯荤粺鍐呴儴閿欒
\ No newline at end of file
diff --git a/zy-asrs-openapi/src/main/webapp/views/md/generatePakIn.md b/zy-asrs-openapi/src/main/webapp/views/md/generateOrderPakIn.md
similarity index 72%
rename from zy-asrs-openapi/src/main/webapp/views/md/generatePakIn.md
rename to zy-asrs-openapi/src/main/webapp/views/md/generateOrderPakIn.md
index b2cafe7..398ec69 100644
--- a/zy-asrs-openapi/src/main/webapp/views/md/generatePakIn.md
+++ b/zy-asrs-openapi/src/main/webapp/views/md/generateOrderPakIn.md
@@ -1,7 +1,7 @@
## 鐢熸垚鍏ュ簱璁㈠崟
- **鎺ュ彛璇存槑锛�** 鐢熸垚鍏ュ簱璁㈠崟
-- **鎺ュ彛鍦板潃锛�** /api/generatePakIn
+- **鎺ュ彛鍦板潃锛�** /api/generateOrderPakIn
#### 璇锋眰鍙傛暟
@@ -12,10 +12,10 @@
Body | |蹇呭～ |
 orderNo |string |蹇呭～ |璁㈠崟鍙�
 orderType |int |蹇呭～ |璁㈠崟绫诲瀷(閫氳繃璁㈠崟绫诲瀷鏌ヨ鎺ュ彛鑾峰彇)
- orderDetails |object |蹇呭～ |鐗╂枡璇︽儏
-  orderNo |string |蹇呭～ |璁㈠崟鍙�
+ mats |object |蹇呭～ |鐗╂枡鍒楄〃
  matnr |string |蹇呭～ |鐗╂枡鍙�
-  anfme |double |蹇呭～ |鏁伴噺
+  count |double |蹇呭～ |鏁伴噺
+  batch |string |鍙�� |鎵瑰彿
 sign |string |鍙�� |绛惧悕
@@ -27,16 +27,16 @@
"appkey":"6cfb9f11935b4d0e1740f41598970c97",
},
"Body":{
- "orderNo": 2024010311062541,
- "orderType": 1,
- "orderDetails": [
- {
- "orderNo": 2024010311062541,
- "matnr": "test001",
- "anfme": 10
- }
- ],
- "sign": "8a7036cfe218e12f50f9107e9eb4a437"
+ "orderNo": 2024010311062545,
+ "orderType": 1,
+ "mats": [
+ {
+ "matnr": "test001",
+ "batch": "",
+ "count": 10
+ }
+ ],
+ "sign": "8a7036cfe218e12f50f9107e9eb4a437"
}
}
diff --git a/zy-asrs-openapi/src/main/webapp/views/md/generatePakIn.md b/zy-asrs-openapi/src/main/webapp/views/md/generateOrderPakOut.md
similarity index 68%
copy from zy-asrs-openapi/src/main/webapp/views/md/generatePakIn.md
copy to zy-asrs-openapi/src/main/webapp/views/md/generateOrderPakOut.md
index b2cafe7..115c5e2 100644
--- a/zy-asrs-openapi/src/main/webapp/views/md/generatePakIn.md
+++ b/zy-asrs-openapi/src/main/webapp/views/md/generateOrderPakOut.md
@@ -1,7 +1,7 @@
-## 鐢熸垚鍏ュ簱璁㈠崟
+## 鐢熸垚鍑哄簱璁㈠崟
-- **鎺ュ彛璇存槑锛�** 鐢熸垚鍏ュ簱璁㈠崟
-- **鎺ュ彛鍦板潃锛�** /api/generatePakIn
+- **鎺ュ彛璇存槑锛�** 鐢熸垚鍑哄簱璁㈠崟
+- **鎺ュ彛鍦板潃锛�** /api/generateOrderPakOut
#### 璇锋眰鍙傛暟
@@ -12,10 +12,10 @@
Body | |蹇呭～ |
 orderNo |string |蹇呭～ |璁㈠崟鍙�
 orderType |int |蹇呭～ |璁㈠崟绫诲瀷(閫氳繃璁㈠崟绫诲瀷鏌ヨ鎺ュ彛鑾峰彇)
- orderDetails |object |蹇呭～ |鐗╂枡璇︽儏
-  orderNo |string |蹇呭～ |璁㈠崟鍙�
+ mats |object |蹇呭～ |鐗╂枡鍒楄〃
  matnr |string |蹇呭～ |鐗╂枡鍙�
-  anfme |double |蹇呭～ |鏁伴噺
+  count |double |蹇呭～ |鏁伴噺
+  batch |string |鍙�� |鎵瑰彿
 sign |string |鍙�� |绛惧悕
@@ -27,16 +27,16 @@
"appkey":"6cfb9f11935b4d0e1740f41598970c97",
},
"Body":{
- "orderNo": 2024010311062541,
- "orderType": 1,
- "orderDetails": [
- {
- "orderNo": 2024010311062541,
- "matnr": "test001",
- "anfme": 10
- }
- ],
- "sign": "8a7036cfe218e12f50f9107e9eb4a437"
+ "orderNo": 2024010311062544,
+ "orderType": 7,
+ "mats": [
+ {
+ "matnr": "test001",
+ "batch": "",
+ "count": 10
+ }
+ ],
+ "sign": "8a7036cfe218e12f50f9107e9eb4a437"
}
}
diff --git a/zy-asrs-openapi/src/main/webapp/views/md/getOrderList.md b/zy-asrs-openapi/src/main/webapp/views/md/getOrderList.md
new file mode 100644
index 0000000..bb2e99b
--- /dev/null
+++ b/zy-asrs-openapi/src/main/webapp/views/md/getOrderList.md
@@ -0,0 +1,165 @@
+## 鑾峰彇璁㈠崟鍒楄〃
+
+- **鎺ュ彛璇存槑锛�** 鑾峰彇璁㈠崟鍒楄〃
+- **鎺ュ彛鍦板潃锛�** /api/getOrderList
+
+#### 璇锋眰鍙傛暟
+
+鍙傛暟鍚嶇О |绫诲瀷 |鍑虹幇瑕佹眰 |鎻忚堪
+:---- |:--- |:------ |:---
+Header | |蹇呭～ |璇锋眰鎶ユ枃澶�
+ appkey |string |蹇呭～ |瀵嗛挜绠＄悊涓敓鎴恆ppkey
+Body | | |
+ orderNo |string |鍙�� |璁㈠崟鍙�
+ orderType |int |鍙�� |璁㈠崟绫诲瀷
+ status |int |鍙�� |璁㈠崟鐘舵��
+
+
+璇锋眰绀轰緥锛�
+
+```
+{
+ "orderNo": "2024010311062544",
+ "orderType": 7,
+ "status": 1
+}
+```
+
+
+#### 杩斿洖缁撴灉
+
+鍙傛暟鍚嶇О |绫诲瀷 |鍑虹幇瑕佹眰 |鎻忚堪
+:---- |:--- |:------ |:---
+code |int |蹇呭～ |鍝嶅簲鐮侊紝浠ｇ爜瀹氫箟璇疯鈥滈檮褰旳 鍝嶅簲鍚楄鏄庘��
+msg |string |蹇呭～ |
+data |object |鍙�� |
+
+绀轰緥锛�
+
+```
+{
+ "msg": "鎿嶄綔鎴愬姛",
+ "code": 200,
+ "data": [
+ {
+ "order": {
+ "id": 16,
+ "uuid": "1192870598489931776",
+ "orderNo": "2024010311062544",
+ "orderTime": "2024-01-05 16:41:53",
+ "docType": 7,
+ "itemId": null,
+ "itemName": null,
+ "allotItemId": null,
+ "defNumber": null,
+ "number": null,
+ "cstmr": null,
+ "cstmrName": null,
+ "tel": null,
+ "operMemb": null,
+ "totalFee": null,
+ "discount": null,
+ "discountFee": null,
+ "otherFee": null,
+ "actFee": null,
+ "payType": null,
+ "salesman": null,
+ "accountDay": null,
+ "postFeeType": null,
+ "postFee": null,
+ "payTime": null,
+ "sendTime": null,
+ "shipName": null,
+ "shipCode": null,
+ "settle": 1,
+ "status": 1,
+ "createBy": 9527,
+ "createTime": "2024-01-05T08:41:53.143+00:00",
+ "updateBy": 9527,
+ "updateTime": "2024-01-05T08:41:53.143+00:00",
+ "memo": null,
+ "hostId": 1,
+ "hostId$": "涓壃鍌ㄥ瓨璁惧",
+ "createTime$": "2024-01-05 16:41:53",
+ "status$": "姝ｅ父",
+ "updateTime$": "2024-01-05 16:41:53",
+ "updateBy$": null,
+ "createBy$": null,
+ "allotItemId$": null,
+ "cstmr$": null,
+ "payTime$": "",
+ "payType$": null,
+ "sendTime$": "",
+ "postFeeType$": null,
+ "itemId$": null,
+ "docType$": "閿�鍞嚭搴�",
+ "settle$": "寰呭鐞�"
+ },
+ "orderDetls": [
+ {
+ "id": 30,
+ "orderId": 16,
+ "orderNo": "2024010311062544",
+ "anfme": 10,
+ "qty": 0,
+ "matnr": "test001",
+ "maktx": "娴嬭瘯鐗╂枡1",
+ "batch": "",
+ "specs": null,
+ "model": null,
+ "color": null,
+ "brand": null,
+ "unit": null,
+ "price": null,
+ "sku": null,
+ "units": null,
+ "barcode": null,
+ "origin": null,
+ "manu": null,
+ "manuDate": null,
+ "itemNum": null,
+ "safeQty": null,
+ "weight": null,
+ "length": null,
+ "volume": null,
+ "threeCode": null,
+ "supp": null,
+ "suppCode": null,
+ "beBatch": null,
+ "deadTime": null,
+ "deadWarn": null,
+ "source": null,
+ "inspect": null,
+ "danger": null,
+ "status": 1,
+ "createBy": 9527,
+ "createTime": "2024-01-05T08:41:53.143+00:00",
+ "updateBy": 9527,
+ "updateTime": "2024-01-05T08:41:53.143+00:00",
+ "memo": null,
+ "hostId": 1,
+ "enableQty": 10,
+ "hostId$": "涓壃鍌ㄥ瓨璁惧",
+ "createTime$": "2024-01-05 16:41:53",
+ "status$": "姝ｅ父",
+ "updateTime$": "2024-01-05 16:41:53",
+ "updateBy$": null,
+ "createBy$": null,
+ "beBatch$": null,
+ "danger$": null,
+ "source$": null,
+ "orderId$": "16",
+ "inspect$": null
+ }
+ ]
+ }
+ ]
+}
+```
+
+## 闄勫綍A 鍝嶅簲鐮佽鏄�
+
+鍝嶅簲鐮� |璇存槑
+:---- |:---
+200 |澶勭悊鎴愬姛
+500 |绯荤粺鍐呴儴閿欒
\ No newline at end of file
diff --git a/zy-asrs-openapi/src/main/webapp/views/md/getOrderStatus.md b/zy-asrs-openapi/src/main/webapp/views/md/getOrderStatus.md
new file mode 100644
index 0000000..58c748e
--- /dev/null
+++ b/zy-asrs-openapi/src/main/webapp/views/md/getOrderStatus.md
@@ -0,0 +1,151 @@
+## 鑾峰彇璁㈠崟鐘舵�佸垪琛�
+
+- **鎺ュ彛璇存槑锛�** 鑾峰彇璁㈠崟鐘舵�佸垪琛�
+- **鎺ュ彛鍦板潃锛�** /api/getOrderStatus
+
+#### 璇锋眰鍙傛暟
+
+鍙傛暟鍚嶇О |绫诲瀷 |鍑虹幇瑕佹眰 |鎻忚堪
+:---- |:--- |:------ |:---
+Header | |蹇呭～ |璇锋眰鎶ユ枃澶�
+ appkey |string |蹇呭～ |瀵嗛挜绠＄悊涓敓鎴恆ppkey
+Body | | |
+
+
+璇锋眰绀轰緥锛�
+
+```
+{}
+```
+
+
+#### 杩斿洖缁撴灉
+
+鍙傛暟鍚嶇О |绫诲瀷 |鍑虹幇瑕佹眰 |鎻忚堪
+:---- |:--- |:------ |:---
+code |int |蹇呭～ |鍝嶅簲鐮侊紝浠ｇ爜瀹氫箟璇疯鈥滈檮褰旳 鍝嶅簲鍚楄鏄庘��
+msg |string |蹇呭～ |
+data |object |鍙�� |
+
+绀轰緥锛�
+
+```
+{
+ "msg": "鎿嶄綔鎴愬姛",
+ "code": 200,
+ "data": [
+ {
+ "orderSettle": 0, //璁㈠崟鐘舵�佺被鍨婭D
+ "settleName": "鍒濆鍖�",//璁㈠崟鐘舵�佺被鍨�
+ "createBy": 9527,
+ "createTime": "2021-04-13T08:49:25.450+00:00",
+ "updateBy": 22,
+ "updateTime": "2021-04-14T02:50:31.577+00:00",
+ "memo": "",
+ "hostId": null,
+ "updateTime$": "2021-04-14 10:50:31",
+ "createTime$": "2021-04-13 16:49:25",
+ "hostId$": null,
+ "createBy$": null,
+ "updateBy$": null
+ },
+ {
+ "orderSettle": 1,
+ "settleName": "寰呭鐞�",
+ "createBy": 22,
+ "createTime": "2021-04-14T02:51:30.897+00:00",
+ "updateBy": 22,
+ "updateTime": "2021-04-14T02:51:30.897+00:00",
+ "memo": "",
+ "hostId": null,
+ "updateTime$": "2021-04-14 10:51:30",
+ "createTime$": "2021-04-14 10:51:30",
+ "hostId$": null,
+ "createBy$": null,
+ "updateBy$": null
+ },
+ {
+ "orderSettle": 2,
+ "settleName": "浣滀笟涓�",
+ "createBy": 22,
+ "createTime": "2021-04-14T02:51:37.403+00:00",
+ "updateBy": 9527,
+ "updateTime": "2022-03-25T06:21:14.303+00:00",
+ "memo": "",
+ "hostId": null,
+ "updateTime$": "2022-03-25 14:21:14",
+ "createTime$": "2021-04-14 10:51:37",
+ "hostId$": null,
+ "createBy$": null,
+ "updateBy$": null
+ },
+ {
+ "orderSettle": 3,
+ "settleName": "宸插彇娑�",
+ "createBy": 22,
+ "createTime": "2021-04-14T02:51:46.977+00:00",
+ "updateBy": 22,
+ "updateTime": "2021-04-14T02:51:46.977+00:00",
+ "memo": "",
+ "hostId": null,
+ "updateTime$": "2021-04-14 10:51:46",
+ "createTime$": "2021-04-14 10:51:46",
+ "hostId$": null,
+ "createBy$": null,
+ "updateBy$": null
+ },
+ {
+ "orderSettle": 4,
+ "settleName": "宸插畬鎴�",
+ "createBy": 22,
+ "createTime": "2021-04-14T02:51:54.440+00:00",
+ "updateBy": 22,
+ "updateTime": "2021-04-14T02:51:54.440+00:00",
+ "memo": "",
+ "hostId": null,
+ "updateTime$": "2021-04-14 10:51:54",
+ "createTime$": "2021-04-14 10:51:54",
+ "hostId$": null,
+ "createBy$": null,
+ "updateBy$": null
+ },
+ {
+ "orderSettle": 5,
+ "settleName": "鍑嗗鍙栨秷",
+ "createBy": 22,
+ "createTime": "2021-04-14T02:52:07.847+00:00",
+ "updateBy": 22,
+ "updateTime": "2021-04-14T02:52:07.847+00:00",
+ "memo": "",
+ "hostId": null,
+ "updateTime$": "2021-04-14 10:52:07",
+ "createTime$": "2021-04-14 10:52:07",
+ "hostId$": null,
+ "createBy$": null,
+ "updateBy$": null
+ },
+ {
+ "orderSettle": 6,
+ "settleName": "涓婃姤瀹屾垚",
+ "createBy": 22,
+ "createTime": "2021-04-14T03:10:10.117+00:00",
+ "updateBy": 22,
+ "updateTime": "2021-04-14T03:10:10.117+00:00",
+ "memo": "",
+ "hostId": null,
+ "updateTime$": "2021-04-14 11:10:10",
+ "createTime$": "2021-04-14 11:10:10",
+ "hostId$": null,
+ "createBy$": null,
+ "updateBy$": null
+ }
+ ]
+}
+```
+
+## 闄勫綍A 鍝嶅簲鐮佽鏄�
+
+鍝嶅簲鐮� |璇存槑
+:---- |:---
+200 |澶勭悊鎴愬姛
+500 |绯荤粺鍐呴儴閿欒
\ No newline at end of file
diff --git a/zy-asrs-openapi/src/main/webapp/views/md/getOrderType.md b/zy-asrs-openapi/src/main/webapp/views/md/getOrderType.md
index a8d2057..cea5248 100644
--- a/zy-asrs-openapi/src/main/webapp/views/md/getOrderType.md
+++ b/zy-asrs-openapi/src/main/webapp/views/md/getOrderType.md
@@ -35,8 +35,8 @@
"code": 200,
"data": [
{
- "docId": 1,
- "docName": "閲囪喘鍏ュ簱",
+ "docId": 1,//璁㈠崟绫诲瀷ID
+ "docName": "閲囪喘鍏ュ簱",//璁㈠崟绫诲瀷
"pakin": 1,
"pakout": 0,
"status": null,
--
Gitblit v1.9.1