DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-04-25 15:28:50 +08:00
parent 511d5b7385 01a06566ee
commit 5729f2ee1a
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-admin/src/main/resources/application.yml
View File

@@ -154,7 +154,7 @@ security:
- /test/** - /test/**
- /klp/generateRecord - /klp/generateRecord
- /klp/generateRecord/** - /klp/generateRecord/**
- /wms/coilPendingAction/**
# 测接口 # 测接口
# - /ems/energyConsumption # - /ems/energyConsumption
# - /ems/energyConsumption/** # - /ems/energyConsumption/**

2
klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java
View File

@@ -289,12 +289,10 @@ public class WmsFurnacePlanServiceImpl implements IWmsFurnacePlanService {
} }
Date now = new Date(); Date now = new Date();
Date endTime = new Date(now.getTime() + 48L * 60 * 60 * 1000);
WmsFurnacePlan update = new WmsFurnacePlan(); WmsFurnacePlan update = new WmsFurnacePlan();
update.setPlanId(planId); update.setPlanId(planId);
update.setActualStartTime(now); update.setActualStartTime(now);
update.setEndTime(endTime);
update.setStatus(2); update.setStatus(2);
baseMapper.updateById(update); baseMapper.updateById(update);