朱园亮 / xingyun-erp · Commits

Commit f492b522a87a18a7ff9de33f69007e43fc61023e

Authored by 房远帅
1 parent 7e44d40d

合同：打印模板修改

Inline Side-by-side
Showing 5 changed files with 16 additions and 12 deletions
@@ -1191,19 +1191,19 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -1191,19 +1191,19 @@ public class ContractDistributorStandardController extends DefaultBaseController
1191 1191
1192 setCellValue(sheet, startRow, 6, line.getMaterialCode()); 1192 setCellValue(sheet, startRow, 6, line.getMaterialCode());
1193 setCellValue(sheet, startRow, 7, line.getStatus()); 1193 setCellValue(sheet, startRow, 7, line.getStatus());
1194 - setCellValue(sheet, startRow, 8, line.getQuantity()); 1194 + setCellValue(sheet, startRow, 8, line.getQuantity() == null ? "" : line.getQuantity().setScale(2, RoundingMode.HALF_UP).toString());
1195 1195
1196 if ("INTL_STD_CONTRACT".equals(data.getType()) 1196 if ("INTL_STD_CONTRACT".equals(data.getType())
1197 || "INTL_INVENTORY_AGMT".equals(data.getType()) 1197 || "INTL_INVENTORY_AGMT".equals(data.getType())
1198 || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) { 1198 || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
1199 - setCellValue(sheet, startRow, 10, line.getProcessingFee());  
1200 - setCellValue(sheet, startRow, 11, line.getUnitPrice()); 1199 + setCellValue(sheet, startRow, 10, line.getProcessingFee() == null ? "" : line.getProcessingFee().toString());
  1200 + setCellValue(sheet, startRow, 11, line.getUnitPrice() == null ? "" : line.getUnitPrice().toString());
1201 } else { 1201 } else {
1202 - setCellValue(sheet, startRow, 10, line.getUnitPrice());  
1203 - setCellValue(sheet, startRow, 11, line.getAmountExcludingTax()); 1202 + setCellValue(sheet, startRow, 10, line.getUnitPrice() == null ? "" : line.getUnitPrice().toString());
  1203 + setCellValue(sheet, startRow, 11, line.getAmountExcludingTax() == null ? "" : line.getAmountExcludingTax().toString());
1204 } 1204 }
1205 1205
1206 - setCellValue(sheet, startRow, 12, line.getTotalAmount()); 1206 + setCellValue(sheet, startRow, 12, line.getTotalAmount() == null ? "" : line.getTotalAmount().toString());
1207 setCellValue(sheet, startRow, 13, 1207 setCellValue(sheet, startRow, 13,
1208 line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : ""); 1208 line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
1209 startRow++; 1209 startRow++;
@@ -1234,9 +1234,9 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -1234,9 +1234,9 @@ public class ContractDistributorStandardController extends DefaultBaseController
1234 } 1234 }
1235 setCellValue(sheet, startRow, 10, line.getMaterialCode()); 1235 setCellValue(sheet, startRow, 10, line.getMaterialCode());
1236 setCellValue(sheet, startRow, 11, line.getProductStatus()); 1236 setCellValue(sheet, startRow, 11, line.getProductStatus());
1237 - setCellValue(sheet, startRow, 12, line.getUnitPrice());  
1238 - setCellValue(sheet, startRow, 13, line.getAmountExcludingTax());  
1239 - setCellValue(sheet, startRow, 14, line.getTotalAmount()); 1237 + setCellValue(sheet, startRow, 12, line.getUnitPrice() == null ? "" : line.getUnitPrice().toString());
  1238 + setCellValue(sheet, startRow, 13, line.getAmountExcludingTax() == null ? "" : line.getAmountExcludingTax().toString());
  1239 + setCellValue(sheet, startRow, 14, line.getTotalAmount() == null ? "" : line.getTotalAmount().toString());
1240 setCellValue(sheet, startRow, 15, 1240 setCellValue(sheet, startRow, 15,
1241 line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : ""); 1241 line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
1242 startRow++; 1242 startRow++;
@@ -1405,7 +1405,11 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -1405,7 +1405,11 @@ public class ContractDistributorStandardController extends DefaultBaseController
1405 if ("DEALER".equals(query.get(0).getEnterpriseType())) { 1405 if ("DEALER".equals(query.get(0).getEnterpriseType())) {
1406 dataMap.put("remarks", ""); 1406 dataMap.put("remarks", "");
1407 } else if ("TERMINAL".equals(query.get(0).getEnterpriseType())) { 1407 } else if ("TERMINAL".equals(query.get(0).getEnterpriseType())) {
1408 - dataMap.put("remarks", "10、贵司在我司的所有订货限于生产使用."); 1408 + if ("PROCESS_STD_AGMT".equals(data.getType())) {
  1409 + dataMap.put("remarks", "11、贵司在我司的所有订货限于生产使用.");
  1410 + } else {
  1411 + dataMap.put("remarks", "10、贵司在我司的所有订货限于生产使用.");
  1412 + }
1409 } else { 1413 } else {
1410 dataMap.put("remarks", ""); 1414 dataMap.put("remarks", "");
1411 } 1415 }
@@ -435,7 +435,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe @@ -435,7 +435,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
435 // 获取客户信息 435 // 获取客户信息
436 Customer customer = customerService.findById(plan.getCustomerId()); 436 Customer customer = customerService.findById(plan.getCustomerId());
437 437
438 - messageHandler.sendMsg(receiveUserIds, customer.getName() + "开发审核通过消息通知测试"  
439 - , customer.getName() +"开发审核通过消息通知测试", bizKey, null); 438 + messageHandler.sendMsg(receiveUserIds, customer.getName() + "开发审核通过消息通知"
  439 + , customer.getName() +"开发审核通过消息通知", bizKey, null);
440 } 440 }
441 } 441 }