From dbc21eab942c1d504a11448c0aa58adc53b7b8b5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 10 二月 2025 08:59:47 +0800
Subject: [PATCH] 提交 更换客户带出历史项目列表
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 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 3253d20..24c37ab 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
@@ -5,6 +5,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.dto.pp.PatchLogAddDTO;
+import com.example.erp.dto.pp.PatchLogDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
@@ -57,7 +58,7 @@
}
- public Map<String, Object> SelectReplenish(Integer pageNum, Integer pageSize,List<String> selectDate,PatchLog patchLog) {
+ public Map<String, Object> SelectReplenish(Integer pageNum, Integer pageSize, List<String> selectDate, PatchLogDTO patchLogDTO) {
Integer offset = (pageNum-1)*pageSize;
String endDate = LocalDate.now().toString();
String startDate = LocalDate.now().minusDays(15).toString();
@@ -70,8 +71,8 @@
}
}
Map<String,Object> map = new HashMap<>();
- map.put("data",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLog));
- map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLog));
+ map.put("data",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLogDTO));
+ map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLogDTO));
List<String> list = new ArrayList<>();
list.add(startDate);
@@ -186,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");
@@ -211,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);
}
@@ -251,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;
@@ -269,7 +280,7 @@
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setFunc("deleteReplenishSv");
sysErrorService.insert(sysError);
saveState = false;
@@ -324,17 +335,6 @@
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