From 3c38ed3606ecbaac693baff568f8f66e635abc8d Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期四, 01 六月 2023 13:12:29 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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 6970920..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,7 +61,7 @@ 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) @@ -72,7 +72,7 @@ TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>() .eq("loc_no",locMast.getLocNo()) .eq("barcode",locDetl.getMatnr()) - .eq("status",4) + .eq("status",4)//瀹屾垚娴嬭瘯 ); if (!Cools.isEmpty(testMast)){ if (testMast.getStatus()==4){ @@ -113,7 +113,7 @@ 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) @@ -217,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)); @@ -230,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"); // 鎷f枡 @@ -263,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