From fd1024c200e7aececc559b11032ecda1b3e96288 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期一, 22 一月 2024 16:34:26 +0800 Subject: [PATCH] #检料再入库逻辑修改,定时器检测是否存在在库无资料数据 --- src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 20 ++++++++++++++++++++ 1 files changed, 20 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 4ce6e80..7885214 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java @@ -1,7 +1,9 @@ package com.zy.asrs.task.handler; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; +import com.core.exception.CoolException; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocMast; import com.zy.asrs.entity.WrkDetl; @@ -134,10 +136,12 @@ if (wrkDetls53.isEmpty()) { exceptionHandle("鎷f枡鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗d负绌猴紱[workNo={0}]", wrkMast.getWrkNo()); } + log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛屾墭鐩樼爜锛�" + wrkMast.getBarcode() + "锛屽伐浣滄。鏄庣粏鍒楄〃锛�" + JSON.toJSONString(wrkDetls53)); for (WrkDetl wrkDetl : wrkDetls53) { LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode()); if (null != locDetl) { + log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛屾墭鐩樼爜锛�" + wrkMast.getBarcode() + "锛屽伐浣滄。鏄庣粏锛�" + JSON.toJSONString(wrkDetl) + "锛屽簱瀛樻槑缁嗭細" + JSON.toJSONString(locDetl)); if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), @@ -158,7 +162,23 @@ if (!locMastService.updateById(locMast)) { exceptionHandle("鎷f枡鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo()); } + + List<LocDetl> locDetls1 = locDetlService.selectByLocNo(locMast.getLocNo()); + log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛屾墭鐩樼爜锛�" + wrkMast.getBarcode() + "锛屼慨鏀瑰簱浣嶇姸鎬丵=>F鎴愬姛锛屽簱瀛樻槑缁嗭細" + JSON.toJSONString(locDetls1)); } + + //娓呯┖婧愬簱浣嶆暟鎹� P ====>> O + LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo()); + if (locMast1.getLocSts().equals("P")) { + locMast1.setLocSts("O"); // 娓呯┖搴撲綅 + locMast1.setModiTime(new Date()); + if (!locMastService.updateById(locMast1)) { + throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�"); + } + } else { + throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�"); + } + break; // 骞舵澘鍏ュ簱 case 54: -- Gitblit v1.9.1