From be25fdca12071375d82a09f78c1235322b4106d0 Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期三, 17 一月 2024 14:23:51 +0800 Subject: [PATCH] # --- src/main/resources/mapper/OrderDetlMapper.xml | 1 + src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java | 20 ++++---------------- src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 4 +++- src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 34 +++++++++++++++++++--------------- 4 files changed, 27 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java index 213ae89..016edf2 100644 --- a/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java +++ b/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java @@ -21,26 +21,14 @@ private String boxNo;// 鏄� 瀛楃涓� 鏈ㄧ缂栧彿锛堝敮涓�瀛楁锛屽嚭搴撲緷鎹紝鍑哄簱鏃舵寜鐓ф湪绠辩紪鍙峰嚭搴擄級 } - public Integer getSourceDevNo$(){ - if (!Cools.isEmpty(this.palletizingNo)){ - switch (this.palletizingNo){ - case "1": - return 119; - case "2": - return 121; - default: - return null; - } - } - return null; - } - public Integer getDevNo$(){ if (!Cools.isEmpty(this.palletizingNo)){ switch (this.palletizingNo){ - case "1": + case "118": + case "119": return 131; - case "2": + case "120": + case "121": return 135; default: return null; diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java index 3c4f475..efe3064 100644 --- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java +++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java @@ -50,7 +50,9 @@ continue; } if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){ - continue; + if (!wrkMast.getStaNo().equals(122)){ + continue; + } } if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){ continue; diff --git a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java index 5380cd7..613d2ed 100644 --- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java @@ -61,7 +61,7 @@ if (!basDevpEnd.getLoading().equals("Y") || !basDevpEnd.getAutoing().equals("Y") || !basDevpEnd.getInEnable().equals("Y")){ return FAIL; } - if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0) || basDevpEnd.getWrkNo()>10000){ + if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0 ) || basDevpEnd.getWrkNo()>10000 || basDevpEnd.getReportSign()!=0){ return FAIL; } WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd)); @@ -78,23 +78,25 @@ } SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetls); singleMountUnstackingCompleteParam.setStaStart(staNo); - singleMountUnstackingCompleteParam.setStaEnd(staNo>119? 135:131); + singleMountUnstackingCompleteParam.setStaEnd(staEnd); ReturnT<String> result = null; result = postMesData(reportOutPath,singleMountUnstackingCompleteParam); // System.out.println(result); -// if (true){ -// for (WrkDetl wrkDetl:wrkDetls){ -// WrkDetlSingle wrkDetlSingle = new WrkDetlSingle(); -// wrkDetlSingle.sync(wrkDetl); -// wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue()); -// wrkDetlSingleService.insert(wrkDetlSingle); -// } -// wrkMast.setSheetNo("1"); -// wrkMastService.updateById(wrkMast); -// basDevp.setReportSign(1); -// basDevpService.updateById(basDevp); -// return SUCCESS; -// } + if (true){ + for (WrkDetl wrkDetl:wrkDetls){ + WrkDetlSingle wrkDetlSingle = new WrkDetlSingle(); + wrkDetlSingle.sync(wrkDetl); + wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue()); + wrkDetlSingleService.insert(wrkDetlSingle); + } + wrkMast.setSheetNo("1"); + wrkMastService.updateById(wrkMast); + basDevp.setReportSign(1); + basDevpService.updateById(basDevp); + basDevpEnd.setReportSign(1); + basDevpService.updateById(basDevp); + return SUCCESS; + } if (result.getCode()==200){ for (WrkDetl wrkDetl:wrkDetls){ WrkDetlSingle wrkDetlSingle = new WrkDetlSingle(); @@ -106,6 +108,8 @@ wrkMastService.updateById(wrkMast); basDevp.setReportSign(1); basDevpService.updateById(basDevp); + basDevpEnd.setReportSign(1); + basDevpService.updateById(basDevp); return SUCCESS; }else { log.error("鎷嗗灈淇℃伅涓婁紶澶辫触"); diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml index a46edda..3b102b7 100644 --- a/src/main/resources/mapper/OrderDetlMapper.xml +++ b/src/main/resources/mapper/OrderDetlMapper.xml @@ -46,6 +46,7 @@ <result column="update_time" property="updateTime" /> <result column="memo" property="memo" /> <result column="tk_type" property="tkType" /> + <result column="roll_up" property="rollUp" /> </resultMap> -- Gitblit v1.9.1