From facf104ca0830f96fe11d54048d17f4b646032e0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 29 一月 2026 16:42:06 +0800
Subject: [PATCH] 库存明细查询去除库区信息
---
src/main/java/com/zy/asrs/task/handler/JlerHandler.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/JlerHandler.java b/src/main/java/com/zy/asrs/task/handler/JlerHandler.java
index 06862fe..e92b37b 100644
--- a/src/main/java/com/zy/asrs/task/handler/JlerHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/JlerHandler.java
@@ -15,6 +15,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Date;
/**
* @author pang.jiabao
@@ -50,11 +51,11 @@
if(wrkMast.getIoType() == 110) {
if(mesOutApply == null) { // 涓嶆槸mes涓嬪彂鐨勭┖鎵樺嚭搴�
TransTask transTask = new TransTask();
-// transTask.setTaskno(mesOutApply.getTaskno());
+ transTask.setTaskno(String.valueOf(new Date().getTime()));
// transTask.setTaskname(mesOutApply.getTaskname());
// transTask.setOrderNo(mesOutApply.getOrderNo());
transTask.setTransType("01");
- transTask.setCurStationId(WMS_TRANS_START_STATION_3);
+ transTask.setCurStationId(wrkMast.getStaNo());
// transTask.setNextProcess(mesOutApply.getProductLineId());
transTask.setNextStationId(wrkMast.getAgvSta());
transTask.setItemno(WMS_ZPALLET_ID); // 鍥哄畾涓虹┖鎵樼殑缂栫爜
@@ -62,12 +63,9 @@
// transTask.setProductLineId(mesOutApply.getProductLineId());
transTask.setOperateType(1);
transTask.setAgvFactory(1);
+ transTask.setTuoPanId(wrkMast.getBarcode());
JSONObject sendAgvTask = mesService.submitTask(transTask);
if ("1".equals(sendAgvTask.getString("Success"))) {
- String taskno = sendAgvTask.getString("taskno");
- if(Cools.isEmpty(wrkMast.getTaskNo())) {
- wrkMast.setTaskNo(taskno);
- }
wrkMast.setCallAgv(1);
wrkMastService.updateById(wrkMast);
}else {
@@ -79,7 +77,7 @@
transTask.setTaskname(mesOutApply.getTaskname());
transTask.setOrderNo(mesOutApply.getOrderNo());
transTask.setTransType(mesOutApply.getTransType());
- transTask.setCurStationId(WMS_TRANS_START_STATION_3);
+ transTask.setCurStationId(wrkMast.getStaNo());
transTask.setNextProcess(mesOutApply.getProductLineId());
transTask.setNextStationId(mesOutApply.getStationId());
transTask.setItemno(WMS_ZPALLET_ID); // 鍥哄畾涓虹┖鎵樼殑缂栫爜
@@ -88,12 +86,9 @@
transTask.setProductLineId(mesOutApply.getProductLineId());
transTask.setOperateType(1);
transTask.setAgvFactory(1);
+ transTask.setTuoPanId(wrkMast.getBarcode());
JSONObject sendAgvTask = mesService.submitTask(transTask);
if ("1".equals(sendAgvTask.getString("Success"))) {
-// String taskno = sendAgvTask.getString("taskno");
-// if(Cools.isEmpty(wrkMast.getTaskNo())) {
-// wrkMast.setTaskNo(taskno);
-// }
wrkMast.setCallAgv(1);
wrkMastService.updateById(wrkMast);
}else {
@@ -109,7 +104,7 @@
transTask.setTaskname(mesOutApply.getTaskname());
transTask.setOrderNo(mesOutApply.getOrderNo());
transTask.setTransType(mesOutApply.getTransType());
- transTask.setCurStationId(WMS_TRANS_START_STATION_3);
+ transTask.setCurStationId(wrkMast.getStaNo());
transTask.setNextProcess(mesOutApply.getProductLineId());
transTask.setNextStationId(mesOutApply.getStationId());
transTask.setItemno(mesOutApply.getItemno());
@@ -122,10 +117,6 @@
JSONObject sendAgvTask = mesService.submitTask(transTask);
if ("1".equals(sendAgvTask.getString("Success"))) {
-// String taskno = sendAgvTask.getString("taskno");
-// if(Cools.isEmpty(wrkMast.getTaskNo())) {
-// wrkMast.setTaskNo(taskno);
-// }
wrkMast.setCallAgv(1);
wrkMastService.updateById(wrkMast);
}else {
--
Gitblit v1.9.1