采购申请审批撤审流程优化；前端显示字段顺序记忆功能；付款传对账单号到SAP

huigou-xt/src/main/webapp/javaScript/UICtrl.js

@@ -62,7 +62,17 @@ UICtrl.getColumnLocal = function(tableKey, allColumns) {
         //         hide: localColumns.find(v => v.name == column.name)?._hide
         //     }
         // })
-        return allColumns.map(function(column) {
+        //先按照配置的字段顺序排序
+        var newColumns = [];
+        for (let i = 0; i < localColumns.length; i++) {
+            for (let j = 0; j < allColumns.length; j++) {
+                if (allColumns[j].name === localColumns[i].name) {
+                    newColumns.push(allColumns[j]);
+                    break;
+                }
+            }
+        }
+        return newColumns.map(function(column) {
             var matchingColumn = localColumns.find(function(v) {
                 return v.name === column.name;
             });

huigou-xt/src/main/webapp/lib/jquery/jquery.gridExtend.js

@@ -668,9 +668,11 @@ $.ligerDefaults.Grid.formatters['datetime'] = function (value, column){
 	    	}
 	    	if($el.hasClass('column-up')){//上移
 	    		_self._onColumnMove('up');
+				g.options._local && _self._setLocalColumns()
 	    	}
 	    	if($el.hasClass('column-down')){//下移
 	    		_self._onColumnMove('down');
+				g.options._local && _self._setLocalColumns()
 	    	}
 	    	if($el.hasClass('column-sort')){//创建排序字段定义视图
 	    		_self._createColumnSortView();

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

@@ -59,7 +59,7 @@ var tableArray = [
                 display: "采购发票号", name: "belnr2", width: 120, minwidth: 120, type: "string", align: "left",
             },
             {
-                display: "实体发票号", name: "zzinvcnr", width: 200, minwidth: 120, type: "string", align: "left",
+                display: "实体发票号", name: "zzinvcnr", width: 300, minwidth: 120, type: "string", align: "left",
             },
             {
                 display: "对账单号", name: "xblnr", width: 150, minwidth: 120, type: "string", align: "left",

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

@@ -20,7 +20,7 @@ function initGrid() {
                     display: "采购发票号", name: "BELNR2", width: 120, minwidth: 120, type: "string", align: "left",
                 },
                 {
-                    display: "实体发票号", name: "ZZINVCNR", width: 200, minwidth: 120, type: "string", align: "left",
+                    display: "实体发票号", name: "ZZINVCNR", width: 300, minwidth: 120, type: "string", align: "left",
                 },
                 {
                     display: "对账单号", name: "XBLNR", width: 150, minwidth: 120, type: "string", align: "left",

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.js

@@ -230,7 +230,9 @@ function initSerachBox(){
             //     });
             // }
             $('#customerOrderNo').val(value.value);
-            $('#customerNo').val(data.KUNNR);
+            if (Public.isBlank($("#customerNo").val())){
+                $('#customerNo').val(data.KUNNR);
+            }
         }
     });
 

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

@@ -3,7 +3,7 @@ $(function () {
     initializeCommonUI();
     bindEvent();
     initItemGrid();
-    initAufnr();
+    //initAufnr();
     revoke()
 });
 

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/impl/SapCostReimbursementApplicationImpl.java

@@ -296,6 +296,8 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
                 String dateFormat = DateUtil.getDateFormat(costReimbursementDetail.getZepFpldate(), "yyyyMMdd");
                 detailMap.put("ZEP_FPLDATE",dateFormat);
             }
+            //对账单号
+            detailMap.put("ZYL04",costReimbursementDetail.getXblnr());
             detailMap.putAll(map);
             itemList.add(detailMap);
             costReimbursementDetail.setBankn1(sapCostReimbursement.getBankn1());

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java

@@ -341,9 +341,11 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
         if ("new".equals(maintenanceType)){
             title = title + "新增";
         } else if ("modify".equals(maintenanceType)) {
-            title = title + "修改";
+            SapNonProdApplyDept applyDept = this.nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(baseInfo.getId());
+            title = title + "修改" + "(" + applyDept.getMatnr() + ")";
         } else if ("extend".equals(maintenanceType)) {
-            title = title + "扩展";
+            SapNonProdApplyDept applyDept = this.nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(baseInfo.getId());
+            title = title + "扩展" + "(" + applyDept.getMatnr() + ")";
         }
         return String.format("%s-%s-%s(%s)", title, baseInfo.getBillCode(), baseInfo.getGenericName(),fillinDateStr);
     }

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

@@ -373,6 +373,9 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
         BeanUtil.copyProperties(sapPurchaseItemDto,sapPurchaseItem);
         sapPurchaseItem.setErnam(sapPurchaseItem.getAfnam());
         sapPurchaseItem.setBadat(new Date());
+        sapPurchaseItem.setAfnam(org.getName());
+        sapPurchaseItem.setAfnamId(org.getId());
+
         List<SapPurchaseItem> itemList = new ArrayList<>();
         itemList.add(sapPurchaseItem);
         this.sapPurchaseItemApplication.saveSapPurchaseItems(id,itemList);

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

@@ -30,7 +30,9 @@ import com.huigou.topsun.sap.purchaseApproval.domain.vo.SapPurchaseApprovalItemV
 import com.huigou.topsun.sap.purchaseApproval.domain.vo.SapPurchaseApprovalVo;
 import com.huigou.topsun.sap.purchaseApproval.repository.SapPurchaseApprovalRepository;
 import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrder;
+import com.huigou.topsun.sap.sapApplication.application.SapDictionaryApplication;
 import com.huigou.topsun.sap.transfers.application.SapStockTransfersApplication;
+import com.huigou.topsun.util.SAPUtils;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.bmp.fn.CodeGenerator;
 import com.huigou.uasp.bmp.operator.OperatorApplication;
@@ -52,6 +54,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -79,6 +82,8 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
     private MannualStartWorkApplication mannualStartWorkApplication;
     @Autowired
     private SapStockTransfersApplication sapStockTransfersApplication;
+    @Autowired
+    private SapDictionaryApplication sapDictionaryApplication;
 
     @Override
     protected String saveBizAndApprovalData() {
@@ -470,6 +475,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
             //如果是关单，传X
             if ("close".equals(sapPurchaseApproval.getRevokeType())){
                 paramItem.put("ELIKZ", "X");
+                paramItem.put("status", 0);
             }
             paramList.add(paramItem);
 
@@ -519,6 +525,13 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
     @Override
     public  String revokeApproval(String id,String revokeReason,String revokeType){
         SapPurchaseApproval sapPurchaseApproval = this.sapPurchaseApprovalRepository.findOne(id);
+        //验证采购申请单是否生成了采购订单
+        String result = this.checkOrderByPurchaseNo(sapPurchaseApproval.getBanfn());
+        //Y是可以提交撤审，N是查询到有对应的采购订单，不可以提交撤审
+        if ("N".equals(result)){
+            throw new RuntimeException("采购申请单已生成采购订单，不能撤销！");
+        }
+
         if (sapPurchaseApproval.getStatusId()!=BizBillStatus.COMPLETED.getId()){
             throw new RuntimeException("审批完成的单据才能撤销！");
         }
@@ -531,6 +544,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
         newSapPurchaseApproval.setId("");
         newSapPurchaseApproval.setRevokeReason(revokeReason);
         newSapPurchaseApproval.setRevokeType(revokeType);
+        newSapPurchaseApproval.setBillCode("");
         String pId=mannualStartWorkApplication.startWorkflow(newSapPurchaseApproval,PROCESS_DEFINITION_KEY,"sapPurchaseApproval");
         newSapPurchaseApproval=this.sapPurchaseApprovalRepository.findOne(pId);
 
@@ -546,6 +560,19 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
         return newSapPurchaseApproval.getId();
     }
 
+    private String checkOrderByPurchaseNo(String banfn) {
+        String result = "";
+        try {
+            List<Map<String, String>> mapList = sapDictionaryApplication.getSapDictionary("BANFN", banfn);
+            if (!CollectionUtils.isEmpty(mapList)){
+                result = mapList.get(0).get("ZYN");
+            }
+        }catch (IOException e){
+            throw new RuntimeException("查询采购申请单失败，请稍后重试！");
+        }
+        return result;
+    }
+
     @Override
     public void abortPurchaseApproval(String id,String jobPageId) {
         //先标记终止状态

topsun/src/main/resources/config/content/easysearch/easy-search-material.xml

@@ -3,9 +3,10 @@
 
     <easy-search name="selectMaterials" desc="物料">
         <sql>
+            select * from (
             SELECT t.*,b.business_usage
              FROM sap_non_prod_apply_dept t left join sap_non_prod_apply_base_info b on t.base_info_id = b.id
-             WHERE b.status = 3 and b.distribute = 2 and t.matnr is not null and t.matnr!= ''
+             WHERE b.status = 3 and b.distribute = 2 and t.matnr is not null and t.matnr!= '' ORDER BY t.MATNR desc ) t where 1=1
         </sql>
         <field name="物料编码" title="物料编码" code="matnr" width="200"/>
         <field name="物料名称" title="物料名称" code="maktx" width="400"/>