From 9a47d3e0843f70a35caff0ad4a4609c33d189f6e Mon Sep 17 00:00:00 2001 From: zhangzq Date: Mon, 9 Dec 2024 14:02:36 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../decisioner/impl/base/LimitStorageRuleHandler.java | 8 ++++---- .../service/quartz/task/SyncErpBillsScheduleService.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/LimitStorageRuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/LimitStorageRuleHandler.java index 54dfa286..2d63747e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/LimitStorageRuleHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/LimitStorageRuleHandler.java @@ -68,16 +68,16 @@ public class LimitStorageRuleHandler extends Decisioner eqLimt= stIvtStructattr -> { Boolean result = Boolean.TRUE; if (limits.contains("h")){ - result = result && stIvtStructattr.getH()>=vehicle.getH(); + result = result && stIvtStructattr.getH()==vehicle.getH(); } if (limits.contains("w")){ - result = result && stIvtStructattr.getW()>=vehicle.getW(); + result = result && stIvtStructattr.getW()==vehicle.getW(); } if (limits.contains("l")){ - result = result && stIvtStructattr.getL()>=vehicle.getL(); + result = result && stIvtStructattr.getL()==vehicle.getL(); } if (limits.contains("weight")){ - result = result && stIvtStructattr.getWeight()>=vehicle.getWeight(); + result = result && stIvtStructattr.getWeight()==vehicle.getWeight(); } return result; }; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java index d29a4dff..3327406d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java @@ -94,7 +94,7 @@ public class SyncErpBillsScheduleService { manualSyncData(mappingString, syncFormMapping.getForm_type(), syncFormMapping.getDtl_split(),code,startTime,endTime); } private void manualSyncData(String mappingJson, String formType, Boolean dtlSplit,String code,String start,String end) { - //formType：SAL_SaleOrder code:JDSCLLD20241102,start:2024-11-11 12:00:00 end:2024-11-11 12:00:00 + //formType:SAL_SaleOrder code:JDSCLLD20241102,start:2024-11-11 12:00:00 end:2024-11-11 12:00:00 boolean islock = lock.tryLock(); try { if (islock) {