fengyuan_yang
/
boying-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2025-12-299 

优化
master
fengyuan_yang 2 weeks ago
parent
8cc06179a0
commit
a46c2c11f5
3 changed files with 25 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java
  2. 34
      src/main/java/com/gaotao/modules/production/controller/ProductionIssueReturnController.java
  3. 6
      src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueReturnServiceImpl.java

10
src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java
View File

@ -1016,11 +1016,11 @@ public class QcServiceImpl implements QcService {
qcMapper.updateIPQCSubDetailSubmitFlag(qcData);
// 发送邮件
if ("不合格".equals(qcData.getInspectionResult())) {
List<QcFAIRecordData> list = qcMapper.ipqcDetailSearch(qcData);
qcData.setItemList(list);
sendMail(qcData, "IPQC");
}
// if ("不合格".equals(qcData.getInspectionResult())) {
// List<QcFAIRecordData> list = qcMapper.ipqcDetailSearch(qcData);
// qcData.setItemList(list);
// sendMail(qcData, "IPQC");
// }
}
}

34
src/main/java/com/gaotao/modules/production/controller/ProductionIssueReturnController.java
View File

@ -141,15 +141,15 @@ public class ProductionIssueReturnController {
logger.info("验证标签，参数: {}", params);
try {
String site = (String) params.get("site");
String buNo = (String) params.get("buNo");
String returnOrderNo = (String) params.get("returnOrderNo");
String issueOrderNo = (String) params.get("issueOrderNo");
String operationSeq = (String) params.get("operationSeq");
String labelCode = (String) params.get("labelCode");
String operationType = (String) params.get("operationType");
String userName = (String) params.get("userName");
String warehouseId = (String) params.get("warehouseId");
String site = params.get("site") != null ? String.valueOf(params.get("site")) : "";
String buNo = params.get("buNo") != null ? String.valueOf(params.get("buNo")) : "";
String returnOrderNo = params.get("returnOrderNo") != null ? String.valueOf(params.get("returnOrderNo")) : "";
String issueOrderNo = params.get("issueOrderNo") != null ? String.valueOf(params.get("issueOrderNo")) : "";
String operationSeq = params.get("operationSeq") != null ? String.valueOf(params.get("operationSeq")) : "";
String labelCode = params.get("labelCode") != null ? String.valueOf(params.get("labelCode")) : "";
String operationType = params.get("operationType") != null ? String.valueOf(params.get("operationType")) : "";
String userName = params.get("userName") != null ? String.valueOf(params.get("userName")) : "";
String warehouseId = params.get("warehouseId") != null ? String.valueOf(params.get("warehouseId")) : "";
logger.info("验证标签参数 - site: {}, buNo: {}, returnOrderNo: {}, issueOrderNo: {}, operationSeq: {}, labelCode: {}, operationType: {}, userName: {}, warehouseId: {}",
site, buNo, returnOrderNo, issueOrderNo, operationSeq, labelCode, operationType, userName, warehouseId);
@ -187,7 +187,7 @@ public class ProductionIssueReturnController {
} catch (Exception e) {
logger.error("验证标签失败", e);
return R.error("操作失败: " + e.getMessage());
return R.error(e.getMessage());
}
}
@ -234,13 +234,13 @@ public class ProductionIssueReturnController {
logger.info("确认保存生产领退料，参数: {}", params);
try {
String site = (String) params.get("site");
String buNo = (String) params.get("buNo");
String returnOrderNo = (String) params.get("returnOrderNo");
String issueOrderNo = (String) params.get("issueOrderNo");
String operationSeq = (String) params.get("operationSeq");
String locationCode = (String) params.get("locationCode");
String userName = (String) params.get("userName");
String site = params.get("site") != null ? String.valueOf(params.get("site")) : "";
String buNo = params.get("buNo") != null ? String.valueOf(params.get("buNo")) : "";
String returnOrderNo = params.get("returnOrderNo") != null ? String.valueOf(params.get("returnOrderNo")) : "";
String issueOrderNo = params.get("issueOrderNo") != null ? String.valueOf(params.get("issueOrderNo")) : "";
String operationSeq = params.get("operationSeq") != null ? String.valueOf(params.get("operationSeq")) : "";
String userName = params.get("userName") != null ? String.valueOf(params.get("userName")) : "";
String locationCode = params.get("locationCode") != null ? String.valueOf(params.get("locationCode")) : "";
logger.info("确认保存参数 - site: {}, buNo: {}, returnOrderNo: {}, issueOrderNo: {}, operationSeq: {}, locationCode: {}, userName: {}",
site, buNo, returnOrderNo, issueOrderNo, operationSeq, locationCode, userName);

6
src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueReturnServiceImpl.java
View File

@ -118,7 +118,7 @@ public class ProductionIssueReturnServiceImpl implements ProductionIssueReturnSe
// 检查返回的code，如果不是200则抛出异常
Object code = result.get("code");
if (code == null || !"200".equals(code.toString())) {
String msg = result.get("msg") != null ? result.get("msg").toString() : "验证失败";
String msg = result.get("message") != null ? result.get("message").toString() : "";
logger.error("存储过程返回错误: {}", msg);
throw new RuntimeException(msg);
}
@ -128,7 +128,7 @@ public class ProductionIssueReturnServiceImpl implements ProductionIssueReturnSe
} catch (Exception e) {
logger.error("验证标签失败，错误信息: {}", e.getMessage(), e);
throw new RuntimeException("验证标签失败: " + e.getMessage(), e);
throw new RuntimeException(e.getMessage(), e);
}
}
@ -181,7 +181,7 @@ public class ProductionIssueReturnServiceImpl implements ProductionIssueReturnSe
// 检查返回的code，如果不是200则抛出异常
Object code = result.get("code");
if (code == null || !"200".equals(code.toString())) {
String msg = result.get("msg") != null ? result.get("msg").toString() : "保存失败";
String msg = result.get("message") != null ? result.get("message").toString() : "保存失败";
logger.error("存储过程返回错误: {}", msg);
throw new RuntimeException(msg);
}

Write Preview
Loading…
Cancel
Save