From df20214207804ba2fffc601f20284b26e800ffef Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期三, 16 四月 2025 18:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
index b6217a2..945cc4b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
@@ -110,22 +110,23 @@
List<ApsWeldSeamTemp> apsWeldSeamTemps = apsWeldSeamTempMapper.selectApsWeldSeamTempList(apsWeldSeamTemp);
int count = 0;
String[] ids = new String[apsWeldSeamTemps.size()];
+ apsWeldSeamMapper.removeLastBatch();
for (int i = 0; i < apsWeldSeamTemps.size(); i++) {
//璁板綍涓存椂琛╥d
ids[i] = apsWeldSeamTemps.get(i).getId();
ApsWeldSeam apsWeldSeam = new ApsWeldSeam();
BeanUtils.copyProperties(apsWeldSeamTemps.get(i), apsWeldSeam);
//閫氳繃宸ュ崟鍙锋煡璇㈡槸鍚﹀瓨鍦ㄦ暟鎹�
- ApsWeldSeam apsWeldSeam1 = apsWeldSeamMapper.selectApsWeldSeamByWorkOrderNo(apsWeldSeam.getWorkOrderNo());
+ /*ApsWeldSeam apsWeldSeam1 = apsWeldSeamMapper.selectApsWeldSeamByWorkOrderNo(apsWeldSeam.getWorkOrderNo());
//褰撳伐鍗曞彿瀛樺湪鍒欐洿鏂版暟鎹惁鍒欐彃鍏ユ暟鎹�
if (apsWeldSeam1!=null&&apsWeldSeam1.getId()!=null) {
apsWeldSeam.setId(apsWeldSeam1.getId());
apsWeldSeamMapper.updateApsWeldSeam(apsWeldSeam);
- } else {
+ } else {*/
//鎻掑叆姝ｅ紡琛紝骞惰褰�
- apsWeldSeam.setId(IdUtils.fastUUID());
- apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
- }
+ apsWeldSeam.setId(IdUtils.fastUUID());
+ apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
+ //}
count++;
}
//鎻掑叆鏁伴噺涓庝复鏃惰〃鏌ヨ涓�鐩村垯鍒犻櫎涓存椂琛ㄦ暟鎹�
@@ -280,7 +281,7 @@
sb.append(value.get("work_order_name"));
sb.append("-");
sb.append(value.get("classification_name"));
- if(sb.toString().equals(title.get(i))){//鍒楁槑
+ if(sb.toString().equals(title.get(i)) && month.equals(value.get("produce_month").toString())){
table.add(value.get("total_weld_seam").toString());
}
}
--
Gitblit v1.9.3