From 46bf33053daa5f2bfe163822ce4f793f669024f8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 10 三月 2025 08:28:13 +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 | 101 ++++++++++++++++++++++++++------------------------
1 files changed, 53 insertions(+), 48 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 432e9a1..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
@@ -71,7 +71,6 @@
}
}
Map<String,Object> map = new HashMap<>();
- System.out.println(patchLogDTO.getPatchId());
map.put("data",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLogDTO));
map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLogDTO));
@@ -188,10 +187,15 @@
if(Objects.equals(type, "琛ョ墖")){
alias="BP";
}
- //鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
- Integer maximum=patchMapper.getMaximum();
+ //鏌ヨ褰撳ぉ鏈�鏂扮殑缂栧彿
+ String str=patchMapper.getMaximum();
+ if (str == null){
+ str="00";
+ }
+ String maximum = str.substring(str.length() - 2);
+ int lastTwoInteger = Integer.parseInt(maximum);
//璁剧疆涓や綅涓嶅琛�0
- String formattedNumber = String.format("%02d", maximum+1);
+ String formattedNumber = String.format("%02d", lastTwoInteger+1);
//鏍煎紡鍖栧綋鍓嶆棩鏈�
Date currentDate = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
@@ -213,14 +217,14 @@
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
- if (lableType != 2){
+ 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{
+ 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);
}
@@ -253,12 +257,17 @@
//鍒ゆ柇鏄惁宸茬粡瀹℃牳
if(patchLog1.getReviewStatus()==0){
//鍒犻櫎琛ョ墖琛ㄥ搴旇ˉ鐗噄d鏁版嵁
- patchMapper.deleteReplenishMp(patchLog.getPatchId());
- //淇敼娆＄牬鏄庣粏琛ㄨˉ鐗囨暟閲忓拰鐘舵��
- patchMapper.updatePatchDdMp(patchLog.getReportingWorkId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber(),patchLog.getPatchNum());
+ patchMapper.deleteReplenishMp(patchLog1.getId());
+ //鍒犻櫎娆＄牬鏄庣粏琛�
+ patchMapper.updatePatchDdMp(patchLog1.getReportingWorkId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum(),patchLog1.getPatchReason());
//淇敼鎶ュ伐鏄庣粏琛ㄧ姸鎬�
- patchMapper.updatePatchBgMp(patchLog.getReportingWorkId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber());
-
+ patchMapper.updatePatchBgMp(patchLog1.getReportingWorkId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber());
+ //淇敼鎶ュ伐涓昏〃娆＄牬鏁伴噺
+ reportingWorkMapper.updateRWPatchNum(patchLog1.getReportingWorkId(),patchLog1.getPatchNum());
+ //淇敼鎶ュ伐鍓〃娆＄牬鏁伴噺
+ reportingWorkMapper.updateRWDPatchNum(patchLog1.getReportingWorkId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum());
+ //鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
+ reportingWorkMapper.updateReplenishWorkProcess(patchLog1.getProcessId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum(),patchLog1.getPatchProcesses());
}
else{
saveState = false;
@@ -271,7 +280,7 @@
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setFunc("deleteReplenishSv");
sysErrorService.insert(sysError);
saveState = false;
@@ -296,47 +305,43 @@
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);
}
}
-
-// } catch (Exception e) {
-// TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
-// //灏嗗紓甯镐紶鍏ユ暟鎹簱
-// SysError sysError = new SysError();
-// sysError.setError(e.toString());
-// sysError.setFunc("updateCancelReviewSv");
-// sysErrorService.insert(sysError);
-// saveState = false;
-//
-// }
return saveState;
}
--
Gitblit v1.8.0