From ccbf7105edf18752ab64871d6112abd4f96cf8d4 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期四, 07 十二月 2023 10:48:35 +0800 Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1 --- src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 36 +++++++++++++++-- src/main/resources/mapper/WrkMastMapper.xml | 2 src/main/webapp/static/js/wrkMast/wrkMast.js | 5 +- src/main/java/com/zy/common/web/WcsController.java | 19 +++++++++ 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java index bd3d89a..4ce6e80 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java @@ -38,10 +38,10 @@ private WaitPakinService waitPakinService; public ReturnT<String> start(WrkMast wrkMast) { - // 14.鍏ュ簱瀹屾垚 + // 9.鍏ュ簱瀹屾垚 if (wrkMast.getWrkSts() == 9) { return doIn(wrkMast); - // 34.鍑哄簱瀹屾垚 + // 29.鍑哄簱瀹屾垚 } else if (wrkMast.getWrkSts() == 29) { return doOut(wrkMast); } @@ -206,8 +206,21 @@ if (wrkDetls57.isEmpty()) { exceptionHandle("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗d负绌猴紱[workNo={0}]", wrkMast.getWrkNo()); } - // 淇敼搴撲綅鐘舵�� Q ====>> F - if (locMast.getLocSts().equals("Q")) { + // 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗� + for (WrkDetl wrkDetl : wrkDetls57) { + LocDetl locDetl = new LocDetl(); + locDetl.sync(wrkDetl); + locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙� + locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺 + locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜 + locDetl.setModiTime(now); + locDetl.setAppeTime(now); + if (!locDetlService.insert(locDetl)) { + exceptionHandle("鐩樼偣鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo()); + } + } + // 淇敼搴撲綅鐘舵�� S ====>> F + if (locMast.getLocSts().equals("S")) { locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D"); locMast.setBarcode(wrkMast.getBarcode()); locMast.setIoTime(now); @@ -253,7 +266,7 @@ break; } // 淇敼宸ヤ綔涓绘。鐘舵�� - wrkMast.setWrkSts(10L);//15.搴撳瓨鏇存柊瀹屾垚 + wrkMast.setWrkSts(10L);//10.搴撳瓨鏇存柊瀹屾垚 wrkMast.setModiTime(now); if (!wrkMastService.updateById(wrkMast)) { exceptionHandle("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo()); @@ -305,6 +318,19 @@ } } break; + //鐩樼偣鍑哄簱 + case 107: + // 淇敼搴撲綅鐘舵�� R ===>> O + if (locMast.getLocSts().equals("P")) { + locMast.setLocSts("O"); + locMast.setBarcode(""); + locMast.setModiTime(now); + locMast.setIoTime(now); + if (!locMastService.updateById(locMast)) { + exceptionHandle("鐩樼偣鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo()); + } + } + return SUCCESS;//鐩樼偣鍙鐞嗗簱瀛樻暟鎹笉鏀瑰彉宸ヤ綔妗g姸鎬� // 绌烘澘鍑哄簱 case 110: // 淇敼搴撲綅鐘舵�� R ===>> O diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index b50cb8c..b6d078f 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -302,7 +302,24 @@ } // 妫�绱㈠簱浣� List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList()); - return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔� + if (ioType == 107) {//鐩樼偣鍥炲簱浠诲姟 + if (devpNo == 325 || devpNo == 331 || devpNo == 333 || devpNo == 339) { + devpNo = 341; + } + } + StartupDto dto = commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔� + // 鏇存柊鐩爣搴撲綅鐘舵�� + LocMast locMast = locMastService.selectById(dto.getLocNo()); + if (locMast.getLocSts().equals("O")){ + locMast.setLocSts("S"); // S.鍏ュ簱棰勭害 + locMast.setModiTime(new Date()); + if (!locMastService.updateById(locMast)){ + throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�"); + } + } else { + throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤"); + } + return dto; } /* diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml index 7dbe608..b23289f 100644 --- a/src/main/resources/mapper/WrkMastMapper.xml +++ b/src/main/resources/mapper/WrkMastMapper.xml @@ -67,7 +67,7 @@ </resultMap> <select id="selectToBeCompleteData" resultMap="BaseResultMap"> - select * from asr_wrk_mast where ((wrk_sts = 9 Or wrk_sts = 29) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no + select * from asr_wrk_mast where ((wrk_sts = 9 Or wrk_sts = 29) and io_type != 103 and io_type != 104) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no </select> <select id="selectToBeHistoryData" resultMap="BaseResultMap"> diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js index e79cbdb..8b03117 100644 --- a/src/main/webapp/static/js/wrkMast/wrkMast.js +++ b/src/main/webapp/static/js/wrkMast/wrkMast.js @@ -30,8 +30,8 @@ ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'} ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'} // ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'} - ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'} - ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'} + ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯'} + ,{field: 'staNo', align: 'center',title: '鐩爣绔�'} ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'} ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'} ,{field: 'shuttleNo', align: 'center',title: '灏忚溅', width: 70} @@ -657,6 +657,7 @@ if (res.code === 403) { top.location.href = baseUrl+"/"; } + $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');//瑙e喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂 pageCurr=curr; if (res.data.length === 0 && count !== 0) { tableIns.reload({ -- Gitblit v1.9.1