From 9c86cce3943842ed28f3acd48c33c76cb93b57e5 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 06 三月 2024 18:04:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 3 +++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4 ++--
src/main/resources/application.yml | 6 ++++--
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 3 +++
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 81e2ddf..ce40209 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -168,6 +168,9 @@
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
public R complete(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3){
+ return R.error("宸插畬缁撴垨宸插彇娑�") ;
+ }
LocMast locMast=new LocMast();
if(taskWrk.getIoType()==1){//鍏ュ簱浠诲姟瀹屾垚搴撲綅涓篎
locMast=locMastService.selectByLocNo(taskWrk.getTargetPoint());
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
index 54dae84..e926683 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -211,6 +211,9 @@
this.wrkNo = taskWrk.getWrkNo();
this.createTime = taskWrk.getCreateTime();
this.ioType = taskWrk.getIoType();
+ if (Cools.isEmpty(taskWrk.getIoPri())){
+ taskWrk.setIoPri(1);
+ }
this.ioPri = (double)taskWrk.getIoPri();
this.startPoint = taskWrk.getStartPoint();
this.targetPoint = taskWrk.getTargetPoint();
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 4270982..046a07a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -190,7 +190,7 @@
continue;
}
String barcode = barcodeThread.getBarcode();
- if(!Cools.isEmpty(barcode)) {
+ if(!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
// 璇锋眰wms鎺ュ彛锛岃幏鍙栧伐浣滃彿鍜岀洰鏍囧簱浣�
ToWmsDTO toWmsDTO = new ToWmsDTO(barcode,staProtocol.getSiteId(),staProtocol.isHigh() ? 2 : 1);
TaskWrk taskWrk1=taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode",barcode));
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index c855306..5e9dc63 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -233,10 +233,10 @@
if (slave.getId() == 1) {
//鏉＄爜
//Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840.0", (short) 60);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840.0", (short) 32);
if (result2.IsSuccess) {
for (int i = 0; i < 4; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 10, 8, "UTF-8");
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5d401f0..52d457c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -49,10 +49,12 @@
# WMS绯荤粺ip
#url: 10.32.53.195:8080
# WMS绯荤粺ip
- url: 10.210.157.109:8090
+# url: 10.210.157.109:8090
+ url: 10.210.157.11:8080/wms
# 鍏ュ簱浠诲姟鐢宠鎺ュ彛
#inboundTaskApplyPath: api/InterFace/inboundTaskApply
- inboundTaskApplyPath: apis/inboundTaskApply
+# inboundTaskApplyPath: apis/inboundTaskApply
+ inboundTaskApplyPath: open/asrs/inboundTaskApply
# 浠诲姟鐘舵�佸弽棣堟帴鍙�
taskStatusFeedbackPath: apis/taskStatusFeedback
# 璐т綅鐘舵�佹洿鏂版帴鍙�
--
Gitblit v1.9.1