Browse Source

[深爱]基础数据对接

zxl 1 year ago
parent
commit
f99395d491
24 changed files with 1318 additions and 16 deletions
  1. 14 3
      src/main/java/com/uas/eis/controller/STKController.java
  2. 81 0
      src/main/java/com/uas/eis/dto/stksto/QueryAccountantProjectDto.java
  3. 60 0
      src/main/java/com/uas/eis/dto/stksto/QueryCashFlowItemsDto.java
  4. 16 0
      src/main/java/com/uas/eis/dto/stksto/StkCommonDto.java
  5. 79 0
      src/main/java/com/uas/eis/sdk/dto/SaveOrChangeCustomerDetailDto.java
  6. 18 0
      src/main/java/com/uas/eis/sdk/dto/SaveOrChangeCustomerDto.java
  7. 19 0
      src/main/java/com/uas/eis/sdk/dto/UpdateCustVendDTO.java
  8. 24 0
      src/main/java/com/uas/eis/sdk/enums/CustomerTypeEnum.java
  9. 28 0
      src/main/java/com/uas/eis/sdk/enums/UidTypeEnum.java
  10. 91 5
      src/main/java/com/uas/eis/service/Impl/RequestSTKServiceImpl.java
  11. 134 6
      src/main/java/com/uas/eis/service/Impl/STKServiceImpl.java
  12. 21 1
      src/main/java/com/uas/eis/service/RequestSTKService.java
  13. 17 1
      src/main/java/com/uas/eis/service/STKService.java
  14. 28 0
      src/main/java/com/uas/eis/task/STKTask.java
  15. 321 0
      src/main/java/com/uas/eis/vo/stkVo/AccountantProjectDataVo.java
  16. 19 0
      src/main/java/com/uas/eis/vo/stkVo/AccountantProjectVo.java
  17. 41 0
      src/main/java/com/uas/eis/vo/stkVo/AssistentryVo.java
  18. 194 0
      src/main/java/com/uas/eis/vo/stkVo/CashFlowItemsDataVo.java
  19. 21 0
      src/main/java/com/uas/eis/vo/stkVo/CashFlowItemsVo.java
  20. 21 0
      src/main/java/com/uas/eis/vo/stkVo/SaveOrChangeCustomerDataVo.java
  21. 13 0
      src/main/java/com/uas/eis/vo/stkVo/SaveOrChangeCustomerVo.java
  22. 44 0
      src/main/java/com/uas/eis/vo/stkVo/StkResponseBaseVo.java
  23. 7 0
      src/main/resources/application-dev.yml
  24. 7 0
      src/main/resources/application-prod.yml

+ 14 - 3
src/main/java/com/uas/eis/controller/STKController.java

@@ -3,9 +3,7 @@ package com.uas.eis.controller;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
-import com.uas.eis.sdk.dto.AssistBalanceDTO;
-import com.uas.eis.sdk.dto.CustvendDTO;
-import com.uas.eis.sdk.dto.Md5TestVo;
+import com.uas.eis.sdk.dto.*;
 import com.uas.eis.sdk.entity.ApiResult;
 import com.uas.eis.service.RequestSTKService;
 import com.uas.eis.service.STKService;
@@ -72,6 +70,19 @@ public class STKController {
         return stkService.getCashFlow(request, dto);
     }
 
+
+
+
+    /**
+     * 新增修改客商信息
+     */
+    @PostMapping(value="/erp/updateCustVend")
+    public ApiResult<String> updateCustVend(@RequestBody UpdateCustVendDTO dto){
+        return stkService.updateCustVend( dto);
+    }
+
+
+
     /**
      * 接口测试
      * */

+ 81 - 0
src/main/java/com/uas/eis/dto/stksto/QueryAccountantProjectDto.java

@@ -0,0 +1,81 @@
+package com.uas.eis.dto.stksto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 查询会计科目
+ * */
+@Data
+public class QueryAccountantProjectDto {
+
+    /**
+     *源_数据 ID
+     * */
+    private Integer S_ID;
+
+    /**
+     *源_会计科目编码
+     * */
+    private String S_NUMBER;
+
+    /**
+     *会计科目编码
+     * */
+    private String CODE;
+
+    /**
+     *名称
+     * */
+    private String NAME;
+
+    /**
+     *上级 ID
+     * */
+    private Integer PARENTID;
+
+    /**
+     *源_上级会计科目编码
+     * */
+    private String S_PARENTNUM;
+
+    /**
+     *上级会计科目编码
+     * */
+    private String PARENTCODE;
+
+    /**
+     *上级名称
+     * */
+    private String PARENTNAME;
+
+    /**
+     *级次
+     * */
+    private Integer LEVEL;
+
+    /**
+     *科目类型名称
+     * */
+    private String ACCOUNTTYPENAME;
+
+    /**
+     *余额方向
+     * 1:借;-1:贷
+     * */
+    private String DC;
+
+    /**
+     *创建时间
+     * yyyy-MM-dd HH:mm:ss
+     * */
+    private Date CREATE_TIME;
+
+    /**
+     *修改时间
+     * yyyy-MM-dd HH:mm:ss
+     * */
+    private Date UPDATE_TIME;
+
+}

+ 60 - 0
src/main/java/com/uas/eis/dto/stksto/QueryCashFlowItemsDto.java

@@ -0,0 +1,60 @@
+package com.uas.eis.dto.stksto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 查询现金流量项目
+ * */
+@Data
+public class QueryCashFlowItemsDto{
+
+    /**
+     *主键 ID
+     * */
+    private Integer ID;
+
+    /**
+     *源_编码
+     * */
+    private String NUMBER;
+
+    /**
+     *编码
+     * */
+    private String CODE;
+
+    /**
+     *名称
+     * */
+    private String NAME;
+
+    /**
+     *长编码
+     * */
+    private String LONGNUMBER;
+
+    /**
+     *级次
+     * */
+    private Integer LEVEL;
+
+    /**
+     *长名称
+     * */
+    private String FULLNAME;
+
+    /**
+     *创建时间
+     * yyyy-MM-dd HH:mm:ss
+     * */
+    private Date CREATE_TIME;
+
+    /**
+     *修改时间
+     * yyyy-MM-dd HH:mm:ss
+     * */
+    private String UPDATE_TIME;
+
+}

+ 16 - 0
src/main/java/com/uas/eis/dto/stksto/StkCommonDto.java

@@ -0,0 +1,16 @@
+package com.uas.eis.dto.stksto;
+
+import lombok.Data;
+
+/**
+ * 查询公用dto
+ * */
+@Data
+public class StkCommonDto extends STKPageDto {
+
+    /**
+     * 查询参数
+     * */
+    private Object param;
+
+}

+ 79 - 0
src/main/java/com/uas/eis/sdk/dto/SaveOrChangeCustomerDetailDto.java

@@ -0,0 +1,79 @@
+package com.uas.eis.sdk.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 新增变更客商信息详情dto
+ * */
+@Data
+public class SaveOrChangeCustomerDetailDto {
+
+    /**
+     *
+     * */
+    private String SERIAL;
+
+    /**
+     *源头业务系统外部客户编码
+     * */
+    private String S_CODE;
+
+    /**
+     *  客户名称
+     * */
+    private String NAME;
+
+    /**
+     * 唯一编码类型 {@link UidTypeEnum}
+     * */
+    private String UID_TYPE;
+
+    /**
+     * 唯一性编码
+     * */
+    private String UID;
+
+    /**
+     * 客户/供应商分类 {@link CustomerTypeEnum}
+     * */
+    private String CUSTOMER_TYPE;
+
+    /**
+     * 是否有效
+     * */
+    private String IS_VALID;
+
+    /**
+     *商创建组织中台编码
+     * */
+    private String CREATED_ORG;
+
+    /**
+     * 数据源头标识
+     * */
+    private String CREATED_SYSTEM;
+
+    /**
+     *是否临时客商
+     * */
+    private String ISTEMPORARY;
+
+    /**
+     *客商 MDM编码
+     * */
+    private String MDM_CODE;
+
+    /**
+     * 数据创建时间
+     * */
+    private Date CREAT_AT;
+
+    /**
+     * 数据更新时间
+     * */
+    private Date UPDATE_AT;
+
+
+}

+ 18 - 0
src/main/java/com/uas/eis/sdk/dto/SaveOrChangeCustomerDto.java

@@ -0,0 +1,18 @@
+package com.uas.eis.sdk.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 新增变更客商信息
+ * */
+@Data
+public class SaveOrChangeCustomerDto {
+
+    /**
+     * 新增变更客商详情集合
+     * */
+    private List<SaveOrChangeCustomerDetailDto> param;
+
+}

+ 19 - 0
src/main/java/com/uas/eis/sdk/dto/UpdateCustVendDTO.java

@@ -0,0 +1,19 @@
+package com.uas.eis.sdk.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class UpdateCustVendDTO{
+
+    /**
+     * 客户/供应商ID
+     * */
+    private int vid;
+
+    /**
+     * 类型(客户/供应商)
+     * */
+    private String vtype;
+}

+ 24 - 0
src/main/java/com/uas/eis/sdk/enums/CustomerTypeEnum.java

@@ -0,0 +1,24 @@
+package com.uas.eis.sdk.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * 客户/供应商分类
+ * */
+@AllArgsConstructor
+public enum CustomerTypeEnum {
+
+    UNIT_CUSTOMER("C0201","单位客户"),
+
+    INDIVIDUAL_CUSTOMER("C0202","单人客户"),
+
+    UNIT_SUPPLIER("S0201","单位供应商"),
+
+    INDIVIDUAL_SUPPLIER("S0202","个人供应商")
+    ;
+
+    private String type;
+
+    private String description;
+
+}

+ 28 - 0
src/main/java/com/uas/eis/sdk/enums/UidTypeEnum.java

@@ -0,0 +1,28 @@
+package com.uas.eis.sdk.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * uid_type唯一编码类型
+ * */
+@AllArgsConstructor
+public enum  UidTypeEnum {
+
+    UNIFIED_SOCIAL_CREDIT_CODE("01","统一社会信用代码"),
+
+    DENG_CODE("02","邓氏编码"),
+
+    ID_CARD("03","身份证号码"),
+
+    passport_NO("04","护照号码(包括港澳身份证号码)"),
+
+    ID_CARD_PASSPORT_COMBINATION("06","身份证护照组合"),
+
+    OTHER_CODE("99","其它编码")
+    ;
+
+    private String type;
+
+    private String description;
+
+}

+ 91 - 5
src/main/java/com/uas/eis/service/Impl/RequestSTKServiceImpl.java

@@ -3,19 +3,24 @@ package com.uas.eis.service.Impl;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.eis.dao.BaseDao;
 import com.uas.eis.dao.SqlRowList;
+import com.uas.eis.dto.stksto.QueryAccountantProjectDto;
+import com.uas.eis.dto.stksto.QueryCashFlowItemsDto;
 import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
+import com.uas.eis.dto.stksto.StkCommonDto;
 import com.uas.eis.sdk.dto.CustvendDTO;
+import com.uas.eis.sdk.dto.SaveOrChangeCustomerDetailDto;
+import com.uas.eis.sdk.dto.SaveOrChangeCustomerDto;
 import com.uas.eis.service.RequestSTKService;
 import com.uas.eis.utils.HuToolUtils;
 import com.uas.eis.utils.STKSignUtil;
-import com.uas.eis.vo.stkVo.HttpResultResponse;
-import com.uas.eis.vo.stkVo.TravellingMerchantVo;
+import com.uas.eis.vo.stkVo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,12 +38,30 @@ public class RequestSTKServiceImpl implements RequestSTKService {
     @Value("${STK.app_key}")
     private String STK_APP_KEY;
 
-    /**
-     * 公司组织编码
-     * */
+    /** 新增修改客商信息接口地址 */
+    @Value("${STK.save_or_update_url}")
+    private String SAVE_OR_UPDATE_URL;
+
+    /** 自动化查询接口地址 */
+    @Value("${STK.query_url}")
+    private String QUERY_URL;
+
+    /** 公司组织编码 */
     @Value("${STK.s_org_code}")
     private String S_ORG_CODE;
 
+    /** 新增修改客商信息接口请求编码 */
+    @Value("${STK.save_or_update_request_code}")
+    private String SAVE_OR_UPDATE_REQUEST_CODE ;
+
+    /** 查询现金流量项目接口编码 */
+    @Value("${STk.cash_flow_items_request_code}")
+    private String CASH_FLOW_ITEMS_REQUEST_CODE;
+
+    /** 查询会计科目方法编码 */
+    @Value("${STk.accountant_project_request_code}")
+    private String ACCOUNTANT_PROJECT_REQUEST_CODE;
+
     @Autowired
     private BaseDao baseDao;
 
@@ -77,6 +100,69 @@ public class RequestSTKServiceImpl implements RequestSTKService {
         return JSONObject.parseObject(resultResponse.getBody(),TravellingMerchantVo.class);  //返回结果
     }
 
+    @Override
+    public SaveOrChangeCustomerVo saveOrChangeCustomer(List<SaveOrChangeCustomerDetailDto> sourceDataList) {
+        if(CollectionUtils.isEmpty(sourceDataList)){
+            log.info("深投控,新增修改客商信息数据为空");
+            return new SaveOrChangeCustomerVo();
+        }
+        //新增修改客商信息对象集合
+        //List<SaveOrChangeCustomerDetailDto> detailDtos = doSaveOrUpdateCustomerParam(sourceDataList);
+
+        //调用深投控新增修改客商信息
+        SaveOrChangeCustomerDto changeCustomerDto = new SaveOrChangeCustomerDto();
+        changeCustomerDto.setParam(sourceDataList);
+        HttpResultResponse resultResponse = HuToolUtils.post(SAVE_OR_UPDATE_URL+SAVE_OR_UPDATE_REQUEST_CODE,changeCustomerDto);
+        log.info("深投控,新增修改客商信息,返回结果数据{}",JSONObject.toJSONString(resultResponse));
+        if(!resultResponse.getSuccess()){
+            log.info("深投控,新增修改客商信息数据异常:{}",resultResponse.getMessage());
+        }
+        return JSONObject.parseObject(resultResponse.getBody(), SaveOrChangeCustomerVo.class);
+    }
+
+    @Override
+    public CashFlowItemsVo getCashFlowItems(QueryCashFlowItemsDto dto) {
+        StkCommonDto stkCommonDto = new StkCommonDto();
+        stkCommonDto.setParam(dto);
+        HttpResultResponse resultResponse = HuToolUtils.post(QUERY_URL+CASH_FLOW_ITEMS_REQUEST_CODE,stkCommonDto);
+        log.info("深投控,现金流项目,返回结果数据{}",JSONObject.toJSONString(resultResponse));
+        if(!resultResponse.getSuccess()){
+            log.info("深投控,现金流项目数据异常:{}",resultResponse.getMessage());
+        }
+        return JSONObject.parseObject(resultResponse.getBody(), CashFlowItemsVo.class);
+    }
+
+    @Override
+    public AccountantProjectVo getAccountantProject(QueryAccountantProjectDto dto) {
+        StkCommonDto stkCommonDto = new StkCommonDto();
+        stkCommonDto.setParam(dto);
+        HttpResultResponse resultResponse = HuToolUtils.post(QUERY_URL+ACCOUNTANT_PROJECT_REQUEST_CODE,stkCommonDto);
+        log.info("深投控,会计项目,返回结果数据{}",JSONObject.toJSONString(resultResponse));
+        if(!resultResponse.getSuccess()){
+            log.info("深投控,会计项目数据异常:{}",resultResponse.getMessage());
+        }
+        return JSONObject.parseObject(resultResponse.getBody(),AccountantProjectVo.class);
+    }
+
+    /**
+     * 新增修改客商信息请求参数封装
+     * @Param 数据库查询数据
+     * */
+    private List<SaveOrChangeCustomerDetailDto> doSaveOrUpdateCustomerParam(List<Object> sourceDataList){
+        if(CollectionUtils.isEmpty(sourceDataList)){
+            return new ArrayList<>();
+        }
+        List<SaveOrChangeCustomerDetailDto> detailDtos = new ArrayList<>();
+        sourceDataList.stream().forEach(p->{
+            SaveOrChangeCustomerDetailDto detailDto = new SaveOrChangeCustomerDetailDto();
+
+            // todo 数据处理, 业务数据需要将 List<Object>中的Object换成数据库查询出的对象类型
+
+            detailDtos.add(detailDto);
+        });
+        return detailDtos;
+    }
+
     @Override
     public List<CustvendDTO> queryList() {
         List<CustvendDTO> custvendDTO = new ArrayList<CustvendDTO>();

+ 134 - 6
src/main/java/com/uas/eis/service/Impl/STKServiceImpl.java

@@ -10,12 +10,10 @@ import com.uas.eis.dao.SqlRowList;
 import com.uas.eis.sdk.dto.*;
 import com.uas.eis.sdk.entity.ApiResult;
 import com.uas.eis.sdk.resp.ApiResponse;
+import com.uas.eis.service.RequestSTKService;
 import com.uas.eis.service.STKService;
-import com.uas.eis.utils.CollectionUtil;
-import com.uas.eis.utils.FlexJsonUtil;
-import com.uas.eis.utils.PSHttpUtils;
-import com.uas.eis.utils.StringUtil;
-import com.uas.eis.vo.stkVo.TravellingMerchantVo;
+import com.uas.eis.utils.*;
+import com.uas.eis.vo.stkVo.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +36,9 @@ public class STKServiceImpl implements STKService {
     @Autowired
     private BaseDao baseDao;
 
+    @Autowired
+    private RequestSTKService requestSTKService;
+
     @Override
     public ApiResult<String> getAssistBalanceCount(HttpServletRequest request, AssistBalanceDTO dto) {
         String yearmonth = dto.getYearMonth();
@@ -142,6 +143,56 @@ public class STKServiceImpl implements STKService {
         }
     }
 
+
+
+    @Override
+    public ApiResult<String> updateCustVend(UpdateCustVendDTO dto) {
+        int vid = dto.getVid();
+        String vtype = dto.getVtype();
+        //查询出的新增,变更数据
+        List<SaveOrChangeCustomerDetailDto> sourceDataList = new ArrayList<>();
+        if ("客户".equals(vtype)) {
+            SqlRowList cust = baseDao
+                    .queryForRowSet("select * from Customer left join STK_CUSTVEND on cu_businesscode = uid2 where cu_id="
+                            + vid + "");
+            while (cust.next()) {
+                SaveOrChangeCustomerDetailDto sourcedao = new SaveOrChangeCustomerDetailDto();
+                sourcedao.setS_CODE(cust.getString("CU_CODE"));
+                sourcedao.setNAME(cust.getString("CU_NAME"));
+                sourcedao.setUID_TYPE(cust.getString("UID_TYPE"));
+                sourcedao.setUID(cust.getString("CU_BUSINESSCODE"));
+                sourcedao.setCUSTOMER_TYPE(cust.getString("CUSTOMER_TYPE"));
+                sourcedao.setIS_VALID(cust.getString("IS_VALID"));
+                sourcedao.setCREATED_ORG(cust.getString("CREATED_ORG"));
+                sourcedao.setCREATED_SYSTEM(cust.getString("CREATED_SYSTEM"));
+                sourcedao.setISTEMPORARY(cust.getString("ISTEMPORARY"));
+                sourceDataList.add(sourcedao);
+            }
+
+        }else{
+            SqlRowList vend = baseDao
+                    .queryForRowSet("select * from Vendor left join STK_CUSTVEND on ve_webserver = uid2 where ve_id="
+                            + vid + "");
+            while (vend.next()) {
+                SaveOrChangeCustomerDetailDto sourcedao = new SaveOrChangeCustomerDetailDto();
+                sourcedao.setS_CODE(vend.getString("CU_CODE"));
+                sourcedao.setNAME(vend.getString("CU_NAME"));
+                sourcedao.setUID_TYPE(vend.getString("UID_TYPE"));
+                sourcedao.setUID(vend.getString("VE_WEBSERVER"));
+                sourcedao.setCUSTOMER_TYPE(vend.getString("CUSTOMER_TYPE"));
+                sourcedao.setIS_VALID(vend.getString("IS_VALID"));
+                sourcedao.setCREATED_ORG(vend.getString("CREATED_ORG"));
+                sourcedao.setCREATED_SYSTEM(vend.getString("CREATED_SYSTEM"));
+                sourcedao.setISTEMPORARY(vend.getString("ISTEMPORARY"));
+                sourceDataList.add(sourcedao);
+            }
+        }
+        //调用深投控api接口
+        SaveOrChangeCustomerVo saveOrChangeCustomerVo = requestSTKService.saveOrChangeCustomer(sourceDataList);
+        return null;
+    }
+
+
     @Override
     public ApiResult<String> getAssistBalanceCountTest(HttpServletRequest request, AssistBalanceDTO dto) {
         //取yearMonth
@@ -156,7 +207,7 @@ public class STKServiceImpl implements STKService {
 
 
 
-
+    //客商信息
     @Override
     public void getCustvend(TravellingMerchantVo travellingMerchantVo , Boolean isdelete) {
         if(null == travellingMerchantVo.getData() || CollectionUtils.isEmpty(travellingMerchantVo.getData().getList())){
@@ -186,6 +237,83 @@ public class STKServiceImpl implements STKService {
         baseDao.execute(sqls);
     }
 
+
+
+    //获取现金流
+    @Override
+    public void getCashFlowItems(CashFlowItemsVo cashFlowItemsVo , Boolean isdelete) {
+        if(null == cashFlowItemsVo.getData()){
+            return ;
+        }
+        List<CashFlowItemsDataVo> cashFlowItemsDataVo = cashFlowItemsVo.getData();
+        List<String> sqls = new ArrayList<>();
+        if (isdelete) {
+            sqls.add("delete from STK_CASHFLOWDJ");
+        }
+        for (int i = 0; i < cashFlowItemsDataVo.size(); i++) {
+            sqls.add("insert into STK_CASHFLOWDJ(ID,NUMBER2,CODE,NAME,LONGNUMBER,LEVEL2,FULLNAME,ISLEAF,CTRLSTRATEGY,SOURCEDATA,BITINDEX,SRCINDEX," +
+                    "TYPE,DIRECTION,ISDEALACTIVITY,ISEXCHANGERATE,ISPREFIT,NOTICE,CHECKITEMHELP,ISASSIST,ISSCHEDULEITEM,MODIFIER_NUMBER," +
+                    "MODIFIER_NAME,CREATEORG_NUMBER,ORG_NUMBER,ORG_NAME,USEORG_NUMBER,USEORG_NAME,STATUS,ENABLE," +
+                    "CREATE_TIME," +
+                    "UPDATE_IME," +
+                    "SOURCE,ASSISTENTRY) " +
+                    "values ("+cashFlowItemsDataVo.get(i).getID()+",'"+cashFlowItemsDataVo.get(i).getNUMBER()+"','"+cashFlowItemsDataVo.get(i).getCODE()+"','"+cashFlowItemsDataVo.get(i).getNAME()+"'" +
+                    ",'"+cashFlowItemsDataVo.get(i).getLONGNUMBER()+"','"+cashFlowItemsDataVo.get(i).getLEVEL()+"','"+cashFlowItemsDataVo.get(i).getFULLNAME()+"','"+cashFlowItemsDataVo.get(i).getISLEAF()+"'" +
+                    ",'"+cashFlowItemsDataVo.get(i).getCTRLSTRATEGY()+"','"+cashFlowItemsDataVo.get(i).getSOURCEDATA()+"','"+cashFlowItemsDataVo.get(i).getBITINDEX()+"','"+cashFlowItemsDataVo.get(i).getSRCINDEX()+"'" +
+                    ",'"+cashFlowItemsDataVo.get(i).getTYPE()+"','"+cashFlowItemsDataVo.get(i).getDIRECTION()+"','"+cashFlowItemsDataVo.get(i).getISDEALACTIVITY()+"','"+cashFlowItemsDataVo.get(i).getISEXCHANGERATE()+"','"+cashFlowItemsDataVo.get(i).getISPREFIT()+"','"+cashFlowItemsDataVo.get(i).getNOTICE()+"'" +
+                    ",'"+cashFlowItemsDataVo.get(i).getCHECKITEMHELP()+"','"+cashFlowItemsDataVo.get(i).getISASSIST()+"','"+cashFlowItemsDataVo.get(i).getISSCHEDULEITEM()+"','"+cashFlowItemsDataVo.get(i).getMODIFIER_NUMBER()+"'" +
+                    ",'"+cashFlowItemsDataVo.get(i).getMODIFIER_NAME()+"','"+cashFlowItemsDataVo.get(i).getCREATEORG_NUMBER()+"','"+cashFlowItemsDataVo.get(i).getORG_NUMBER()+"','"+cashFlowItemsDataVo.get(i).getORG_NAME()+"'" +
+                    ",'"+cashFlowItemsDataVo.get(i).getUSEORG_NUMBER()+"','"+cashFlowItemsDataVo.get(i).getUSEORG_NAME()+"','"+cashFlowItemsDataVo.get(i).getSTATUS()+"','"+cashFlowItemsDataVo.get(i).getENABLE()+"'" +
+                    ",case when '"+cashFlowItemsDataVo.get(i).getCREATE_TIME()+"' = 'null' then null else to_date(to_char(to_timestamp('"+cashFlowItemsDataVo.get(i).getCREATE_TIME()+"','yyyy-mm-dd hh24:mi:ssxff'),'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss') end" +
+                    ",case when '"+cashFlowItemsDataVo.get(i).getUPDATE_IME()+"' = 'null' then null else to_date(to_char(to_timestamp('"+cashFlowItemsDataVo.get(i).getUPDATE_IME()+"','yyyy-mm-dd hh24:mi:ssxff'),'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss') end" +
+                    ",'"+cashFlowItemsDataVo.get(i).getSOURCE()+"','"+cashFlowItemsDataVo.get(i).getASSISTENTRY()+"')");
+        }
+        baseDao.execute(sqls);
+    }
+
+
+    //获取会计科目
+    @Override
+    public void getAccountantProject(AccountantProjectVo accountantProjectVo , Boolean isdelete) {
+        if(null == accountantProjectVo.getData()){
+            return ;
+        }
+        List<AccountantProjectDataVo> accountantProjectDataVo = accountantProjectVo.getData();
+        List<String> sqls = new ArrayList<>();
+        if (isdelete) {
+            sqls.add("delete from STK_CATEGORYDJ");
+        }
+        for (int i = 0; i < accountantProjectDataVo.size(); i++) {
+            sqls.add("insert into STK_CATEGORYDJ(S_ID,S_NUMBER,CODE,NAME,PARENTID,S_PARENTNUM,PARENTCODE,PARENTNAME,LONGNUMBER,LONGNAME,LEVEL2,ISLEAF,ACCOUNTTABLENUMBER,ACCOUNTTABLENAME,ACCOUNTTYPENUMBER,ACCOUNTTYPENAME," +
+                    "PLTYPE,DC,ACCRUALDIRECTION,ISCASH,ISBANK,ISCASHEQUIVALENT,ACNOTICE,ISCHANGECURRENCY,BW,ISQTY,ISASSIST,NOCURRENCYRADIO,DESCURRENCYRADIO,ALLCURRENCYRADIO,ACCTCURRENCY,HELPCODE,ISALLOWCA,ORGCONTROLLEVEL,ISMANUAL,ACCHECK,ISJOURNAL," +
+                    "STARTDATE," +
+                    "ENDDATE," +
+                    "MREUTYPENUMBER,MREUTYPENAME,MEASUREUNITCNUM,MEASUREUNITNAME,CREATEORGCODE,CREATEORGNAME,ORG_NUMBER,ORG_NAME,USEORG_NUMBER,USEORG_NAME,CTRLSTRATEGY,STATUS,ENABLE," +
+                    "CREATE_TIME," +
+                    "UPDATE_TIME," +
+                    "DISABLEDATE," +
+                    "SOURCE,ENTRYCHECKITEM,ENTRYCURRENCY) " +
+                    "values ("+accountantProjectDataVo.get(i).getS_ID()+",'"+accountantProjectDataVo.get(i).getCODE()+"','"+accountantProjectDataVo.get(i).getNAME()+"'" +
+                    ",'"+accountantProjectDataVo.get(i).getPARENTID()+"','"+accountantProjectDataVo.get(i).getS_PARENTNUM()+"','"+accountantProjectDataVo.get(i).getPARENTCODE()+"','"+accountantProjectDataVo.get(i).getPARENTNAME()+"'" +
+                    ",'"+accountantProjectDataVo.get(i).getLONGNUMBER()+"','"+accountantProjectDataVo.get(i).getLONGNAME()+"','"+accountantProjectDataVo.get(i).getLEVEL()+"','"+accountantProjectDataVo.get(i).getISLEAF()+"'" +
+                    ",'"+accountantProjectDataVo.get(i).getACCOUNTTABLENUMBER()+"','"+accountantProjectDataVo.get(i).getACCOUNTTABLENAME()+"','"+accountantProjectDataVo.get(i).getACCOUNTTYPENUMBER()+"','"+accountantProjectDataVo.get(i).getACCOUNTTYPENAME()+"'" +
+                    ",'"+accountantProjectDataVo.get(i).getPLTYPE()+"','"+accountantProjectDataVo.get(i).getDC()+"','"+accountantProjectDataVo.get(i).getACCRUALDIRECTION()+"','"+accountantProjectDataVo.get(i).getISCASH()+"','"+accountantProjectDataVo.get(i).getISBANK()+"'" +
+                    ",'"+accountantProjectDataVo.get(i).getISCASHEQUIVALENT()+"','"+accountantProjectDataVo.get(i).getACNOTICE()+"','"+accountantProjectDataVo.get(i).getISCHANGECURRENCY()+"','"+accountantProjectDataVo.get(i).getBW()+"','"+accountantProjectDataVo.get(i).getISQTY()+"'" +
+                    ",'"+accountantProjectDataVo.get(i).getISASSIST()+"','"+accountantProjectDataVo.get(i).getNOCURRENCYRADIO()+"','"+accountantProjectDataVo.get(i).getDESCURRENCYRADIO()+"','"+accountantProjectDataVo.get(i).getACCTCURRENCY()+"','"+accountantProjectDataVo.get(i).getHELPCODE()+"'" +
+                    ",'"+accountantProjectDataVo.get(i).getISALLOWCA()+"','"+accountantProjectDataVo.get(i).getORGCONTROLLEVEL()+"','"+accountantProjectDataVo.get(i).getISMANUAL()+"','"+accountantProjectDataVo.get(i).getACCHECK()+"','"+accountantProjectDataVo.get(i).getISJOURNAL()+"'" +
+                    ",case when '"+accountantProjectDataVo.get(i).getSTARTDATE()+"' = 'null' then null else to_date(to_char(to_timestamp('"+accountantProjectDataVo.get(i).getSTARTDATE()+"','yyyy-mm-dd hh24:mi:ssxff'),'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss') end" +
+                    ",case when '"+accountantProjectDataVo.get(i).getENDDATE()+"' = 'null' then null else to_date(to_char(to_timestamp('"+accountantProjectDataVo.get(i).getENDDATE()+"','yyyy-mm-dd hh24:mi:ssxff'),'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss') end" +
+                    ",'"+accountantProjectDataVo.get(i).getMREUTYPENUMBER()+"','"+accountantProjectDataVo.get(i).getMREUTYPENAME()+"','"+accountantProjectDataVo.get(i).getMEASUREUNITCNUM()+"','"+accountantProjectDataVo.get(i).getMEASUREUNITNAME()+"','"+accountantProjectDataVo.get(i).getCREATEORGCODE()+"'" +
+                    ",'"+accountantProjectDataVo.get(i).getCREATEORGNAME()+"','"+accountantProjectDataVo.get(i).getORG_NUMBER()+"','"+accountantProjectDataVo.get(i).getORG_NAME()+"','"+accountantProjectDataVo.get(i).getUSEORG_NUMBER()+"','"+accountantProjectDataVo.get(i).getUSEORG_NAME()+"'" +
+                    ",'"+accountantProjectDataVo.get(i).getCTRLSTRATEGY()+"','"+accountantProjectDataVo.get(i).getSTATUS()+"','"+accountantProjectDataVo.get(i).getENABLE()+"'" +
+                    ",case when '"+accountantProjectDataVo.get(i).getCREATE_TIME()+"' = 'null' then null else to_date(to_char(to_timestamp('"+accountantProjectDataVo.get(i).getCREATE_TIME()+"','yyyy-mm-dd hh24:mi:ssxff'),'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss') end" +
+                    ",case when '"+accountantProjectDataVo.get(i).getUPDATE_TIME()+"' = 'null' then null else to_date(to_char(to_timestamp('"+accountantProjectDataVo.get(i).getUPDATE_TIME()+"','yyyy-mm-dd hh24:mi:ssxff'),'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss') end" +
+                    ",case when '"+accountantProjectDataVo.get(i).getDISABLEDATE()+"' = 'null' then null else to_date(to_char(to_timestamp('"+accountantProjectDataVo.get(i).getDISABLEDATE()+"','yyyy-mm-dd hh24:mi:ssxff'),'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss') end" +
+                    ",'"+accountantProjectDataVo.get(i).getSOURCE()+"','"+accountantProjectDataVo.get(i).getENTRYCHECKITEM()+"','"+accountantProjectDataVo.get(i).getENTRYCURRENCY()+"')");
+        }
+        baseDao.execute(sqls);
+    }
+
     /**
      * 获取客商数据前,先删除客商信息(暂时)
      * */

+ 21 - 1
src/main/java/com/uas/eis/service/RequestSTKService.java

@@ -1,8 +1,11 @@
 package com.uas.eis.service;
 
+import com.uas.eis.dto.stksto.QueryAccountantProjectDto;
+import com.uas.eis.dto.stksto.QueryCashFlowItemsDto;
 import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
 import com.uas.eis.sdk.dto.CustvendDTO;
-import com.uas.eis.vo.stkVo.TravellingMerchantVo;
+import com.uas.eis.sdk.dto.SaveOrChangeCustomerDetailDto;
+import com.uas.eis.vo.stkVo.*;
 
 import java.util.List;
 
@@ -17,9 +20,26 @@ public interface RequestSTKService {
      * */
     TravellingMerchantVo selectTravellingMerchantList(QueryTravellingMerchantDto dto, String url);
 
+    /**
+     * 新增修改客商信息
+     * */
+    SaveOrChangeCustomerVo saveOrChangeCustomer(List<SaveOrChangeCustomerDetailDto> sourceDataList);
+
+    /**
+     * 查询现金流项目
+     * */
+    CashFlowItemsVo getCashFlowItems(QueryCashFlowItemsDto dto);
+
+    /**
+     * 获取会计科目
+     * */
+    AccountantProjectVo getAccountantProject(QueryAccountantProjectDto dto);
+
     /**
      * 获取深投控测试获取,测试
      * */
     List<CustvendDTO> queryList();
 
+
+
 }

+ 17 - 1
src/main/java/com/uas/eis/service/STKService.java

@@ -5,7 +5,10 @@ package com.uas.eis.service;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.eis.sdk.dto.AssistBalanceDTO;
 import com.uas.eis.sdk.dto.CustvendDTO;
+import com.uas.eis.sdk.dto.UpdateCustVendDTO;
 import com.uas.eis.sdk.entity.ApiResult;
+import com.uas.eis.vo.stkVo.AccountantProjectVo;
+import com.uas.eis.vo.stkVo.CashFlowItemsVo;
 import com.uas.eis.vo.stkVo.TravellingMerchantVo;
 
 import javax.servlet.http.HttpServletRequest;
@@ -40,6 +43,12 @@ public interface STKService {
      */
     ApiResult<String> getCashFlow(HttpServletRequest request, AssistBalanceDTO dto);
 
+
+    /**
+     * 客户供应商修改
+     */
+    ApiResult<String> updateCustVend( UpdateCustVendDTO dto);
+
     /**
      * 接口测试
      * */
@@ -51,7 +60,14 @@ public interface STKService {
     void getCustvend(TravellingMerchantVo travellingMerchantVo , Boolean isdelete);
 
     /**
-     * 删除客商数据信息
+     * 获取现金流
      * */
+    void getCashFlowItems(CashFlowItemsVo cashFlowItemsVo , Boolean isdelete);
+
+    /**
+     * 获取会计科目
+     * */
+    void getAccountantProject(AccountantProjectVo accountantProjectVo , Boolean isdelete);
+
     void delete();
 }

+ 28 - 0
src/main/java/com/uas/eis/task/STKTask.java

@@ -1,10 +1,14 @@
 package com.uas.eis.task;
 
 import com.alibaba.fastjson.JSONObject;
+import com.uas.eis.dto.stksto.QueryAccountantProjectDto;
+import com.uas.eis.dto.stksto.QueryCashFlowItemsDto;
 import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
 import com.uas.eis.sdk.dto.CustvendDTO;
 import com.uas.eis.service.RequestSTKService;
 import com.uas.eis.service.STKService;
+import com.uas.eis.vo.stkVo.AccountantProjectVo;
+import com.uas.eis.vo.stkVo.CashFlowItemsVo;
 import com.uas.eis.vo.stkVo.TravellingMerchantVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,6 +93,7 @@ public class STKTask {
         log.info("开始获取深投控客商状态信息,结束:"+((System.currentTimeMillis()-date.getTime())/1000));
     }*/
 
+    //客商获取
     //@Scheduled(cron = "0 56 23 * * ?")
     public void queryCustVendQuartz(){
         log.info("开始获取深投控客商状态信息=========start=============");
@@ -138,4 +143,27 @@ public class STKTask {
         log.info("开始获取深投控客商状态信息,结束:"+((System.currentTimeMillis()-date.getTime())/1000));
     }
 
+
+    //现金流项目
+    //@Scheduled(cron = "0 56 23 * * ?")
+    public void queryCashFlowItems(){
+        QueryCashFlowItemsDto dto = new QueryCashFlowItemsDto();
+        CashFlowItemsVo cashFlowItemsVo = new CashFlowItemsVo();
+        cashFlowItemsVo = requestSTKService.getCashFlowItems(dto);
+        //获取到现金流项目,数据入库
+        stkService.getCashFlowItems(cashFlowItemsVo, true);
+    }
+
+
+    //获取会计科目
+    //@Scheduled(cron = "0 56 23 * * ?")
+    public void queryAccountantProject(){
+        QueryAccountantProjectDto dto = new QueryAccountantProjectDto();
+        AccountantProjectVo accountantProjectVo = new AccountantProjectVo();
+        accountantProjectVo = requestSTKService.getAccountantProject(dto);
+        //获取到现金流项目,数据入库
+        stkService.getAccountantProject(accountantProjectVo, true);
+    }
+
+
 }

+ 321 - 0
src/main/java/com/uas/eis/vo/stkVo/AccountantProjectDataVo.java

@@ -0,0 +1,321 @@
+package com.uas.eis.vo.stkVo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 会计科目数据Vo
+ * */
+@Data
+public class AccountantProjectDataVo {
+
+    /**
+     *主键 ID
+     * */
+    private Integer ID;
+
+    /**
+     *源数据 ID
+     * */
+    private Integer S_ID;
+
+    /**
+     *源会计科目编码
+     * */
+    private String S_NUMBER;
+
+    /**
+     *会计科目编码
+     * */
+    private String CODE;
+
+    /**
+     *名称.简体中文
+     * */
+    private String NAME;
+
+    /**
+     *上级 ID
+     * */
+    private Integer PARENTID;
+
+    /**
+     *源_上级会计科目编码
+     * */
+    private String S_PARENTNUM;
+
+    /**
+     *上级会计科目编码
+     * */
+    private String PARENTCODE;
+
+    /**
+     *上级.名称
+     * */
+    private String PARENTNAME;
+
+    /**
+     *长编码
+     * */
+    private String LONGNUMBER;
+
+    /**
+     *长名称
+     * */
+    private String LONGNAME;
+
+    /**
+     *级次
+     * */
+    private Integer LEVEL;
+
+    /**
+     *是否是明细科目
+     * 1:是;0:否
+     * */
+    private String ISLEAF;
+
+    /**
+     *科目表编码:源_科目表.编码
+     * */
+    private String ACCOUNTTABLENUMBER;
+
+    /**
+     *科目表名称
+     * */
+    private String ACCOUNTTABLENAME;
+
+    /**
+     *科目类型编码:STD科目类型.编码
+     * */
+    private String ACCOUNTTYPENUMBER;
+
+    /**
+     *科目类型名称
+     * */
+    private String ACCOUNTTYPENAME;
+
+    /**
+     *损益类型,详见文档附录 1
+     * */
+    private String PLTYPE;
+
+    /**
+     *余额方向
+     * 1:借;-1:贷
+     * */
+    private String DC;
+
+    /**
+     *科目录入方向控制
+     * nocontrol:不控制;debit:借方;credit:贷方
+     * */
+    private String ACCRUALDIRECTION;
+
+    /**
+     *现金科目
+     * 0:否;1:是
+     * */
+    private String ISCASH;
+
+    /**
+     *银行科目
+     * 0:否;1:是
+     * */
+    private String ISBANK;
+
+    /**
+     *现金等价物
+     * 0:否;1:是
+     * */
+    private String ISCASHEQUIVALENT;
+
+    /**
+     *往来通知
+     * 0:否;1:是
+     * */
+    private String ACNOTICE;
+
+    /**
+     *期末调汇
+     * 0:否;1:是
+     * */
+    private String ISCHANGECURRENCY;
+
+    /**
+     *表外科目
+     * 0:否;1:是
+     * */
+    private String BW;
+
+    /**
+     *数量核算
+     * 0:否;1:是
+     * */
+    private String ISQTY;
+
+    /**
+     *是否包含核算项目
+     * */
+    private String ISASSIST;
+
+    /**
+     *不核算外币
+     * */
+    private String NOCURRENCYRADIO;
+
+    /**
+     *指定核算币别
+     * */
+    private String DESCURRENCYRADIO;
+
+    /**
+     *核算所有币别
+     * */
+    private String ALLCURRENCYRADIO;
+
+    /**
+     *外币核算类型
+     * nocurrency:不核算外币;descurrency:指定核算币别;allcurrency:核算所有币别
+     * */
+    private String ACCTCURRENCY;
+
+    /**
+     *助记码
+     * */
+    private String HELPCODE;
+
+    /**
+     *允许公司增加下级科目
+     * */
+    private String ISALLOWCA;
+
+    /**
+     *控制级次
+     * */
+    private String ORGCONTROLLEVEL;
+
+    /**
+     *手工录入
+     * */
+    private String ISMANUAL;
+
+    /**
+     *往来核算
+     * */
+    private String ACCHECK;
+
+    /**
+     *登日记账
+     * */
+    private String ISJOURNAL;
+
+    /**
+     *版本化日期:版本化日期
+     * */
+    private String STARTDATE;
+
+    /**
+     *失效日期
+     * */
+    private Date ENDDATE;
+
+    /**
+     *计量单位分组编码
+     * */
+    private Date MREUTYPENUMBER;
+
+    /**
+     *计量单位分组名称
+     * */
+    private String MREUTYPENAME;
+
+    /**
+     *计量单位编码
+     * */
+    private String MEASUREUNITCNUM;
+
+    /**
+     *计量单位名称
+     * */
+    private String MEASUREUNITNAME;
+
+    /**
+     *创建组织编码:创建组织编码
+     * */
+    private String CREATEORGCODE;
+
+    /**
+     *创建组织名称
+     * */
+    private String CREATEORGNAME;
+
+    /**
+     *管理组织编码
+     * */
+    private String ORG_NUMBER;
+
+    /**
+     *管理组织名称
+     * */
+    private String ORG_NAME;
+
+    /**
+     *使用组织编码
+     * */
+    private String USEORG_NUMBER;
+
+    /**
+     *使用组织名称
+     * */
+    private String USEORG_NAME;
+
+    /**
+     *控制策略
+     * */
+    private String CTRLSTRATEGY;
+
+    /**
+     *数据状态
+     * A:暂存;B:已提交;C:已审核
+     * */
+    private String STATUS;
+
+    /**
+     *使用状态
+     * 0:禁用;1:可用;
+     * */
+    private String ENABLE;
+
+    /**
+     *创建时间
+     **/
+    private Date CREATE_TIME;
+
+    /**
+     *修改时间
+     **/
+    private Date UPDATE_TIME;
+
+    /**
+     *禁用时间
+     **/
+    private Date DISABLEDATE;
+
+    /**
+     *数据来源单位
+     **/
+    private String SOURCE;
+
+    /**
+     *分录_核算维度
+     **/
+    private String ENTRYCHECKITEM;
+
+    /**
+     *分录_币别
+     **/
+    private String ENTRYCURRENCY;
+
+}

+ 19 - 0
src/main/java/com/uas/eis/vo/stkVo/AccountantProjectVo.java

@@ -0,0 +1,19 @@
+package com.uas.eis.vo.stkVo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 会计科目Vo
+ * */
+@Data
+public class AccountantProjectVo extends StkResponseBaseVo{
+
+    /**
+     * 返回数据
+     * */
+    //private AccountantProjectDataVo data;
+    private List<AccountantProjectDataVo> data;
+
+}

+ 41 - 0
src/main/java/com/uas/eis/vo/stkVo/AssistentryVo.java

@@ -0,0 +1,41 @@
+package com.uas.eis.vo.stkVo;
+
+import lombok.Data;
+
+/**
+ * 查询现金流项目返回附加信息VO
+ * */
+@Data
+public class AssistentryVo {
+
+    /**
+     *明细
+     * */
+    private String ISDETAIL;
+
+    /**
+     *必录
+     * */
+    private String ISREQUIRE;
+
+    /**
+     *编码(基础资料核算维度)
+     * */
+    private String ASSTYPE_NUMBER;
+
+    /**
+     *名称
+     * */
+    private String ASSTYPE_NAME;
+
+    /**
+     *值类型
+     * */
+    private String ASSTYPE_VALUETYPE;
+
+    /**
+     *字段名
+     * */
+    private String ASSTYPE_FLEXFIELD;
+
+}

+ 194 - 0
src/main/java/com/uas/eis/vo/stkVo/CashFlowItemsDataVo.java

@@ -0,0 +1,194 @@
+package com.uas.eis.vo.stkVo;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 查询现金流项目具体信息Vo
+ * */
+@Data
+public class CashFlowItemsDataVo {
+
+    /**
+     *ID
+     * */
+    private Integer ID;
+
+    /**
+     *源_编码,唯一性
+     * */
+    private String NUMBER;
+
+    /**
+     *ADS_编码,唯一性
+     * */
+    private String CODE;
+
+    /**
+     *名称
+     * */
+    private String NAME;
+
+    /**
+     *长编码
+     * */
+    private String LONGNUMBER;
+
+    /**
+     *级次
+     * */
+    private Integer LEVEL;
+
+    /**
+     *长名称
+     * */
+    private String FULLNAME;
+
+    /**
+     *是否叶子
+     * */
+    private String ISLEAF;
+
+    /**
+     *控制策略
+     * 缺省值:全局共享:1:逐级分配;2:自由分配;5:全局共享;6:管控范围内共享;7:私有
+     * */
+    private String CTRLSTRATEGY;
+
+    /**
+     *原资料 id
+     * */
+    private Integer SOURCEDATA;
+
+    /**
+     *位图
+     * */
+    private Integer BITINDEX;
+
+    /**
+     *原资料位图
+     * */
+    private Integer SRCINDEX;
+
+    /**
+     *项目类别
+     * 1:主表项目;3:补充资料项目
+     * */
+    private String TYPE;
+
+    /**
+     * 现金流向
+     * :流入流出;i:现金流入;o:现金流出
+     * */
+    private String DIRECTION;
+
+    /**
+     *经营活动
+     * */
+    private String ISDEALACTIVITY;
+
+    /**
+     *汇率变动
+     * */
+    private String ISEXCHANGERATE;
+
+    /**
+     *净利润
+     * */
+    private String ISPREFIT;
+
+    /**
+     *现金流量通知单
+     * */
+    private String NOTICE;
+
+    /**
+     *核算维度辅助信息
+     * */
+    private String CHECKITEMHELP;
+
+    /**
+     *是否包含核算维度
+     * */
+    private String ISASSIST;
+
+    /**
+     *附表项目
+     * */
+    private String ISSCHEDULEITEM;
+
+    /**
+     *修改人.工号(基础资料:人员)
+     * */
+    private String MODIFIER_NUMBER;
+
+    /**
+     *修改人.姓名
+     * */
+    private String MODIFIER_NAME;
+
+    /**
+     *创建组织.编码(基础资料:组织)
+     * */
+    private String CREATEORG_NUMBER;
+
+    /**
+     *创建组织.名称
+     * */
+    private String CREATEORG_NAME;
+
+    /**
+     *管理组织.编码(基础资料:组织)
+     * */
+    private String ORG_NUMBER;
+
+    /**
+     *管理组织.名称
+     * */
+    private String ORG_NAME;
+
+    /**
+     *核算组织.编码(基础资料:组织)
+     * */
+    private String USEORG_NUMBER;
+
+    /**
+     *核算组织.名称
+     * */
+    private String USEORG_NAME;
+
+    /**
+     *数据状态
+     * A:暂存;B:已提交;C:已审核
+     * */
+    private String STATUS;
+
+    /**
+     *使用状态
+     * 1:启用;0:禁用
+     * */
+    private String ENABLE;
+
+    /**
+     *创建时间
+     * */
+    private Date CREATE_TIME;
+
+    /**
+     *修改时间
+     * */
+    private Date UPDATE_IME;
+
+    /**
+     *来源单位
+     * */
+    private String SOURCE;
+
+    /**
+     *assistentry JSON对象
+     * */
+    private String ASSISTENTRY;
+
+}

+ 21 - 0
src/main/java/com/uas/eis/vo/stkVo/CashFlowItemsVo.java

@@ -0,0 +1,21 @@
+package com.uas.eis.vo.stkVo;
+
+import com.uas.eis.sdk.dto.CustvendDTO;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *查询现金流项目Vo
+ * */
+@Data
+public class CashFlowItemsVo extends StkResponseBaseVo {
+
+    /**
+     * 返回数据
+     * */
+    //private CashFlowItemsDataVo data;
+    private List<CashFlowItemsDataVo> data;
+
+
+}

+ 21 - 0
src/main/java/com/uas/eis/vo/stkVo/SaveOrChangeCustomerDataVo.java

@@ -0,0 +1,21 @@
+package com.uas.eis.vo.stkVo;
+
+import lombok.Data;
+
+/**
+ * 新增变更客商信息返回数据
+ * */
+@Data
+public class SaveOrChangeCustomerDataVo {
+
+    /**
+     * 响应子码,新增成功是 200001,新增失败是其他值 500001
+     * */
+    private Integer processCode;
+
+    /**
+     * 处理消息,成功为"success",失败为"fail"
+     * */
+    private String processMsg;
+
+}

+ 13 - 0
src/main/java/com/uas/eis/vo/stkVo/SaveOrChangeCustomerVo.java

@@ -0,0 +1,13 @@
+package com.uas.eis.vo.stkVo;
+
+import lombok.Data;
+
+@Data
+public class SaveOrChangeCustomerVo extends StkResponseBaseVo {
+
+    /**
+     * 返回数据
+     * */
+    private SaveOrChangeCustomerDataVo data;
+
+}

+ 44 - 0
src/main/java/com/uas/eis/vo/stkVo/StkResponseBaseVo.java

@@ -0,0 +1,44 @@
+package com.uas.eis.vo.stkVo;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 深投控返回数据
+ * */
+@Data
+public class StkResponseBaseVo {
+
+    /**
+     * 请求接口返回状态码
+     * */
+    private String code;
+
+    /**
+     * 接口返回信息
+     * */
+    private String message;
+
+    /**
+     *页码
+     * */
+    private Integer pageNum;
+
+    /**
+     * 总页码
+     * */
+    private Integer pages;
+
+    /**
+     * 每页数量
+     * */
+    private Integer size;
+
+    /**
+     * 总数
+     * */
+    private Integer total;
+
+}

+ 7 - 0
src/main/resources/application-dev.yml

@@ -44,3 +44,10 @@ STK:
     #复杂查询接口地址
     complexity_query_url: https://192.168.2.179/api/oapigw/api/oapisvc/api/v2/search
 
+    #新增修改客商信息接口编码
+    save_or_update_request_code: 18c60d85eb0646a080341b64310109f1
+    #现金流量项目查询方法编码
+    cash_flow_items_request_code: 22224aed3e87474988304a542544604a
+    #会计科目查询方法code
+    accountant_project_request_code: 4e2085d2cdd04b35bf5fac1c85acab32
+

+ 7 - 0
src/main/resources/application-prod.yml

@@ -43,3 +43,10 @@ STK:
     save_or_update_url: http://192.168.2.179/api/oapigw/api/oapisvc/automicUpsertApi/
     #复杂查询接口地址
     complexity_query_url: https://192.168.2.179/api/oapigw/api/oapisvc/api/v2/search
+
+    #新增修改客商信息接口编码
+    save_or_update_request_code: 18c60d85eb0646a080341b64310109f1
+    #现金流量项目查询方法编码
+    cash_flow_items_request_code: 89edb885a8cf4412b870233fc89fb381
+    #会计科目查询方法code
+    accountant_project_request_code: 11e72229359a4fdeb038dd6713dc9330