From 2f269a156fc820de8ee893475f0d89e0d77a732a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 11 十二月 2023 17:16:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 ccd1501..bd53665 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -92,7 +92,7 @@
private String movePath;
- public void generateStoreWrkFile() throws IOException {
+ public void generateStoreWrkFile() throws IOException, InterruptedException {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
@@ -165,17 +165,20 @@
}
String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
+ StaDescService staDescService = SpringUtils.getBean(StaDescService.class);
+
ToWmsDTO toWmsDTO = new ToWmsDTO();
Map<String, Object> map = new HashMap<>();
map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
List<Integer> list = openServiceImpl.getInEnableRoadway();
- TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode).eq("crn_no",inSta.getBarcode()));
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
+
if (Cools.isEmpty(taskWrk)){
continue;
}
+ //StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null && taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() != workNo){
- //鑾峰彇鍫嗗灈鏈虹珯鐐�
- StaDescService staDescService = SpringUtils.getBean(StaDescService.class);
+ //鑾峰彇鍫嗗灈鏈虹珯鐐�
StaDesc staDesc = new StaDesc();
if (devp.getId() <= 1){
staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
@@ -187,6 +190,7 @@
staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+ Thread.sleep(200);
}else {
//TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
toWmsDTO.setWarehouseId("1688469798893297665");
@@ -439,7 +443,7 @@
// }
}
- return;
+ // return;
}
}
@@ -869,7 +873,7 @@
} else if (taskWrk.getIoType() == 2) {
//鍑哄簱浠诲姟
taskWrk.setWrkSts(14);//12.鍚婅溅鍑哄簱涓� => 14.鍑哄簱瀹屾垚
- taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+// taskWrk.setStatus(TaskStatusType.COMPLETE.id);
taskWrk.setModiTime(now);
taskWrkService.updateById(taskWrk);
--
Gitblit v1.9.1