From ea8e354c77945964562edc61e04288b5a28dcb5c Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期日, 18 五月 2025 11:02:48 +0800
Subject: [PATCH] #pda盘点入库开发
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 3 +++
src/main/java/com/zy/asrs/controller/ConsoleController.java | 25 +++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ++++++
src/main/java/com/zy/common/model/SearchLocParam.java | 2 ++
4 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 44ad2dc..b8c4443 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -26,6 +26,7 @@
import com.zy.core.DevpThread;
import com.zy.core.RgvThread2;
import com.zy.core.Slave;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
@@ -33,6 +34,7 @@
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.RgvSlave;
+import com.zy.core.model.Task;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
@@ -92,6 +94,29 @@
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
+ @PostMapping("/site/pickIn")
+// @ManagerAuth(memo = "鐩樼偣鍐嶅叆搴�")
+ public R sitePickIn(@RequestParam Integer siteId, @RequestParam Integer workNo) throws InterruptedException {
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ for (DevpSlave.Sta inSta : devp.getPickSta()) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setSiteId(siteId);
+ staProtocol.setStaNo((short) 999);
+ if(MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol))){
+ return R.ok();
+ }
+ }
+ }
+ return R.error("鍏ュ簱澶辫触锛岃妫�鏌ョ珯鐐逛互鍙婂伐浣滄。淇℃伅");
+ }
+
/****************************************************************/
/************************** 瀹炴椂鏁版嵁 ******************************/
/****************************************************************/
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 cd49969..e064d65 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -158,6 +158,11 @@
errMsg = "鎵爜澶辫触";
back = true;
}
+// if (!back && staProtocol.getWeight() == 0.0) {
+// errMsg = "閲嶉噺鑾峰彇澶辫触";
+// back = true;
+// }
+
// 閫�鍥�
if (back) {
@@ -245,6 +250,7 @@
param.setIoType(1);
param.setSourceStaNo(inSta.getStaNo());
param.setLocType1(locTypeDto.getLocType1());
+ param.setWeight(staProtocol.getWeight());
String response = new HttpHandler.Builder()
.setTimeout(30,TimeUnit.SECONDS)
.setUri(wmsUrl)
diff --git a/src/main/java/com/zy/common/model/SearchLocParam.java b/src/main/java/com/zy/common/model/SearchLocParam.java
index 159024e..4b820b1 100644
--- a/src/main/java/com/zy/common/model/SearchLocParam.java
+++ b/src/main/java/com/zy/common/model/SearchLocParam.java
@@ -18,6 +18,8 @@
// 搴撲綅瑙勬牸锛� 0:鏈煡, 1:浣庡簱浣�, 2:涓簱浣�, 3:楂樺簱浣� 锛�
private Short locType1;
+ private Double weight;
+
public static void main(String[] args) {
SearchLocParam searchLocParam = new SearchLocParam();
searchLocParam.setIoType(1);
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 0e2be39..8430c47 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -49,6 +49,9 @@
// 閿佸畾鏍囪
private boolean pakMk = true;
+ //鎵樼洏閲嶉噺
+ private Double weight = 0.0;
+
// 鍏ュ簱鏆傚瓨鏁�
private Short inQty;
--
Gitblit v1.9.1