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 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 SFDC_Rolls set site = #{Site}, - - parent_roll_no = #{parentRollNo}, - - - batch_no = #{batchNo}, - - - Remark = #{Remark}, - + + + parent_roll_no = NULL, + + + parent_roll_no = #{parentRollNo}, + + + + + batch_no = NULL, + + + batch_no = #{batchNo}, + + + + + Remark = NULL, + + + Remark = #{Remark}, + + OrderNo = #{OrderNo} where site = #{Site} and OrderNo = #{OrderNo} and RollNo = #{RollNo}