多选打印；解决采购订单打印时空指针错误；采购申请审批单退回后删单

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.js

@@ -139,21 +139,51 @@ function resetForm(obj) {
 }
 
 function printHandler(){
-    var row = DataUtil.getUpdateRow(purchaseOrderGridManager);
-    if (!row) {
+    var rows = purchaseOrderGridManager.getSelectedRows();
+    if (rows.length == 0) {
+        Public.tip('请选择数据!');
         return;
     }
+    var ids = [];
+    for (var i = 0; i < rows.length; i++){
+        var row=rows[i];
+        //工序外协ZNB3
+        //成品外购的类型是ZNB1+knttp包含‘M’
+        if ((row.bsart == "ZNB1" && row.knttp.indexOf("M") !== -1) || row.bsart == "ZNB3"){
             var url='/sapPurchaseOrder/print.load';
-    Public.openPostWindow(web_app.name+url,{id: row.id});
+            Public.openPostWindow(web_app.name+url,{id:row.id});
+        }else {
+            Public.tip("请选择工序外协单或者外购单");
+            return false;
+        }
+    }
 }
 
 function sapPrintProduceNoHandler(){
-    var row = DataUtil.getUpdateRow(purchaseOrderGridManager);
-    if (!row) {
+    // var row = DataUtil.getUpdateRow(purchaseOrderGridManager);
+    // if (!row) {
+    //     return;
+    // }
+    // var url='/sapPurchaseOrder/printProduceNo.load';
+    // Public.openPostWindow(web_app.name+url,{id: row.id});
+    var rows = purchaseOrderGridManager.getSelectedRows();
+    if (rows.length == 0) {
+        Public.tip('请选择数据!');
         return;
     }
+    var ids = [];
+    for (var i = 0; i < rows.length; i++){
+        var row=rows[i];
+        //工序外协ZNB3
+        //成品外购的类型是ZNB1+knttp包含‘M’
+        if ((row.bsart == "ZNB1" && row.knttp.indexOf("M") !== -1) || row.bsart == "ZNB3"){
             var url='/sapPurchaseOrder/printProduceNo.load';
-    Public.openPostWindow(web_app.name+url,{id: row.id});
+            Public.openPostWindow(web_app.name+url,{id:row.id});
+        }else {
+            Public.tip("请选择工序外协单或者外购单");
+            return false;
+        }
+    }
 }
 
 function sendOutHandler(){

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java

@@ -308,8 +308,8 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
             if ("7".equals(sapPurchaseApprovalItem.getPstyp())){
                 sapPurchaseApproval.setBatxt(sapPurchaseApprovalItem.getPtext());
             }
-            if ("L".equals(approvalItemVo.getLoekz())){
-                loekz = "L";
+            if ("X".equals(approvalItemVo.getLoekz())){
+                loekz = "X";
             }
         }
         //knttp审批要素没有值时，赋值0，防止发起流程时报错
@@ -349,7 +349,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
                     sapPurchaseApprovalItemApplication.deleteByIds(collect);
                     purchaseApprovalId = purchaseApproval.getId();
 
-                    if ("L".equals(loekz)){
+                    if ("X".equals(loekz)){
                         purchaseApproval.setStatusId(BizBillStatus.ABORTED.getId());
                         baseTask.deleteRunTimeTaskExtensionByBizId(purchaseApproval.getId());
                         baseTask.updateHistoricTaskInstanceExtensionByBizId(purchaseApproval.getId());

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

@@ -764,9 +764,12 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
                     if (priceUnit != null && priceUnit.compareTo(BigDecimal.ONE) > 0){
                         kbetr = kbetr.divide(priceUnit,4, RoundingMode.HALF_UP);
 
+                        if (freight != null){
                             freight = freight.divide(priceUnit,4, RoundingMode.HALF_UP);
-
+                        }
+                        if (packMoney!= null){
                             packMoney = packMoney.divide(priceUnit,4, RoundingMode.HALF_UP);
+                        }
 
                         priceAmount = priceAmount.divide(priceUnit,4, RoundingMode.HALF_UP);
                     }