1：合同打印模板修改；2：订货单模板修改

@@ -36,11 +36,14 @@ import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.contract.ContractFrameworkService;
 import com.lframework.xingyun.sc.service.contract.ContractFrameworkService;
 import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
 import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
+import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
+import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
+import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
@@ -110,6 +113,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
     private ContractStdProcessingLineService contractStdProcessingLineService;
     private ContractStdProcessingLineService contractStdProcessingLineService;
     @Resource
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private CustomerCreditService customerCreditService;
 
 
 
 
     public static final String SUPPLIER_DIC_CODE = "SUPPLIER"; // 所属单位/供方
     public static final String SUPPLIER_DIC_CODE = "SUPPLIER"; // 所属单位/供方
@@ -1243,8 +1248,21 @@ public class ContractDistributorStandardController extends DefaultBaseController
         } else {
         } else {
             dataMap.put("includesTransportOrPackaging", "单价中不包含包装费用与运费");
             dataMap.put("includesTransportOrPackaging", "单价中不包含包装费用与运费");
         }
         }
-
-        dataMap.put("remarks", data.getRemarks());
+        //企业类型为经销商
+        QueryCustomerCreditVo vo = new QueryCustomerCreditVo();
+        vo.setCompanyId(data.getBuyer());
+        List<CustomerCredit> query = customerCreditService.query(vo);
+        if (CollectionUtils.isNotEmpty(query) && query.get(0) != null) {
+            if ("DEALER".equals(query.get(0).getEnterpriseType())) {
+                dataMap.put("remarks", "");
+            } else if ("TERMINAL".equals(query.get(0).getEnterpriseType())) {
+                dataMap.put("remarks", "10、□贵司在我司的所有订货限于生产使用.");
+            } else {
+                dataMap.put("remarks", "");
+            }
+        } else {
+            dataMap.put("remarks", "");
+        }
         return dataMap;
         return dataMap;
     }
     }
 
 

@@ -423,7 +423,13 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
 
 
                             setCellValue(sheet, startRow, 11, currentOrderLine.getStatus());
                             setCellValue(sheet, startRow, 11, currentOrderLine.getStatus());
                             setCellValue(sheet, startRow, 13, currentOrderLine.getQuantity());
                             setCellValue(sheet, startRow, 13, currentOrderLine.getQuantity());
-                            setCellValue(sheet, startRow, 14, currentOrderLine.getSalesPrice());
+                            if ("PRODUCTION_PROCESS".equals(templateType)) {
+                                setCellValue(sheet, startRow, 14, "");
+                                setCellValue(sheet, startRow, 17, "");
+                            } else {
+                                setCellValue(sheet, startRow, 14, currentOrderLine.getSalesPrice());
+                                setCellValue(sheet, startRow, 17, currentOrderLine.getAssessmentExceedsAgreement());
+                            }
                             setCellValue(sheet, startRow, 16, currentOrderLine.getDeliveryDate());
                             setCellValue(sheet, startRow, 16, currentOrderLine.getDeliveryDate());
                             setCellValue(sheet, startRow, 17, currentOrderLine.getAssessmentExceedsAgreement());
                             setCellValue(sheet, startRow, 17, currentOrderLine.getAssessmentExceedsAgreement());
                             totalQuantity = totalQuantity.add(currentOrderLine.getQuantity());
                             totalQuantity = totalQuantity.add(currentOrderLine.getQuantity());