付款申请（无PO）、采购申请的撤销审批

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

@@ -13,7 +13,33 @@ function initUI() {
 function initPurchaseListGrid() {
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
         addHandler: addHandler,
+        revokeApproveHandler: {
+            id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
+
+                var rows = purchaseGridManager.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+'/sapPurchase/revokeApproval.ajax', {id:rows[0].id}, function(msg) {
+                   // reloadGrid();
+                   // _self.close();
+                 });
+                });
+                   // var newRow = JSON.parse(JSON.stringify(row));
+                   // newRow.zepItemno = getZepItemNo();
+                   /// newRow.id = null;
+                  //  UICtrl.addGridRow(item.gridManager, newRow);
+
+            }
+        }
     });
+
     purchaseGridManager = UICtrl.grid('#purchaseGrid', {
             columns: [
                 {display: "状态", name: "statusTextView", width: "100", align: "left", type: "string"}
@@ -22,6 +48,8 @@ function initPurchaseListGrid() {
                 , {display: "PR类型", name: "bsartTextView", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "采购申请编号", name: "banfn", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "批准时间", name: "frgdt", width: 200, minWidth: 60, type: "date", align: "center"}
+                , {display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"}
+                , {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"}
             ],
             dataAction: 'server',
             url: web_app.name + '/sapPurchase/slicedSapPurchaseList.ajax?',

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

@@ -9,6 +9,7 @@ import com.huigou.context.ThreadLocalUtil;
 import com.huigou.data.domain.model.CommonDomainConstants;
 import com.huigou.data.query.model.QueryDescriptor;
 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.purchaseApproval.application.impl.SapPurchaseApprovalApplicationImpl;
@@ -64,9 +65,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
     SapPurchaseApprovalApplicationImpl sapPurchaseApprovalApplication;
 
     @Autowired
-    private WorkflowApplication workflowApplication;
-    @Autowired
-    private CodeGenerator codeGenerator;
+    private MannualStartWorkApplication mannualStartWorkApplication;
 
     @Override
     protected String saveBizAndApprovalData() {
@@ -215,10 +214,14 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
             sapPurchaseOrder.setFillinDate(sapPurchaseOrderVo.getAedat());
             */
             //发起流程
-            String nextCode = codeGenerator.getNextCode("sapPurchaseOrder");
-            sapPurchaseOrder.setBillCode(nextCode);
-            sapPurchaseOrder =mannualStartWorkflow(sapPurchaseOrder);
+           // String nextCode = codeGenerator.getNextCode("sapPurchaseOrder");
+           // sapPurchaseOrder.setBillCode(nextCode);
+           // sapPurchaseOrder =mannualStartWorkflow(sapPurchaseOrder);
+
+           String pId=mannualStartWorkApplication.startWorkflow(sapPurchaseOrder,PROCESS_DEFINITION_KEY,"sapPurchaseOrder");
+            sapPurchaseOrder=this.sapPurchaseOrderRepository.findOne(pId);
             purchaseOrderId = sapPurchaseOrder.getId();
+
           //  sapPurchaseOrder = this.sapPurchaseOrderRepository.save(sapPurchaseOrder);
           //  purchaseOrderId = sapPurchaseOrder.getId();
         if (purchaseOrder == null) {    //存在也新建 04.28注释的    05.11 把存在的作废掉
@@ -248,70 +251,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
     }
 
 
-    /**
-     * 启动流程
-     */
-    private SapPurchaseOrder mannualStartWorkflow(SapPurchaseOrder purchaseOrder) {
-        Operator operator = null;
-        operator = ThreadLocalUtil.getOperator();
-        if (operator == null) {
-            String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
-            operator = operatorApplication.createOperatorByPersonMemberId(createdById);
-            ThreadLocalUtil.putOperator(operator);
-        }
-
-        // Assert.notNull(operator, "未获取到当前操作用户，无法创建流程");
-        SDO sdo = ThreadLocalUtil.getVariable(Constants.SDO, SDO.class);
-        if (sdo == null) {
-            sdo = new SDO();
-        }
-        try {
-            // 业务数据
-            Map<String, Object> map = ClassHelper.beanToMap(purchaseOrder);
-            sdo.setProperties(map);
-
-            // 启动流程的必要参数
-            sdo.putProperty("fullId", operator.getFullId());
-            sdo.putProperty("organId", operator.getOrgId());
-            sdo.putProperty("organName", operator.getOrgName());
-            sdo.putProperty("deptId", operator.getDeptId());
-            sdo.putProperty("deptName", operator.getDeptName());
-            sdo.putProperty("positionId", operator.getPositionId());
-            sdo.putProperty("positionName", operator.getPositionName());
-            sdo.putProperty("personMemberId", operator.getPersonMemberId());
-            sdo.putProperty("personMemberName", operator.getPersonMemberName());
-            sdo.putProperty("processAction", ProcessAction.SAVE);
-            sdo.putProperty("procUnitId", "");
-          //  sdo.putProperty("bizId", purchaseOrder.getId());
-            sdo.putProperty("createdDate", new Date());
-            sdo.putProperty("fillinDate", new Date());
-
-            sdo.putProperty("billCode", purchaseOrder.getBillCode());
-            ThreadLocalUtil.putVariable(Constants.SDO, sdo);
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("startModel", ProcessStartModel.MANUAL.getId());
-            variables.put("executorFullId", operator.getFullId());
-            variables.put("executorFullName", operator.getFullName());
-            ThreadLocalUtil.putOperator(operator);
-            ExecutionEntity pi = (ExecutionEntity) workflowApplication.startProcessInstanceByKey(PROCESS_DEFINITION_KEY, null, variables);
-            // 业务参数
-            TaskEntity applyTask = pi.getTasks().get(0);
-            sdo.putProperty("processAction", ProcessAction.ADVANCE);
-            sdo.putProperty("bizId", pi.getBusinessKey());
-            sdo.putProperty("id", pi.getBusinessKey());
-            sdo.putProperty("statusId", BizBillStatus.APPLYING.getId());
-            ThreadLocalUtil.removeVariable("_approvalParameter_");
-            ThreadLocalUtil.putVariable(Constants.SDO, sdo);
-            workflowApplication.advance(applyTask.getId(), Collections.emptyMap());
-            return this.sapPurchaseOrderRepository.findOne(pi.getBusinessKey());
-        }catch(Exception ex){
-            ex.printStackTrace();
-            throw ex;
-        }
-
-    }
-
-    /**
+     /**
      * 远程调用sap接口，传递数据
      */
     public void sendSapDate(SapPurchaseOrder sapPurchaseOrder, String flag) {