From 25bcc429993cc31d88a621e1b917ec0ab41d1ac0 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期四, 18 八月 2022 12:46:29 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 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 dd58724..b531d7e 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java @@ -1,9 +1,11 @@ package com.zy.asrs.task.handler; import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.mapper.Wrapper; import com.core.common.Cools; -import com.zy.asrs.entity.*; +import com.zy.asrs.entity.LocDetl; +import com.zy.asrs.entity.LocMast; +import com.zy.asrs.entity.WrkDetl; +import com.zy.asrs.entity.WrkMast; import com.zy.asrs.service.*; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; @@ -36,11 +38,11 @@ private WaitPakinService waitPakinService; public ReturnT<String> start(WrkMast wrkMast) { - // 4.鍏ュ簱瀹屾垚 - if (wrkMast.getWrkSts() == 4) { + // 9.鍏ュ簱瀹屾垚 + if (wrkMast.getWrkSts() == 9) { return doIn(wrkMast); - // 14.鍑哄簱瀹屾垚 - } else if (wrkMast.getWrkSts() == 14) { + // 17.鍑哄簱瀹屾垚 + } else if (wrkMast.getWrkSts() == 17) { return doOut(wrkMast); } return SUCCESS; @@ -105,19 +107,19 @@ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y try { - Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>() - .eq("zpallet", wrkDetl.getZpallet()) - .eq("matnr", wrkDetl.getMatnr()) - .eq("anfme", wrkDetl.getAnfme()); - if (Cools.isEmpty(wrkDetl.getBatch())) { - wrapper.eq("batch", wrkDetl.getBatch()); - } else { - wrapper.isNull("batch").or().eq("batch", ""); - } - WaitPakin setParam = new WaitPakin(); - setParam.setIoStatus("Y"); - setParam.setModiTime(now); - waitPakinService.update(setParam, wrapper); +// Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>() +// .eq("zpallet", wrkDetl.getZpallet()) +// .eq("matnr", wrkDetl.getMatnr()) +// .eq("anfme", wrkDetl.getAnfme()); +// if (Cools.isEmpty(wrkDetl.getBatch())) { +// wrapper.eq("batch", wrkDetl.getBatch()); +// } else { +// wrapper.isNull("batch").or().eq("batch", ""); +// } +// WaitPakin setParam = new WaitPakin(); +// setParam.setIoStatus("Y"); +// setParam.setModiTime(now); +// waitPakinService.update(setParam, wrapper); } catch (Exception ignore){} } @@ -252,7 +254,7 @@ break; } // 淇敼宸ヤ綔涓绘。鐘舵�� - wrkMast.setWrkSts(5L); + wrkMast.setWrkSts(10L); wrkMast.setModiTime(now); if (!wrkMastService.updateById(wrkMast)) { exceptionHandle("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo()); @@ -321,7 +323,7 @@ break; } // 淇敼宸ヤ綔涓绘。鐘舵�� - wrkMast.setWrkSts(15L); + wrkMast.setWrkSts(18L); wrkMast.setModiTime(now); if (!wrkMastService.updateById(wrkMast)) { exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo()); -- Gitblit v1.9.1