From e7acfde6a5d4db04104b02b64412233136eaf6af Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Fri, 14 Feb 2025 09:57:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=88=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/iostorInv/util/service/LashManageService.java | 6 +++++- .../main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java index d5ae9ab9e..796956c5e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java @@ -46,9 +46,13 @@ public interface LashManageService { * length: 木箱长 * weight: 木箱宽 * height: 木箱高 + * case: 木箱类型 * isBinding: 是否捆绑 - * isLabeling: 是否贴标 * bindingTemplate: 捆扎模板 + * bundleTimes: 第一次捆扎数量 + * box_structure: 木箱结构 + * box_structure: 木箱结构 + * isLabeling: 是否贴标 * labelingTemplate: 贴标模板 * bundleTimes: 捆扎次数 * printQty: 贴标数量 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql index c1f288d20..32d67d9fe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql @@ -230,7 +230,7 @@ ENDPAGEQUERY ENDIF IF 输入.flag = "4" - PAGEQUERY + QUERY SELECT * FROM @@ -288,5 +288,5 @@ 1=1 order by workorder_id desc limit 0,输入.limits ENDOPTION ENDSELECT - ENDPAGEQUERY + ENDQUERY ENDIF From 014222811d90210562cde4623adb47e52978bfdc Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Fri, 14 Feb 2025 10:09:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E7=83=98=E7=AE=B1=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pda/mps/service/impl/BakingServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index ed7f6910b..9b89694a3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -5,12 +5,10 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.b_lms.sch.point.service.IschBasePointService; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.RedisUtils; @@ -18,7 +16,6 @@ import org.nl.common.utils.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.pda.mps.eum.RegionTypeEnum; @@ -521,7 +518,11 @@ public class BakingServiceImpl implements BakingService { hotParam.put("task_id", task_id); hotParam.put("start_point_code", point_code1); hotParam.put("end_point_code", point_code2); - String point_temperature = (String) redisUtils.hget(point_code1, "temperature"); + Object pt = redisUtils.hget(point_code1, "temperature"); + if (ObjectUtil.isEmpty(pt)) { + throw new BadRequestException("当前操作点位设备:"+point_code1+",无法获取温度，请稍后再试!"); + } + String point_temperature = String.valueOf(pt); hotParam.put("temperature", point_temperature); if (ObjectUtil.isEmpty(last_hot_mst)) { hotParam.put("oven_time", "480");