From 96fc6c344e23e0180881b87aa2291a2fc19e4ab8 Mon Sep 17 00:00:00 2001 From: tqs <56479841@qq.com> Date: 星期五, 14 四月 2023 12:55:20 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 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 816c14d..0a7f1ee 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java @@ -127,8 +127,10 @@ if (locMast.getLocSts().equals("S")) { locMast.setLocSts("F"); locMast.setBarcode(wrkMast.getBarcode()); + locMast.setFrozen(wrkMast.getFrozen()); locMast.setIoTime(now); locMast.setModiTime(now); + locMast.setFrozenMemo(wrkMast.getMemo()); if (!locMastService.updateById(locMast)) { exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo()); } @@ -207,6 +209,24 @@ if (wrkDetls57.isEmpty()) { exceptionHandle("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗d负绌猴紱[workNo={0}]", wrkMast.getWrkNo()); } + if(!Cools.isEmpty(locDetlService.selectByLocNo(wrkMast.getLocNo()))){ + locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo())); + } + if (Cools.isEmpty(locDetlService.selectByLocNo(wrkMast.getLocNo()))){ + 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}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr()); + } + } + } + // 淇敼搴撲綅鐘舵�� Q ====>> F if (locMast.getLocSts().equals("Q")) { locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D"); @@ -329,8 +349,10 @@ if (locMast.getLocSts().equals("R")) { locMast.setLocSts("O"); locMast.setBarcode(""); + locMast.setFrozen(0); locMast.setModiTime(now); locMast.setIoTime(now); + locMast.setFrozenMemo(""); if (!locMastService.updateById(locMast)) { exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo()); } -- Gitblit v1.9.1