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 +++++++++++------
src/main/java/com/zy/asrs/task/handler/JlerHandler.java | 6 +++---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 +++---
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 6 +++---
src/main/resources/application-dev.yml | 4 ++--
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 6 +++---
7 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index babb339..628d95b 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -52,9 +52,9 @@
if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
}
- if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣鏃犵墿");
- }
+// if(station.getLoading()==null || !station.getLoading().equals("Y")) {
+// throw new CoolException(devpNo+"绔欑偣鏃犵墿");
+// }
if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
}
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"));
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 23c861b..fd32c4d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -620,9 +620,9 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
- if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
- throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
- }
+// if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
+// throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
+// }
WaitPakin waitPakin = new WaitPakin();
BeanUtils.copyProperties(mat, waitPakin);
waitPakin.setBatch(detlDto.getBatch());
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 2bd841a..9b02315 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1258,7 +1258,7 @@
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", wrkMast.getIoType() - 50)
- .eq("stn_no", Integer.parseInt(wrkMast.getStaNo())-2) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
+ .eq("stn_no", wrkMast.getSourceStaNo()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
.eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
@@ -1270,8 +1270,8 @@
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
- wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
- wrkMast.setStaNo(staNo + ""); // 鐩爣绔�
+ wrkMast.setSourceStaNo(staDesc.getStnNo$()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getCrnStn$()); // 鐩爣绔�
wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
wrkMast.setModiTime(now);
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 6f4331e..063ddd1 100644
--- a/src/main/java/com/zy/asrs/task/handler/JlerHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/JlerHandler.java
@@ -55,7 +55,7 @@
// 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); // 鍥哄畾涓虹┖鎵樼殑缂栫爜
@@ -76,7 +76,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); // 鍥哄畾涓虹┖鎵樼殑缂栫爜
@@ -102,7 +102,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());
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 1c04b05..db54f31 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -120,8 +120,8 @@
currentId: 2
#褰撳墠搴撳悕绉�
currentName: 鍔犲伐搴�
- #绔嬪簱AGV鑷姩杩愯揣鍑哄簱鍙ｇ紪鐮�
- wmsTransStartStation1: 204
+ #绔嬪簱AGV鑷姩杩愯揣鍑哄簱鍙ｇ紪鐮� 渚ч潰濂ユ櫘鐟炴柉浜х嚎鍑哄叆搴撳彛
+ wmsTransStartStation1: 205
#绔嬪簱AGV鑷姩杩愯揣鍏ュ簱鍙ｇ紪鐮侊紙杈撻�佺嚎锛�
wmsTransStartStation2: 202
#绔嬪簱AGV鑷姩杩愯揣鍑哄簱鍙ｇ紪鐮侊紙杈撻�佺嚎锛�
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 5a9aacd..af2f59b 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -73,7 +73,7 @@
select * from asr_wrk_mast
where wrk_sts=5
or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and dateadd(mi,1,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and dateadd(second,10,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
order by io_time,wrk_no asc
</select>
--
Gitblit v1.9.1