From 7bea8428d74527993cb4ae47d01c79850b5f34bc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 20 三月 2023 08:09:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/webapp/views/api_index.html | 236 ++++++++++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 6
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 2
src/main/resources/application.yml | 4
4 files changed, 240 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index c8fb7ed..3e10676 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -67,9 +67,9 @@
// if(!station.getInEnable().equals("Y")) {
// throw new CoolException(devpNo+"绔欑偣涓嶆槸鍙叆鐘舵��");
// }
- if(wrkMastService.getWorkingMast(devpNo)>0){
- throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
- }
+// if(wrkMastService.getWorkingMast(devpNo)>0){
+// throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+// }
}
return station;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index 6534ba4..adb917a 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -24,7 +24,7 @@
public StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo, Integer row1) {
StaDesc staDesc = null;
if(crnNo==2){
- Integer sourceStaNo = 0;
+ Integer sourceStaNo = 204;
switch (stnNo){
case 100:
sourceStaNo = 104;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 10c71cc..e759cba 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8081
servlet:
context-path: /@pom.build.finalName@
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=bfasrs
+ url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
username: sa
# password: Zoneyung@zy56$
diff --git a/src/main/webapp/views/api_index.html b/src/main/webapp/views/api_index.html
index b47e7a0..36efeb1 100644
--- a/src/main/webapp/views/api_index.html
+++ b/src/main/webapp/views/api_index.html
@@ -119,8 +119,8 @@
<p>璇锋眰澶达細</p>
<table border="1">
<tr><th>鍙傛暟鍚�</th><th>鎻忚堪</th></tr>
- <tr><td>Method</td><td>http://{prefix}/open/asrs/order/matSync/default/v1</td></tr>
- <tr><td>Url</td><td>Post</td></tr>
+ <tr><td>Method</td><td>Post</td></tr>
+ <tr><td>Url</td><td>http://{prefix}/open/asrs/order/matSync/default/v1</td></tr>
<tr><td>Content-Type</td><td>application/json;charset=UTF-8</td></tr>
<tr><td>appkey</td><td>ea1f0459efc02a79f046f982767939ae</td></tr>
</table>
@@ -176,6 +176,238 @@
<tr><td>createTime</td><td>鏄�</td><td>Date</td><td>娣诲姞鏃堕棿</td></tr>
<tr><td>memo</td><td>鏄�</td><td>瀛楃涓�</td><td>澶囨敞</td></tr>
</table>
+ <p>璇锋眰绀轰緥锛�</p>
+ <div class="code language-css">
+ <pre>
+ <code>
+ {
+"createTime":"2022-04-1109:28:10",
+"matDetails":[
+{
+"matnr":"Y9000P",
+"maktx":"鑱旀兂鎷晳鑰呯數鑴�",
+"groupCode":"A01",
+"groupName":"laptop",
+"name":"鑱旀兂绗旇鏈數鑴�",
+"specs":"3070鏄惧崱",
+"model":"闈炲叕妯″叿",
+"color":"榛戣壊",
+"brand":"鑱旀兂",
+"unit":"鍙�",
+"price":10999,
+"sku":"鏃爏ku",
+"units":1000,
+"barcode":"90000001",
+"origin":"涓浗",
+"manu":"涓浗鑱旀兂",
+"manuDate":"2022-04-1109:28:10",
+"itemNum":"1000",
+"safeQty":30,
+"weight":5,
+"length":3,
+"volume":10,
+"threeCode":"鏃犱笁鏂圭紪鐮�",
+"supp":"娴欐睙涓壃绔嬪簱",
+"suppCode":"supp01",
+"beBatch":1,
+"deadTime":"2022-08-1109:28:10",
+"deadWarn":1,
+"source":1,
+"inspect":1,
+"danger":2,
+"status":1,
+"createBy":1,
+"createTime":"2022-08-1109:28:10",
+"memo":"娴嬭瘯鐢�"
+}
+]
+}
+ </code>
+ </pre>
+ </div>
+ <h3>杩斿洖鍊�</h3>
+ <p>鍝嶅簲瀛楁锛�</p>
+ <table border="1">
+ <tr><th>瀛楁鍚嶇О</th><th>绫诲瀷</th><th>璇存槑</th></tr>
+ <tr><td>code</td><td>鏁板瓧</td><td>鍝嶅簲鐮�</td></tr>
+ <tr><td>msg</td><td>瀛楃涓�</td><td>鍝嶅簲鎻忚堪</td></tr>
+ <tr><td>data</td><td>鍒楄〃</td><td>鍝嶅簲鍐呭</td></tr>
+ </table>
+ <p>鍝嶅簲绀轰緥锛�</p>
+ <div class="code language-css">
+ <pre>
+ <code>
+{
+"msg":"鎿嶄綔鎴愬姛",
+"code":200
+}
+ </code>
+ </pre>
+ </div>
+ <h2>鐢熸垚鍏ュ簱鍗曟嵁</h2>
+ <h3>鎺ュ彛鍓嶈█</h3>
+ <ul>
+ <li>鎺ュ彛鎻愪緵鏂癸細AS/RS</li>
+ <li>鎺ュ彛璋冪敤鏂癸細ERP</li>
+ <li>涓氬姟绫诲瀷锛氬叆搴撲綔涓�</li>
+ <li>鍦烘櫙鎻忚堪锛氭牴鎹瓻RP鍏ュ簱鍗曟嵁锛堢敓浜с�侀噰璐�佽皟鎷ㄣ�侀攢鍞��鍥炪�佸叾浠栫瓑锛夎繘琛屽叆搴撲綔涓氾紝姝や换鍔′粎涓�
+ 鐢熸垚AS/RS鍏ュ簱閫氱煡鍗曟暟鎹紝鐒跺悗鐢辩幇鍦轰汉鍛樻搷浣淧DA杩涜鍏ュ簱锛屽苟涓嶈〃绀鸿皟鐢ㄦ鎺ュ彛鍚庡嵆琛ㄧず鍏ュ簱瀹屾垚銆�
+ </li>
+ </ul>
+ <h3>璇锋眰瑙勮寖</h3>
+ <p>璇锋眰澶�:</p>
+ <table border="1">
+ <tr><th>鍙傛暟鍚�</th><th>鎻忚堪</th></tr>
+ <tr><td>Method</td><td>Post</td></tr>
+ <tr><td>Url</td><td>Post</td></tr>
+ <tr><td>Content-Type</td><td>application/json;charset=UTF-8</td></tr>
+ <tr><td>appkey</td><td>ea1f0459efc02a79f046f982767939ae</td></tr>
+ </table>
+ <p>娉細appkey銆乸refix鐢辩鐞嗗憳鎻愪緵</p>
+ <p>璇锋眰浣擄細</p>
+ <table border="1">
+ <tr><th>瀛楁鍚嶇О</th><th>蹇呴渶</th><th>绫诲瀷</th><th>璇存槑</th></tr>
+ <tr><td>orderNo</td><td>鏄�</td><td>瀛楃涓�</td><td>鍗曟嵁缂栧彿</td></tr>
+ <tr><td>orderType</td><td>鏄�</td><td>瀛楃涓�</td><td>鍗曟嵁绫诲瀷</td></tr>
+ <tr><td>orderTime</td><td>鏄�</td><td>瀛楃涓�</td><td>鍗曟嵁鏃堕棿锛坹yyy-MM-ddHH:mm:ss锛�</td></tr>
+ <tr><td>orderDetails</td><td>鏄�</td><td>鍒楄〃</td><td>鍗曟嵁鏄庣粏</td></tr>
+ </table>
+ <p>娉細JSON鎻愪氦</p>
+ <p>娉�:濡傛灉orderDetails涓嚭鐜颁袱鏉℃湁鐩稿悓鍟嗗搧缂栧彿(matnr)鍜岀浉鍚岀敓浜ф壒鍙�(batch)鐨�
+ 淇℃伅,绔嬪簱浠呬細鐢熸垚涓�鏉�,骞跺皢鏁伴噺绱姞.</p>
+ <p>orderDetails鍒楄〃瀵硅薄锛�</p>
+ <table border="1">
+ <tr><th>瀛楁鍚嶇О</th><th>蹇呴渶</th><th>绫诲瀷</th><th>璇存槑</th></tr>
+ <tr><td>matnr</td><td>鏄�</td><td>瀛楃涓�</td><td>鍟嗗搧缂栧彿锛堢‘淇濇鍟嗗搧宸插悓姝ヨ嚦绔嬪簱锛�</td></tr>
+ <tr><td>batch</td><td>鍚�</td><td>瀛楃涓�</td><td>鐢熶骇鎵瑰彿</td></tr>
+ <tr><td>anfme</td><td>鏄�</td><td>鏁板瓧鍨�</td><td>鍏ュ簱鏁伴噺</td></tr>
+ </table>
+ <p>璇锋眰绀轰緥锛�</p>
+ <div class="code language-css">
+ <pre>
+ <code>
+{
+"orderNo":"963007546090586112",
+"orderTime":"2022-04-1109:28:10",
+"orderType":"閲囪喘鍏ュ簱鍗�",
+"orderDetails":[
+{
+"matnr":"MDH020030530",
+"anfme":18.0,
+"batch":"500"
+},
+{
+"matnr":"LSH90152025",
+"anfme":50.0
+}
+]
+}
+ </code>
+ </pre>
+ </div>
+ <h3>杩斿洖鍊�</h3>
+ <p>鍝嶅簲瀛楁锛�</p>
+ <table border="1">
+ <tr><th>瀛楁鍚嶇О</th><th>绫诲瀷</th><th>璇存槑</th></tr>
+ <tr><td>code</td><td>鏁板瓧</td><td>鍝嶅簲鐮�</td></tr>
+ <tr><td>msg</td><td>瀛楃涓�</td><td>鍝嶅簲鎻忚堪</td></tr>
+ <tr><td>data</td><td>鍒楄〃</td><td>鍝嶅簲鍐呭</td></tr>
+ </table>
+ <p>鍝嶅簲绀轰緥锛�</p>
+ <div class="code language-css">
+ <pre>
+ <code>
+{
+"msg":"鎿嶄綔鎴愬姛",
+"code":200
+}
+ </code>
+ </pre>
+ </div>
+ <h2>鍏ュ簱瀹屾垚鍥炲啓</h2>
+ <h3>鎺ュ彛鍓嶈█</h3>
+ <ul>
+ <li>鎺ュ彛鎻愪緵鏂癸細ERP</li>
+ <li>鎺ュ彛璋冪敤鏂癸細AS/RS</li>
+ <li>涓氬姟绫诲瀷锛氬叆搴撲綔涓�</li>
+ <li>鍦烘櫙鎻忚堪锛欰S/RS鎵цERP鍏ュ簱鍗曟嵁锛屽畬鎴愯揣鐗╃殑缁勬墭銆佸叆搴撳悗锛屼笂鎶ュ凡鍏ュ簱瀹屾垚
+ 鏁伴噺銆傚叆搴撳畬鎴愮瓥鐣ヤ互鏁翠釜鍗曟嵁涓哄崟浣嶄笂鎶ャ��</li>
+ </ul>
+ <h3>璇锋眰瑙勮寖</h3>
+ <p>璇锋眰澶达細</p>
+ <table border="1">
+ <tr><th>鍙傛暟鍚�</th><th>鎻忚堪</th></tr>
+ <tr><td>Method</td><td>Post</td></tr>
+ <tr><td>Url</td><td>http://{prefix}/open/asrs/order/matSync/default/v1</td></tr>
+ <tr><td>Content-Type</td><td>application/json;charset=UTF-8</td></tr>
+ <tr><td>appkey</td><td>ea1f0459efc02a79f046f982767939ae</td></tr>
+ </table>
+ <p>娉細appkey銆乸refix鐢辩鐞嗗憳鎻愪緵</p>
+ <p>璇锋眰浣擄細</p>
+ <table border="1">
+ <tr><th>瀛楁鍚嶇О</th><th style="width: 50px">蹇呴渶</th><th style="width: 50px">绫诲瀷</th><th>璇存槑</th></tr>
+ <tr><td>orderNo</td><td>鍚�</td><td>瀛楃涓�</td><td>鍗曟嵁缂栧彿锛堟鍙傛暟涓虹┖鏃讹紝鑾峰彇鎵�鏈夊凡
+ 瀹屾垚鐨勫叆搴撳崟鎹紝鏁版嵁琚幏鍙栧悗锛屼笅娆�
+ 璇锋眰姝ゆ帴鍙ｏ紝鏁版嵁涓嶄細閲嶅鍑虹幇锛涘弽
+ 涔嬶紝鍒欒幏鍙栨寚瀹氬崟鎹紪鍙锋暟鎹紝鎸囧畾鍗�
+ 鎹暟鎹彲閲嶅鍑虹幇銆�</td></tr>
+ </table>
+ <h3>杩斿洖鍊�</h3>
+ <p>鍝嶅簲瀛楁锛�</p>
+ <table border="1">
+ <tr><th>瀛楁鍚嶇О</th><th>绫诲瀷</th><th>璇存槑</th></tr>
+ <tr><td>code</td><td>鏁板瓧</td><td>鍝嶅簲鐮�</td></tr>
+ <tr><td>msg</td><td>瀛楃涓�</td><td>鍝嶅簲鎻忚堪</td></tr>
+ <tr><td>data</td><td>鍒楄〃</td><td>鍝嶅簲鍐呭</td></tr>
+ </table>
+ <p>data鍒楄〃瀵硅薄锛�</p>
+ <table border="1">
+ <tr><th>瀛楁鍚嶇О</th><th>绫诲瀷</th><th>璇存槑</th></tr>
+ <tr><td>orderNo</td><td>瀛楃涓�</td><td>鍗曟嵁缂栧彿</td></tr>
+ <tr><td>orderType</td><td>瀛楃涓�</td><td>鍗曟嵁绫诲瀷</td></tr>
+ <tr><td>orderTime</td><td>瀛楃涓�</td><td>鍗曟嵁鏃堕棿锛坹yyy-MM-ddHH:mm:ss锛�</td></tr>
+ <tr><td>orderDetails</td><td>鍒楄〃</td><td>鍗曟嵁鏄庣粏</td></tr>
+ </table>
+ <p>orderDetails鍒楄〃瀵硅薄锛�</p>
+ <table border="1">
+ <tr><th>瀛楁鍚嶇О</th><th>绫诲瀷</th><th>璇存槑</th></tr>
+ <tr><td>matnr</td><td>瀛楃涓�</td><td>鍟嗗搧缂栧彿</td></tr>
+ <tr><td>batch</td><td>瀛楃涓�</td><td>鐢熶骇鎵瑰彿</td></tr>
+ <tr><td>anfme</td><td>鏁板瓧鍨�</td><td>鍏ュ簱鏁伴噺</td></tr>
+ <tr><td>orderNo</td><td>瀛楃涓�</td><td>鍗曟嵁缂栧彿</td></tr>
+ </table>
+ <p>鍝嶅簲绀轰緥锛�</p>
+ <div class="code language-css">
+ <pre>
+ <code>
+{
+ "msg":"鎿嶄綔鎴愬姛",
+ "code":200,
+ "data":[
+ {
+ "orderNo":"963007546090586112",
+ "orderType":"閲囪喘鍏ュ簱鍗�",
+ "orderTime":"2022-04-11 09:30:35",
+ "orderDetils":[
+ {
+ "orderNo":"963007546090586112",
+ "matnr":"MDH020030530",
+ "batch":"500",
+ "anfme":18.0
+ },
+ {
+ "orderNo":"963007546090586112",
+ "matnr":"MDH020030530",
+ "batch":"500",
+ "anfme":18.0
+ }
+ ]
+ }
+ ]
+}
+ </code>
+ </pre>
+ </div>
</div>
</div>
</body>
--
Gitblit v1.9.1