aps-保存订单时，增加校验合并订单是否为空

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

@@ -277,8 +277,11 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
             apsProductDetailService.saveOrUpdateBatch(productDetailDoList);
 
             //保存合并订单子表
-            for (ApsProductionMergeOrderDo apsProductionMergeOrderDo : apsProductionMergeOrderDoList) {
-                apsProductionMergeOrderDo.setTenantid(tenantId);
+            if (ObjectUtil.isNotEmpty(apsProductionMergeOrderDoList)) {
+                for (ApsProductionMergeOrderDo apsProductionMergeOrderDo : apsProductionMergeOrderDoList) {
+                    apsProductionMergeOrderDo.setTenantid(tenantId);
+                }
+                apsProductionMergeOrderService.saveOrUpdateBatch(apsProductionMergeOrderDoList);
             }
         }