采购订单删除功能；撤审后关闭弹窗

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

@@ -26,13 +26,13 @@ function initPurchaseListGrid() {
                     Public.tip("只能由创建人撤审！");
                     return;
                 }
-                var _self = this;
                 UICtrl.showAjaxDialog({
                     url: web_app.name + '/sapPurchase/showRevokeDetail.load',
                     param:{id:row.id},
                     title: "撤审",
                     width: 400,
                     ok: function () {
+                        var _self = this;
                         Public.ajax(web_app.name + '/sapPurchase/revokeApproval.ajax', {id: row.id,revokeReason: $("#revokeForm #revokeReason").val(),revokeType:$("#revokeType").val()}, function (msg) {
                             purchaseGridManager.loadData();
                         });

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

@@ -23,13 +23,13 @@ function initPurchaseListGrid() {
                     Public.tip("只能由创建人撤审！");
                     return;
                 }
-                var _self = this;
                 UICtrl.showAjaxDialog({
                     url: web_app.name + '/sapPurchaseApproval/showRevokeDetail.load',
                     param:{id:row.id},
                     title: "撤审",
                     width: 400,
                     ok: function () {
+                        var _self = this;
                         Public.ajax(web_app.name + '/sapPurchaseApproval/revokeApproval.ajax', {id: row.id,revokeReason: $("#revokeForm #revokeReason").val(),revokeType:$("#revokeType").val()}, function (msg) {
                             purchaseApprovalGridManager.loadData();
                         });

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

@@ -19,13 +19,16 @@ function bindEvent() {
 }
 
 function revoke(){
-    var revokeType = $("#revokeType").val();
+    var revokeType = $("#orderRevokeType").val();
     if ("update" == revokeType) {
         $("#billTitle .subject").html("撤审修改采购订单")
         $("#revoke").show();
     }else if ("close" == revokeType){
         $("#billTitle .subject").html("撤审关闭采购订单")
         $("#revoke").show();
+    }else if ("delete" == revokeType){
+        $("#billTitle .subject").html("撤审删除采购订单")
+        $("#revoke").show();
     }else {
         $("#revoke").hide();
     }

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

@@ -56,7 +56,7 @@
         <div id="revoke">
             <div class="hg-form-cols">
                 <div class="hg-form-row">
-                    <x:selectC name="revokeType" required="false" label="撤审类型" labelCol="1" fieldCol="2" dictionary="revokeType"/>
+                    <x:selectC name="orderRevokeType" required="false" label="撤审类型" labelCol="1" fieldCol="2" dictionary="orderRevokeType"/>
                     <x:textareaC name="revokeReason" required="false" label="撤审原因" labelCol="1" fieldCol="8" rows="2"/>
                 </div>
             </div>

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

@@ -38,14 +38,14 @@ function loadGrid() {
                   Public.tip("只能由创建人撤审！");
                   return;
               }
-              var _self = this;
               UICtrl.showAjaxDialog({
                   url: web_app.name + '/sapPurchaseOrder/showRevokeDetail.load',
                   param:{id:row.id},
                   title: "撤审",
                   width: 400,
                   ok: function () {
-                      Public.ajax(web_app.name + '/sapPurchaseOrder/revokeApproval.ajax', {id: row.id,revokeReason: $("#revokeForm #revokeReason").val(),revokeType:$("#revokeType").val()}, function (msg) {
+                      var _self = this;
+                      Public.ajax(web_app.name + '/sapPurchaseOrder/revokeApproval.ajax', {id: row.id,revokeReason: $("#revokeForm #revokeReason").val(),orderRevokeType:$("#orderRevokeType").val()}, function (msg) {
                           purchaseOrderGridManager.loadData();
                       });
                       _self.close();
@@ -73,7 +73,7 @@ function loadGrid() {
                 , {display: "sap回执", name: "message", width: 200, minWidth: 60, type: "string", align: "center"}
                 , {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "center"}
                 , {display: "创建人", name: "personMemberName", width: 140, minWidth: 60, type: "string", align: "center"}
-                , {display: "撤审类型", name: "revokeTypeTextView", width: 100, minWidth: 60, type: "date", align: "center"}
+                , {display: "撤审类型", name: "orderRevokeTypeTextView", width: 100, minWidth: 60, type: "date", align: "center"}
                 , {display: "撤审原因", name: "revokeReason", width: 300, minWidth: 60, type: "date", align: "center"}
             ],
             dataAction: 'server',

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

@@ -10,7 +10,7 @@
     <x:hidden name="id"/>
     <div class="hg-form-cols">
         <div class="hg-form-row">
-            <x:selectC name="revokeType" required="true" label="撤审类型" labelCol="4" fieldCol="8" dictionary="revokeType"/>
+            <x:selectC name="orderRevokeType" required="true" label="撤审类型" labelCol="4" fieldCol="8" dictionary="orderRevokeType"/>
             <x:textareaC name="revokeReason" required="true" label="撤审原因" labelCol="4" fieldCol="8" rows="3"/>
         </div>
     </div>

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

@@ -332,7 +332,10 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
                 //审批完成的，终止状态的，终止审批完成的，并发起新的流程
                 if (purchaseApproval.getStatusId() == BizBillStatus.COMPLETED.getId() || purchaseApproval.getStatusId() == BizBillStatus.ABORTED.getId()){
                     purchaseApproval.setStatusId(BizBillStatus.ABORTED.getId());
-
+                    if ("X".equals(loekz)){
+                        //如果在SAP中删除了，终止流程，不另外发起新的流程
+                        needStartWorkflow = false;
+                    }
                 }
 
                 //在审批中，更新明细数据的（先删除，再新增）
@@ -472,7 +475,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
             paramItem.put("bnfpo",sapPurchaseApprovalItem.getBnfpo());
             paramItem.put("flag",flag);
             paramItem.put("status",status);
-            //如果是关单，传X
+            //如果是关单，传X和0
             if ("close".equals(sapPurchaseApproval.getRevokeType())){
                 paramItem.put("ELIKZ", "X");
                 paramItem.put("status", 0);

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

@@ -151,10 +151,12 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         //查询 单据日期
         String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", sapPurchaseOrder.getFillinDate());
         String title = "";
-        if ("update".equals(sapPurchaseOrder.getRevokeType())){
+        if ("update".equals(sapPurchaseOrder.getOrderRevokeType())){
             title = "撤审修改-";
-        }else if ("close".equals(sapPurchaseOrder.getRevokeType())){
+        }else if ("close".equals(sapPurchaseOrder.getOrderRevokeType())){
             title = "撤审关单-";
+        }else if ("delete".equals(sapPurchaseOrder.getOrderRevokeType())){
+            title = "撤审删除-";
         }
         //设置标题
         if ("X".equals(sapPurchaseOrder.getRetpo())) {
@@ -371,6 +373,10 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
                 //审批完成的，SAP撤审触发，终止审批完成的，并发起新的流程
                 if (purchaseOrder.getStatusId() == BizBillStatus.COMPLETED.getId() || purchaseOrder.getStatusId() == BizBillStatus.ABORTED.getId()){
                     purchaseOrder.setStatusId(BizBillStatus.ABORTED.getId());
+                    if ("L".equals(loekz)){
+                        //如果在SAP中删除了，终止流程，不另外发起新的流程
+                        needStartWorkflow = false;
+                    }
                 }
                 //在审批中，更新明细数据的（先删除，再新增）
                 if (purchaseOrder.getStatusId() == BizBillStatus.APPROVING.getId() || purchaseOrder.getStatusId() == BizBillStatus.APPLYING.getId()){
@@ -426,10 +432,15 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         paramItem.put("flag", flag);
         paramItem.put("status", status);
         //如果是关单，传X
-        if ("close".equals(sapPurchaseOrder.getRevokeType())){
+        if ("close".equals(sapPurchaseOrder.getOrderRevokeType())){
             paramItem.put("ELIKZ", "X");
             paramItem.put("status", 0);
         }
+        //如果是删除，传X和1
+        if ("delete".equals(sapPurchaseOrder.getOrderRevokeType())){
+            paramItem.put("ELIKZ", "X");
+            paramItem.put("status", 1);
+        }
         List<Map<String, Object>> paramList = new ArrayList<>();
         paramList.add(paramItem);
         Map<String, Object> param = new HashMap<>();
@@ -481,7 +492,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         newSapPurchaseOrder.setId("");
         newSapPurchaseOrder.setBillCode("");
         newSapPurchaseOrder.setRevokeReason(revokeReason);//撤审原因
-        newSapPurchaseOrder.setRevokeType(revokeType);//撤审类型
+        newSapPurchaseOrder.setOrderRevokeType(revokeType);//撤审类型
         String pId=mannualStartWorkApplication.startWorkflow(newSapPurchaseOrder,PROCESS_DEFINITION_KEY,"sapPurchaseOrder");
         newSapPurchaseOrder=this.sapPurchaseOrderRepository.findOne(pId);
 

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

@@ -95,7 +95,7 @@ public class SapPurchaseOrderController extends CommonController {
         SDO sdo = this.getSDO();
         String id=sdo.getString("id");
         String revokeReason=sdo.getString("revokeReason");
-        String revokeType=sdo.getString("revokeType");
+        String revokeType=sdo.getString("orderRevokeType");
         String newId=sapPurchaseOrderApplication.revokeApproval(id,revokeReason,revokeType);
         return success();
     }

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrder.java

@@ -190,8 +190,8 @@ public class SapPurchaseOrder extends FlowBillAbstractEntity {
     /**
      * 撤审类型
      */
-    @Column(name = "revoke_type")
-    private String revokeType;
+    @Column(name = "order_revoke_type")
+    private String orderRevokeType;
 
     @Override
     protected String getCodeRuleId() {

topsun/target/classes/config/topsun/base/function.xml

@@ -41,6 +41,14 @@
 			 AND o.CODE IN ( 'JL', 'ZZ', 'KZ', 'FL', 'FKZ','ZR','DTAB' );
 		</sql>
 
+		<!--根据业务主表id和业务表名查询销售跟单员的直接领导-->
+		<sql name="querySalebmjl">
+			SELECT o.FULL_ID, o.FULL_NAME
+			 FROM sa_oporg o WHERE o.PARENT_ID IN (
+			 SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN ( SELECT o.PARENT_ID FROM sa_oporg o LEFT JOIN ep_sale_order pro ON o.code = pro.merchandiser WHERE pro.id = ? ) )
+			 AND o.CODE IN ( 'JL', 'ZZ', 'KZ', 'FL', 'FKZ','ZR','FZR','DTAB' );
+		</sql>
+
 		<!--根据业务主表id和业务表名查询对应申请人的二级部门领导-->
 		<sql name="queryejbmld">
 			SELECT o.FULL_ID,o.FULL_NAME FROM sa_oporg o WHERE o.PARENT_ID IN (