From 3b3fc4103e337cb48f51e6ea059505d67f87ca09 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 07 五月 2025 14:13:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
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 69a505a..fa6d1e3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -194,7 +194,7 @@
String barcode = barcodeThread.getBarcode();
if (!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
// 璇锋眰wms鎺ュ彛锛岃幏鍙栧伐浣滃彿鍜岀洰鏍囧簱浣�
- ToWmsDTO toWmsDTO = new ToWmsDTO(barcode, staProtocol.getSiteId(), 0);
+ ToWmsDTO toWmsDTO = new ToWmsDTO(staProtocol.getSiteId(),staProtocol.getGrossWt(),barcode, 0);
TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
if (!Cools.isEmpty(taskWrk1)) {
log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗ｅ瓨鍦�");
@@ -517,7 +517,7 @@
}
}
} else {
- TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>());
+ TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("IO_TYPE",1).eq("WRK_STS",1).eq("START_POINT",staProtocol.getSiteId().toString()));
if (!Cools.isEmpty(taskWrk1)) {
if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
@@ -605,7 +605,7 @@
if (offer) {
log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
Date now = new Date();
- taskWrk.setStatus(5);
+ taskWrk.setStatus(9);
taskWrk.setWrkSts(14);
taskWrk.setModiTime(now);
taskWrk.setCompleteTime(now);
@@ -797,7 +797,7 @@
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo", taskWrk.getTaskNo());
headParam.put("status", taskWrk.getStatus());
- headParam.put("ioType", taskWrk.getIoType());
+ headParam.put("ioType", taskWrk.getIoTypeWms());
headParam.put("barcode", taskWrk.getBarcode());
String response;
response = new HttpHandler.Builder()
@@ -917,7 +917,7 @@
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo", taskWrk.getTaskNo());
headParam.put("status", taskWrk.getStatus());
- headParam.put("ioType", taskWrk.getIoType());
+ headParam.put("ioType", taskWrk.getIoTypeWms());
headParam.put("barcode", taskWrk.getBarcode());
String response;
response = new HttpHandler.Builder()
@@ -1021,7 +1021,7 @@
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo", taskWrk.getTaskNo());
headParam.put("status", taskWrk.getStatus());
- headParam.put("ioType", taskWrk.getIoType());
+ headParam.put("ioType", taskWrk.getIoTypeWms());
headParam.put("barcode", taskWrk.getBarcode());
String response;
response = new HttpHandler.Builder()
@@ -1135,7 +1135,7 @@
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo", taskWrk.getTaskNo());
headParam.put("status", taskWrk.getStatus());
- headParam.put("ioType", taskWrk.getIoType());
+ headParam.put("ioType", taskWrk.getIoTypeWms());
headParam.put("barcode", taskWrk.getBarcode());
String response;
log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", headParam);
@@ -1665,8 +1665,17 @@
}
// 鑾峰彇宸ヤ綔妗ｆ暟鎹�
LedCommand ledCommand = new LedCommand();
- //璇锋眰wms
+//
+// ledCommand.setWorkNo(wrkMast.getWrkNo());
+// ledCommand.setIoType(wrkMast.getIoType());
+// ledCommand.setTitle("绌烘澘鍑哄簱");
+// ledCommand.setEmptyMk(true);
+// ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
+// ledCommand.setLocNo(wrkMast.getLocNo());
+// ledCommand.setStaNo(wrkMast.getStaNo());
+ MatDto matDto = new MatDto();
+ ledCommand.getMatDtos().add(matDto);
commands.add(ledCommand);
}
Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
--
Gitblit v1.9.1