From f0226479e92a906950aac0834048cc709e032e97 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 24 十二月 2025 09:17:44 +0800
Subject: [PATCH] 奥普瑞斯从侧面口进出，盘点拣料功能修复
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
index 3150545..4d03fa8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
@@ -372,7 +372,7 @@
// 绌烘墭鍑哄簱
if (StringUtils.isEmpty(mesOutApply.getOrderNo()) && "01".equals(mesOutApply.getTransType())) {
// 鐢熸垚绌烘墭鍑哄簱浠诲姟
- mobileService.callEmptyBinOutBound(mesOutApply,WMS_TRANS_START_STATION_1,"1",1,defaultUserId);
+ mobileService.callEmptyBinOutBound(mesOutApply,mesOutApply.getStationId().startsWith("LL") ? WMS_TRANS_START_STATION_3 : WMS_TRANS_START_STATION_1,"1",1,defaultUserId);
// try {
// if (!StringUtils.isEmpty(mesOutApply.getTaskno()) && !StringUtils.isEmpty(mesOutApply.getStationId())) {
@@ -477,8 +477,13 @@
wrkMast.setIoType(101); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(1);
- wrkMast.setSourceStaNo("203"); // 婧愮珯
- wrkMast.setStaNo("204"); // 鐩爣绔�
+ if(mesOutApply.getStationId().startsWith("LL")) {
+ wrkMast.setSourceStaNo("203"); // 婧愮珯
+ wrkMast.setStaNo("204"); // 鐩爣绔�
+ } else {
+ wrkMast.setSourceStaNo("205"); // 婧愮珯
+ wrkMast.setStaNo("205"); // 鐩爣绔�
+ }
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -587,7 +592,7 @@
transTask.setTransType(mesInApply.getTransType());
transTask.setCurProcess(mesInApply.getProductLineId());
transTask.setCurStationId(mesInApply.getStationID());
- transTask.setNextStationId(WMS_TRANS_START_STATION_2);
+ transTask.setNextStationId(mesInApply.getStationID().startsWith("LL") ? WMS_TRANS_START_STATION_2 : WMS_TRANS_START_STATION_1);
transTask.setItemno(WMS_ZPALLET_ID); // 鍥哄畾涓虹┖鎵樼殑缂栫爜
transTask.setQty(1); // 绌烘墭鍙洖1涓�
transTask.setProductLineId(mesInApply.getProductLineId());
@@ -686,7 +691,7 @@
transTask.setTransType(mesInApply.getTransType());
transTask.setCurProcess(mesInApply.getProductLineId());
transTask.setCurStationId(mesInApply.getStationID());
- transTask.setNextStationId(WMS_TRANS_START_STATION_2);
+ transTask.setNextStationId(mesInApply.getStationID().startsWith("LL") ? WMS_TRANS_START_STATION_2 : WMS_TRANS_START_STATION_1);
transTask.setItemno(mesInApply.getItemno());
transTask.setQty(mesInApply.getQty());
transTask.setProductLineId(mesInApply.getProductLineId());
@@ -972,7 +977,7 @@
transTask.setOrderNo(dbMemo.getString("OrderNo"));
transTask.setTransType(dbMemo.getString("TransType"));
// transTask.setCurProcess();
- transTask.setCurStationId(WMS_TRANS_START_STATION_1);
+ transTask.setCurStationId(WMS_TRANS_START_STATION_3);
transTask.setNextProcess(dbMemo.getString("ProductLineId"));
transTask.setNextStationId(dbMemo.getString("StationId"));
transTask.setItemno(dbMemo.getString("Itemno"));
--
Gitblit v1.9.1