Merge remote-tracking branch 'origin/master_merge' into master_merge

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: 贴标数量

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");

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