From 87e67df7185c91e99ce2bcd65e7508b31ad0e43a Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 22 Aug 2023 13:38:10 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=B5=B7=E6=9F=94=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext_manage/acs/service/impl/AcsToWmsServiceImpl.java | 3 ++- .../service/check/impl/StIvtCheckmstHrBcpServiceImpl.java | 8 ++++---- .../iostorInv/impl/StIvtIostorinvEmpBcpServiceImpl.java | 6 +++--- .../iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java | 2 +- .../iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java | 5 +++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java index d47ffee9..124884d4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java @@ -425,9 +425,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{ } catch (Exception e) { result.put("status", HttpStatus.BAD_REQUEST.value()); result.put("message", e.getMessage()); + return result; } result.put("status", HttpStatus.OK.value()); - result.put("message", ""); + result.put("message", "下发成功！"); return result; } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java index dfd99ba5..278cdb9a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java @@ -164,7 +164,7 @@ public class StIvtCheckmstHrBcpServiceImpl extends ServiceImpl row.getStatus().equals(CHECKEnum.BILL_STATUS.code("完成"))); + .allMatch(row -> row.getStatus().equals(CHECKEnum.BILL_STATUS.code("完成"))); if (is_status) { // 完成单据 @@ -410,9 +410,9 @@ public class StIvtCheckmstHrBcpServiceImpl extends ServiceImpl ObjectUtil.isNotEmpty(row.getCheck_result())) - .anyMatch(row -> row.getCheck_result().equals(CHECKEnum.CHECK_RESULT.code("正常"))); + .allMatch(row -> row.getCheck_result().equals(CHECKEnum.CHECK_RESULT.code("正常"))); - mstDao.setIs_nok(is_check); + mstDao.setIs_nok(!is_check); this.updateById(mstDao); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvEmpBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvEmpBcpServiceImpl.java index 13ad6406..aecb3f03 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvEmpBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvEmpBcpServiceImpl.java @@ -95,10 +95,10 @@ public class StIvtIostorinvEmpBcpServiceImpl implements IStIvtIostorinvEmpBcpSe SchBaseTask taskDao = new SchBaseTask(); PointEvent event = PointEvent.builder() .type(AcsTaskEnum.TASK_STRUCT_HR_EMP_IN) - .acs_task_type("7") + .acs_task_type("17") .task_group_id(IdUtil.getStringId()) .point_code1(device_code) - .point_code3(barcode) + .point_code3(arrtDao.getStruct_code()) .vehicle_code(barcode) .product_area("A3") .callback((Consumer) taskDao::setTask_id) @@ -192,7 +192,7 @@ public class StIvtIostorinvEmpBcpServiceImpl implements IStIvtIostorinvEmpBcpSe SchBaseTask taskDao = new SchBaseTask(); PointEvent event = PointEvent.builder() .type(AcsTaskEnum.TASK_STRUCT_HR_EMP_OUT) - .acs_task_type("7") + .acs_task_type("16") .task_group_id(IdUtil.getStringId()) .point_code1(arrtDao.getStruct_code()) .point_code3(device_code) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java index 3a1b69a3..24a1a325 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java @@ -347,7 +347,7 @@ public class StIvtIostorinvHrBcpInServiceImpl extends ServiceImpl().lambda() .eq(StIvtStructattr::getStruct_code, mst.getStruct_code()) .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .set(StIvtStructattr::getTask_code, "") .set(StIvtStructattr::getInv_code,"") .set(StIvtStructattr::getStoragevehicle_code, "")); @@ -437,7 +438,7 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl