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 | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 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 04f0a32..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
@@ -187,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");
@@ -212,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);
}
@@ -330,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