采购申请、采购订单、采购申请审批增加撤销审批

topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.js

@@ -18,7 +18,7 @@ function initPurchaseListGrid() {
 
                 var rows = purchaseGridManager.getSelectedRows();
                 if (rows.length == 0||rows.length>1) {
-                        Public.tip("请选择一条数据！");
+                        Public.tip("请选择一条已完成的数据！");
                         return;
                     }
                 if (rows[0].status!=3){
@@ -27,8 +27,7 @@ function initPurchaseListGrid() {
                  }
                 UICtrl.confirm('确定要把当前单据撤销审批吗?',function(){
                  Public.ajax(web_app.name+'/sapPurchase/revokeApproval.ajax', {id:rows[0].id}, function(msg) {
-                   // reloadGrid();
-                   // _self.close();
+                           purchaseGridManager.loadData();
                  });
                 });
                    // var newRow = JSON.parse(JSON.stringify(row));

topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE2PurchaseDetail.js

@@ -61,11 +61,15 @@ function initAufnr(knttp){
 
 function initItemGrid() {
     var canEdit = true;
-    if (!isApplyProcUnit){
-        canEdit = false;
+    if( typeof(isApplyProcUnit) =='function') {
+        if (!isApplyProcUnit) {
+            canEdit = false;
+        }
     }
-    if ("financeNode" == getSubProcUnitId()){
-        canEdit = true;
+    if( typeof(getSubProcUnitId) =='function') {
+        if ("financeNode" == getSubProcUnitId()) {
+            canEdit = true;
+        }
     }
     var toolbar = UICtrl.getDefaultToolbarOptions({
         addHandler: function () {
@@ -150,7 +154,7 @@ function initItemGrid() {
 
 function getGridColumns() {
     var columns = [];
-    if ("financeNode" == getSubProcUnitId()){
+    if (typeof(getSubProcUnitId) =='function'&&"financeNode" == getSubProcUnitId()){
         columns.push({
             display: "申购项次号", name: "bnfpo", width: "80", align: "left", type: "string",
         },);
@@ -524,7 +528,7 @@ function businessJudgmentUnit() {
         return true;
     }else {
         //财务节点
-        if ("financeNode" === getSubProcUnitId()){
+        if (typeof(getSubProcUnitId) =='function'&&"financeNode" === getSubProcUnitId()){
             UICtrl.disable("#knttp");
             return true;
         }

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.js

@@ -11,7 +11,24 @@ function initUI() {
 
 function initPurchaseListGrid() {
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
-        //addHandler: addHandler,
+        revokeApproveHandler: {
+            id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
+                var rows = purchaseApprovalGridManager.getSelectedRows();
+                if (rows.length == 0 || rows.length > 1) {
+                    Public.tip("请选择一条已完成的数据！");
+                    return;
+                }
+                if (rows[0].status != 3) {
+                    Public.tip("请选择一条已完成的数据！");
+                    return;
+                }
+                UICtrl.confirm('确定要把当前单据撤销审批吗?', function () {
+                    Public.ajax(web_app.name + '/sapPurchaseApproval/revokeApproval.ajax', {id: rows[0].id}, function (msg) {
+                        purchaseApprovalGridManager.loadData();
+                    });
+                });
+            }
+        }
     });
     purchaseApprovalGridManager = UICtrl.grid('#purchaseApprovalGrid', {
             columns: [

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

@@ -10,10 +10,27 @@ function initUI() {
 }
 
 function loadGrid() {
-    // var toolbarOptions = UICtrl.getDefaultToolbarOptions({
-    //     addHandler: addHandler,
-    // });
-    debugger
+    var toolbarOptions = UICtrl.getDefaultToolbarOptions({
+      revokeApproveHandler: {
+          id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
+              var rows = purchaseOrderGridManager.getSelectedRows();
+              if (rows.length == 0 || rows.length > 1) {
+                  Public.tip("请选择一条已完成的数据！");
+                  return;
+              }
+              if (rows[0].status != 3) {
+                  Public.tip("请选择一条已完成的数据！");
+                  return;
+              }
+              UICtrl.confirm('确定要把当前单据撤销审批吗?', function () {
+                  Public.ajax(web_app.name + '/sapPurchaseOrder/revokeApproval.ajax', {id: rows[0].id}, function (msg) {
+                      purchaseOrderGridManager.loadData();
+                  });
+              });
+          }
+        }
+        });
+    //debugger
     purchaseOrderGridManager = UICtrl.grid('#purchaseOrderGrid', {
             columns: [
                 {display: "状态", name: "statusTextView", width: "100", align: "left", type: "string"}
@@ -29,9 +46,10 @@ function loadGrid() {
             dataAction: 'server',
             url: web_app.name + '/sapPurchaseOrder/slicedSapPurchaseOrderList.ajax?',
             //parms: {requireItemId: $("#prepareItemId").val()},
-            // toolbar: toolbarOptions,
+            toolbar: toolbarOptions,
             width: '99.8%',
             height: '100%',
+            checkbox: true,
             pageSize: 100,
             heightDiff: -4,
             usePager: true,

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

@@ -21,7 +21,7 @@
                 </div>
                 <x:searchButtons/>
             </form>
-            <x:title title="采购审批明细" hideTable="#purchaseOrderGrid" name="list"/>
+            <x:title title="" hideTable="#purchaseOrderGrid" name="list"/>
             <div id="purchaseOrderGrid" style="margin:2px;"></div>
         </div>
     </div>

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/SapPurchaseApprovalApplication.java

@@ -22,4 +22,6 @@ public interface SapPurchaseApprovalApplication {
     SapPurchaseApproval loadSapPurchaseApproval(String id);
 
     void saveSapPurchaseApprovalVo(SapPurchaseApprovalDto sapPurchaseApprovalDto);
+
+    String revokeApproval(String id);
 }

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

@@ -14,6 +14,8 @@ import com.huigou.topsun.base.bsnMessage.appliction.MannualStartWorkApplication;
 import com.huigou.topsun.sap.common.DefaultHttpClient;
 import com.huigou.topsun.sap.common.application.SapMutualEpLogApplication;
 import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement;
+import com.huigou.topsun.sap.purchase.domain.SapPurchase;
+import com.huigou.topsun.sap.purchase.domain.SapPurchaseItem;
 import com.huigou.topsun.sap.purchaseApproval.application.SapPurchaseApprovalApplication;
 import com.huigou.topsun.sap.purchaseApproval.application.SapPurchaseApprovalItemApplication;
 import com.huigou.topsun.sap.purchaseApproval.domain.SapPurchaseApproval;
@@ -208,6 +210,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
             queryModel.addCriteria(" and t.banfn like:banfn");
             queryModel.putLikeParam("banfn", queryRequest.getBanfn());
         }
+        queryModel.addCriteria(" order by fillin_date desc ");
         return this.sqlExecutorDao.executeSlicedQuery(queryModel);
     }
 
@@ -418,4 +421,33 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
             sapMutualEpLogApplication.saveSapMutualEpLog(resultMap);
         }
     }
+
+    @Override
+    public  String revokeApproval(String id){
+        SapPurchaseApproval sapPurchaseApproval = this.sapPurchaseApprovalRepository.findOne(id);
+        if (sapPurchaseApproval.getStatusId()!=BizBillStatus.COMPLETED.getId()){
+            throw new RuntimeException("审批完成的单据才能撤销！");
+        }
+        sapPurchaseApproval.setStatusId(BizBillStatus.ABORTED.getId());
+        sapPurchaseApprovalRepository.save(sapPurchaseApproval);
+        List<SapPurchaseApprovalItem> sapPurchaseApprovalItemList=this.sapPurchaseApprovalItemApplication.querySapPurchaseApprovalItems(id);
+        //发起流程
+        SapPurchaseApproval newSapPurchaseApproval=new SapPurchaseApproval();
+        ClassHelper.copyProperties(sapPurchaseApproval,newSapPurchaseApproval);
+        newSapPurchaseApproval.setId("");
+
+        String pId=mannualStartWorkApplication.startWorkflow(newSapPurchaseApproval,PROCESS_DEFINITION_KEY,"sapPurchaseApproval");
+        newSapPurchaseApproval=this.sapPurchaseApprovalRepository.findOne(pId);
+
+        List<SapPurchaseApprovalItem> newSapPurchaseApprovalItemList=new ArrayList<>();
+        for (SapPurchaseApprovalItem sapPurchaseApprovalItem:sapPurchaseApprovalItemList){
+            SapPurchaseApprovalItem newSapPurchaseApprovalItem=new SapPurchaseApprovalItem();
+            ClassHelper.copyProperties(sapPurchaseApprovalItem,newSapPurchaseApprovalItem);
+            newSapPurchaseApprovalItem.setId("");
+            newSapPurchaseApprovalItemList.add(newSapPurchaseApprovalItem);
+        }
+        sapPurchaseApprovalItemApplication.saveSapPurchaseApprovalItems(newSapPurchaseApproval.getId(),newSapPurchaseApprovalItemList);
+
+        return newSapPurchaseApproval.getId();
+    }
 }

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/controller/SapPurchaseApprovalController.java

@@ -91,4 +91,12 @@ public class SapPurchaseApprovalController extends CommonController {
         SapPurchaseApproval sapPurchaseApproval = sapPurchaseApprovalApplication.loadSapPurchaseApproval(id);
         return forward("sapPurchaseApprovalDetail",sapPurchaseApproval);
     }
+
+    //撤销审批
+    public String revokeApproval(){
+        SDO sdo = this.getSDO();
+        String id=sdo.getString("id");
+        String newId=sapPurchaseApprovalApplication.revokeApproval(id);
+        return success();
+    }
 }

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/SapPurchaseOrderApplication.java

@@ -25,4 +25,6 @@ public interface SapPurchaseOrderApplication {
 
 
     void sendSapDate(SapPurchaseOrder sapPurchaseOrder,String flag);
+
+    String revokeApproval(String id);
 }

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

@@ -12,6 +12,8 @@ import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.base.bsnMessage.appliction.MannualStartWorkApplication;
 import com.huigou.topsun.sap.common.DefaultHttpClient;
 import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement;
+import com.huigou.topsun.sap.purchase.domain.SapPurchase;
+import com.huigou.topsun.sap.purchase.domain.SapPurchaseItem;
 import com.huigou.topsun.sap.purchaseApproval.application.impl.SapPurchaseApprovalApplicationImpl;
 import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderApplication;
 import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderItemApplication;
@@ -185,6 +187,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
             queryModel.addCriteria(" and t.ebeln like:ebeln");
             queryModel.putLikeParam("ebeln", queryRequest.getEbeln());
         }
+        queryModel.addCriteria(" order by fillin_date desc ");
         return this.sqlExecutorDao.executeSlicedQuery(queryModel);
     }
 
@@ -292,4 +295,34 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
             throw new RuntimeException("数据传输失败请检查数据后重试！" + e.getMessage());
         }
     }
+
+    @Override
+    public  String revokeApproval(String id){
+        SapPurchaseOrder sapPurchaseOrder = this.sapPurchaseOrderRepository.findOne(id);
+        if (sapPurchaseOrder.getStatusId()!=BizBillStatus.COMPLETED.getId()){
+            throw new RuntimeException("审批完成的单据才能撤销！");
+        }
+        sapPurchaseOrder.setStatusId(BizBillStatus.ABORTED.getId());
+        sapPurchaseOrderRepository.save(sapPurchaseOrder);
+        List<SapPurchaseOrderItem> sapPurchaseOrderItemList=this.sapPurchaseOrderItemApplication.getPurchaseOrderItems(id);
+        //发起流程
+        SapPurchaseOrder newSapPurchaseOrder=new SapPurchaseOrder();
+        ClassHelper.copyProperties(sapPurchaseOrder,newSapPurchaseOrder);
+        newSapPurchaseOrder.setId("");
+
+        String pId=mannualStartWorkApplication.startWorkflow(newSapPurchaseOrder,PROCESS_DEFINITION_KEY,"sapPurchaseOrder");
+        newSapPurchaseOrder=this.sapPurchaseOrderRepository.findOne(pId);
+
+
+        List<SapPurchaseOrderItem> newSapPurchaseOrderItemList=new ArrayList<>();
+        for (SapPurchaseOrderItem sapPurchaseOrderItem:sapPurchaseOrderItemList){
+            SapPurchaseOrderItem newSapPurchaseOrderItem=new SapPurchaseOrderItem();
+            ClassHelper.copyProperties(sapPurchaseOrderItem,newSapPurchaseOrderItem);
+            newSapPurchaseOrderItem.setId("");
+            newSapPurchaseOrderItemList.add(newSapPurchaseOrderItem);
+        }
+        sapPurchaseOrderItemApplication.saveSapPurchaseOrderItems(newSapPurchaseOrder.getId(),newSapPurchaseOrderItemList);
+
+        return newSapPurchaseOrder.getId();
+    }
 }

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/controller/SapPurchaseOrderController.java

@@ -59,7 +59,7 @@ public class SapPurchaseOrderController extends CommonController {
     @RequestMapping( value = "/getSapPurchaseOrder",consumes = "application/json; charset=UTF-8", produces = "application/json; charset=UTF-8")
     @ResponseBody
     public HashMap<String, Object> getSapPurchaseOrder(@RequestBody SapPurchaseOrderDto sapPurchaseOrderDto){
-        System.out.println(sapPurchaseOrderDto);
+        //System.out.println(sapPurchaseOrderDto);
         this.sapPurchaseOrderApplication.saveSapPurchaseOrderDto(sapPurchaseOrderDto);
 
         HashMap<String, Object> messageMap = new HashMap<>();
@@ -94,4 +94,12 @@ public class SapPurchaseOrderController extends CommonController {
         Map<String, Object> map = sapPurchaseOrderItemApplication.querySapPurchaseOrderItems(queryRequest);
         return toResult(map);
     }
+
+    //撤销审批
+    public String revokeApproval(){
+        SDO sdo = this.getSDO();
+        String id=sdo.getString("id");
+        String newId=sapPurchaseOrderApplication.revokeApproval(id);
+        return success();
+    }
 }