From e3b7642c6b5ef81801e8ef0d95e9ba1e8882ccb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 4 Jun 2026 09:56:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(qrcode):=20=E6=B7=BB=E5=8A=A0=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E8=A1=A5=E7=A0=81=E4=BB=BB=E5=8A=A1=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在入库生产订单、余料入库、正常发货确认、公司间调拨、工厂间调拨流程中集成补码任务创建 - 实现仓库管理员角色查询并为每位管理员创建补码待办任务 - 添加待办任务实体备注字段用于存储物料编号信息 - 修正SRM质检入库逻辑判断条件，优化无二维码物料处理流程 - 注入并配置相关服务依赖，完善补码任务生成的数据一致性校验机制 --- .../nflg/wms/admin/service/NoScanningBaseControllerService.java | 2 +- .../src/test/java/com/nflg/wms/srm/receive/DeployDevTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java index 903c343d..8bb9cbd4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java @@ -52,7 +52,7 @@ public class NoScanningBaseControllerService { } public boolean cannotOutNoScanning(String materialNo, String factoryNo, String warehouseNo) { - if (!existsQrCode(materialNo)) { + if (existsQrCode(materialNo)) { return true; } return !quantityConsistencyCheck(materialNo, factoryNo, warehouseNo); diff --git a/nflg-wms-srm-receive/src/test/java/com/nflg/wms/srm/receive/DeployDevTest.java b/nflg-wms-srm-receive/src/test/java/com/nflg/wms/srm/receive/DeployDevTest.java index 9d843f25..c0f513a3 100644 --- a/nflg-wms-srm-receive/src/test/java/com/nflg/wms/srm/receive/DeployDevTest.java +++ b/nflg-wms-srm-receive/src/test/java/com/nflg/wms/srm/receive/DeployDevTest.java @@ -32,7 +32,7 @@ public class DeployDevTest { //处理主jar包 handleFile(sshUtil, localPath + jarName, remotePath + jarName); //处理lib目录 - handleDir(sshUtil, localPath, remotePath, "lib"); +// handleDir(sshUtil, localPath, remotePath, "lib"); //执行脚本启动服务 sshUtil.exec("cd " + remotePath + " && ./restart.sh"); sshUtil.disconnect();