root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:验箱代码上传，参数表加是否验箱参数；删除任务定时器更新

Browse Source
This commit is contained in:
DESKTOP-5DIJMF9\admin
2025-03-03 16:22:58 +08:00
parent fa6f8f90b7
commit 70f19e9ce5
2 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
View File

@@ -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<PdmBiSubpack
@Resource
private BstIvtBoxinfoMapper bstIvtBoxinfoMapper;
@Autowired
private ISysParamService iSysParamService;
@Resource
private TaskQueue taskQueue;
@Resource
@@ -421,6 +423,26 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
taskBean.createTask(jsonTaskParam);
taskBean.immediateNotifyAcs(null);
String is_labeling = iSysParamService.findByCode("is_checkbox").getValue();
if (is_labeling.equals("1")) {
//给MES传输验箱结果
CompletableFuture.runAsync(() -> {
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<PdmBiSubpackagerelation> packagerelationList) {

29
lms/nladmin-system/src/main/java/org/nl/wms/autotask/CleanLog.java
View File

@@ -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("自动清理任务执行成功...!");
}
}