From e1554a9250bed6038ac754786f11b58c68fe0458 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 24 十一月 2023 18:01:10 +0800
Subject: [PATCH] #堆垛机出入库
---
src/main/java/com/zy/asrs/controller/OpenController.java | 5 +++++
src/main/resources/application-prod.yml | 52 ++++++++++++++++++++++++++--------------------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +-
3 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6806b2b..1ad9267 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -39,6 +39,8 @@
@Autowired
private BasDevpService basDevpService;
+ private static final boolean auth = true;
+
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
@@ -161,6 +163,7 @@
public R outboundTaskSend(@RequestHeader String appkey,
@RequestBody List<WMSAndAGVInterfaceParam> params,
HttpServletRequest request) {
+ auth(appkey, params, request);
List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
for (WMSAndAGVInterfaceParam param:params){
try {
@@ -267,4 +270,6 @@
}
}
+
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 9cb9d38..9ee699d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -36,7 +36,7 @@
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
- taskWrk.setWrkSts(1);
+ taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index e255ab6..5a69fca 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -11,14 +11,14 @@
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 103
- row: 3
+ staNo: 100
+ row: 2
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 100
- row: 4
+ staNo: 103
+ row: 3
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
@@ -43,14 +43,14 @@
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 107
- row: 3
+ staNo: 104
+ row: 5
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 104
- row: 4
+ staNo: 107
+ row: 6
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
@@ -75,14 +75,14 @@
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 103
- row: 3
+ staNo: 108
+ row: 8
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 100
- row: 4
+ staNo: 111
+ row: 9
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
@@ -139,14 +139,14 @@
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 103
- row: 3
+ staNo: 116
+ row: 16
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 100
- row: 4
+ staNo: 119
+ row: 17
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
@@ -171,28 +171,28 @@
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 103
- row: 3
+ staNo: 120
+ row: 20
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 100
- row: 4
+ staNo: 123
+ row: 21
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
staNo: 230
- row: 3
- bay: 41
- lev: 1
+ row: 20
+ bay: 22
+ lev: 2
devpPlcId: ${wcs-slave.devp[1].id}
crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
staNo: 235
- row: 4
- bay: 41
- lev: 1
+ row: 19
+ bay: 22
+ lev: 2
devpPlcId: ${wcs-slave.devp[1].id}
devp[0]: #杈撻�佺嚎
id: 1
--
Gitblit v1.9.1