From 4f0617f8fcc7f1c91f3c2dc8056e195ae71aad83 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 19 十一月 2025 11:10:03 +0800
Subject: [PATCH] 侧面入库下发码盘层数变更为第一版
---
src/main/java/com/zy/asrs/controller/OpenController.java | 7 +++----
src/main/resources/wcs和wms接口(2).docx | 0
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 31 ++++++++++++++++++++++---------
3 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 2e137c7..ce27fdd 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -14,7 +14,6 @@
import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.service.*;
-import com.zy.asrs.service.impl.OpenServiceImpl;
import com.zy.common.web.BaseController;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -65,7 +64,7 @@
@PostMapping("/preStoragePallet")
public R preStoragePallet(@RequestHeader String appkey, @RequestBody PreStoragePallet preStoragePallet, HttpServletRequest request) {
auth(appkey, preStoragePallet, request);
- if(Cools.isEmpty(preStoragePallet.getSite(),preStoragePallet.getLx(),preStoragePallet.getLev())) {
+ if(Cools.isEmpty(preStoragePallet.getSite(),preStoragePallet.getLev())) {
return R.error("鍙傛暟涓嶅畬鏁达紝璇锋鏌ワ細" + preStoragePallet);
}
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
@@ -76,9 +75,9 @@
staProtocol = staProtocol.clone();
}
- staProtocol.setMp((short) (preStoragePallet.getLev() > 1 ? 1 : 2));
+// staProtocol.setMp((short) (preStoragePallet.getLev() > 1 ? 1 : 2));
staProtocol.setLev(preStoragePallet.getLev());
- staProtocol.setLx(OpenServiceImpl.getGzlx(preStoragePallet.getLx()));
+// staProtocol.setLx(OpenServiceImpl.getGzlx(preStoragePallet.getLx()));
boolean offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
if(!offer) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 4bb7db6..6199eb5 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -677,9 +677,10 @@
int lx = 0,mp = 0,lev = 0;
switch (staProtocol.getSiteId()) {
- case 205: lx = 16;mp = 18;lev=344;break;
+ case 202: lev=366;break;
+ case 206: lev=368;break;
case 207: lx = 24;mp = 26;lev=348;break;
- case 210: lx = 36;mp = 38;lev=354;break;
+ case 211: lev=370;break;
case 212: lx = 44;mp = 46;lev=358;break;
default:
log.error("鍐欑爜鐩樹俊鎭珯鐐规湁璇細{}" , staProtocol.getSiteId());
@@ -693,16 +694,28 @@
//浠诲姟涓嬪彂鎴愬姛鏍囪瘑
boolean writeFlag = false;
while (writeCount < 5) {
- OperateResult writeResult1 = siemensS7Net.Write(addressPre + lx, staProtocol.getLx()); // 宸ヨ绫诲瀷
- OperateResult writeResult2 = siemensS7Net.Write(addressPre + mp, staProtocol.getMp()); // 鏄惁鐮佺洏
- OperateResult writeResult3 = siemensS7Net.Write(addressPre + lev, staProtocol.getLev()); // 鐮佺洏灞傛暟
- if (writeResult1.IsSuccess && writeResult2.IsSuccess && writeResult3.IsSuccess) {
+ if (staProtocol.getSiteId() == 202 || staProtocol.getSiteId() == 206 || staProtocol.getSiteId() == 211) {
+ OperateResult writeResult3 = siemensS7Net.Write(addressPre + lev, staProtocol.getLev()); // 鐮佺洏灞傛暟
+ if (writeResult3.IsSuccess) {
writeFlag = true;
- log.info("鐮佺洏淇℃伅鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔熴�恵},{},{},{}銆戯紝骞朵笖鍥炶鎴愬姛锛屽啓鍏ユ鏁�={}", staProtocol.getSiteId(),staProtocol.getMp(),staProtocol.getLx(),staProtocol.getLev(), writeCount);
+ log.info("鍏ュ簱鐮佺洏淇℃伅鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔熴�恵},{},{},{}銆戯紝骞朵笖鍥炶鎴愬姛锛屽啓鍏ユ鏁�={}", staProtocol.getSiteId(), staProtocol.getMp(), staProtocol.getLx(), staProtocol.getLev(), writeCount);
break;
+ } else {
+ writeCount++;
+ log.error("鍏ュ簱鐮佺洏淇℃伅鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ }
} else {
- writeCount++;
- log.error("鐮佺洏淇℃伅鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ OperateResult writeResult1 = siemensS7Net.Write(addressPre + lx, staProtocol.getLx()); // 宸ヨ绫诲瀷
+ OperateResult writeResult2 = siemensS7Net.Write(addressPre + mp, staProtocol.getMp()); // 鏄惁鐮佺洏
+ OperateResult writeResult3 = siemensS7Net.Write(addressPre + lev, staProtocol.getLev()); // 鐮佺洏灞傛暟
+ if (writeResult1.IsSuccess && writeResult2.IsSuccess && writeResult3.IsSuccess) {
+ writeFlag = true;
+ log.info("鍑哄簱鐮佺洏淇℃伅鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔熴�恵},{},{},{}銆戯紝骞朵笖鍥炶鎴愬姛锛屽啓鍏ユ鏁�={}", staProtocol.getSiteId(), staProtocol.getMp(), staProtocol.getLx(), staProtocol.getLev(), writeCount);
+ break;
+ } else {
+ writeCount++;
+ log.error("鍑哄簱鐮佺洏淇℃伅鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ }
}
}
diff --git "a/src/main/resources/wcs\345\222\214wms\346\216\245\345\217\243\0502\051.docx" "b/src/main/resources/wcs\345\222\214wms\346\216\245\345\217\243\0502\051.docx"
index 9fa733d..edf35ba 100644
--- "a/src/main/resources/wcs\345\222\214wms\346\216\245\345\217\243\0502\051.docx"
+++ "b/src/main/resources/wcs\345\222\214wms\346\216\245\345\217\243\0502\051.docx"
Binary files differ
--
Gitblit v1.9.1