From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index 54885a1..8bf6888 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -219,12 +219,12 @@
for (FlowCard flowCard : flowCardList) {
if (lableType != 2){//鎴愬搧鏍囩
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getRepairPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId()));
+ itemmap.put("data", flowCardMapper.getRepairPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber()));
list.add(itemmap);
}
else{//灏忕墖鏍囩
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId()));
+ itemmap.put("data", flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber()));
list.add(itemmap);
}
@@ -305,34 +305,41 @@
List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
if (!patchLoglist.isEmpty()){
for (PatchLog patchLog : patchLoglist) {
+ //鏌ヨ鏄惁宸茬敓鎴愬伐绋嬪彿
+ Integer projectCount = patchMapper.selectProjectCount(patchLog.getProcessId(),patchLog.getPatchId(),patchLog.getTechnologyNumber());
//鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(patchLog.getProcessId(), String.valueOf(patchLog.getTechnologyNumber()));
- if (technologicalProcess!=null || !technologicalProcess.equals("")) {
- String[] processList = technologicalProcess.split("->");
- //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
- String interceptProcess = processList[0];
- Integer firstStep=reportingWorkMapper.getFirstStep(patchLog.getProcessId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber(),interceptProcess);
- if (firstStep>=patchLog.getPatchNum()){
- ReportingWork reportingWork = reportingWorkMapper
- .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
- //淇敼灏忕墖娴佺▼鍗℃暟閲�
- patchMapper.updateOrderProcessDetailCancel(patchLog,reportingWork);
- //瀹℃牳
- patchMapper.updateReplenishCancel(patchLog);
- }
- else {
- saveState = false;
- }
- }else{
+ if (projectCount == 0){
+ if (technologicalProcess!=null || !technologicalProcess.equals("")) {
+ String[] processList = technologicalProcess.split("->");
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ String interceptProcess = processList[0];
+ Integer firstStep=reportingWorkMapper.getFirstStep(patchLog.getProcessId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber(),interceptProcess);
+ if (firstStep>=patchLog.getPatchNum()){
+ ReportingWork reportingWork = reportingWorkMapper
+ .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
+ //淇敼灏忕墖娴佺▼鍗℃暟閲�
+ patchMapper.updateOrderProcessDetailCancel(patchLog,reportingWork);
+ //瀹℃牳
+ patchMapper.updateReplenishCancel(patchLog);
+ }
+ else {
+ saveState = false;
+ }
+ }else{
+ saveState = false;
+ }
+
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("updateCancelReviewSv琛ョ墖鍙嶅");
+ log.setOperatorId((String) object.get("userId"));
+ log.setOperator((String) object.get("userName"));
+ logService.saveLog(log);
+ } else {
saveState = false;
}
- Log log = new Log();
- log.setContent(object.toString());
- log.setFunction("updateCancelReviewSv琛ョ墖鍙嶅");
- log.setOperatorId((String) object.get("userId"));
- log.setOperator((String) object.get("userName"));
- logService.saveLog(log);
}
}
--
Gitblit v1.8.0