From ddc6cd417d5e912d5cba297bb7849a1dcf7367be Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 27 四月 2025 11:01:41 +0800
Subject: [PATCH] 获取未完成订单统计信息
---
src/main/java/com/zy/asrs/task/handler/GhjtHandler.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
index f624dc9..b9cef6a 100644
--- a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
@@ -72,6 +72,9 @@
// 鍫嗗灈鏈哄搴斾竴妤煎嚭搴撶珯鐐�
private static final int[] oneFloorOutSite = new int[]{0,3002,3003,3006,3008,3009,3012};
+ // 鍫嗗灈鏈哄搴斾竴妤煎叆搴撶珯鐐�
+ private static final int[] oneFloorInSite = new int[]{0,3001,3004,3005,3007,3010,3011};
+
public void startCkrwPushGwcs(WrkMast wrkMast) {
// 鑾峰彇璇锋眰澶�
@@ -110,6 +113,7 @@
wrkMast.setModiTime(new Date());
} else if(wrkMast.getIoType() == 12) { // 璺ㄥ贩閬撹浆绉�
wrkMast.setWrkSts(1L); // 鐘舵�佹敼涓�1.鐢熸垚鍏ュ簱id
+ wrkMast.setCrnNo(Arrays.binarySearch(oneFloorInSite,wrkMast.getStaNo()));// 鍫嗗灈鏈鸿浆鎹负鍏ュ簱鐨勫爢鍨涙満
wrkMast.setModiTime(new Date());
}
wrkMastMapper.updateById(wrkMast);
@@ -208,7 +212,7 @@
String staLocNo = null;
Integer wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", i));
if(wrkCount > 0) {
- log.warn("{}鍙峰爢鍨涙満宸插瓨鍦ㄤ换鍔�",i);
+// log.warn("{}鍙峰爢鍨涙満宸插瓨鍦ㄤ换鍔�",i);
continue;
}
// 鏍规嵁鍫嗗灈鏈哄彿鏌ヨ鍒板搴旂殑娣卞簱浣嶅拰娴呭簱浣� 娣卞簱浣�4*n-3鍜�4*n 娴呭簱浣�4*n-2鍜�4*n-1
@@ -237,16 +241,16 @@
}
// 娌℃湁鎵惧埌婧愬簱浣�
if (sourceLocNo == null) {
- log.warn("娌℃湁鎵惧埌婧愬簱浣�,鍫嗗灈鏈猴細{}",i);
+// log.warn("娌℃湁鎵惧埌婧愬簱浣�,鍫嗗灈鏈猴細{}",i);
continue;
}
// 瀵绘壘涓�涓璐х殑鐩爣搴撲綅锛屽厛娣卞悗娴�
List<LocMast> locMasts1 = locMastMapper.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", i).in("row1", s1, s2)
- .le("bay1", columnNum));
+ .le("bay1", columnNum).orderBy("lev1,bay1,row1"));
if (locMasts1.isEmpty()) {
// 娣卞簱浣嶄负绌轰簡锛屽彇娴呭簱浣�
List<LocMast> locMasts2 = locMastMapper.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", i).in("row1", q1, q2)
- .le("bay1", columnNum));
+ .le("bay1", columnNum).orderBy("lev1,bay1,row1"));
if (!locMasts2.isEmpty()) {
staLocNo = locMasts2.get(0).getLocNo();
}
@@ -392,6 +396,16 @@
// 瀵绘壘涓�绠变竴鍗风殑锛屾病鏈夌悊璐х殑锛屼笉鍦ㄥ璐у尯鐨勭墿鏂欐槑缁�
List<LocDetl> tallyGoosList = locDetlMapper.selectTallyGoosList(columnNum);
+ // 杩囨护鎺夋湪绠辫鏍煎搴﹀ぇ浜�600鐨�(澶т簬600涓�涓墭鐩樺彧鑳芥斁涓�绠�)
+ tallyGoosList = tallyGoosList.stream().filter(locDetl -> {
+ String[] split = locDetl.getColor().split("\\*");
+ if (split.length == 3) {
+ return Integer.parseInt(split[1]) <= 600;
+ } else {
+ return false;
+ }
+ }).collect(Collectors.toList());
+
// 瀵绘壘婊¤冻鐞嗚揣鏉′欢鐨勪袱涓湪绠�
LocDetl leftLocDetl = null;
LocDetl rightLocDetl = null;
--
Gitblit v1.9.1