From 70f19e9ce541e751ad21c1887448803825515c6c Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Mon, 3 Mar 2025 16:22:58 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E9=AA=8C=E7=AE=B1=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=EF=BC=8C=E5=8F=82=E6=95=B0=E8=A1=A8=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=AA=8C=E7=AE=B1=E5=8F=82=E6=95=B0=EF=BC=9B?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1=E5=AE=9A=E6=97=B6=E5=99=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PdmBiSubpackagerelationServiceImpl.java | 24 ++++++++++++++- .../java/org/nl/wms/autotask/CleanLog.java | 29 ++++++++++++++----- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index b87243f95..d499547bb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -51,6 +51,7 @@ import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.pda.mps.eum.RegionTypeEnum; @@ -114,7 +115,8 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl { + try { + log.error("----回传子卷包装关系----"); + String isConnect2 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_CONNECT_MES2").getValue(); + if ("1".equals(isConnect2)) { + JSONObject param_jo = new JSONObject(); + param_jo.put("box_no", boxSn); + param_jo.put("box_weight", subList.get(0).getBox_weight()); + + lmsToMesServiceImpl.BoxDataCollectionSubmit2(param_jo); + } + } catch (Exception e) { + log.error("验箱回传MES异常，BoxDataCollectionSubmit2给MES传输子卷包装关系异常,木箱号为：" + boxSn + ",异常信息：" + e); + } + }, pool); + } } private void checkEntityList(JSONObject whereJson, List packagerelationList) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/autotask/CleanLog.java b/lms/nladmin-system/src/main/java/org/nl/wms/autotask/CleanLog.java index 500dbce2b..d250452d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/autotask/CleanLog.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/autotask/CleanLog.java @@ -1,11 +1,15 @@ package org.nl.wms.autotask; +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.system.service.param.ISysParamService; import org.springframework.stereotype.Component; +import java.util.Date; + /** * 自动清除日志(操作日志、异常日志)数据 */ @@ -16,14 +20,25 @@ public class CleanLog { private final ISysParamService paramService; public void run() { - //delete from sys_log where DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL 30 day)) limit 10; - WQLObject logTab = WQLObject.getWQLObject("sys_log"); - WQLObject sys_interface_log = WQLObject.getWQLObject("sys_interface_log"); - int days = Integer.parseInt(paramService.findByCode("log_day").getValue()); - logTab.delete("DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL " + days + " day))"); - sys_interface_log.delete("DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL " + days + " day))"); - log.info("自动清理日志执行成功...!"); + //清理90天以前的任务记录 + WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); + int days = Integer.parseInt(paramService.findByCode("task_day").getValue()); + + + Date todayDate = DateUtil.offset(DateUtil.date(), DateField.DAY_OF_MONTH,-days); + String beforeDate = DateUtil.format(todayDate, "yyyy-MM-dd HH:mm:ss"); + taskTab.delete("create_time <='" + beforeDate + "'"); + + + //清空库存变动记录表 + WQLObject ivtFlowTab = WQLObject.getWQLObject("ST_IVT_StructIvtFlow"); + ivtFlowTab.delete("1=1"); + //清空库区日表 + WQLObject wql_IOSectDaily = WQLObject.getWQLObject("ST_IVT_IOStorDaily"); + wql_IOSectDaily.delete("1=1"); + + log.info("自动清理任务执行成功...!"); } }