From 6443fe2da40fcd917c14d3db35b53f38caa1fefc Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 20 Mar 2025 16:38:19 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E7=AE=A1=E8=8A=AF?= =?UTF-8?q?=E4=B8=8D=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/TwoOutHeapTask.java | 6 +++--- .../sch/tasks/first_floor_area/ZxqTask.java | 15 +++------------ .../org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql | 2 +- .../wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql | 2 +- .../wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 4 ++-- .../src/main/java/org/nl/wms/util/TaskUtil.java | 16 +++------------- 6 files changed, 13 insertions(+), 32 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java index 2fd82c11c..42d3fd1a6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java @@ -204,20 +204,20 @@ public class TwoOutHeapTask extends AbstractAcsTask { JSONObject param = new JSONObject(); param.put("is_delete", "1"); param.put("update_time", DateUtil.now()); - taskTab.update(param,"task_id = '" + task_id); + taskTab.update(param,"task_id = '" + task_id+ "'"); } if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { JSONObject param = new JSONObject(); param.put("task_status", TaskStatusEnum.EXECUTING.getCode()); param.put("update_time", DateUtil.now()); - taskTab.update(param,"task_id = '" + task_id); + taskTab.update(param,"task_id = '" + task_id+ "'"); } if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { // 更新任务完成 JSONObject param = new JSONObject(); param.put("task_status", TaskStatusEnum.FINISHED.getCode()); param.put("update_time", DateUtil.now()); - taskTab.update(param,"task_id = '" + task_id); + taskTab.update(param,"task_id = '" + task_id+ "'"); // 如果是异常出库口则不需要下发行架任务 if (jsonTask.getString("point_code2").equals(IOSEnum.EXCEP_OUT.code("异常出库口"))) { WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java index 33c964c92..52bad24fd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java @@ -20,6 +20,7 @@ import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dto.SchBaseTaskVO; import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; @@ -178,17 +179,8 @@ public class ZxqTask extends AbstractAcsTask { throw new BadRequestException("该子卷暂无分切计划信息"); } //获取纸管长度 - String containerLength = productionPlanList.get(0).getPaper_tube_or_FRP().equals("1") ? productionPlanList.get(0).getPaper_tube_description() : productionPlanList.get(0).getFRP_description(); - int maxNum = 0; - for (String part : containerLength.split("\\|")) { - String numStr = part.replaceAll("\\D+", ""); - if (!numStr.isEmpty()) { - int num = Integer.parseInt(numStr); - if (num > maxNum) { - maxNum = num; - } - } - } + Integer maxNum = SlitterTaskUtil.getPaperLengthInt(productionPlanList.get(0)); + //扩展参数 JSONObject param = new JSONObject(); //获取木箱信息,未包装的木箱 @@ -234,7 +226,6 @@ public class ZxqTask extends AbstractAcsTask { } } - /** * 返回实体 */ 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 3426fceab..a110df4a4 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 @@ -294,7 +294,7 @@ status = 输入.status ENDOPTION OPTION 输入.limits <> "" - 1=1 order by date_of_FG_inbound desc limit 0,10000 + 1=1 order by date_of_FG_inbound desc limit 0,100000 ENDOPTION ENDSELECT ENDQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql index 92d14a644..c2edcbd6e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql @@ -225,7 +225,7 @@ OPTION 输入.end_time <> "" ios.input_time <= 输入.end_time ENDOPTION - limit 0,10000 + limit 0,100000 ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql index 53cd86b83..97c800cd6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -404,7 +404,7 @@ ENDOPTION GROUP BY sub.sale_order_name,spec,ios.iostorinv_id,dtl.iostorinvdtl_id - limit 0,10000 + limit 0,100000 ENDSELECT ENDQUERY ENDIF @@ -684,7 +684,7 @@ OPTION 输入.bill_status <> "" dis.work_status <= 输入.bill_status ENDOPTION - order by dis.box_no,dis.pcsn limit 0,10000 + order by dis.box_no,dis.pcsn limit 0,100000 ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/util/TaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/util/TaskUtil.java index 3d143b01a..ff14f64c8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/util/TaskUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/util/TaskUtil.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.sch.task.dao.SchBaseTask; +import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.manage.TaskStatusEnum; @@ -46,18 +47,7 @@ public class TaskUtil { * 根据分切计划获取子卷长度 */ public static int getMaxNum(PdmBiSlittingproductionplan productionPlan, String paperDescription) { - String containerLength = productionPlan != null ? productionPlan.getPaper_tube_or_FRP().equals("1") ? productionPlan.getPaper_tube_description() : productionPlan.getFRP_description() : paperDescription; - int maxNum = 0; - for (String part : containerLength.split("\\|")) { - String numStr = part.replaceAll("\\D+", ""); - if (!numStr.isEmpty()) { - int num = Integer.parseInt(numStr); - if (num > maxNum) { - maxNum = num; - } - } - } - return maxNum; + return SlitterTaskUtil.getPaperLengthInt(productionPlan); } -} \ No newline at end of file +}