From fe52a181f66fed0f792d608696d4cb2ab10679e9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 15 四月 2025 17:01:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 663bfdc..94f52df 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -106,6 +106,8 @@
public int workNo = 9900;
+ public int workNoMax = 12000;
+
/**
* 缁勬墭
* 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵�� 2
@@ -1891,7 +1893,7 @@
log.error("鍙屾繁搴撲綅 --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
throw new CoolException("鍙屾繁搴撲綅 --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
}
-
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(0);
// 淇濆瓨宸ヤ綔妗�
@@ -1904,7 +1906,7 @@
wrkMast.setCrnNo(crn.getId());
wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 婧愬簱浣�
wrkMast.setLocNo(loc.getLocNo()); // 鐩爣搴撲綅
- wrkMast.setFullPlt(shallowLoc.getFullPlt()); // 婊℃澘
+ wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
@@ -1918,7 +1920,7 @@
}
// 宸ヤ綔妗ｆ槑缁嗕繚瀛�
if (shallowLoc.getLocSts().equals("F")) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
+
for (LocDetl locDetl : locDetls) {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
@@ -2842,6 +2844,7 @@
if (rgvSlave.getId() != 2 ){
continue;
}
+ if (workNo >= workNoMax){ workNo = 9900;}
workNo1 = workNo++;
souSta1 = Utils.getRgvStaNo(rgvSlave.getId(),inStn.getSourceStaNo());
if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 1){
@@ -2968,6 +2971,7 @@
if (rgvSlave.getId() != 2 ){
continue;
}
+ if (workNo >= workNoMax){ workNo = 9900;}
workNo2 = workNo++;
souSta2 = Utils.getRgvStaNo(rgvSlave.getId(),inStn.getSourceStaNo());
if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 1){
@@ -3085,10 +3089,26 @@
command.setWeight2(weight2);
if (workNo1 == 0 && workNo2 !=0){
+ if("0".equals(matnr2) || "".equals(batch2) ){
+ log.error("婧愮珯"+souSta2+"宸ヤ綅涓�浠诲姟缂哄皯淇℃伅锛岀墿鏂欎唬鐮�:"+matnr+",batch:"+batch);
+ continue;
+ }
command.setTaskMode(RgvTaskModeType.FETCH_PUT2); // 浠诲姟妯″紡: 2鍙栨斁璐�
} else if (workNo1 != 0 && workNo2 ==0) {
+ if("0".equals(matnr) || "".equals(batch) ){
+ log.error("婧愮珯"+souSta1+"宸ヤ綅浜屼换鍔＄己灏戜俊鎭紝鐗╂枡浠ｇ爜:"+matnr+",batch:"+batch);
+ continue;
+ }
command.setTaskMode(RgvTaskModeType.FETCH_PUT1); // 浠诲姟妯″紡: 1鍙栨斁璐�
}else {
+ if("0".equals(matnr) || "".equals(batch) ){
+ log.error("婧愮珯"+souSta1+"宸ヤ綅涓�浠诲姟缂哄皯淇℃伅锛岀墿鏂欎唬鐮�:"+matnr+",batch:"+batch);
+ continue;
+ }
+ if("0".equals(matnr2) || "".equals(batch2) ){
+ log.error("婧愮珯"+souSta2+"宸ヤ綅浜屼换鍔＄己灏戜俊鎭紝鐗╂枡浠ｇ爜:"+matnr+",batch:"+batch);
+ continue;
+ }
command.setTaskMode(RgvTaskModeType.FETCH_PUT_ALL); // 浠诲姟妯″紡: all鍙栨斁璐�
}
command.setCommand(false);
--
Gitblit v1.9.1