Commit ab9d1c74d85f29cbf41eb053ff745232eccc6cdd

Authored by 房远帅
1 parent 90273e3c

加工合同:打印规格不全问题修复

@@ -1120,7 +1120,6 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -1120,7 +1120,6 @@ public class ContractDistributorStandardController extends DefaultBaseController
1120 } 1120 }
1121 1121
1122 if (CollectionUtils.isNotEmpty(data.getContractStdProcessingLineList())) { 1122 if (CollectionUtils.isNotEmpty(data.getContractStdProcessingLineList())) {
1123 - startRow++;  
1124 for (GetContractStdProcessingLineBo line : data.getContractStdProcessingLineList()) { 1123 for (GetContractStdProcessingLineBo line : data.getContractStdProcessingLineList()) {
1125 setCellValue(sheet, startRow, 1, line.getRawProductName() + "、" + line.getRawProductGradeName()); 1124 setCellValue(sheet, startRow, 1, line.getRawProductName() + "、" + line.getRawProductGradeName());
1126 setCellValue(sheet, startRow, 4, line.getSupplyTime()); 1125 setCellValue(sheet, startRow, 4, line.getSupplyTime());
@@ -1149,6 +1148,7 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -1149,6 +1148,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
1149 setCellValue(sheet, startRow, 13, line.getTotalAmount()); 1148 setCellValue(sheet, startRow, 13, line.getTotalAmount());
1150 setCellValue(sheet, startRow, 14, 1149 setCellValue(sheet, startRow, 14,
1151 line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : ""); 1150 line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
  1151 + startRow++;
1152 } 1152 }
1153 } 1153 }
1154 1154