aps-提交时更新所有涉及客户订单号冗余字段的地方

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsProductionOrderService.java

@@ -52,5 +52,4 @@ public interface ApsProductionOrderService extends IService<ApsProductionOrderDo
 
     void dataEyeReport();
 
-    void setBlankColumn(ApsProductionOrderDo orderDo, List<ApsBlankOrderDo> apsBlankOrderDoList, List<ApsProductDetailDo> apsProductDetailVoList, List<ApsProductionMergeOrderDo> apsProductionMergeOrderDoList);
 }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -1285,10 +1285,9 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
         List<ApsProductionMergeOrderDo> apsProductionMergeOrderDoList = apsProductionMergeOrderService.list(new LambdaQueryWrapper<ApsProductionMergeOrderDo>().eq(ApsProductionMergeOrderDo::getMainid, orderId));
         //查询坯料计划列表
         List<ApsBlankOrderDo> apsBlankOrderDoList = apsBlankOrderService.list(new LambdaQueryWrapper<ApsBlankOrderDo>().eq(ApsBlankOrderDo::getProductionorderid, orderId));
-        apsProductionOrderService.setBlankColumn(apsProductionOrderDo, apsBlankOrderDoList, apsProductDetailVoList, apsProductionMergeOrderDoList);
+        setBlankColumn(apsProductionOrderDo, apsBlankOrderDoList, apsProductDetailVoList, apsProductionMergeOrderDoList);
     }
 
-    @Transactional
     public void setBlankColumn(ApsProductionOrderDo orderDo, List<ApsBlankOrderDo> apsBlankOrderDoList, List<ApsProductDetailDo> apsProductDetailVoList, List<ApsProductionMergeOrderDo> apsProductionMergeOrderDoList) {
         //根据订单和产品明细，及其合并订单，重新赋值 坯料计划和输出成品的冗余字段
         String orderno = StringUtils.isNotBlank(orderDo.getOrderno()) ? orderDo.getOrderno() : "";
@@ -1309,6 +1308,9 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                     } else {
                         needUpdateDetail.setCustomorderno(apsProductionMergeOrderDo.getCustomorderno());
                     }
+                    if (needUpdateDetail.getCustomorderno() != apsProductDetailDo.getCustomorderno()){
+                        needUpdateDetailList.add(needUpdateDetail);
+                    }
                 } else {
                     if (customorderno != apsProductDetailDo.getCustomorderno()) {
                         ApsProductDetailDo needUpdateDetail = new ApsProductDetailDo();