Merge branch 'master_sample_order' into master_after0225

房远帅
2 parents 10242b00 ab9d1c74
Showing 1 changed file with 1 additions and 1 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractDistributorStandardController.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractDistributorStandardController.java
View file @2d12585
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractDistributorStandardController.java
View file @2d12585
@@ -1121,7 +1121,6 @@ public class ContractDistributorStandardController extends DefaultBaseController
                     }
                     if (CollectionUtils.isNotEmpty(data.getContractStdProcessingLineList())) {
-                        startRow++;
                         for (GetContractStdProcessingLineBo line : data.getContractStdProcessingLineList()) {
                             setCellValue(sheet, startRow, 1, line.getRawProductName() + "、" + line.getRawProductGradeName());
                             setCellValue(sheet, startRow, 4, line.getSupplyTime());
@@ -1150,6 +1149,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
                             setCellValue(sheet, startRow, 14, line.getTotalAmount());
                             setCellValue(sheet, startRow, 15,
                                     line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
+                            startRow++;
                         }
                     }