合同：规格变更问题处理

@@ -413,10 +413,10 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
                             , purchaseOrderInfo.getContractCreateById());
                             , purchaseOrderInfo.getContractCreateById());
                 }
                 }
             }
             }
-            purchaseOrderInfoService.update(orderInfo);
-            // 更新订货单物料行数据
-            purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList());
         }
         }
+        purchaseOrderInfoService.update(orderInfo);
+        // 更新订货单物料行数据
+        purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList());
     }
     }
 
 
     @Override
     @Override

@@ -221,6 +221,9 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
         if (vo.getShowOrder() != null) {
         if (vo.getShowOrder() != null) {
             data.setShowOrder(vo.getShowOrder());
             data.setShowOrder(vo.getShowOrder());
         }
         }
+        if (!StringUtil.isBlank(vo.getType())) {
+            data.setType(vo.getType());
+        }
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);