From 5c50696e9514c45960e08e84ce8c7ccec52a60e4 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 31 五月 2023 09:28:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 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 ce55486..f22ae5b 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -61,17 +61,18 @@
try {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "F")
- .eq("pack_status", 4)
+ .eq("pack_status", 4)//娴嬭瘯澶辫触
.eq("row1", equipmentRow)
.eq("loc_type1", (short) 1)
.eq("fire_status",0)
);
if (!Cools.isEmpty(locMasts)){
for (LocMast locMast:locMasts){
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",locMast.getLocNo())
- .eq("barcode",locMast.getBarcode())
- .eq("status",4)
+ .eq("barcode",locDetl.getMatnr())
+ .eq("status",4)//瀹屾垚娴嬭瘯
);
if (!Cools.isEmpty(testMast)){
if (testMast.getStatus()==4){
@@ -84,7 +85,7 @@
workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
//4.娴嬭瘯瀹屾垚涓婃姤
CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
+ combParam.setPackNo(locDetl.getMatnr());
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(2);
combParam.setStepSts(4);
@@ -112,18 +113,20 @@
try {
List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "F")
- .eq("pack_status", 4)
+ .eq("pack_status", 3)//娴嬭瘯瀹屾垚
.eq("row1", equipmentRow)
.eq("loc_type1", (short) 1)
.eq("fire_status",0)
);
if (!Cools.isEmpty(locMasts2)){
for (LocMast locMast:locMasts2){
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",locMast.getLocNo())
- .eq("barcode",locMast.getBarcode())
+ .eq("barcode",locDetl.getMatnr())
.eq("status",4)
);
+ boolean sign=false;
if (!Cools.isEmpty(testMast)){
if (testMast.getStatus()==4){
//绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
@@ -134,15 +137,7 @@
if (targetLocNo != null){
//鐢熸垚鍑哄簱浠诲姟
if (outLoc(locMast)){
- //4.娴嬭瘯瀹屾垚涓婃姤
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- 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;
+ sign=true;
}
}else {
//3\4鎺掓弧 鍚�2鎺掔Щ搴擄紝鏌ヨ鐩爣搴撲綅
@@ -152,15 +147,7 @@
}
if (targetLocNo != null){
workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
- //4.娴嬭瘯瀹屾垚涓婃姤
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- 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;
+ sign=true;
}else {
log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
}
@@ -168,8 +155,20 @@
}else if (testMast.getStatus()!=4) {
log.error("娴嬭瘯鐘舵�佸紓甯�,搴撲綅鍙蜂负锛�" + testMast.getLocNo());
}
+
}else {
log.error("娴嬭瘯搴撲綅锛�"+locMast.getLocNo()+"鎵�灞炴祴璇曟。涓虹┖鎴栬�呬笉鐘舵�佷负4");
+ }
+ if (sign){
+ //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;
}
}
}
@@ -218,7 +217,7 @@
} else if (Cools.isEmpty(locMast.getModiTime())){
log.error("搴撲綅:"+locMast.getLocNo()+"modiTime涓虹┖");
} else if (Cools.isEmpty(locMast.getBarcode())){
- log.error("搴撲綅:"+locMast.getLocNo()+"Pack鐮佷负绌�");
+ log.error("搴撲綅:"+locMast.getLocNo()+"鎵樼洏鐮佷负绌�");
} else {
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
@@ -231,7 +230,7 @@
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(1);
wrkMast.setSourceStaNo(203); // 婧愮珯
- wrkMast.setStaNo(205); // 鐩爣绔� 2鍙峰爢鍨涙満鍏ュ簱绔�
+ wrkMast.setStaNo(206); // 鐩爣绔� 2鍙峰爢鍨涙満鍏ュ簱绔�
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -264,7 +263,7 @@
// locMast.setPackStatus(5); //5:寮�濮嬮潤缃�
CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
+ combParam.setPackNo(wrkDetl.getMatnr());
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(locMast.getPackStatus());
combParam.setRequestTime(DateUtils.convert(new Date()));
--
Gitblit v1.9.1