Browse Source

2026-11-13

优化日志打印
master
fengyuan_yang 3 days ago
parent
commit
dd975ba7ce
  1. 57
      src/main/java/com/gaotao/common/log/Utf8RollingFileAppender.java
  2. 63
      src/main/java/com/gaotao/modules/schedule/CreateSplitRollTiming.java
  3. 75
      src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
  4. 56
      src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
  5. 9
      src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java
  6. 15
      src/main/resources/logback.xml
  7. 14
      src/main/resources/mapper/schedule/SchedulingMapper.xml

57
src/main/java/com/gaotao/common/log/Utf8RollingFileAppender.java

@ -0,0 +1,57 @@
package com.gaotao.common.log;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.rolling.RollingFileAppender;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
/**
* 日志文件按 UTF-8 写,并在新文件开头加 BOM,记事本才能认出中文。
* 没有 BOM 的旧文件(例如按 GBK 写的)先挪开,避免两种编码接在同一个文件里。
*/
public class Utf8RollingFileAppender extends RollingFileAppender<ILoggingEvent> {
private static final byte[] UTF8_BOM = new byte[] {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF};
@Override
public void openFile(String fileName) throws IOException {
moveFileWithoutBomAside(fileName);
super.openFile(fileName);
File file = new File(fileName);
if (!file.exists() || file.length() == 0) {
OutputStream os = getOutputStream();
if (os != null) {
os.write(UTF8_BOM);
os.flush();
}
}
}
private void moveFileWithoutBomAside(String fileName) {
File file = new File(fileName);
if (!file.exists() || file.length() < 3 || startsWithBom(file)) {
return;
}
File rotated = new File(file.getParentFile(), file.getName() + ".gbk");
if (rotated.exists()) {
rotated = new File(file.getParentFile(), file.getName() + "." + System.currentTimeMillis() + ".gbk");
}
if (!file.renameTo(rotated)) {
addWarn("Failed to move non-UTF-8 log aside: " + file.getAbsolutePath());
}
}
private boolean startsWithBom(File file) {
try (FileInputStream in = new FileInputStream(file)) {
byte[] head = new byte[3];
int read = in.read(head);
return read == 3 && head[0] == UTF8_BOM[0] && head[1] == UTF8_BOM[1] && head[2] == UTF8_BOM[2];
} catch (IOException e) {
addWarn("Failed to check log file header: " + file.getAbsolutePath(), e);
return true;
}
}
}

63
src/main/java/com/gaotao/modules/schedule/CreateSplitRollTiming.java

@ -0,0 +1,63 @@
package com.gaotao.modules.schedule;
import java.util.ArrayList;
import java.util.List;
/**
* Collects create-split step timings on the current request thread and prints one summary.
*/
public final class CreateSplitRollTiming {
private static final ThreadLocal<Session> SESSION = new ThreadLocal<>();
private CreateSplitRollTiming() {
}
public static void begin() {
SESSION.set(new Session());
}
public static void record(String step, long elapsedMs) {
Session session = SESSION.get();
if (session == null || step == null) {
return;
}
long cost = Math.max(elapsedMs, 0);
session.steps.add(step + "=" + cost + "毫秒");
session.stepTotal += cost;
}
public static String summary(String api, long totalMs, String context, String failedMessage) {
Session session = SESSION.get();
long cost = Math.max(totalMs, 0);
StringBuilder sb = new StringBuilder();
sb.append("[创建分卷] 汇总 接口=").append(api)
.append(" 总耗时=").append(cost).append("毫秒");
if (context != null && !context.isEmpty()) {
sb.append(" ").append(context);
}
if (session != null && !session.steps.isEmpty()) {
long otherMs = cost - session.stepTotal;
if (otherMs < 0) {
otherMs = 0;
}
sb.append(" 提交及间隙=").append(otherMs).append("毫秒");
for (String step : session.steps) {
sb.append(" | ").append(step);
}
}
if (failedMessage != null && !failedMessage.isEmpty()) {
sb.append(" | 失败=").append(failedMessage);
}
return sb.toString();
}
public static void clear() {
SESSION.remove();
}
private static final class Session {
private final List<String> steps = new ArrayList<>();
private long stepTotal;
}
}

75
src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@ -7,6 +7,7 @@ import com.gaotao.common.exception.XJException;
import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.PageUtils;
import com.gaotao.common.utils.R; import com.gaotao.common.utils.R;
import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData; import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData;
import com.gaotao.modules.schedule.CreateSplitRollTiming;
import com.gaotao.modules.schedule.data.*; import com.gaotao.modules.schedule.data.*;
import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto; import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto;
import com.gaotao.modules.schedule.data.dto.SfdcNewsfdcDto; import com.gaotao.modules.schedule.data.dto.SfdcNewsfdcDto;
@ -1335,11 +1336,22 @@ public class ScheduleController extends AbstractController {
*/ */
@PostMapping(value = "checkSplitRollExceptionRule") @PostMapping(value = "checkSplitRollExceptionRule")
public R checkSplitRollExceptionRule(@RequestBody SearchScheduleData inData) { public R checkSplitRollExceptionRule(@RequestBody SearchScheduleData inData) {
Map<String, Object> resultMap = scheduleService.checkSplitRollExceptionRule(inData);
return R.ok()
.put("code", 200)
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
long start = System.currentTimeMillis();
CreateSplitRollTiming.begin();
String failedMessage = null;
try {
Map<String, Object> resultMap = scheduleService.checkSplitRollExceptionRule(inData);
return R.ok()
.put("code", 200)
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
} catch (RuntimeException e) {
failedMessage = e.getMessage();
throw e;
} finally {
logger.info(CreateSplitRollTiming.summary("异常规则校验", System.currentTimeMillis() - start, createSplitLogContext(inData), failedMessage));
CreateSplitRollTiming.clear();
}
} }
/** /**
@ -1359,10 +1371,21 @@ public class ScheduleController extends AbstractController {
*/ */
@PostMapping(value = "completeSplitRuleTodoOperation") @PostMapping(value = "completeSplitRuleTodoOperation")
public R completeSplitRuleTodoOperation(@RequestBody SearchScheduleData inData) { public R completeSplitRuleTodoOperation(@RequestBody SearchScheduleData inData) {
scheduleService.completeSplitRuleTodoOperation(inData);
return R.ok()
.put("code", 200)
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
long start = System.currentTimeMillis();
CreateSplitRollTiming.begin();
String failedMessage = null;
try {
scheduleService.completeSplitRuleTodoOperation(inData);
return R.ok()
.put("code", 200)
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
} catch (RuntimeException e) {
failedMessage = e.getMessage();
throw e;
} finally {
logger.info(CreateSplitRollTiming.summary("回写代办操作", System.currentTimeMillis() - start, createSplitLogContext(inData), failedMessage));
CreateSplitRollTiming.clear();
}
} }
/** /**
@ -1422,11 +1445,35 @@ public class ScheduleController extends AbstractController {
@RequestMapping(value = "createSplitSfdcRoll") @RequestMapping(value = "createSplitSfdcRoll")
// @RepeatSubmit // 注释掉重复提交校验,因为创建分卷时需要循环调用多次 // @RepeatSubmit // 注释掉重复提交校验,因为创建分卷时需要循环调用多次
public R createSplitSfdcRoll(@RequestBody SearchScheduleData inData) { public R createSplitSfdcRoll(@RequestBody SearchScheduleData inData) {
List<Map<String, Object>> printList = scheduleService.createSplitSfdcRoll(inData);
return R.ok()
.put("code", 200)
.put("printList", printList)
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
long start = System.currentTimeMillis();
CreateSplitRollTiming.begin();
String failedMessage = null;
try {
List<Map<String, Object>> printList = scheduleService.createSplitSfdcRoll(inData);
return R.ok()
.put("code", 200)
.put("printList", printList)
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
} catch (RuntimeException e) {
failedMessage = e.getMessage();
throw e;
} finally {
logger.info(CreateSplitRollTiming.summary("创建分卷", System.currentTimeMillis() - start, createSplitLogContext(inData), failedMessage));
CreateSplitRollTiming.clear();
}
}
private String createSplitLogContext(SearchScheduleData inData) {
if (inData == null) {
return "";
}
return "工厂=" + inData.getSite()
+ " 工单=" + inData.getOrderNo()
+ " 行号=" + inData.getItemNo()
+ " 工序=" + inData.getSeqNo()
+ " 卷号=" + inData.getRollNo()
+ " 操作员=" + inData.getOperatorId()
+ " 登录账号=" + inData.getUsername();
} }
/** /**

56
src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@ -10,6 +10,7 @@ import com.gaotao.common.utils.PageUtils;
import com.gaotao.common.utils.R; import com.gaotao.common.utils.R;
import com.gaotao.modules.inboundNotification.service.impl.InboundNotificationServiceImpl; import com.gaotao.modules.inboundNotification.service.impl.InboundNotificationServiceImpl;
import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData; import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData;
import com.gaotao.modules.schedule.CreateSplitRollTiming;
import com.gaotao.modules.schedule.data.*; import com.gaotao.modules.schedule.data.*;
import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto; import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto;
import com.gaotao.modules.schedule.data.dto.SfdcNewsfdcDto; import com.gaotao.modules.schedule.data.dto.SfdcNewsfdcDto;
@ -3764,7 +3765,9 @@ public class ScheduleServiceImpl implements ScheduleService {
return resultMap; return resultMap;
} }
long stepStart = System.currentTimeMillis();
ScheduleTodoMessageEntity pendingLockTodo = getLatestPendingLockTodo(inData); ScheduleTodoMessageEntity pendingLockTodo = getLatestPendingLockTodo(inData);
logCreateSplitStep("异常规则-查询未审核代办", stepStart, createSplitContext(inData));
if (pendingLockTodo != null) { if (pendingLockTodo != null) {
resultMap.put("todoInfoCode", pendingLockTodo.getInfoCode()); resultMap.put("todoInfoCode", pendingLockTodo.getInfoCode());
resultMap.put("warningLevel", pendingLockTodo.getWarningLevel()); resultMap.put("warningLevel", pendingLockTodo.getWarningLevel());
@ -3790,8 +3793,10 @@ public class ScheduleServiceImpl implements ScheduleService {
} }
} }
stepStart = System.currentTimeMillis();
List<SysSceneExceptionRuleEntity> ruleList = sysSceneExceptionRuleMapper.getEnabledRuleListByApply( List<SysSceneExceptionRuleEntity> ruleList = sysSceneExceptionRuleMapper.getEnabledRuleListByApply(
inData.getSite(), inData.getBuNo(), SPLIT_RULE_APPLY_PAGE, SPLIT_RULE_APPLY_BUTTON); inData.getSite(), inData.getBuNo(), SPLIT_RULE_APPLY_PAGE, SPLIT_RULE_APPLY_BUTTON);
logCreateSplitStep("异常规则-加载规则", stepStart, createSplitContext(inData) + " ruleCount=" + (ruleList == null ? 0 : ruleList.size()));
if (CollectionUtils.isEmpty(ruleList)) { if (CollectionUtils.isEmpty(ruleList)) {
return resultMap; return resultMap;
} }
@ -3806,7 +3811,9 @@ public class ScheduleServiceImpl implements ScheduleService {
return resultMap; return resultMap;
} }
stepStart = System.currentTimeMillis();
List<SplitRollMetricContext> metricContextList = buildSplitRollMetricContexts(inData); List<SplitRollMetricContext> metricContextList = buildSplitRollMetricContexts(inData);
logCreateSplitStep("异常规则-计算指标", stepStart, createSplitContext(inData) + " metricCount=" + (metricContextList == null ? 0 : metricContextList.size()));
for (SysSceneExceptionRuleEntity rule : ruleList) { for (SysSceneExceptionRuleEntity rule : ruleList) {
if (!matchesTriggerWorkCenter(rule.getTriggerWorkCenter(), currentWorkCenterNo)) { if (!matchesTriggerWorkCenter(rule.getTriggerWorkCenter(), currentWorkCenterNo)) {
continue; continue;
@ -4907,9 +4914,10 @@ public class ScheduleServiceImpl implements ScheduleService {
params.add(rollNums); params.add(rollNums);
params.add(username); params.add(username);
params.add(defectQty); params.add(defectQty);
//调用存储过程
long start = System.currentTimeMillis();
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkSplitRollWithSfdcRollAndSecurity", params); List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkSplitRollWithSfdcRollAndSecurity", params);
//处理返回的结果
logCreateSplitStep("校验分卷数量及权限", start,
"site=" + site + " orderNo=" + orderNo + " itemNo=" + itemNo + " seqNo=" + seqNo + " rollNo=" + rollNo + " username=" + username);
return resultList.get(0); return resultList.get(0);
} }
@ -4929,16 +4937,20 @@ public class ScheduleServiceImpl implements ScheduleService {
params.add(rollQty); params.add(rollQty);
params.add(rollNo); params.add(rollNo);
params.add(username); params.add(username);
//调用存储过程
long start = System.currentTimeMillis();
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("workbench_createslittingroll_check", params); List<Map<String, Object>> resultList = procedureMapper.getProcedureData("workbench_createslittingroll_check", params);
//处理返回的结果
logCreateSplitStep("创建分卷前置校验", start,
"site=" + site + " orderNo=" + orderNo + " itemNo=" + itemNo + " seqNo=" + seqNo + " rollNo=" + rollNo + " username=" + username);
return resultList.get(0); return resultList.get(0);
} }
@Override @Override
@Transactional @Transactional
public List<Map<String, Object>> createSplitSfdcRoll(SearchScheduleData inData) { public List<Map<String, Object>> createSplitSfdcRoll(SearchScheduleData inData) {
String context = createSplitContext(inData);
long stepStart = System.currentTimeMillis();
ScheduleTodoMessageEntity pendingLockTodo = getLatestPendingLockTodo(inData); ScheduleTodoMessageEntity pendingLockTodo = getLatestPendingLockTodo(inData);
logCreateSplitStep("检查未审核代办锁定", stepStart, context + " locked=" + (pendingLockTodo != null && FLAG_N.equalsIgnoreCase(pendingLockTodo.getAuditFlag())));
if (pendingLockTodo != null && FLAG_N.equalsIgnoreCase(pendingLockTodo.getAuditFlag())) { if (pendingLockTodo != null && FLAG_N.equalsIgnoreCase(pendingLockTodo.getAuditFlag())) {
throw new XJException("当前异常代办尚未审核,创建分卷操作已锁定。"); throw new XJException("当前异常代办尚未审核,创建分卷操作已锁定。");
} }
@ -4962,7 +4974,9 @@ public class ScheduleServiceImpl implements ScheduleService {
// 更新 SOScheduledRouting 表的 carrier_no 字段 // 更新 SOScheduledRouting 表的 carrier_no 字段
//if (fixture != null && !fixture.trim().isEmpty()) { //if (fixture != null && !fixture.trim().isEmpty()) {
stepStart = System.currentTimeMillis();
schedulingMapper.updateCarrierNo(site, seqNo, fixture); schedulingMapper.updateCarrierNo(site, seqNo, fixture);
logCreateSplitStep("更新载具", stepStart, context + " fixture=" + fixture);
// } // }
//存储过程 调用存储过程 创建分卷 //存储过程 调用存储过程 创建分卷
@ -4970,7 +4984,9 @@ public class ScheduleServiceImpl implements ScheduleService {
Float defectQty = inData.getDefectQty(); Float defectQty = inData.getDefectQty();
String packingList = inData.getPackingList(); String packingList = inData.getPackingList();
String tidRollType = StringUtils.hasText(inData.getTidRollType()) ? inData.getTidRollType().trim() : "正常卷"; String tidRollType = StringUtils.hasText(inData.getTidRollType()) ? inData.getTidRollType().trim() : "正常卷";
stepStart = System.currentTimeMillis();
Map<String, Object> resultMap = this.workBenchCreateSlittingRollAction(site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, operatorId, remark, defectQty, packingList, tidRollType); Map<String, Object> resultMap = this.workBenchCreateSlittingRollAction(site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, operatorId, remark, defectQty, packingList, tidRollType);
logCreateSplitStep("执行创建分卷", stepStart, context + " tidRollType=" + tidRollType);
//判断结果是否成功 //判断结果是否成功
String resultCode = String.valueOf(resultMap.get("resultCode")); String resultCode = String.valueOf(resultMap.get("resultCode"));
if ("400".equalsIgnoreCase(resultCode)) { if ("400".equalsIgnoreCase(resultCode)) {
@ -4990,7 +5006,9 @@ public class ScheduleServiceImpl implements ScheduleService {
tempData.setOrderNo(orderNo); tempData.setOrderNo(orderNo);
tempData.setRollNo(rollNoArr[i]); tempData.setRollNo(rollNoArr[i]);
//查询当前的打印的数据 //查询当前的打印的数据
stepStart = System.currentTimeMillis();
Map<String, Object> printMap = schedulingMapper.getSfdcFlowLabelData(tempData); Map<String, Object> printMap = schedulingMapper.getSfdcFlowLabelData(tempData);
logCreateSplitStep("查询流转标签数据", stepStart, context + " createdRollNo=" + rollNoArr[i] + " index=" + (i + 1) + "/" + rollNoArr.length);
//添加打印的数据 //添加打印的数据
printList.add(printMap); printList.add(printMap);
@ -5063,6 +5081,23 @@ public class ScheduleServiceImpl implements ScheduleService {
return resultList.get(0); return resultList.get(0);
} }
private String createSplitContext(SearchScheduleData inData) {
if (inData == null) {
return "";
}
return "site=" + inData.getSite()
+ " orderNo=" + inData.getOrderNo()
+ " itemNo=" + inData.getItemNo()
+ " seqNo=" + inData.getSeqNo()
+ " rollNo=" + inData.getRollNo()
+ " operatorId=" + inData.getOperatorId()
+ " username=" + inData.getUsername();
}
private void logCreateSplitStep(String step, long startMs, String detail) {
CreateSplitRollTiming.record(step, System.currentTimeMillis() - startMs);
}
private void checkTidSplitControl(SearchScheduleData inData) { private void checkTidSplitControl(SearchScheduleData inData) {
checkTidRollsControl(inData, TID_SPLIT_CONTROL_NO, "TID分卷校验"); checkTidRollsControl(inData, TID_SPLIT_CONTROL_NO, "TID分卷校验");
} }
@ -5072,11 +5107,17 @@ public class ScheduleServiceImpl implements ScheduleService {
} }
private void checkTidRollsControl(SearchScheduleData inData, String controlNo, String failLabel) { private void checkTidRollsControl(SearchScheduleData inData, String controlNo, String failLabel) {
String context = createSplitContext(inData) + " controlNo=" + controlNo;
String workCenterNo = inData.getWorkCenterNo() == null ? "" : inData.getWorkCenterNo().trim(); String workCenterNo = inData.getWorkCenterNo() == null ? "" : inData.getWorkCenterNo().trim();
if (!sysSceneDynamicControlModelService.isAnyCheckedDimensionEnabled(inData.getSite(), controlNo, buildTidControlContext(inData))) {
long stepStart = System.currentTimeMillis();
boolean tidEnabled = sysSceneDynamicControlModelService.isAnyCheckedDimensionEnabled(inData.getSite(), controlNo, buildTidControlContext(inData));
logCreateSplitStep("TID控制-检查是否启用", stepStart, context + " enabled=" + tidEnabled);
if (!tidEnabled) {
return; return;
} }
stepStart = System.currentTimeMillis();
List<String> rollNos = scheduleMapper.listTidPendingNormalRolls(inData.getSite(), inData.getSeqNo()); List<String> rollNos = scheduleMapper.listTidPendingNormalRolls(inData.getSite(), inData.getSeqNo());
logCreateSplitStep("TID控制-查询待校验卷", stepStart, context + " rollCount=" + (rollNos == null ? 0 : rollNos.size()));
if (rollNos == null || rollNos.isEmpty()) { if (rollNos == null || rollNos.isEmpty()) {
return; return;
} }
@ -5095,7 +5136,9 @@ public class ScheduleServiceImpl implements ScheduleService {
logger.info("{}请求: site={}, orderNo={}, seqNo={}", logger.info("{}请求: site={}, orderNo={}, seqNo={}",
failLabel, inData.getSite(), inData.getOrderNo(), inData.getSeqNo()); failLabel, inData.getSite(), inData.getOrderNo(), inData.getSeqNo());
postMesLogs("/checkRolls", body, failLabel); postMesLogs("/checkRolls", body, failLabel);
stepStart = System.currentTimeMillis();
scheduleMapper.updateTidPassFlag(inData.getSite(), inData.getSeqNo(), rollNos); scheduleMapper.updateTidPassFlag(inData.getSite(), inData.getSeqNo(), rollNos);
logCreateSplitStep("TID控制-回写通过标记", stepStart, context + " rollCount=" + rollNos.size());
} }
private Map<String, String> buildTidControlContext(SearchScheduleData inData) { private Map<String, String> buildTidControlContext(SearchScheduleData inData) {
@ -5201,9 +5244,12 @@ public class ScheduleServiceImpl implements ScheduleService {
logger.info("{}请求: url={}, contentType=multipart/form-data, form={}", logger.info("{}请求: url={}, contentType=multipart/form-data, form={}",
failLabel, requestUrl, JSON.toJSONString(formLog)); failLabel, requestUrl, JSON.toJSONString(formLog));
ResponseEntity<String> response; ResponseEntity<String> response;
long remoteStart = System.currentTimeMillis();
try { try {
response = restTemplate.exchange(requestUrl, HttpMethod.POST, new HttpEntity<>(form, headers), String.class); response = restTemplate.exchange(requestUrl, HttpMethod.POST, new HttpEntity<>(form, headers), String.class);
logCreateSplitStep("TID远程校验", remoteStart, "path=" + path + " label=" + failLabel);
} catch (Exception e) { } catch (Exception e) {
logCreateSplitStep("TID远程校验失败", remoteStart, "path=" + path + " label=" + failLabel + " message=" + e.getMessage());
logger.error("{}调用失败", failLabel, e); logger.error("{}调用失败", failLabel, e);
throw new XJException(failLabel + "失败: " + e.getMessage()); throw new XJException(failLabel + "失败: " + e.getMessage());
} }

9
src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java

@ -13,6 +13,7 @@ import com.gaotao.modules.pda.dao.TransNoDao;
import com.gaotao.modules.pms.data.QcMethodData; import com.gaotao.modules.pms.data.QcMethodData;
import com.gaotao.modules.purchasingManagement.entity.CRollInfoData; import com.gaotao.modules.purchasingManagement.entity.CRollInfoData;
import com.gaotao.modules.purchasingManagement.entity.ViewSapPoData; import com.gaotao.modules.purchasingManagement.entity.ViewSapPoData;
import com.gaotao.modules.schedule.CreateSplitRollTiming;
import com.gaotao.modules.schedule.data.*; import com.gaotao.modules.schedule.data.*;
import com.gaotao.modules.schedule.entity.ProductionReportData; import com.gaotao.modules.schedule.entity.ProductionReportData;
import com.gaotao.modules.schedule.entity.SfdcDefectHistData; import com.gaotao.modules.schedule.entity.SfdcDefectHistData;
@ -1373,8 +1374,10 @@ public class SchedulingServiceImpl implements SchedulingService {
report.setSeqNo(String.valueOf(seqNo)); report.setSeqNo(String.valueOf(seqNo));
} }
long stepStart = System.currentTimeMillis();
// 批量插入排数据 // 批量插入排数据
schedulingMapper.batchInsertProductionReport(reportList); schedulingMapper.batchInsertProductionReport(reportList);
CreateSplitRollTiming.record("保存产量排数据", System.currentTimeMillis() - stepStart);
// 计算不良总数和面损总数 // 计算不良总数和面损总数
float totalDefectQty = 0; float totalDefectQty = 0;
@ -1390,8 +1393,10 @@ public class SchedulingServiceImpl implements SchedulingService {
// 如果有不良数量,插入不良历史记录 // 如果有不良数量,插入不良历史记录
if (totalDefectQty > 0) { if (totalDefectQty > 0) {
stepStart = System.currentTimeMillis();
// 获取下一个HistSeqNo // 获取下一个HistSeqNo
Integer nextHistSeqNo = schedulingMapper.getNextHistSeqNo(site, orderNo, itemNo, seqNo); Integer nextHistSeqNo = schedulingMapper.getNextHistSeqNo(site, orderNo, itemNo, seqNo);
CreateSplitRollTiming.record("获取不良历史序号", System.currentTimeMillis() - stepStart);
if (nextHistSeqNo == null) { if (nextHistSeqNo == null) {
nextHistSeqNo = 1; nextHistSeqNo = 1;
} }
@ -1471,8 +1476,10 @@ public class SchedulingServiceImpl implements SchedulingService {
} }
} }
stepStart = System.currentTimeMillis();
// 批量插入不良历史数据 // 批量插入不良历史数据
schedulingMapper.batchInsertSfdcDefectHist(defectList); schedulingMapper.batchInsertSfdcDefectHist(defectList);
CreateSplitRollTiming.record("保存不良历史", System.currentTimeMillis() - stepStart);
// 调用存储过程处理不良品处置(更新SFDC_MaterialHist的NetIssueQty) // 调用存储过程处理不良品处置(更新SFDC_MaterialHist的NetIssueQty)
List<Object> params = new ArrayList<>(); List<Object> params = new ArrayList<>();
@ -1481,7 +1488,9 @@ public class SchedulingServiceImpl implements SchedulingService {
params.add(String.valueOf(seqNo)); params.add(String.valueOf(seqNo));
params.add(rollNo2); // 原卷号 params.add(rollNo2); // 原卷号
params.add(totalDefectQty); // 不良品总数 params.add(totalDefectQty); // 不良品总数
stepStart = System.currentTimeMillis();
procedureMapper.getProcedureData("GetDefectiveProductDisposal", params); procedureMapper.getProcedureData("GetDefectiveProductDisposal", params);
CreateSplitRollTiming.record("不良品处置", System.currentTimeMillis() - stepStart);
} }
} }

15
src/main/resources/logback.xml

@ -10,12 +10,14 @@
<!--控制台输出 --> <!--控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread]%logger{56}.%method:%L -%msg%n</Pattern>
<Pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread]%logger{56}.%method:%L -%msg%n</Pattern>
<!-- 现场黑框是 GBK。写成 UTF-8 时,你好会显示成浣犲ソ -->
<charset>GBK</charset>
</encoder> </encoder>
</appender> </appender>
<!-- 日志文件输出 --> <!-- 日志文件输出 -->
<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<appender name="file" class="com.gaotao.common.log.Utf8RollingFileAppender">
<File>logs/xujie-erp/xujie2021.log</File><!-- 设置日志不超过${log.max.size}时的保存路径,注意如果 是web项目会保存到Tomcat的bin目录 下 --> <File>logs/xujie-erp/xujie2021.log</File><!-- 设置日志不超过${log.max.size}时的保存路径,注意如果 是web项目会保存到Tomcat的bin目录 下 -->
<!-- 滚动记录文件,先将日志记录到指定文件,当符合某个条件时,将日志记录到其他文件。--> <!-- 滚动记录文件,先将日志记录到指定文件,当符合某个条件时,将日志记录到其他文件。-->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@ -26,10 +28,11 @@
<maxFileSize>${log.max.size}</maxFileSize> <maxFileSize>${log.max.size}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy> </timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<!-- 日志输出的文件的格式 -->
<layout class="ch.qos.logback.classic.PatternLayout">
<pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread]%logger{56}.%method:%L -%msg%n</pattern>
</layout>
<!-- 文件按 UTF-8 写。控制台单独用 GBK,黑框才能直接看到中文 -->
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread]%logger{56}.%method:%L -%msg%n</pattern>
<charset>UTF-8</charset>
</encoder>
</appender> </appender>
<logger name="org.springframework.jdbc.core.StatementCreatorUtils" <logger name="org.springframework.jdbc.core.StatementCreatorUtils"
additivity="false" level="INFO"> additivity="false" level="INFO">

14
src/main/resources/mapper/schedule/SchedulingMapper.xml

@ -462,13 +462,17 @@
'系统数据' as ul, '系统数据' as ul,
pt.DefaultLocationID locationId, pt.DefaultLocationID locationId,
st.SiteName siteName st.SiteName siteName
FROM SFDC_Rolls sfr, ShopOrder so, Part pt
<!-- LEFT JOIN dbo.view_sap_oitm oi ON oi.ItemCode = pt.PartNo-->
FROM SFDC_Rolls sfr
INNER JOIN ShopOrder so ON sfr.Site = so.Site AND sfr.OrderNo = so.OrderNo
INNER JOIN Part pt ON so.Site = pt.Site AND so.PartNo = pt.PartNo
LEFT JOIN Site st ON st.SiteID = pt.Site LEFT JOIN Site st ON st.SiteID = pt.Site
<where> <where>
AND sfr.Site = so.Site AND sfr.OrderNo = so.OrderNo
AND so.Site = pt.Site AND so.PartNo = pt.PartNo AND sfr.Site = #{site}
AND sfr.RollNo = #{rollNo} AND sfr.VirtualRollFlag = 'N'
AND sfr.Site = #{site}
<if test="orderNo != null and orderNo != ''">
AND sfr.OrderNo = #{orderNo}
</if>
AND sfr.RollNo = #{rollNo}
AND sfr.VirtualRollFlag = 'N'
</where> </where>
</select> </select>

Loading…
Cancel
Save