From edbf54064b70a6311a98eeefc7516a35287e6b44 Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期日, 08 五月 2022 15:28:00 +0800 Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs --- src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 3 +++ 1 files changed, 3 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 644fecf..dd58724 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java @@ -59,6 +59,9 @@ case 10: // 淇敼搴撲綅鐘舵��=D if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) { + if (!Cools.isEmpty(wrkMast.getBarcode())) { + locMast.setBarcode(wrkMast.getBarcode()); + } locMast.setLocSts("D"); locMast.setIoTime(now); locMast.setModiTime(now); -- Gitblit v1.9.1