From b87a7eaf1e20c4245166d4978e50fd443a02b116 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 4 Mar 2025 16:30:14 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E6=9C=A8=E7=AE=B1=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java index 8de79c811..8325a77ab 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java @@ -26,6 +26,7 @@ import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapp import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.modules.common.exception.BadRequestException; +import org.nl.system.service.param.ISysParamService; import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.sch.manage.TaskStatusEnum; import org.redisson.api.RLock; @@ -54,6 +55,8 @@ public class AutoSendZxToDjw extends Prun{ private IschBaseTaskService taskService; @Resource private ZxDjwTask zxDjwTask; + @Autowired + private ISysParamService iSysParamService; @Resource private LmsToMesServiceImpl lmsToMesServiceImpl; @@ -263,10 +266,8 @@ public class AutoSendZxToDjw extends Prun{ private String getHeightLevel(BstIvtBoxinfo bstIvtBoxinfo) { String height; - //String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue(); - //String heightLevel2 = iSysParamService.findByCode("height_level_2").getValue(); - String heightLevel1 = "650"; - String heightLevel2 = "800"; + String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue(); + String heightLevel2 = iSysParamService.findByCode("height_level_2").getValue(); String box_high = bstIvtBoxinfo.getBox_high(); if (Integer.parseInt(box_high) <= Integer.parseInt(heightLevel1)) { height = "1";