报错，无法打印预览采购订单;创建非资产消耗性采购申请报错。

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js

@@ -1018,8 +1018,8 @@ function totalGrid(money) {
             zepFtamount = MathUtil.add(zepFtamount, _kzwi11);
         });
     }
-    $('#zepFtamount1').val(zepFtamount1);
-    $('#zepFtamount').val(zepFtamount);
+    $('#zepFtamount1').val(Public.currency(zepFtamount1));
+    $('#zepFtamount').val(Public.currency(zepFtamount));
 }
 
 function initFinancialAuditGridData(){
@@ -1053,8 +1053,8 @@ function totalFinancialAuditGrid(data){
         zepPtamount = MathUtil.add(zepPtamount, _zepPtdamount);
         zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1);
     });
-    $('#zepPtamount').val(zepPtamount);
-    $('#zepPtamount1').val(zepPtamount1);
+    $('#zepPtamount').val(Public.currency(zepPtamount));
+    $('#zepPtamount1').val(Public.currency(zepPtamount1));
 }
 
 function reloadGrid(){

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js

@@ -246,6 +246,7 @@ function initbstmi(mtart){
 
 function initueetk(mtart){
     if (mtart == "ZBCP" || mtart == "ZZCP" || mtart == "ZSHB"){
+        UICtrl.setElRequiredFlag("#ueetk", true);
         $("#ueetk").val("X");//允许未限制的过量交货
         $("#ueetk_text").val("是");//允许未限制的过量交货
     }else {

topsun-xt/src/main/webapp/template/print/topsun/processOuter.ftl

@@ -70,9 +70,9 @@
         <td class="left">外发单号</td>
         <td class="left">${ebeln?default("")?html}</td>
         <td class="left">外发日期</td>
-        <td class="left"><@formatDate date=fillinDate/></td>
+        <td class="left">${fillinDate?default("")?html}</td>
         <td class="left">交货日期</td>
-        <td class="left"><@formatDate date=eindt/></td>
+        <td class="left">${eindt?default("")?html}</td>
         <td class="left">联系人电话</td>
         <td class="left">${telf1?default("")?html}</td>
 

topsun-xt/src/main/webapp/template/print/topsun/processOuter2.ftl

@@ -70,9 +70,9 @@
         <td class="left">外发单号</td>
         <td class="left">${ebeln?default("")?html}</td>
         <td class="left">外发日期</td>
-        <td class="left"><@formatDate date=fillinDate/></td>
+        <td class="left">${fillinDate?default("")?html}</td>
         <td class="left">交货日期</td>
-        <td class="left"><@formatDate date=eindt/></td>
+        <td class="left">${eindt?default("")?html}</td>
         <td class="left">联系人电话</td>
         <td class="left">${telf1?default("")?html}</td>
 

topsun/src/main/java/com/huigou/topsun/sap/purchase/application/impl/SapPurchaseApplicationImpl.java

@@ -83,8 +83,14 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
         } else {
             sapPurchase = (SapPurchase) commonDomainService.loadAndFillinProperties(sapPurchase);
         }
-        sapPurchase = sapPurchaseRepository.save(sapPurchase);
         List<SapPurchaseItem> sapPurchaseItems = getBizEntities(SapPurchaseItem.class, "sapPurchaseItems");
+        Set<String> collect = sapPurchaseItems
+                .stream()
+                .map(SapPurchaseItem::getKostl)
+                .collect(Collectors.toSet());
+        String kostl = String.join(",", collect);
+        sapPurchase.setKostl(kostl);
+        sapPurchase = sapPurchaseRepository.save(sapPurchase);
         sapPurchaseItemApplication.saveSapPurchaseItems(sapPurchase.getId(),sapPurchaseItems);
 
         /*List<SapPurchaseVo> purchaseVoList = this.getSapPurchaseVoJson(sapPurchase);

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java

@@ -515,6 +515,9 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
     public Map<String, Object> print(String id) {
         SapPurchaseOrder sapPurchaseOrder = this.sapPurchaseOrderRepository.findOne(id);
         Map<String, Object> map = ClassHelper.beanToMap(sapPurchaseOrder);
+        if (sapPurchaseOrder.getFillinDate()!=null){
+            map.put("fillinDate", DateUtil.getDateFormat(sapPurchaseOrder.getFillinDate(),"yyyy-MM-dd"));
+        }
         //获取加工商信息
         String lifnr = sapPurchaseOrder.getLifnr();
         map = this.getSupplierInfo(map,lifnr);
@@ -523,7 +526,11 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         //map.put("page","/print/topsun/productProcessOuter.ftl");
 
         List<SapPurchaseOrderItem> purchaseOrderItems = this.sapPurchaseOrderItemApplication.getPurchaseOrderItems(sapPurchaseOrder.getId());
-        map.put("eindt",purchaseOrderItems.get(0).getEindt());//交货时间
+        String eindt ="";
+        if (purchaseOrderItems.get(0).getEindt() != null){
+            eindt = DateUtil.getDateFormat(purchaseOrderItems.get(0).getEindt(),"yyyy-MM-dd");
+        }
+        map.put("eindt",eindt);//交货时间
         map.put("telf1",purchaseOrderItems.get(0).getTelf1());//联系电话
         map.put("lgobe",purchaseOrderItems.get(0).getLgobe());//仓库
         map.put("werks",purchaseOrderItems.get(0).getWerks());//工厂
@@ -730,7 +737,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
                 .map(p -> new ProductKey(p.getProductCode(), p.getWempf(),p.getKbetr()))
                 .distinct()  // 如果类正确实现了 equals() 和 hashCode()
                 .collect(Collectors.toList()));
-        map.put("eindt",outsourceOrderItemList.get(0).getEeind());
+        //map.put("eindt",outsourceOrderItemList.get(0).getEeind());
         List<Map<String,Object>> detailList = new ArrayList<>();
         for (int i = 0; i < uniqueProductList.size(); i++) {
             Map<String, Object> detailMap = new HashMap<>();