合同：打印模板修改

@@ -1191,19 +1191,19 @@ public class ContractDistributorStandardController extends DefaultBaseController
 
                             setCellValue(sheet, startRow, 6, line.getMaterialCode());
                             setCellValue(sheet, startRow, 7, line.getStatus());
-                            setCellValue(sheet, startRow, 8, line.getQuantity());
+                            setCellValue(sheet, startRow, 8, line.getQuantity() == null ? "" : line.getQuantity().setScale(2, RoundingMode.HALF_UP).toString());
 
                             if ("INTL_STD_CONTRACT".equals(data.getType())
                                     || "INTL_INVENTORY_AGMT".equals(data.getType())
                                     || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
-                                setCellValue(sheet, startRow, 10, line.getProcessingFee());
-                                setCellValue(sheet, startRow, 11, line.getUnitPrice());
+                                setCellValue(sheet, startRow, 10, line.getProcessingFee() == null ? "" : line.getProcessingFee().toString());
+                                setCellValue(sheet, startRow, 11, line.getUnitPrice() == null ? "" : line.getUnitPrice().toString());
                             } else {
-                                setCellValue(sheet, startRow, 10, line.getUnitPrice());
-                                setCellValue(sheet, startRow, 11, line.getAmountExcludingTax());
+                                setCellValue(sheet, startRow, 10, line.getUnitPrice() == null ? "" : line.getUnitPrice().toString());
+                                setCellValue(sheet, startRow, 11, line.getAmountExcludingTax() == null ? "" : line.getAmountExcludingTax().toString());
                             }
 
-                            setCellValue(sheet, startRow, 12, line.getTotalAmount());
+                            setCellValue(sheet, startRow, 12, line.getTotalAmount() == null ? "" : line.getTotalAmount().toString());
                             setCellValue(sheet, startRow, 13,
                                     line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
                             startRow++;
@@ -1234,9 +1234,9 @@ public class ContractDistributorStandardController extends DefaultBaseController
                             }
                             setCellValue(sheet, startRow, 10, line.getMaterialCode());
                             setCellValue(sheet, startRow, 11, line.getProductStatus());
-                            setCellValue(sheet, startRow, 12, line.getUnitPrice());
-                            setCellValue(sheet, startRow, 13, line.getAmountExcludingTax());
-                            setCellValue(sheet, startRow, 14, line.getTotalAmount());
+                            setCellValue(sheet, startRow, 12, line.getUnitPrice() == null ? "" : line.getUnitPrice().toString());
+                            setCellValue(sheet, startRow, 13, line.getAmountExcludingTax() == null ? "" : line.getAmountExcludingTax().toString());
+                            setCellValue(sheet, startRow, 14, line.getTotalAmount() == null ? "" : line.getTotalAmount().toString());
                             setCellValue(sheet, startRow, 15,
                                     line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
                             startRow++;
@@ -1405,7 +1405,11 @@ public class ContractDistributorStandardController extends DefaultBaseController
             if ("DEALER".equals(query.get(0).getEnterpriseType())) {
                 dataMap.put("remarks", "");
             } else if ("TERMINAL".equals(query.get(0).getEnterpriseType())) {
-                dataMap.put("remarks", "10、贵司在我司的所有订货限于生产使用.");
+                if ("PROCESS_STD_AGMT".equals(data.getType())) {
+                    dataMap.put("remarks", "11、贵司在我司的所有订货限于生产使用.");
+                } else {
+                    dataMap.put("remarks", "10、贵司在我司的所有订货限于生产使用.");
+                }
             } else {
                 dataMap.put("remarks", "");
             }

@@ -435,7 +435,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         // 获取客户信息
         Customer customer = customerService.findById(plan.getCustomerId());
 
-        messageHandler.sendMsg(receiveUserIds, customer.getName() + "开发审核通过消息通知测试"
-                , customer.getName() +"开发审核通过消息通知测试", bizKey, null);
+        messageHandler.sendMsg(receiveUserIds, customer.getName() + "开发审核通过消息通知"
+                , customer.getName() +"开发审核通过消息通知", bizKey, null);
     }
 }