From 5e574f766f17f906815391a5935675dddbfac7aa Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 05 三月 2025 16:06:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 1
src/main/java/com/zy/core/thread/LedThread.java | 46 +++++-----
src/main/java/com/zy/asrs/controller/OpenController.java | 129 +++++++++++++++-----------------
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 10 +-
src/main/resources/application.yml | 12 +-
6 files changed, 96 insertions(+), 104 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9a16f6c..1ffb332 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -81,69 +81,67 @@
return R.ok();
}
- //鍒涘缓浠诲姟
- @PostMapping("/taskCreate")
- @Transactional
- public R taskCreate(@RequestHeader String appkey,
- @RequestBody List<TaskCreateParam> param1,
- HttpServletRequest request) {
- auth(appkey, param1, request);
- try{
- List<TaskCreateParam> paramList = new ArrayList<>();
- List<String> locNoList = new ArrayList<>();
- for (TaskCreateParam param : param1) {
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
- }
- String locNo=null;
- if(param.getIoType()==1){
- locNo=param.getTargetPoint();
- }else{
- locNo=param.getStartPoint();
- }
- try{
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", locNo).ne("loc_sts","X"));
- if (Cools.isEmpty(locMast)){
- log.error("搴撲綅鍙蜂笉瀛樺湪"+locNo);
- return R.error("搴撲綅鍙蜂笉瀛樺湪"+locNo).add("搴撲綅鍙蜂笉瀛樺湪"+locNo);
- }
- }catch (Exception e){
- log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
- return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
- }
- LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_sts","F")
- .eq("loc_no",locNo)
- .eq("barcode",param.getBarcode()));
- if(Cools.isEmpty(locMast)){
- return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
- }
- if (!locNoList.contains(locMast.getLocNo())){
- locNoList.add(locMast.getLocNo());
- paramList.add(param);
- }else {
- return R.error("璇ュ簱浣嶄笉鑳藉悓鏃朵笅鍙戜袱绗斾换鍔�"+locMast.getLocNo());
- }
- }
- for (TaskCreateParam param : paramList){
- openService.taskCreate(param);
- }
- }catch (Exception e){
- log.error("浠诲姟涓嬪彂寮傚父"+e);
- return R.error();
- }
- return R.ok();
- }
+// //鍒涘缓浠诲姟
+// @PostMapping("/taskCreate")
+// @Transactional
+// public R taskCreate(@RequestBody List<TaskCreateParam> param1) {
+// // auth(appkey, param1, request);
+// try{
+// List<TaskCreateParam> paramList = new ArrayList<>();
+// List<String> locNoList = new ArrayList<>();
+// for (TaskCreateParam param : param1) {
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// if (Cools.isEmpty(param.getTaskNo())) {
+// return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+// }
+// if (Cools.isEmpty(param.getIoType())) {
+// return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+// }
+// if (Cools.isEmpty(param.getBarcode())) {
+// return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
+// }
+// String locNo=null;
+// if(param.getIoType()==1){
+// locNo=param.getTargetPoint();
+// }else{
+// locNo=param.getStartPoint();
+// }
+// try{
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_no", locNo).ne("loc_sts","X"));
+// if (Cools.isEmpty(locMast)){
+// log.error("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+// return R.error("搴撲綅鍙蜂笉瀛樺湪"+locNo).add("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+// }
+// }catch (Exception e){
+// log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+// return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+// }
+// LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_sts","F")
+// .eq("loc_no",locNo)
+// .eq("barcode",param.getBarcode()));
+// if(Cools.isEmpty(locMast)){
+// return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
+// }
+// if (!locNoList.contains(locMast.getLocNo())){
+// locNoList.add(locMast.getLocNo());
+// paramList.add(param);
+// }else {
+// return R.error("璇ュ簱浣嶄笉鑳藉悓鏃朵笅鍙戜袱绗斾换鍔�"+locMast.getLocNo());
+// }
+// }
+// for (TaskCreateParam param : paramList){
+// openService.taskCreate(param);
+// }
+// }catch (Exception e){
+// log.error("浠诲姟涓嬪彂寮傚父"+e);
+// return R.error();
+// }
+// return R.ok();
+// }
//鏌ヨ浠诲姟璇︽儏
@GetMapping("/queryTask")
@@ -309,11 +307,6 @@
);
return R.error("绔欑偣鐘舵�佷笉鍙叆");
}
-
-
-
-
-
}
//浠诲姟涓嬪彂鎺ュ彛
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index 0096e15..04ba6e2 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -141,7 +141,7 @@
TaskWrkLog taskWrk = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("task_no", taskNo));
if(!Cools.isEmpty(taskWrk)){
HashMap<String, Object> headParam = new HashMap<>();
- if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {//瀹屾垚
+ if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)||taskWrk.getStatus().equals(7)) {//瀹屾垚
headParam.put("Result", 1);
} else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
headParam.put("Result", 2);
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 1e53034..c1909b4 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -90,6 +90,7 @@
}
bool = true;
} catch (Exception e) {
+ log.error(e.getMessage(), e);
log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
} finally {
apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms"
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 056c0e8..f8586ee 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -65,29 +65,29 @@
public void run() {
connect();
close();
- while (true) {
- try {
- Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
- if (task != null) {
- switch (task.getStep()) {
- // 鍐欐暟鎹�
- case 1:
- write((List<LedCommand>)task.getData());
- break;
- // 澶嶄綅
- case 2:
- reset();
- break;
- default:
- break;
- }
- }
-
- Thread.sleep(400);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+// while (true) {
+// try {
+// Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
+// if (task != null) {
+// switch (task.getStep()) {
+// // 鍐欐暟鎹�
+// case 1:
+// write((List<LedCommand>)task.getData());
+// break;
+// // 澶嶄綅
+// case 2:
+// reset();
+// break;
+// default:
+// break;
+// }
+// }
+//
+// Thread.sleep(400);
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
}
private void write(List<LedCommand> list) throws Bx5GException {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 53f6ee8..f802042 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -48,12 +48,10 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);add(104);
- add(105);add(106);add(107);add(108);add(109);
- add(110);add(111);add(112);add(113);add(114);
- add(115);add(116);add(117);add(118);add(119);
- add(120);add(121);add(122);add(123);add(124);
- add(125);add(1001);add(1002);add(1003);add(1004);
+ add(1);add(2);add(3);add(4);add(5);
+ add(6);add(7);add(8);add(9);add(10);
+ add(11);add(12);add(13);add(14);add(15);
+ add(16);
}};
/*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
add(200);add(201);add(202);add(203);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e5ad29d..b362b70 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -17,7 +17,7 @@
host: localhost
port: 6379
database: 0
-# password: xltys1995
+ # password: xltys1995
profiles:
active: prod
@@ -50,14 +50,14 @@
#url: 10.32.53.195:8080
# WMS绯荤粺ip
# url: 10.210.157.109:8090
- url: 10.10.10.222:2410
+ url: 10.197.22.245:8000
# 鍏ュ簱浠诲姟鐢宠鎺ュ彛
#inboundTaskApplyPath: api/InterFace/inboundTaskApply
- inboundTaskApplyPath: api/StereoscopicCallBack/AcceptTaskStatus
+ inboundTaskApplyPath: api/zmdms-zt56Wms-core/api/wcs/AcceptTaskStatus
# inboundTaskApplyPath: open/asrs/inboundTaskApply
# 浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
- taskStatusFeedbackPath: api/StereoscopicCallBack/TaskExecCallback
+ taskStatusFeedbackPath: api/zmdms-zt56Wms-core/api/wcs/TaskExecCallback
# 浠诲姟瀹屾垚缁撴潫鏃讹紝WCS鍥炶皟WMS
- TaskExecCallback: api/StereoscopicCallBack/TaskExecFinishedCallback
+ TaskExecCallback: api/zmdms-zt56Wms-core/api/wcs/TaskExecFinishedCallback
# 绉诲簱鐢宠鎺ュ彛
movePath: api/InterFace/get_InterFace_TestStorage
--
Gitblit v1.9.1