From fa04f927a1ce828dd2f8a1ff871bf923b3b39122 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 11 Mar 2026 14:10:10 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-10=20=E5=B1=9E=E6=80=A7=E5=8F=98?=
 =?UTF-8?q?=E5=8A=A8=E5=A2=9E=E5=8A=A0=E3=80=90=E7=BD=AE=E7=A9=BA=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LabelSplitMergeServiceImpl.java      |  2 +-
 .../rollNoReview/data/SFDCRollsOutData.java   | 27 ++++++++++++++-
 .../Impl/ProductionReportServiceImpl.java     |  6 ++--
 .../shopOrder/ProductionReportMapper.xml      | 33 ++++++++++++++-----
 4 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/labelSplitMerge/service/impl/LabelSplitMergeServiceImpl.java b/src/main/java/com/gaotao/modules/labelSplitMerge/service/impl/LabelSplitMergeServiceImpl.java
index cb0add4..c1addcf 100644
--- a/src/main/java/com/gaotao/modules/labelSplitMerge/service/impl/LabelSplitMergeServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/labelSplitMerge/service/impl/LabelSplitMergeServiceImpl.java
@@ -162,7 +162,7 @@ public class LabelSplitMergeServiceImpl extends ServiceImpl<LabelSplitMergeMappe
                 }
 
                 // 生成标签变动事务记录
-                generateSplitTransaction(site, buNo, warehouseId, originalLabelCode, newLabelCode, partNo, batchNo, splitQuantity, remainingQuantity, locationId);
+                //generateSplitTransaction(site, buNo, warehouseId, originalLabelCode, newLabelCode, partNo, batchNo, splitQuantity, remainingQuantity, locationId);
             }
 
             // 6. 获取打印参数列表（拆分需要打印多张标签：原标签 + 所有新标签）
diff --git a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java
index d7b0624..cb2fe16 100644
--- a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java
+++ b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java
@@ -57,6 +57,10 @@ public class SFDCRollsOutData {
 	private String parentRollType;
 	private String finalStatus;
 	private String batchNo;
+	// 置空标志：true 表示将该字段更新为 NULL
+	private Boolean parentRollNoClear;
+	private Boolean batchNoClear;
+	private Boolean remarkClear;
 	// 分页参数
 	private Integer page;
 	private Integer limit;
@@ -451,5 +455,26 @@ public class SFDCRollsOutData {
 	public void setCQCNeedInspectFlag(String cQCNeedInspectFlag) {
 		CQCNeedInspectFlag = cQCNeedInspectFlag;
 	}
-	
+
+	public Boolean getParentRollNoClear() {
+		return parentRollNoClear;
+	}
+	public void setParentRollNoClear(Boolean parentRollNoClear) {
+		this.parentRollNoClear = parentRollNoClear;
+	}
+
+	public Boolean getBatchNoClear() {
+		return batchNoClear;
+	}
+	public void setBatchNoClear(Boolean batchNoClear) {
+		this.batchNoClear = batchNoClear;
+	}
+
+	public Boolean getRemarkClear() {
+		return remarkClear;
+	}
+	public void setRemarkClear(Boolean remarkClear) {
+		this.remarkClear = remarkClear;
+	}
+
 }
diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java
index 62ebd39..e6cba23 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java
@@ -197,9 +197,9 @@ public class ProductionReportServiceImpl implements ProductionReportService {
     @Override
     public void updateSfdcRollsAttribute(List<SFDCRollsOutData> indata) {
         for (SFDCRollsOutData data : indata) {
-            data.setParentRollNo(data.getParentRollNo().trim());
-            data.setBatchNo(data.getBatchNo().trim());
-            data.setRemark(data.getRemark().trim());
+            if (data.getParentRollNo() != null) data.setParentRollNo(data.getParentRollNo().trim());
+            if (data.getBatchNo() != null) data.setBatchNo(data.getBatchNo().trim());
+            if (data.getRemark() != null) data.setRemark(data.getRemark().trim());
             productionReportMapper.updateSfdcRollsAttribute(data);
         }
     }
diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
index b5e104e..5e475dc 100644
--- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
@@ -34,15 +34,30 @@
     <update id="updateSfdcRollsAttribute">
         update SFDC_Rolls set
         site = #{Site},
-        <if test="parentRollNo != null and parentRollNo != ''">
-            parent_roll_no = #{parentRollNo},
-        </if>
-        <if test="batchNo != null and batchNo != ''">
-            batch_no = #{batchNo},
-        </if>
-        <if test="Remark != null and Remark != ''">
-            Remark = #{Remark},
-        </if>
+        <choose>
+            <when test="parentRollNoClear != null and parentRollNoClear == true">
+                parent_roll_no = NULL,
+            </when>
+            <when test="parentRollNo != null and parentRollNo != ''">
+                parent_roll_no = #{parentRollNo},
+            </when>
+        </choose>
+        <choose>
+            <when test="batchNoClear != null and batchNoClear == true">
+                batch_no = NULL,
+            </when>
+            <when test="batchNo != null and batchNo != ''">
+                batch_no = #{batchNo},
+            </when>
+        </choose>
+        <choose>
+            <when test="remarkClear != null and remarkClear == true">
+                Remark = NULL,
+            </when>
+            <when test="Remark != null and Remark != ''">
+                Remark = #{Remark},
+            </when>
+        </choose>
         OrderNo = #{OrderNo}
         where site = #{Site} and OrderNo = #{OrderNo}  and RollNo = #{RollNo}
     </update>