供应商主数据接口数据结构调整

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js

@@ -12,6 +12,7 @@ $(document).ready(function () {
 });
 function initialize(){
     UICtrl.layout("#layout", {leftWidth: 3});
+    $("#buGroup").val("Z00001X");
    // let isDetailPage = ($("#isDetailPage").val() === "true");
  //   if (isDetailPage) {
    //     $("#jobPageTop").hide();
@@ -28,12 +29,12 @@ function initialize(){
  * 流程引擎回调设置打样的id
  * @param value 打样申请的id
  */
-function setId(id) {
-    $("#id").val(id);
+function setId(bizId) {
+    $("#id").val(bizId);
     var _grid = UICtrl.getGridManager('#sapSuppliersPayGrid');
-    _grid.options.parms.id = value;
+    _grid.options.parms.id = bizId;
     var _grid = UICtrl.getGridManager('#sapSuppliersBuyerGrid');
-    _grid.options.parms.id = value;
+    _grid.options.parms.id = bizId;
 }
 
 /**
@@ -62,7 +63,7 @@ function loadSuppliersPayListGrid() {
             UICtrl.addGridRow(sapSuppliersPayGridManager,
                 {
                     // 行号加一
-                    sequence: sapSuppliersPayGridManager.getData().length + 1
+                    sequence: sapSuppliersPayGridManager.getData().length + 1,reprf:"X"
                 }
             );
         },
@@ -101,10 +102,12 @@ function loadSuppliersPayListGrid() {
             },
             {
                 display: "根据分配号排序代码", name: "zuawa", width: 150, minWidth: 60, type: "String", align: "left",
-                editor: {type: 'text', required: true}
+                render:function (item){
+                    return item.sequence;
+                }
             },
             {
-                display: "付款条件代码", name: "zterm", width: 100, minWidth: 60, type: "String", align: "left",
+                display: "付款条件", name: "zterm", width: 100, minWidth: 60, type: "String", align: "left",
                 editor: {type: 'text', required: true}
             },
             {
@@ -113,7 +116,7 @@ function loadSuppliersPayListGrid() {
             },
             {
                 display: "检查双重发票", name: "reprf", width: 160, minWidth: 60, type: "String", align: "left",
-                editor: {type: 'text', required: true}
+                //editor: {type: 'text', required: true}
             },
             {
                 display: "中心记帐冻结", name: "sperr", width: 100, minWidth: 60, type: "String", align: "left",
@@ -151,7 +154,10 @@ function loadSuppliersBuyerListGrid() {
             UICtrl.addGridRow(sapSuppliersBuyerGridManager,
                 {
                     // 行号加一
-                    sequence: sapSuppliersBuyerGridManager.getData().length + 1
+                    sequence: sapSuppliersBuyerGridManager.getData().length + 1,
+                    webre:"X",
+                    kalsk:"Z1"
+
                 }
             );
         },
@@ -189,7 +195,7 @@ function loadSuppliersBuyerListGrid() {
                 editor: {type: 'text', required: true}
             },
             {
-                display: "付款条件代码", name: "zterm", width: 150, minWidth: 60, type: "String", align: "left",
+                display: "付款条件", name: "zterm", width: 150, minWidth: 60, type: "String", align: "left",
                 editor: {type: 'text', required: true}
             },
             {
@@ -206,11 +212,11 @@ function loadSuppliersBuyerListGrid() {
             },
             {
                 display: "收货的发票验证", name: "webre", width: 100, minWidth: 60, type: "String", align: "left",
-                editor: {type: 'text', required: true}
+                //editor: {type: 'text', required: true}
             },
             {
-                display: "计算方案组", name: "kalsk", width: 140, minWidth: 60, type: "String", align: "left",
-                editor: {type: 'text', required: true}
+                display: "供应商方案组", name: "kalsk", width: 140, minWidth: 60, type: "String", align: "left",
+                //editor: {type: 'text', required: true}
             },
             {
                 display: "供应商销售人员", name: "verkf", width: 140, minWidth: 60, type: "String", align: "left",
@@ -218,11 +224,11 @@ function loadSuppliersBuyerListGrid() {
             },
             {
                 display: "供应商电话号码", name: "telf1", width: 140, minWidth: 60, type: "String", align: "left",
-                editor: {type: 'text', required: true}
+                editor: {type: 'text', required: false}
             },
             {
                 display: "服务的发票校验标识", name: "lebre", width: 140, minWidth: 60, type: "String", align: "left",
-                editor: {type: 'text', required: true}
+                editor: {type: 'text', required: false}
             },
             {
                 display: "边境运输方式", name: "expvz", width: 140, minWidth: 60, type: "String", align: "left",

topsun/src/main/java/com/huigou/topsun/sap/suppliers/application/impl/SuppliersDataApplicationImpl.java

@@ -4,20 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 import com.huigou.cache.DictUtil;
 import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.sap.common.DefaultHttpClient;
 import com.huigou.topsun.sap.common.application.SapMutualEpLogApplication;
-import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
-import com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo;
-import com.huigou.topsun.sap.nonProdApply.domain.SapNonProdApplyDept;
-import com.huigou.topsun.sap.priceMasterData.domain.SapPriceMasterDataItem;
-import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrder;
 import com.huigou.topsun.sap.suppliers.application.SuppliersDataApplication;
 import com.huigou.topsun.sap.suppliers.domain.*;
 import com.huigou.topsun.sap.suppliers.domain.query.SuppliersBankQueryRequest;
@@ -26,30 +18,26 @@ import com.huigou.topsun.sap.suppliers.domain.query.SuppliersDataQueryRequest;
 import com.huigou.topsun.sap.suppliers.domain.query.SuppliersPayQueryRequest;
 import com.huigou.topsun.sap.suppliers.domain.vo.SuppliersBankVo;
 import com.huigou.topsun.sap.suppliers.domain.vo.SuppliersBuyerVo;
+import com.huigou.topsun.sap.suppliers.domain.vo.SuppliersInfoVo;
 import com.huigou.topsun.sap.suppliers.domain.vo.SuppliersPayVo;
 import com.huigou.topsun.sap.suppliers.repository.SuppliersBankRepository;
 import com.huigou.topsun.sap.suppliers.repository.SuppliersBuyerRepository;
 import com.huigou.topsun.sap.suppliers.repository.SuppliersInfoRepository;
 import com.huigou.topsun.sap.suppliers.repository.SuppliersPayRepository;
-import com.huigou.topsun.util.CommonUtil;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.bpm.ApprovalParameter;
 import com.huigou.uasp.bpm.FlowBroker;
-import com.huigou.uasp.bpm.HandleResult;
 import com.huigou.util.ClassHelper;
 import com.huigou.util.DateUtil;
 import com.huigou.util.StringUtil;
 import lombok.SneakyThrows;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.swing.text.html.parser.Entity;
 import java.util.*;
 
 @Service("suppliersDataApplication")
@@ -69,26 +57,26 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
     SapMutualEpLogApplication sapMutualEpLogApplication;
 
     @Override
-    public Map<String, Object> slicedSuppliersDataQuery(SuppliersDataQueryRequest query){
+    public Map<String, Object> slicedSuppliersDataQuery(SuppliersDataQueryRequest query) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedSuppliersInfoQuery");
         QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
-        if (StringUtil.isNotBlank(query.getBillCode())){
+        if (StringUtil.isNotBlank(query.getBillCode())) {
             model.addCriteria(" and t.bill_code like:billCode");
             model.putLikeParam("billCode", query.getBillCode());
         }
-        if (StringUtil.isNotBlank(query.getBillCode())){
+        if (StringUtil.isNotBlank(query.getBillCode())) {
             model.addCriteria(" and t.name_Org1 like:nameOrg1");
             model.putLikeParam("nameOrg1", query.getNameOrg1());
         }
-        if (StringUtil.isNotBlank(query.getPartner())){
+        if (StringUtil.isNotBlank(query.getPartner())) {
             model.addCriteria(" and t.partner like:partner");
             model.putLikeParam("partner", query.getPartner());
         }
-        if (query.getStatus()!=null){
+        if (query.getStatus() != null) {
             model.addCriteria(" and t.status =:status");
             model.putParam("status", query.getStatus());
         }
-        if (StringUtil.isNotBlank(query.getApplyType())){
+        if (StringUtil.isNotBlank(query.getApplyType())) {
             model.addCriteria(" and t.apply_type =:applyType");
             model.putParam("applyType", query.getApplyType());
         }
@@ -119,30 +107,30 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
         }
         suppliersInfo = suppliersInfoRepository.save(suppliersInfo);
 
-        for (SuppliersPay pay:suppliersPayList){
+        for (SuppliersPay pay : suppliersPayList) {
             if (StringUtil.isBlank(pay.getSId())) {
                 pay.setSId(suppliersInfo.getId());
                 this.suppliersPayRepository.save(pay);
-            } else if (!(suppliersInfo.getId().equals(pay.getSId()))){ //从新增带过来的
-                SuppliersPay modifyPay=new SuppliersPay();
-                ClassHelper.copyProperties(pay,modifyPay);
+            } else if (!(suppliersInfo.getId().equals(pay.getSId()))) { //从新增带过来的
+                SuppliersPay modifyPay = new SuppliersPay();
+                ClassHelper.copyProperties(pay, modifyPay);
                 modifyPay.setId(UUID.randomUUID().toString());
                 modifyPay.setSId(suppliersInfo.getId());
                 this.suppliersPayRepository.save(modifyPay);
-             } else {
+            } else {
                 pay.setSId(suppliersInfo.getId());
                 this.suppliersPayRepository.save(pay);
             }
 
         }
-        for (SuppliersBuyer buyer:suppliersBuyerList){
+        for (SuppliersBuyer buyer : suppliersBuyerList) {
 
             if (StringUtil.isBlank(buyer.getSId())) {
                 buyer.setSId(suppliersInfo.getId());
                 this.suppliersBuyerRepository.save(buyer);
-            } else if (!(suppliersInfo.getId().equals(buyer.getSId()))){ //从新增带过来的
-                SuppliersBuyer modifyBuyer=new SuppliersBuyer();
-                ClassHelper.copyProperties(buyer,modifyBuyer);
+            } else if (!(suppliersInfo.getId().equals(buyer.getSId()))) { //从新增带过来的
+                SuppliersBuyer modifyBuyer = new SuppliersBuyer();
+                ClassHelper.copyProperties(buyer, modifyBuyer);
                 modifyBuyer.setId(UUID.randomUUID().toString());
                 modifyBuyer.setSId(suppliersInfo.getId());
                 this.suppliersBuyerRepository.save(modifyBuyer);
@@ -152,14 +140,14 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
             }
         }
 
-        for (SuppliersBank bank:suppliersBankList){
+        for (SuppliersBank bank : suppliersBankList) {
 
             if (StringUtil.isBlank(bank.getSId())) {
                 bank.setSId(suppliersInfo.getId());
                 this.suppliersBankRepository.save(bank);
-            } else if (!(suppliersInfo.getId().equals(bank.getSId()))){ //从新增带过来的
-                SuppliersBank modifyBank=new SuppliersBank();
-                ClassHelper.copyProperties(bank,modifyBank);
+            } else if (!(suppliersInfo.getId().equals(bank.getSId()))) { //从新增带过来的
+                SuppliersBank modifyBank = new SuppliersBank();
+                ClassHelper.copyProperties(bank, modifyBank);
                 modifyBank.setId(UUID.randomUUID().toString());
                 modifyBank.setSId(suppliersInfo.getId());
                 this.suppliersBankRepository.save(modifyBank);
@@ -188,16 +176,16 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
             suppliersInfoRepository.save(suppliersInfo);
         }
     }
+
     //流程已办
     @Override
     public void onAfterComplete(DelegateTask delegateTask) {
         super.onAfterComplete(delegateTask);
         String bizId = delegateTask.getExecution().getProcessBusinessKey();
-      //  SuppliersInfo suppliersInfo = suppliersInfoRepository.findOne(bizId);
+        //  SuppliersInfo suppliersInfo = suppliersInfoRepository.findOne(bizId);
 
     }
 
-    @Transactional("hanaTransactionManager")
     @Override
     public void onComplete(DelegateTask delegateTask) {
         super.onComplete(delegateTask);
@@ -205,11 +193,12 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
         SuppliersInfo suppliersInfo = suppliersInfoRepository.findOne(bizId);
         //审批不通过
         ApprovalParameter parameter = getApprovalParameter();
-       // if (ObjectUtils.equals(parameter.getHandleResult(), HandleResult.DISAGREE.id)) {   //审批不通过 或者退回
-      //  }
+        // if (ObjectUtils.equals(parameter.getHandleResult(), HandleResult.DISAGREE.id)) {   //审批不通过 或者退回
+        //  }
         if (this.isApplyProcUnit(delegateTask)) {   //申请后直接提交
         }
     }
+
     /**
      * 流程实例结束
      *
@@ -224,13 +213,13 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
         suppliersInfo.setStatusId(status.getId());
         suppliersInfoRepository.save(suppliersInfo);
 
-        List <SuppliersPay> payList=this.suppliersPayRepository.findAllBySId(suppliersInfo.getId());
+        List<SuppliersPay> payList = this.suppliersPayRepository.findAllBySId(suppliersInfo.getId());
 
-        List <SuppliersBuyer> buyerList=this.suppliersBuyerRepository.findAllBySId(suppliersInfo.getId());
+        List<SuppliersBuyer> buyerList = this.suppliersBuyerRepository.findAllBySId(suppliersInfo.getId());
 
-        List <SuppliersBank> bankList=this.suppliersBankRepository.findAllBySId(suppliersInfo.getId());
+        List<SuppliersBank> bankList = this.suppliersBankRepository.findAllBySId(suppliersInfo.getId());
 
-        sendSapData(suppliersInfo,payList,buyerList,bankList);
+        sendSapData(suppliersInfo, payList, buyerList, bankList);
 
     }
 
@@ -252,7 +241,7 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
         super.onBack(delegateTask, destActivityId);
         if ("Apply".equalsIgnoreCase(destActivityId)) {
             String bizId = delegateTask.getExecution().getProcessBusinessKey();
-            SuppliersInfo suppliersInfo= suppliersInfoRepository.findOne(bizId);
+            SuppliersInfo suppliersInfo = suppliersInfoRepository.findOne(bizId);
             suppliersInfo.setStatusId(BizBillStatus.APPLYING.getId());
             suppliersInfoRepository.save(suppliersInfo);
         }
@@ -262,101 +251,60 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
     /**
      * 远程调用sap接口，传递数据
      */
-    public void sendSapData(SuppliersInfo suppliersInfo, List <SuppliersPay> payList,List <SuppliersBuyer> buyerList,List <SuppliersBank> bankList) {
-       // Map<String, Object> paramItem = new HashMap<>();
-       // paramItem.put("ebeln", sapPurchaseOrder.getEbeln());
-        /*paramItem.put("BEDNR", suppliersInfo.getBillCode());
-        paramItem.put("frgkz", "10");
-        paramItem.put("flag", flag);
-        List<Map<String, Object>> paramList = new ArrayList<>();
-        paramList.add(paramItem);
-        Map<String, Object> param = new HashMap<>();
-        param.put("MODE", "PO");
-        param.put("DATA", paramList);*/
-        Map <String,Object> map=new HashMap<>();
-        Gson gson=new Gson();
-        String uu=  JSON.toJSONString(suppliersInfo);
-
-        BeanUtil.copyProperties(suppliersInfo,map);
-
-        map.remove("id");
-        map.remove("fullId");
-        map.remove("personMemberId");
-        map.remove("personMemberName");
-        map.remove("positionId");
-        map.remove("positionName");
-        map.remove("deptId");
-        map.remove("deptName");
-        map.remove("organId");
-        map.remove("organName");
-        map.remove("version");
-        map.put("rltyp",map.get("rltgr"));
-        map.put("updkz","I");
-        map.remove("rltgr");
-        map.remove("applyType");
-        map.remove("statusId");
-        map.remove("sId");
-        map.remove("billCode");
-        map.remove("inputDetails_");
-        map.remove("fillinDate");
-        map.remove("updateFields_");
-
-        if (suppliersInfo.getApplyType().equals("1")){ //更新
-            map.put("updkz","U");
-        }
-        if (suppliersInfo.getApplyType().equals("-1")){ //更新
-            map.put("updkz","D");
+    public void sendSapData(SuppliersInfo suppliersInfo, List<SuppliersPay> payList, List<SuppliersBuyer> buyerList, List<SuppliersBank> bankList) {
+        SuppliersInfoVo suppliersInfoVo = new SuppliersInfoVo();
+        BeanUtil.copyProperties(suppliersInfo, suppliersInfoVo);
+        suppliersInfoVo.setKtokk(suppliersInfoVo.getRltgr());
+        suppliersInfoVo.setUpdkz("I");
+        if (suppliersInfo.getApplyType().equals("1")) { //更新
+            suppliersInfoVo.setUpdkz("U");
         }
-        //String pageName=CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL,"updkz_erwe");
-        Set <String> keySet=map.keySet();
-   //  Iterator <Map.Entry<String,String>> entries=map.entrySet().iterator();
-   // while (entries.hasNext() )
-        Map <String,Object>upperMap=new HashMap<String,Object>();
-        for (String  str:keySet){
-            upperMap.put(CommonUtil.camelToUnderline(str).toUpperCase(),map.get(str));
+        if (suppliersInfo.getApplyType().equals("-1")) { //删除
+            suppliersInfoVo.setUpdkz("D");
         }
-        List <SuppliersPayVo> payVoList=new ArrayList<>();
-        for  (SuppliersPay suppliersPay:payList){
-            SuppliersPayVo payVo=new SuppliersPayVo();
-            ClassHelper.copyProperties(suppliersPay,payVo);
+        List<SuppliersPayVo> payVoList = new ArrayList<>();
+        for (SuppliersPay suppliersPay : payList) {
+            SuppliersPayVo payVo = new SuppliersPayVo();
+            ClassHelper.copyProperties(suppliersPay, payVo);
             payVoList.add(payVo);
         }
-        List <SuppliersBuyerVo> buyerVoList=new ArrayList<>();
-        for  (SuppliersBuyer suppliersBuyer:buyerList){
-            SuppliersBuyerVo buyerVo=new SuppliersBuyerVo();
-            ClassHelper.copyProperties(suppliersBuyer,buyerVo);
+        suppliersInfoVo.setSuppliersPayList(payVoList);
+        List<SuppliersBuyerVo> buyerVoList = new ArrayList<>();
+        for (SuppliersBuyer suppliersBuyer : buyerList) {
+            SuppliersBuyerVo buyerVo = new SuppliersBuyerVo();
+            ClassHelper.copyProperties(suppliersBuyer, buyerVo);
             buyerVoList.add(buyerVo);
         }
-        List <SuppliersBankVo> bankVoList=new ArrayList<>();
-        for  (SuppliersBank suppliersBank:bankList){
-            SuppliersBankVo bankVo=new SuppliersBankVo();
-            ClassHelper.copyProperties(suppliersBank,bankVo);
+        suppliersInfoVo.setSuppliersBuyerList(buyerVoList);
+        List<SuppliersBankVo> bankVoList = new ArrayList<>();
+        for (SuppliersBank suppliersBank : bankList) {
+            SuppliersBankVo bankVo = new SuppliersBankVo();
+            ClassHelper.copyProperties(suppliersBank, bankVo);
             bankVoList.add(bankVo);
         }
-
-        upperMap.put("LFB1", JSON.toJSONString(payVoList));
-        upperMap.put("LFM1",JSON.toJSONString(buyerVoList));
-        upperMap.put("BANK",JSON.toJSONString(bankVoList));
+        suppliersInfoVo.setSuppliersBankList(bankVoList);
         ObjectMapper objectMapper = new ObjectMapper();
         String url = "CUD_SUPPLY/SUPPLY_DATA";
-        Map<String, Object> resultMap =new HashMap<>();
-         resultMap.put("businessType","suppliersInfo");
-         resultMap.put("businessId",suppliersInfo.getId());
-         resultMap.put("parameter", JSON.toJSONString(upperMap));
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("businessType", "suppliersInfo");
+        resultMap.put("businessId", suppliersInfo.getId());
+        resultMap.put("parameter", JSON.toJSONString(suppliersInfoVo));
+        List<SuppliersInfoVo> suppliersInfoVos = new ArrayList<>();
+        suppliersInfoVos.add(suppliersInfoVo);
         try {
-            String result = defaultHttpClient.execute(upperMap, url);
+            String result = defaultHttpClient.execute(suppliersInfoVos, url);
             List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() {
             });
-             resultMap = resultList.get(0);
-             resultMap.put("sequence",resultMap.get("row"));
-             sapMutualEpLogApplication.saveSapMutualEpLog(resultMap);
+            resultMap = resultList.get(0);
+            resultMap.put("sequence", resultMap.get("row"));
+            sapMutualEpLogApplication.saveSapMutualEpLog(resultMap);
             if ("S".equals(resultMap.get("TYPE"))) {
             } else {
                 throw new RuntimeException("数据传输失败，请稍后手动重试！" + resultMap.get("MESSAGE"));
             }
         } catch (Exception e) {
-            resultMap.put("type","E");
-            resultMap.put("message",e.getMessage());
+            resultMap.put("type", "E");
+            resultMap.put("message", e.getMessage());
             sapMutualEpLogApplication.saveSapMutualEpLog(resultMap);
             throw new RuntimeException("数据传输失败请检查数据后重试！" + e.getMessage());
         }
@@ -380,12 +328,12 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
      * @return
      */
     private String getApprovalSubjectName(String bizId) {
-        SuppliersInfo suppliersInfo=this.suppliersInfoRepository.findOne(bizId);
+        SuppliersInfo suppliersInfo = this.suppliersInfoRepository.findOne(bizId);
         //查询 单据日期
         String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", suppliersInfo.getFillinDate());
         //设置标题
         // String wantGoodsNameText = DictUtil.getDictionaryDetailText("A0051", wantGoods.getCustomerName());
-        if (suppliersInfo.getApplyType().equals("1")){
+        if (suppliersInfo.getApplyType().equals("1")) {
             return String.format("%s-%s(%s)", "供应商主数据修改", "", fillinDateStr);
         } else if (suppliersInfo.getApplyType().equals("-1")) {
             return String.format("%s-%s(%s)", "供应商主数据删除", "", fillinDateStr);
@@ -397,27 +345,28 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
     @Override
     public SuppliersInfo loadSuppliersDataById(String id) {
 
-        SuppliersInfo suppliersInfo=suppliersInfoRepository.findOne(id);
+        SuppliersInfo suppliersInfo = suppliersInfoRepository.findOne(id);
         return suppliersInfo;
     }
 
     @Override
-    public Map<String, Object>  loadSuppliersPayDatas(SuppliersPayQueryRequest queryRequest){
+    public Map<String, Object> loadSuppliersPayDatas(SuppliersPayQueryRequest queryRequest) {
 
         //SuppliersInfo suppliersInfo=suppliersInfoRepository.findOne(queryRequest.getSId());
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedSuppliersPayList");
-       // SuppliersPayQueryRequest queryRequest=new  SuppliersPayQueryRequest();
-       // queryRequest.setSId(sId);
+        // SuppliersPayQueryRequest queryRequest=new  SuppliersPayQueryRequest();
+        // queryRequest.setSId(sId);
         QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
-       // queryModel.putDictionary("konwa", DictUtil.getDictionary("currency"));
+        // queryModel.putDictionary("konwa", DictUtil.getDictionary("currency"));
         queryModel.addCriteria(" and t.s_id =:sId");
         queryModel.putParam("sId", queryRequest.getSId());
         return this.sqlExecutorDao.executeSlicedQuery(queryModel);
     }
+
     @Override
-    public Map<String, Object>  loadSuppliersBuyerDatas(SuppliersBuyerQueryRequest queryRequest){
+    public Map<String, Object> loadSuppliersBuyerDatas(SuppliersBuyerQueryRequest queryRequest) {
         //return  this.suppliersBuyerRepository.findBysId(sId);
-       // Sort sort = new Sort(Sort.Direction.ASC, "sequence");
+        // Sort sort = new Sort(Sort.Direction.ASC, "sequence");
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedSuppliersBuyerList");
 
         QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
@@ -425,8 +374,9 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
         queryModel.putParam("sId", queryRequest.getSId());
         return this.sqlExecutorDao.executeSlicedQuery(queryModel);
     }
+
     @Override
-    public Map<String, Object>  loadSuppliersBankDatas(SuppliersBankQueryRequest  queryRequest){
+    public Map<String, Object> loadSuppliersBankDatas(SuppliersBankQueryRequest queryRequest) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedSuppliersBankList");
         QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
         queryModel.addCriteria(" and t.s_id =:sId");
@@ -436,28 +386,28 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
 
     //删除数据
     @Override
-    public void   deleteSuppliersDataByIds( List<String> ids){
-        for  (String id:ids){
-            List<SuppliersPay> suppliersPayList=this.suppliersPayRepository.findAllBySId(id);
-            for (SuppliersPay suppliersPay:suppliersPayList){
+    public void deleteSuppliersDataByIds(List<String> ids) {
+        for (String id : ids) {
+            List<SuppliersPay> suppliersPayList = this.suppliersPayRepository.findAllBySId(id);
+            for (SuppliersPay suppliersPay : suppliersPayList) {
                 suppliersPayRepository.delete(suppliersPay);
             }
-            List<SuppliersBuyer> suppliersBuyerList=this.suppliersBuyerRepository.findAllBySId(id);
-            for (SuppliersBuyer suppliersBuyer:suppliersBuyerList){
+            List<SuppliersBuyer> suppliersBuyerList = this.suppliersBuyerRepository.findAllBySId(id);
+            for (SuppliersBuyer suppliersBuyer : suppliersBuyerList) {
                 suppliersBuyerRepository.delete(suppliersBuyer);
             }
-            List<SuppliersBank> suppliersBankList=this.suppliersBankRepository.findAllBySId(id);
-            for (SuppliersBank suppliersBank:suppliersBankList){
+            List<SuppliersBank> suppliersBankList = this.suppliersBankRepository.findAllBySId(id);
+            for (SuppliersBank suppliersBank : suppliersBankList) {
                 suppliersBankRepository.delete(suppliersBank);
             }
-             this.suppliersInfoRepository.delete(id);
+            this.suppliersInfoRepository.delete(id);
         }
     }
 
     @Override
     public List<SuppliersInfo> findDeletedSuppliersDataById(String id) {
 
-        List<SuppliersInfo> list=suppliersInfoRepository.findDeletedById(id);
+        List<SuppliersInfo> list = suppliersInfoRepository.findDeletedById(id);
         return list;
     }
 }

topsun/src/main/java/com/huigou/topsun/sap/suppliers/domain/SuppliersInfo.java

 package com.huigou.topsun.sap.suppliers.domain;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.huigou.data.domain.model.FlowBillAbstractEntity;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 供应商主数据
@@ -22,49 +18,49 @@ public class SuppliersInfo extends FlowBillAbstractEntity {
      * 屏幕用途的bp角色
      */
     @Column(name = "rltgr")
-    @JSONField(name = "RLTGR")
+    @JsonProperty("RLTGR")
     private String rltgr;
 
     /**
      * 业务伙伴分组
      */
     @Column(name = "bu_group")
-    @JSONField(name = "BU_GROUP")
+    @JsonProperty("BU_GROUP")
     private String buGroup;
 
     /**
      * 业务伙伴编号
      */
     @Column(name = "partner")
-    @JSONField(name = "PARTNER")
+    @JsonProperty("PARTNER")
     private String partner;
 
     /**
      * 称谓代码
      */
     @Column(name = "title")
-    @JSONField(name = "TITLE")
+    @JsonProperty("TITLE")
     private String title;
 
     /**
      * 组织名称 1
      */
     @Column(name = "name_org1")
-    @JSONField(name = "NAME_ORG1")
+    @JsonProperty("NAME_ORG1")
     private String nameOrg1;
 
     /**
      * 组织名称 2
      */
     @Column(name = "name_org2")
-    @JSONField(name = "NAME_ORG2")
+    @JsonProperty("NAME_ORG2")
     private String nameOrg2;
 
     /**
      * 组织名称 3
      */
     @Column(name = "name_org3")
-    @JSONField(name = "NAME_ORG3")
+    @JsonProperty("NAME_ORG3")
     private String nameOrg3;
 
 
@@ -72,21 +68,21 @@ public class SuppliersInfo extends FlowBillAbstractEntity {
      * 组织名称 4
      */
     @Column(name = "name_org4")
-    @JSONField(name = "NAME_ORG4")
+    @JsonProperty("NAME_ORG4")
     private String nameOrg4;
 
     /**
      * 业务伙伴的搜索词1
      */
     @Column(name = "bu_sort1")
-    @JSONField(name = "BU_SORT1")
+    @JsonProperty("BU_SORT1")
     private String buSort1;
 
     /**
      * 业务伙伴的搜索词2
      */
     @Column(name = "bu_sort2")
-    @JSONField(name = "BU_SORT2")
+    @JsonProperty("BU_SORT2")
     private String buSort2;
 
 
@@ -94,161 +90,161 @@ public class SuppliersInfo extends FlowBillAbstractEntity {
      * 街道
      */
     @Column(name = "street")
-    @JSONField(name = "STREET")
+    @JsonProperty("STREET")
     private String street;
 
     /**
      * 街道2
      */
     @Column(name = "str_suppl1")
-    @JSONField(name = "STR_SUPPL1")
+    @JsonProperty("STR_SUPPL1")
     private String strSuppl1;
 
     /**
      * 街道3
      */
     @Column(name = "str_suppl2")
-    @JSONField(name = "STR_SUPPL2")
+    @JsonProperty("STR_SUPPL2")
     private String strSuppl2;
 
     /**
      * 街道4
      */
     @Column(name = "str_suppl3")
-    @JSONField(name = "STR_SUPPL3")
+    @JsonProperty("STR_SUPPL3")
     private String strSuppl3;
 
     /**
      * 国家/地区代码
      */
     @Column(name = "land1")
-    @JSONField(name = "LAND1")
+    @JsonProperty("LAND1")
     private String land1;
 
     /**
      * 国家/地区代码
      */
     @Column(name = "region")
-    @JSONField(name = "REGION")
+    @JsonProperty("REGION")
     private String region;
 
     /**
      * 语言关键字
      */
     @Column(name = "langu")
-    @JSONField(name = "LANGU")
+    @JsonProperty("LANGU")
     private String langu;
 
     /**
      * 语言关键字
      */
     @Column(name = "city1")
-    @JSONField(name = "CITY1")
+    @JsonProperty("CITY1")
     private String city1;
 
     /**
      * 城市邮政编码
      */
     @Column(name = "post_code1")
-    @JSONField(name = "POST_CODE1")
+    @JsonProperty("POST_CODE1")
     private String postCode1;
 
     /**
      * 第一个电话号码
      */
     @Column(name = "tel_number")
-    @JSONField(name = "TEL_NUMBER")
+    @JsonProperty("TEL_NUMBER")
     private String telNumber;
 
     /**
      * 一个电话号码:分机号
      */
     @Column(name = "tel_extens")
-    @JSONField(name = "TEL_EXTENS")
+    @JsonProperty("TEL_EXTENS")
     private String telExtens;
 
     /**
      * 第一个移动电话号码
      */
     @Column(name = "mob_number")
-    @JSONField(name = "MOB_NUMBER")
+    @JsonProperty("MOB_NUMBER")
     private String mobNumber;
 
     /**
      * 第一个移动电话号码:分机
      */
     @Column(name = "mob_extens")
-    @JSONField(name = "MOB_EXTENS")
+    @JsonProperty("MOB_EXTENS")
     private String mobExtens;
 
     /**
      * 第一个传真号
      */
     @Column(name = "fax_number")
-    @JSONField(name = "FAX_NUMBER")
+    @JsonProperty("FAX_NUMBER")
     private String faxNumber;
 
     /**
      * 第一个传真号：分机号
      */
     @Column(name = "fax_extens")
-    @JSONField(name = "FAX_EXTENS")
+    @JsonProperty("FAX_EXTENS")
     private String faxExtens;
 
     /**
      * 电子邮件地址
      */
     @Column(name = "smtp_addr")
-    @JSONField(name = "SMTP_ADDR")
+    @JsonProperty("SMTP_ADDR")
     private String smtpAddr;
 
     /**
      * 供应商帐户组
      */
     @Column(name = "ktokk")
-    @JSONField(name = "KTOKK")
+    @JsonProperty("KTOKK")
     private String ktokk;
 
     /**
      * 集中设置的采购冻结
      */
     @Column(name = "sperm")
-    @JSONField(name = "SPERM")
+    @JsonProperty("SPERM")
     private String sperm;
 
     /**
      * 中心记帐冻结
      */
     @Column(name = "sperr")
-    @JSONField(name = "SPERR")
+    @JsonProperty("SPERR")
     private String sperr;
 
     /**
      * 贸易合作伙伴的公司标识
      */
     @Column(name = "vbund")
-    @JSONField(name = "VBUND")
+    @JsonProperty("VBUND")
     private String vbund;
 
     /**
      * 客户编号
      */
     @Column(name = "kunnr")
-    @JSONField(name = "KUNNR")
+    @JsonProperty("KUNNR")
     private String kunnr;
 
     /**
      * 责任税务部门的税收编号
      */
     @Column(name = "stenr")
-    @JSONField(name = "STENR")
+    @JsonProperty("STENR")
     private String stenr;
 
     /**
      * 更新标识 I、U、D
      */
     @Column(name = "updkz")
-    @JSONField(name = "UPDKZ")
+    @JsonProperty("UPDKZ")
     private String updkz;
 
     @Column(name = "apply_type")

topsun/src/main/java/com/huigou/topsun/sap/suppliers/domain/vo/SuppliersBankVo.java

 package com.huigou.topsun.sap.suppliers.domain.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
-import org.hibernate.annotations.GenericGenerator;
-
-import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -17,55 +14,55 @@ public class SuppliersBankVo implements Serializable {
     /**
      * 银行所属国家/地区代码
      */
-    @JSONField(name = "BANKS")
+    @JsonProperty("BANKS")
     private String banks;
 
     /**
      * 银行代码
      */
-    @JSONField(name = "BANKL")
+    @JsonProperty("BANKL")
     private String bankl;
 
     /**
      * 银行帐户号码
      */
-    @JSONField(name = "BANKN")
+    @JsonProperty("BANKN")
     private String bankn;
 
     /**
      * 账户持有人姓名
      */
-    @JSONField(name = "KOINH")
+    @JsonProperty("KOINH")
     private String koinh;
 
     /**
      * 银行控制代码
      */
-    @JSONField(name = "BKONT")
+    @JsonProperty("BKONT")
     private String bkont;
 
     /**
      * 对方开户行类型
      */
-    @JSONField(name = "BVTYP")
+    @JsonProperty("BVTYP")
     private String bvtyp;
 
     /**
      * 财务机构名称
      */
-     @JSONField(name = "BANKA")
+     @JsonProperty("BANKA")
     private String banka;
 
     /**
      * 分行
      */
-    @JSONField(name = "BRNCH")
+    @JsonProperty("BRNCH")
     private String brnch;
 
     /**
      * 银行细目的参考明细
      */
-    @JSONField(name = "BKREF")
+    @JsonProperty("BKREF")
     private String bkref;
 
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/suppliers/domain/vo/SuppliersBuyerVo.java

 package com.huigou.topsun.sap.suppliers.domain.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
-import org.hibernate.annotations.GenericGenerator;
-
-import javax.persistence.*;
-import java.io.Serializable;
 
 /**
  */
@@ -16,82 +12,82 @@ public class SuppliersBuyerVo {
     /**
      * 采购组织
      */
-     @JSONField(name = "EKORG")
+     @JsonProperty("EKORG")
     private String ekorg;
 
     /**
      * 货币码
      */
-      @JSONField(name = "WAERS")
+      @JsonProperty("WAERS")
     private String waers;
 
     /**
      * 付款条件代码
      */
-    @JSONField(name = "ZTERM")
+    @JsonProperty("ZTERM")
     private String zterm;
 
     /**
      * 国际贸易条款
      */
-    @JSONField(name = "INCO1")
+    @JsonProperty("INCO1")
     private String inco1;
 
     /**
      * 国际贸易条款位置 1
      */
-    @JSONField(name = "INCO2_L")
+    @JsonProperty("INCO2_L")
     private String inco2L;
 
     /**
      * 国际贸易条款位置 2
      */
-    @JSONField(name = "INCO3_L")
+    @JsonProperty("INCO3_L")
     private String inco3L;
 
     /**
      * 标识：基于收货的发票验证
      */
-    @JSONField(name = "WEBRE")
+    @JsonProperty("WEBRE")
     private String webre;
 
     /**
      * 计算方案组（供应商）
      */
-    @JSONField(name = "KALSK")
+    @JsonProperty("KALSK")
     private String kalsk;
 
 
     /**
      * 供应商办公室的负责销售人员
      */
-    @JSONField(name = "VERKF")
+    @JsonProperty("VERKF")
     private String verkf;
 
 
     /**
      * 供应商电话号码
      */
-    @JSONField(name = "TELF1")
+    @JsonProperty("TELF1")
     private String telf1;
 
     /**
      * 基于服务的发票校验标识
      */
-    @JSONField(name = "LEBRE")
+    @JsonProperty("LEBRE")
     private String lebre;
 
     /**
      * 边境运输方式（欧盟内部贸易统计）
      */
-    @JSONField(name = "EXPVZ")
+    @JsonProperty("EXPVZ")
     private String expvz;
 
 
     /**
      * 采购冻结在采购组织层
      */
-    @JSONField(name = "SPERM")
+    @JsonProperty("SPERM")
     private String sperm;
 
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/suppliers/domain/vo/SuppliersInfoVo.java

+package com.huigou.topsun.sap.suppliers.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 供应商主数据
+  */
+@Data
+public class SuppliersInfoVo implements Serializable {
+
+    /**
+     * 屏幕用途的bp角色
+     */
+    @JsonProperty("RLTGR")
+    private String rltgr;
+
+    /**
+     * 业务伙伴分组
+     */
+    @JsonProperty("BU_GROUP")
+    private String buGroup;
+
+    /**
+     * 业务伙伴编号
+     */
+    @JsonProperty("PARTNER")
+    private String partner;
+
+    /**
+     * 称谓代码
+     */
+    @JsonProperty("TITLE")
+    private String title;
+
+    /**
+     * 组织名称 1
+     */
+    @JsonProperty("NAME_ORG1")
+    private String nameOrg1;
+
+    /**
+     * 组织名称 2
+     */
+    @JsonProperty("NAME_ORG2")
+    private String nameOrg2;
+
+    /**
+     * 组织名称 3
+     */
+    @JsonProperty("NAME_ORG3")
+    private String nameOrg3;
+
+
+    /**
+     * 组织名称 4
+     */
+    @JsonProperty("NAME_ORG4")
+    private String nameOrg4;
+
+    /**
+     * 业务伙伴的搜索词1
+     */
+    @JsonProperty("BU_SORT1")
+    private String buSort1;
+
+    /**
+     * 业务伙伴的搜索词2
+     */
+    @JsonProperty("BU_SORT2")
+    private String buSort2;
+
+
+    /**
+     * 街道
+     */
+    @JsonProperty("STREET")
+    private String street;
+
+    /**
+     * 街道2
+     */
+    @JsonProperty("STR_SUPPL1")
+    private String strSuppl1;
+
+    /**
+     * 街道3
+     */
+    @JsonProperty("STR_SUPPL2")
+    private String strSuppl2;
+
+    /**
+     * 街道4
+     */
+    @JsonProperty("STR_SUPPL3")
+    private String strSuppl3;
+
+    /**
+     * 国家/地区代码
+     */
+    @JsonProperty("LAND1")
+    private String land1;
+
+    /**
+     * 国家/地区代码
+     */
+    @JsonProperty("REGION")
+    private String region;
+
+    /**
+     * 语言关键字
+     */
+    @JsonProperty("LANGU")
+    private String langu;
+
+    /**
+     * 语言关键字
+     */
+    @JsonProperty("CITY1")
+    private String city1;
+
+    /**
+     * 城市邮政编码
+     */
+    @JsonProperty("POST_CODE1")
+    private String postCode1;
+
+    /**
+     * 第一个电话号码
+     */
+    @JsonProperty("TEL_NUMBER")
+    private String telNumber;
+
+    /**
+     * 一个电话号码:分机号
+     */
+    @JsonProperty("TEL_EXTENS")
+    private String telExtens;
+
+    /**
+     * 第一个移动电话号码
+     */
+    @JsonProperty("MOB_NUMBER")
+    private String mobNumber;
+
+    /**
+     * 第一个移动电话号码:分机
+     */
+    @JsonProperty("MOB_EXTENS")
+    private String mobExtens;
+
+    /**
+     * 第一个传真号
+     */
+    @JsonProperty("FAX_NUMBER")
+    private String faxNumber;
+
+    /**
+     * 第一个传真号：分机号
+     */
+    @JsonProperty("FAX_EXTENS")
+    private String faxExtens;
+
+    /**
+     * 电子邮件地址
+     */
+    @JsonProperty("SMTP_ADDR")
+    private String smtpAddr;
+
+    /**
+     * 供应商帐户组
+     */
+    @JsonProperty("KTOKK")
+    private String ktokk;
+
+    /**
+     * 集中设置的采购冻结
+     */
+    @JsonProperty("SPERM")
+    private String sperm;
+
+    /**
+     * 中心记帐冻结
+     */
+    @JsonProperty("SPERR")
+    private String sperr;
+
+    /**
+     * 贸易合作伙伴的公司标识
+     */
+    @JsonProperty("VBUND")
+    private String vbund;
+
+    /**
+     * 客户编号
+     */
+    @JsonProperty("KUNNR")
+    private String kunnr;
+
+    /**
+     * 责任税务部门的税收编号
+     */
+    @JsonProperty("STENR")
+    private String stenr;
+
+    /**
+     * 更新标识 I、U、D
+     */
+    @JsonProperty("UPDKZ")
+    private String updkz;
+
+    @JsonProperty("LFB1")
+    private List<SuppliersPayVo>  suppliersPayList;
+
+    @JsonProperty("LFM1")
+    private List<SuppliersBuyerVo> suppliersBuyerList;
+
+    @JsonProperty("BANK")
+    private List<SuppliersBankVo>  suppliersBankList;
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/suppliers/domain/vo/SuppliersPayVo.java

 package com.huigou.topsun.sap.suppliers.domain.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
-import org.hibernate.annotations.GenericGenerator;
-
-import javax.persistence.*;
-import java.io.Serializable;
 
 /**
  * 
@@ -18,51 +14,51 @@ public class SuppliersPayVo  {
     /**
      * 公司代码
      */
-    @JSONField(name = "BUKRS")
+    @JsonProperty("BUKRS")
     private String bukrs;
 
     /**
      * 总帐中的统驭科目
      */
-    @JSONField(name = "AKONT")
+    @JsonProperty("AKONT")
     private String akont;
 
 
     /**
      * 根据分配号排序代码
      */
-    @JSONField(name = "ZUAWA")
+    @JsonProperty("ZUAWA")
     private String zuawa;
 
     /**
      * 付款条件代码
      */
-    @JSONField(name = "ZTERM")
+    @JsonProperty("ZTERM")
     private String zterm;
 
     /**
      * 考虑的付款方式清单
      */
-    @JSONField(name = "ZWELS")
+    @JsonProperty("ZWELS")
     private String zwels;
 
 
     /**
      * 检查双重发票或信贷凭单的标志
      */
-    @JSONField(name = "REPRF")
+    @JsonProperty("REPRF")
     private String reprf;
 
     /**
      * 中心记帐冻结
     */
-    @JSONField(name = "SPERR")
+    @JsonProperty("SPERR")
     private String sperr;
 
     /**
      * 对公司代码过帐冻结
      */
-    @JSONField(name = "SPERR_B")
+    @JsonProperty("SPERR_B")
     private String sperrB;
 
 }
\ No newline at end of file