From 288e45a990a5abf4ab50f820ed4e870e8314468e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 21 六月 2025 15:14:10 +0800
Subject: [PATCH] 完善
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
index 9bbc6a8..1c42497 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -68,6 +68,7 @@
.eq("row1", equipmentRow)
.eq("loc_type1", (short) 1)
.eq("fire_status", 0)
+ .eq("ctn_kind",1)
);
if (!Cools.isEmpty(locMasts2)) {
for (LocMast locMast : locMasts2) {
@@ -79,11 +80,11 @@
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no", locMast.getLocNo())
.eq("barcode", locDetl.getMatnr())
- .eq("status", 4)
+ .eq("status", 3)
);
boolean sign = false;
if (!Cools.isEmpty(testMast)) {
- if (testMast.getStatus() == 4) {
+ if (testMast.getStatus() == 3) {
//绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
LocMast targetLocNo = locMastService.queryFreeLocMast(3, (short) 2);
if (Cools.isEmpty(targetLocNo)) {
@@ -109,7 +110,7 @@
} else {
log.error("娴嬭瘯搴撲綅锛�" + locMast.getLocNo() + "鎵�灞炴祴璇曟。涓虹┖鎴栬�呬笉鐘舵�佷负4");
}
- if (sign) {
+ if (false) {
//4.娴嬭瘯瀹屾垚涓婃姤
CombParam combParam = new CombParam();
combParam.setPackNo(locDetl.getMatnr());
@@ -117,7 +118,7 @@
combParam.setPackSts(1);
combParam.setStepSts(4);
combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺", mesUrl, inpath, combParam);
+// new PostMesDataUtils().postMesData("MES绯荤粺", mesUrl, inpath, combParam);
return SUCCESS;
}
}
@@ -125,6 +126,74 @@
} catch (Exception e) {
log.error("" + e);
}
+
+ //娴嬭瘯澶辫触,绉诲簱
+ try {
+ List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "F")
+ .eq("pack_status", 4)//娴嬭瘯澶辫触
+ .eq("row1", equipmentRow)
+ .eq("loc_type1", (short) 1)
+ .eq("fire_status", 0)
+ .eq("ctn_kind",1)
+ );
+ if (!Cools.isEmpty(locMasts2)) {
+ for (LocMast locMast : locMasts2) {
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+ if (Cools.isEmpty(locDetl)) {
+ log.error("娴嬭瘯澶辫触 鍑哄簱銆佺Щ搴�==>搴撳瓨鏄庣粏鏌ヨ澶辫触锛佸簱浣嶅彿锛�" + locMast.getLocNo());
+ continue;
+ }
+ TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("loc_no", locMast.getLocNo())
+ .eq("barcode", locDetl.getMatnr())
+ .eq("status", 4)
+ );
+ boolean sign = false;
+ if (!Cools.isEmpty(testMast)) {
+ if (testMast.getStatus() == 4) {
+ //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
+ LocMast targetLocNo = locMastService.queryFreeLocMast(3, (short) 4);
+ if (Cools.isEmpty(targetLocNo)) {
+ targetLocNo = locMastService.queryFreeLocMast(2, (short) 4);
+ if (Cools.isEmpty(targetLocNo)) {
+ targetLocNo = locMastService.queryFreeLocMast(1, (short) 4);
+ if (Cools.isEmpty(targetLocNo)) {
+ return FAIL.setMsg("娌℃湁涓浆搴撲綅");
+ }
+ }
+ }
+ if (targetLocNo != null) {
+ workService.locMove(locMast.getLocNo(), targetLocNo.getLocNo(), (long) 9935);
+ sign = true;
+ } else {
+ log.error("娴嬭瘯澶辫触鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
+ }
+
+ } else if (testMast.getStatus() != 4) {
+ log.error("娴嬭瘯鐘舵�佸紓甯�,搴撲綅鍙蜂负锛�" + testMast.getLocNo());
+ }
+
+ } else {
+ log.error("娴嬭瘯搴撲綅锛�" + locMast.getLocNo() + "鎵�灞炴祴璇曟。涓虹┖鎴栬�呬笉鐘舵�佷负4");
+ }
+ if (false) {
+ //4.娴嬭瘯瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locDetl.getMatnr());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(1);
+ combParam.setStepSts(4);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+// new PostMesDataUtils().postMesData("MES绯荤粺", mesUrl, inpath, combParam);
+ return SUCCESS;
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("" + e);
+ }
+
//娴嬭瘯鏈夌┖搴撲綅 绉诲簱
try {
List<LocMast> locMasts3 = locMastService.selectList(new EntityWrapper<LocMast>()
--
Gitblit v1.9.1