Jelajahi Sumber

【盛威尔-华润微】

DINGYL 1 bulan lalu
induk
melakukan
33e0a702e3
100 mengubah file dengan 136 tambahan dan 5280 penghapusan
  1. 0 67
      src/main/java/com/uas/eis/beans/AppReqParmVO.java
  2. 0 34
      src/main/java/com/uas/eis/beans/CorpAccessToken.java
  3. 0 67
      src/main/java/com/uas/eis/beans/MsgReceiveParamVO.java
  4. 0 14
      src/main/java/com/uas/eis/beans/arg/CrmCallBackArg.java
  5. 0 49
      src/main/java/com/uas/eis/beans/req/AppTokenReq.java
  6. 0 58
      src/main/java/com/uas/eis/beans/req/BaseOfOpenUserIdReq.java
  7. 0 44
      src/main/java/com/uas/eis/beans/req/BaseReq.java
  8. 0 63
      src/main/java/com/uas/eis/beans/req/CorpAccessTokenReq.java
  9. 0 42
      src/main/java/com/uas/eis/beans/req/CrmAddReq.java
  10. 0 52
      src/main/java/com/uas/eis/beans/req/CrmGetReq.java
  11. 0 202
      src/main/java/com/uas/eis/beans/req/CrmQueryReq.java
  12. 0 50
      src/main/java/com/uas/eis/beans/req/CrmUpdateReq.java
  13. 0 49
      src/main/java/com/uas/eis/beans/req/OpenUserIdReq.java
  14. 0 7
      src/main/java/com/uas/eis/beans/req/Req.java
  15. 0 52
      src/main/java/com/uas/eis/beans/result/AppTokenResult.java
  16. 0 48
      src/main/java/com/uas/eis/beans/result/BaseResult.java
  17. 0 65
      src/main/java/com/uas/eis/beans/result/CorpAccessTokenResult.java
  18. 0 40
      src/main/java/com/uas/eis/beans/result/CrmAddResult.java
  19. 0 11
      src/main/java/com/uas/eis/beans/result/CrmCallBackResult.java
  20. 0 34
      src/main/java/com/uas/eis/beans/result/CrmGetResult.java
  21. 0 33
      src/main/java/com/uas/eis/beans/result/CrmQueryResult.java
  22. 0 67
      src/main/java/com/uas/eis/beans/result/Customer.java
  23. 0 139
      src/main/java/com/uas/eis/beans/result/Goods.java
  24. 0 51
      src/main/java/com/uas/eis/beans/result/OpenUserIdResult.java
  25. 0 156
      src/main/java/com/uas/eis/beans/result/Product.java
  26. 0 41
      src/main/java/com/uas/eis/beans/result/ProductAddResult.java
  27. 0 53
      src/main/java/com/uas/eis/beans/result/ProductDto.java
  28. 0 39
      src/main/java/com/uas/eis/beans/result/Result.java
  29. 0 36
      src/main/java/com/uas/eis/config/KingdeeConfig.java
  30. 0 23
      src/main/java/com/uas/eis/config/PNSConfig.java
  31. 0 19
      src/main/java/com/uas/eis/config/SynaConfig.java
  32. 5 27
      src/main/java/com/uas/eis/controller/ERPController.java
  33. 0 56
      src/main/java/com/uas/eis/controller/EventCallbackController.java
  34. 0 46
      src/main/java/com/uas/eis/controller/GEController.java
  35. 0 459
      src/main/java/com/uas/eis/core/X12Converter.java
  36. 0 54
      src/main/java/com/uas/eis/core/enums/ElecInVoiceSpecificFactor.java
  37. 0 81
      src/main/java/com/uas/eis/core/enums/ElecInVoicekind.java
  38. 0 23
      src/main/java/com/uas/eis/core/enums/KingdeeFormId.java
  39. 0 9
      src/main/java/com/uas/eis/dao/BaseNuoNuoQResp.java
  40. 0 23
      src/main/java/com/uas/eis/dao/BaseNuoNuoResp.java
  41. 0 22
      src/main/java/com/uas/eis/dao/BaseResp.java
  42. 0 30
      src/main/java/com/uas/eis/dao/RedInvoiceReq.java
  43. 0 37
      src/main/java/com/uas/eis/dao/RoleDao.java
  44. 0 39
      src/main/java/com/uas/eis/dto/AsnAddrInfoDTO.java
  45. 0 75
      src/main/java/com/uas/eis/dto/AsnDTO.java
  46. 0 23
      src/main/java/com/uas/eis/dto/AsnDetDTO.java
  47. 0 27
      src/main/java/com/uas/eis/dto/AsnOrderDTO.java
  48. 0 44
      src/main/java/com/uas/eis/dto/AsnOrderDetailDTO.java
  49. 0 44
      src/main/java/com/uas/eis/dto/AsnPackDTO.java
  50. 0 45
      src/main/java/com/uas/eis/dto/AsnPalletDTO.java
  51. 0 27
      src/main/java/com/uas/eis/dto/AsnSnDetailDTO.java
  52. 0 124
      src/main/java/com/uas/eis/dto/FindOrderRelationInvoiceDTO.java
  53. 0 10
      src/main/java/com/uas/eis/dto/FindOrderRelationInvoiceReq.java
  54. 0 11
      src/main/java/com/uas/eis/dto/FindOrderRelationInvoiceResp.java
  55. 0 24
      src/main/java/com/uas/eis/dto/OrderDetailCallBackVOSDTO.java
  56. 0 15
      src/main/java/com/uas/eis/dto/PoInternalDTO.java
  57. 0 50
      src/main/java/com/uas/eis/dto/PoOrderAddrinfosGrDTO.java
  58. 0 51
      src/main/java/com/uas/eis/dto/PoOrderDetailsGrDTO.java
  59. 0 66
      src/main/java/com/uas/eis/dto/PoOrderGrDTO.java
  60. 0 34
      src/main/java/com/uas/eis/dto/PoOrderSubDetailsGrDTO.java
  61. 0 33
      src/main/java/com/uas/eis/dto/QueryInvoiceRedConfirmDTO.java
  62. 0 21
      src/main/java/com/uas/eis/dto/QueryInvoiceRedConfirmDetDTO.java
  63. 0 16
      src/main/java/com/uas/eis/dto/QueryInvoiceRedConfirmReq.java
  64. 0 9
      src/main/java/com/uas/eis/dto/QueryInvoiceRedConfirmResp.java
  65. 0 12
      src/main/java/com/uas/eis/dto/QueryInvoiceRedConfirmRespDTO.java
  66. 0 94
      src/main/java/com/uas/eis/dto/QueryInvoiceResultDTO.java
  67. 0 12
      src/main/java/com/uas/eis/dto/QueryInvoiceResultReq.java
  68. 0 11
      src/main/java/com/uas/eis/dto/QueryInvoiceResultResp.java
  69. 0 16
      src/main/java/com/uas/eis/dto/RelateRedInvoiceDTO.java
  70. 0 30
      src/main/java/com/uas/eis/entity/K3/AbstractAuditReq.java
  71. 0 42
      src/main/java/com/uas/eis/entity/K3/CommonSaveReq.java
  72. 0 13
      src/main/java/com/uas/eis/entity/K3/FNumberE.java
  73. 0 13
      src/main/java/com/uas/eis/entity/K3/ProdInoutPickingF.java
  74. 0 10
      src/main/java/com/uas/eis/entity/K3/ProdInoutPickingFSerialSub.java
  75. 0 25
      src/main/java/com/uas/eis/entity/K3/ProdInoutPickingSaveReqModel.java
  76. 0 17
      src/main/java/com/uas/eis/entity/POS.java
  77. 0 33
      src/main/java/com/uas/eis/entity/POSDetail.java
  78. 0 19
      src/main/java/com/uas/eis/entity/Purchase.java
  79. 0 22
      src/main/java/com/uas/eis/entity/PurchaseChange.java
  80. 0 25
      src/main/java/com/uas/eis/entity/PurchaseChangeDetail.java
  81. 0 18
      src/main/java/com/uas/eis/entity/PurchaseDetail.java
  82. 0 48
      src/main/java/com/uas/eis/entity/QueryArgs.java
  83. 0 95
      src/main/java/com/uas/eis/entity/QueryConfig.java
  84. 0 34
      src/main/java/com/uas/eis/entity/QueryConfigDetail.java
  85. 0 10
      src/main/java/com/uas/eis/exception/AccessTokenException.java
  86. 0 10
      src/main/java/com/uas/eis/exception/AppAccessTokenRequestException.java
  87. 0 10
      src/main/java/com/uas/eis/exception/CorpAccessTokenRequestException.java
  88. 0 191
      src/main/java/com/uas/eis/sdk/dto/SubPickmtrlReq.java
  89. 0 75
      src/main/java/com/uas/eis/sdk/entity/GRApiResult.java
  90. 0 30
      src/main/java/com/uas/eis/sdk/entity/ReturnData.java
  91. 0 21
      src/main/java/com/uas/eis/sdk/entity/Seller.java
  92. 0 106
      src/main/java/com/uas/eis/sdk/okhttp/AKRestClient.java
  93. 0 19
      src/main/java/com/uas/eis/sdk/resp/SellerGetResp.java
  94. 0 108
      src/main/java/com/uas/eis/sdk/webservice/SoapUtil.java
  95. 1 0
      src/main/java/com/uas/eis/service/ERPService.java
  96. 0 30
      src/main/java/com/uas/eis/service/GEService.java
  97. 130 0
      src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java
  98. 0 517
      src/main/java/com/uas/eis/service/Impl/GEServiceImpl.java
  99. 0 189
      src/main/java/com/uas/eis/service/Impl/SynaServiceImpl.java
  100. 0 15
      src/main/java/com/uas/eis/service/SynaService.java

+ 0 - 67
src/main/java/com/uas/eis/beans/AppReqParmVO.java

@@ -1,67 +0,0 @@
-package com.uas.eis.beans;
-
-import java.io.Serializable;
-
-/**
- * 封装接收App端请求传入参数的JavaBean
- * 
- * @author huanghp
- * @date 2015年8月28日
- */
-public class AppReqParmVO implements Serializable {
-
-    private static final long serialVersionUID = -1206184202179044275L;
-
-    /**
-     * App 端 请求传入的身份态
-     */
-    private String code;
-
-    /**
-     * 请求时间戳
-     */
-    private String timestamp;
-
-    /**
-     * 请求随机数
-     */
-    private String nonce;
-
-    /**
-     * 请求参数+token的签名
-     */
-    private String codeSig;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(String timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public String getNonce() {
-        return nonce;
-    }
-
-    public void setNonce(String nonce) {
-        this.nonce = nonce;
-    }
-
-    public String getCodeSig() {
-        return codeSig;
-    }
-
-    public void setCodeSig(String codeSig) {
-        this.codeSig = codeSig;
-    }
-
-}

+ 0 - 34
src/main/java/com/uas/eis/beans/CorpAccessToken.java

@@ -1,34 +0,0 @@
-package com.uas.eis.beans;
-
-import java.io.Serializable;
-
-public class CorpAccessToken implements Serializable {
-
-    private static final long serialVersionUID = -4995204525912210225L;
-
-    /**
-     * corpAccessToken
-     */
-    private String corpAccessToken;
-
-    /**
-     * corpId
-     */
-    private String corpId;
-
-    public String getCorpAccessToken() {
-        return corpAccessToken;
-    }
-
-    public void setCorpAccessToken(String corpAccessToken) {
-        this.corpAccessToken = corpAccessToken;
-    }
-
-    public String getCorpId() {
-        return corpId;
-    }
-
-    public void setCorpId(String corpId) {
-        this.corpId = corpId;
-    }
-}

+ 0 - 67
src/main/java/com/uas/eis/beans/MsgReceiveParamVO.java

@@ -1,67 +0,0 @@
-package com.uas.eis.beans;
-
-import java.io.Serializable;
-
-/**
- * 封装接收开平推送消息请求参数的JavaBean
- * 
- * @author huanghp
- * @date 2015年8月28日
- */
-public class MsgReceiveParamVO implements Serializable {
-
-    private static final long serialVersionUID = 3966976690051895927L;
-
-    /**
-     * 请求随机数
-     */
-    private String nonce;
-
-    /**
-     * 请求时间戳
-     */
-    private String timeStamp;
-
-    /**
-     * AesKey 加密的消息内容
-     */
-    private String content;
-
-    /**
-     * 请求参数+token 签名
-     */
-    private String sig;
-
-    public String getNonce() {
-        return nonce;
-    }
-
-    public void setNonce(String nonce) {
-        this.nonce = nonce;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getSig() {
-        return sig;
-    }
-
-    public void setSig(String sig) {
-        this.sig = sig;
-    }
-
-    public String getTimeStamp() {
-        return timeStamp;
-    }
-
-    public void setTimeStamp(String timeStamp) {
-        this.timeStamp = timeStamp;
-    }
-
-}

+ 0 - 14
src/main/java/com/uas/eis/beans/arg/CrmCallBackArg.java

@@ -1,14 +0,0 @@
-package com.uas.eis.beans.arg;
-
-import lombok.Data;
-
-@Data
-public class CrmCallBackArg {
-    private String signature;
-    private Long timestamp;
-    private String nonce;
-    private String messageId;
-    private Integer retryTimes;
-    private String enterpriseAccount;
-    private String encryptedContent;
-}

+ 0 - 49
src/main/java/com/uas/eis/beans/req/AppTokenReq.java

@@ -1,49 +0,0 @@
-package com.uas.eis.beans.req;
-
-import com.google.common.base.MoreObjects;
-
-/**
- * 封装获取appToken 请求参数的JaveBean
- * 
- * @author huanghp
- * @date 2015年8月28日
- */
-public class AppTokenReq implements Req {
-
-    private static final long serialVersionUID = -5691676776742443894L;
-
-    /**
-     * 应用ID
-     */
-    private String appId;
-
-    /**
-     * 应用秘钥
-     */
-    private String appSecret;
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getAppSecret() {
-        return appSecret;
-    }
-
-    public void setAppSecret(String appSecret) {
-        this.appSecret = appSecret;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("appId", appId)
-                .add("appSecret", appSecret)
-                .toString();
-    }
-
-}

+ 0 - 58
src/main/java/com/uas/eis/beans/req/BaseOfOpenUserIdReq.java

@@ -1,58 +0,0 @@
-package com.uas.eis.beans.req;
-
-
-import com.google.common.base.MoreObjects;
-
-public class BaseOfOpenUserIdReq implements Req {
-
-    private static final long serialVersionUID = 6280290415792613761L;
-
-    /**
-     * 第三方应用获得企业授权的凭证
-     */
-    protected String corpAccessToken;
-
-    /**
-     * 开放平台派发的公司账号
-     */
-    protected String corpId;
-
-    /**
-     * 前操作的开放平台派发的用户帐号
-     */
-    protected String currentOpenUserId;
-
-    public String getCurrentOpenUserId() {
-        return currentOpenUserId;
-    }
-
-    public void setCurrentOpenUserId(String currentOpenUserId) {
-        this.currentOpenUserId = currentOpenUserId;
-    }
-
-    public String getCorpAccessToken() {
-        return corpAccessToken;
-    }
-
-    public void setCorpAccessToken(String corpAccessToken) {
-        this.corpAccessToken = corpAccessToken;
-    }
-
-    public String getCorpId() {
-        return corpId;
-    }
-
-    public void setCorpId(String corpId) {
-        this.corpId = corpId;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("corpAccessToken", corpAccessToken)
-                .add("corpId", corpId)
-                .add("currentOpenUserId",currentOpenUserId)
-                .toString();
-    }
-
-}

+ 0 - 44
src/main/java/com/uas/eis/beans/req/BaseReq.java

@@ -1,44 +0,0 @@
-package com.uas.eis.beans.req;
-
-
-import com.google.common.base.MoreObjects;
-
-public class BaseReq implements Req {
-
-    private static final long serialVersionUID = 6280290415792613761L;
-
-    /**
-     * 第三方应用获得企业授权的凭证
-     */
-    protected String corpAccessToken;
-
-    /**
-     * 开放平台派发的公司账号
-     */
-    protected String corpId;
-
-    public String getCorpAccessToken() {
-        return corpAccessToken;
-    }
-
-    public void setCorpAccessToken(String corpAccessToken) {
-        this.corpAccessToken = corpAccessToken;
-    }
-
-    public String getCorpId() {
-        return corpId;
-    }
-
-    public void setCorpId(String corpId) {
-        this.corpId = corpId;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("corpAccessToken", corpAccessToken)
-                .add("corpId", corpId)
-                .toString();
-    }
-
-}

+ 0 - 63
src/main/java/com/uas/eis/beans/req/CorpAccessTokenReq.java

@@ -1,63 +0,0 @@
-package com.uas.eis.beans.req;
-
-import com.google.common.base.MoreObjects;
-
-/**
- * 封装获取CorpAccessToken 请求参数的JaveBean
- * 
- * @author huanghp
- * @date 2015年8月28日
- */
-public class CorpAccessTokenReq implements Req {
-
-    private static final long serialVersionUID = 119087883828028381L;
-
-    /**
-     * 应用ID
-     */
-    private String appId;
-
-    /**
-     * 应用秘钥
-     */
-    private String appSecret;
-
-    /**
-     * 永久授权码
-     */
-    private String permanentCode;
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getAppSecret() {
-        return appSecret;
-    }
-
-    public void setAppSecret(String appSecret) {
-        this.appSecret = appSecret;
-    }
-
-    public String getPermanentCode() {
-        return permanentCode;
-    }
-
-    public void setPermanentCode(String permanentCode) {
-        this.permanentCode = permanentCode;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("appId", appId)
-                .add("permanentCode", permanentCode)
-                .add("permanentCode", permanentCode)
-                .toString();
-    }
-
-}

+ 0 - 42
src/main/java/com/uas/eis/beans/req/CrmAddReq.java

@@ -1,42 +0,0 @@
-package com.uas.eis.beans.req;
-
-import com.google.common.base.MoreObjects;
-import com.uas.eis.beans.result.Goods;
-
-import java.util.Map;
-
-/**
- * CRM添加接口参数
- * Created by zhongcy on 2016/12/30.
- */
-public class CrmAddReq<T> extends BaseOfOpenUserIdReq{
-
-    private static final long serialVersionUID = 9135811674969239762L;
-
-    private T data;
-
-    public CrmAddReq(T data) {
-        this.data = data;
-    }
-
-    public CrmAddReq() {
-    }
-
-    public T getData() {
-        return data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("corpAccessToken", corpAccessToken)
-                .add("corpId", corpId)
-                .add("currentOpenUserId", currentOpenUserId)
-                .add("data", data)
-                .toString();
-    }
-}

+ 0 - 52
src/main/java/com/uas/eis/beans/req/CrmGetReq.java

@@ -1,52 +0,0 @@
-package com.uas.eis.beans.req;
-
-
-import com.google.common.base.MoreObjects;
-
-/**
- * Crm获取详情接口参数
- * Created by zhongcy on 2017/1/9.
- */
-public class CrmGetReq extends BaseReq{
-
-    private static final long serialVersionUID = -6899653224372546750L;
-
-    private String currentOpenUserId;
-
-    private String apiName;
-
-    private String dataId;
-
-    public String getCurrentOpenUserId() {
-        return currentOpenUserId;
-    }
-
-    public void setCurrentOpenUserId(String currentOpenUserId) {
-        this.currentOpenUserId = currentOpenUserId;
-    }
-
-    public String getApiName() {
-        return apiName;
-    }
-
-    public void setApiName(String apiName) {
-        this.apiName = apiName;
-    }
-
-    public String getDataId() {
-        return dataId;
-    }
-
-    public void setDataId(String dataId) {
-        this.dataId = dataId;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("currentOpenUserId", currentOpenUserId)
-                .add("apiName", apiName)
-                .add("dataId", dataId)
-                .toString();
-    }
-}

+ 0 - 202
src/main/java/com/uas/eis/beans/req/CrmQueryReq.java

@@ -1,202 +0,0 @@
-package com.uas.eis.beans.req;
-
-import com.google.common.base.MoreObjects;
-
-import java.util.List;
-
-/**
- * Query Arg
- * Created by zhongcy on 2017/1/6.
- */
-public class CrmQueryReq extends BaseReq{
-
-    private static final long serialVersionUID = -6119269380581225350L;
-
-    private String currentOpenUserId;
-
-    private DataApiName data;
-
-    public DataApiName getDataApiName() {
-        return data;
-    }
-
-    public void setDataApiName(DataApiName dataApiName) {
-        this.data = dataApiName;
-    }
-
-    public String getCurrentOpenUserId() {
-        return currentOpenUserId;
-    }
-
-    public void setCurrentOpenUserId(String currentOpenUserId) {
-        this.currentOpenUserId = currentOpenUserId;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("currentOpenUserId", currentOpenUserId)
-                .add("data", data)
-                .toString();
-    }
-
-    public static class SearchQuery{
-        //偏移量
-        private int offset = 0;
-
-        //获取数据条数,取最大值1000
-        private int limit = 100;
-
-        private List<Filters> filters;
-
-        private List<Order> orders;
-
-        public int getOffset() {
-            return offset;
-        }
-
-        public void setOffset(int offset) {
-            this.offset = offset;
-        }
-
-        public int getLimit() {
-            return limit;
-        }
-
-        public void setLimit(int limit) {
-            this.limit = limit;
-        }
-
-
-        public List<Filters> getFilters() {
-            return filters;
-        }
-
-        public void setFilters(List<Filters> filters) {
-            this.filters = filters;
-        }
-
-        public List<Order> getOrders() {
-            return orders;
-        }
-
-        public void setOrders(List<Order> orders) {
-            this.orders = orders;
-        }
-
-        @Override
-        public String toString() {
-            return MoreObjects.toStringHelper(this)
-                    .add("offset", offset)
-                    .add("limit", limit)
-                    .add("filters", filters)
-                    .add("orders", orders)
-                    .toString();
-        }
-    }
-
-    public static class DataApiName{
-        public String getDataObjectApiName() {
-            return dataObjectApiName;
-        }
-
-        public void setDataObjectApiName(String dataObjectApiName) {
-            this.dataObjectApiName = dataObjectApiName;
-        }
-
-        public SearchQuery getSearch_query_info() {
-            return search_query_info;
-        }
-
-        public void setSearch_query_info(SearchQuery search_query_info) {
-            this.search_query_info = search_query_info;
-        }
-
-        private String dataObjectApiName;
-
-        public SearchQuery search_query_info;
-
-        @Override
-        public String toString() {
-            return MoreObjects.toStringHelper(this)
-                    .add("dataObjectApiName", dataObjectApiName)
-                    .add("search_query_info", search_query_info)
-                    .toString();
-        }
-    }
-
-    public static class Filters{
-
-        private String field_name;
-        private List<String> field_values;
-        private String operator;
-
-        public String getField_name() {
-            return field_name;
-        }
-
-        public void setField_name(String field_name) {
-            this.field_name = field_name;
-        }
-
-        public List<String> getField_values() {
-            return field_values;
-        }
-
-        public void setField_values(List<String> field_values) {
-            this.field_values = field_values;
-        }
-
-        public String getOperator() {
-            return operator;
-        }
-
-        public void setOperator(String operator) {
-            this.operator = operator;
-        }
-
-        @Override
-        public String toString() {
-            return MoreObjects.toStringHelper(this)
-                    .add("field_name", field_name)
-                    .add("field_values", field_values)
-                    .add("operator", operator)
-                    .toString();
-        }
-    }
-
-    public static class Order{
-        //降序
-        private boolean isAsc = true;
-
-        public boolean isAsc() {
-            return isAsc;
-        }
-
-        public void setAsc(boolean asc) {
-            isAsc = asc;
-        }
-
-        public String getFieldName() {
-            return fieldName;
-        }
-
-        public void setFieldName(String fieldName) {
-            this.fieldName = fieldName;
-        }
-
-        //字段,默认按照最后更新时间排序
-        private String fieldName = "create_time";
-
-
-        @Override
-        public String toString() {
-            return MoreObjects.toStringHelper(this)
-                    .add("isAsc", isAsc)
-                    .add("fieldName", fieldName)
-                    .toString();
-        }
-    }
-
-}
-

+ 0 - 50
src/main/java/com/uas/eis/beans/req/CrmUpdateReq.java

@@ -1,50 +0,0 @@
-package com.uas.eis.beans.req;
-
-import com.google.common.base.MoreObjects;
-
-/**
- * Crm更新对象数据参数
- * Created by zhongcy on 2017/1/4.
- */
-public class CrmUpdateReq<T> extends BaseOfOpenUserIdReq {
-    private static final long serialVersionUID = -3661876864620608225L;
-
-    private String dataId;
-
-    private T data;
-
-    public CrmUpdateReq() {
-    }
-
-    public CrmUpdateReq(String dataId, T data) {
-        this.dataId = dataId;
-        this.data = data;
-    }
-
-    public String getDataId() {
-        return dataId;
-    }
-
-    public void setDataId(String dataId) {
-        this.dataId = dataId;
-    }
-
-    public T getData() {
-        return data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("corpAccessToken", corpAccessToken)
-                .add("corpId", corpId)
-                .add("currentOpenUserId", currentOpenUserId)
-                .add("dataId", dataId)
-                .add("data", data)
-                .toString();
-    }
-}

+ 0 - 49
src/main/java/com/uas/eis/beans/req/OpenUserIdReq.java

@@ -1,49 +0,0 @@
-package com.uas.eis.beans.req;
-
-import com.google.common.base.MoreObjects;
-
-/**
- * 封装通过code获取 openUserId 请求参数的JaveBean
- * 
- * @author huanghp
- * @date 2015年8月28日
- */
-public class OpenUserIdReq implements Req {
-
-    private static final long serialVersionUID = 7019560397749052017L;
-
-    /**
-     * appAccessToken
-     */
-    private String appAccessToken;
-
-    /**
-     * 临时身份票据
-     */
-    private String code;
-
-    public String getAppAccessToken() {
-        return appAccessToken;
-    }
-
-    public void setAppAccessToken(String appAccessToken) {
-        this.appAccessToken = appAccessToken;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("appAccessToken", appAccessToken)
-                .add("code", code)
-                .toString();
-    }
-
-}

+ 0 - 7
src/main/java/com/uas/eis/beans/req/Req.java

@@ -1,7 +0,0 @@
-package com.uas.eis.beans.req;
-
-import java.io.Serializable;
-
-public interface Req extends Serializable {
-
-}

+ 0 - 52
src/main/java/com/uas/eis/beans/result/AppTokenResult.java

@@ -1,52 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-
-/**
- * 封装获取到的AppToken结果的JavaBean
- * 
- * @author huanghp
- * @date 2015年8月28日
- */
-public class AppTokenResult extends BaseResult {
-
-    private static final long serialVersionUID = 7698338379605078704L;
-
-    /**
-     * appAccessToken
-     */
-    private String appAccessToken;
-
-    /**
-     * appToken 超时时间(单位为:分钟)
-     */
-    private long expiresIn;
-
-    public String getAppAccessToken() {
-        return appAccessToken;
-    }
-
-    public void setAppAccessToken(String appAccessToken) {
-        this.appAccessToken = appAccessToken;
-    }
-
-    public long getExpiresIn() {
-        return expiresIn;
-    }
-
-    public void setExpiresIn(long expiresIn) {
-        this.expiresIn = expiresIn;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("errorCode", errorCode)
-                .add("errorMessage", errorMessage)
-                .add("appAccessToken", appAccessToken)
-                .add("expiresIn", expiresIn)
-                .toString();
-    }
-
-}

+ 0 - 48
src/main/java/com/uas/eis/beans/result/BaseResult.java

@@ -1,48 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-import java.io.Serializable;
-
-/**
- * Created by zhongcy on 2016/4/18.
- */
-public class BaseResult implements Serializable {
-
-    private static final long serialVersionUID = -1694441659920313916L;
-
-    /**
-     * 结果返回码(0表示成功)
-     */
-    protected int errorCode = 99;
-
-    /**
-     * 返回结果信息
-     */
-    protected String errorMessage;
-
-    public int getErrorCode() {
-        return errorCode;
-    }
-
-    public void setErrorCode(int errorCode) {
-        this.errorCode = errorCode;
-    }
-
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    public void setErrorMessage(String errorMessage) {
-        this.errorMessage = errorMessage;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("errorCode", errorCode)
-                .add("errorMessage", errorMessage)
-                .toString();
-    }
-
-}

+ 0 - 65
src/main/java/com/uas/eis/beans/result/CorpAccessTokenResult.java

@@ -1,65 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-/**
- * 封装获取到的CorpAccessToken结果的JavaBean
- * 
- * @author huanghp
- * @date 2015年8月28日
- */
-public class CorpAccessTokenResult extends BaseResult {
-
-    private static final long serialVersionUID = -4995204525912210225L;
-
-    /**
-     * corpAccessToken
-     */
-    private String corpAccessToken;
-
-    /**
-     * corpId
-     */
-    private String corpId;
-
-    /**
-     * corpAccessToken 超时时间(单位为:秒)
-     */
-    private long expiresIn;
-
-    public String getCorpAccessToken() {
-        return corpAccessToken;
-    }
-
-    public void setCorpAccessToken(String corpAccessToken) {
-        this.corpAccessToken = corpAccessToken;
-    }
-
-    public String getCorpId() {
-        return corpId;
-    }
-
-    public void setCorpId(String corpId) {
-        this.corpId = corpId;
-    }
-
-    public long getExpiresIn() {
-        return expiresIn;
-    }
-
-    public void setExpiresIn(long expiresIn) {
-        this.expiresIn = expiresIn;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("errorCode", errorCode)
-                .add("errorMessage", errorMessage)
-                .add("corpAccessToken", corpAccessToken)
-                .add("corpId", corpId)
-                .add("expiresIn", expiresIn)
-                .toString();
-    }
-
-}

+ 0 - 40
src/main/java/com/uas/eis/beans/result/CrmAddResult.java

@@ -1,40 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-/**
- * CRM crete接口返回结果
- * Created by zhongcy on 2016/12/30.
- */
-public class CrmAddResult extends BaseResult {
-
-    private static final long serialVersionUID = -6938203198421600660L;
-
-    private String dataId;
-
-    public String getExtraData() {
-        return extraData;
-    }
-
-    public void setExtraData(String extraData) {
-        this.extraData = extraData;
-    }
-
-    private String extraData;
-
-    public String getDataId() {
-        return dataId;
-    }
-
-    public void setDataId(String dataId) {
-        this.dataId = dataId;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("dataId", dataId)
-                .add("extraData", extraData)
-                .toString();
-    }
-}

+ 0 - 11
src/main/java/com/uas/eis/beans/result/CrmCallBackResult.java

@@ -1,11 +0,0 @@
-package com.uas.eis.beans.result;
-
-import lombok.Data;
-
-@Data
-public class CrmCallBackResult {
-    private String signature;
-    private Long timestamp;
-    private String nonce;
-    private String encryptedResult;
-}

+ 0 - 34
src/main/java/com/uas/eis/beans/result/CrmGetResult.java

@@ -1,34 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-import java.util.Map;
-
-/**
- * 获取详情接口返回值
- * Created by zhongcy on 2017/1/9.
- */
-public class CrmGetResult extends BaseResult{
-
-    private static final long serialVersionUID = 4289877461866887841L;
-
-    /**
-     * 数据详情结果
-     */
-    private Map<String, Object> data;
-
-    public Map<String, Object> getData() {
-        return data;
-    }
-
-    public void setData(Map<String, Object> data) {
-        this.data = data;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("data", data)
-                .toString();
-    }
-}

+ 0 - 33
src/main/java/com/uas/eis/beans/result/CrmQueryResult.java

@@ -1,33 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-import java.util.Map;
-
-/**
- * Crm查询结果
- * Created by zhongcy on 2017/1/6.
- */
-public class CrmQueryResult extends BaseResult {
-
-    private static final long serialVersionUID = -2706748557128822040L;
-
-    private Map<String, Object> data;
-
-    public Map<String, Object> getData() {
-        return data;
-    }
-
-    public void setData(Map<String, Object> data) {
-        this.data = data;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("data", data)
-                .add("errorCode", errorCode)
-                .add("errorMessage", errorMessage)
-                .toString();
-    }
-}

+ 0 - 67
src/main/java/com/uas/eis/beans/result/Customer.java

@@ -1,67 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-import java.io.Serializable;
-
-public class Customer implements Serializable {
-
-    private static final long serialVersionUID = 3486839815456351252L;
-
-    private String dataObjectApiName;
-    private String _id;
-    private String name;
-    private String account_level;
-    private String field_w9e4q__c;
-
-    public String getDataObjectApiName() {
-        return dataObjectApiName;
-    }
-
-    public void setDataObjectApiName(String dataObjectApiName) {
-        this.dataObjectApiName = dataObjectApiName;
-    }
-
-    public String get_id() {
-        return _id;
-    }
-
-    public void set_id(String _id) {
-        this._id = _id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getAccount_level() {
-        return account_level;
-    }
-
-    public void setAccount_level(String account_level) {
-        this.account_level = account_level;
-    }
-
-    public String getField_w9e4q__c() {
-        return field_w9e4q__c;
-    }
-
-    public void setField_w9e4q__c(String field_w9e4q__c) {
-        this.field_w9e4q__c = field_w9e4q__c;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("dataObjectApiName", dataObjectApiName)
-                .add("_id", _id)
-                .add("name", name)
-                .add("account_level", account_level)
-                .add("field_w9e4q__c", field_w9e4q__c)
-                .toString();
-    }
-}

+ 0 - 139
src/main/java/com/uas/eis/beans/result/Goods.java

@@ -1,139 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-public class Goods implements Serializable {
-
-    private static final long serialVersionUID = 3486839815456351252L;
-
-    private String dataObjectApiName;
-    private String unit;
-    private List<String> owner;
-    private boolean is_spec;
-    private String remark;
-    private Double standard_price;
-    private String product_line;
-    private String name;
-    private String category;
-    private List<Map<String,Object>> sku;
-    private String _id;
-    private String item_code__c;
-
-    public String getItem_code__c() {
-        return item_code__c;
-    }
-
-    public void setItem_code__c(String item_code__c) {
-        this.item_code__c = item_code__c;
-    }
-
-    public String get_id() {
-        return _id;
-    }
-
-    public void set_id(String _id) {
-        this._id = _id;
-    }
-
-    public String getDataObjectApiName() {
-        return dataObjectApiName;
-    }
-
-    public void setDataObjectApiName(String dataObjectApiName) {
-        this.dataObjectApiName = dataObjectApiName;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public List<String> getOwner() {
-        return owner;
-    }
-
-    public void setOwner(List<String> owner) {
-        this.owner = owner;
-    }
-
-    public boolean isIs_spec() {
-        return is_spec;
-    }
-
-    public void setIs_spec(boolean is_spec) {
-        this.is_spec = is_spec;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Double getStandard_price() {
-        return standard_price;
-    }
-
-    public void setStandard_price(Double standard_price) {
-        this.standard_price = standard_price;
-    }
-
-    public String getProduct_line() {
-        return product_line;
-    }
-
-    public void setProduct_line(String product_line) {
-        this.product_line = product_line;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public List<Map<String, Object>> getSku() {
-        return sku;
-    }
-
-    public void setSku(List<Map<String, Object>> sku) {
-        this.sku = sku;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("dataObjectApiName", dataObjectApiName)
-                .add("unit", unit)
-                .add("owner", owner)
-                .add("is_spec", is_spec)
-                .add("remark", remark)
-                .add("standard_price", standard_price)
-                .add("product_line", product_line)
-                .add("name", name)
-                .add("category", category)
-                .add("sku", sku)
-                .add("_id",_id)
-                .add("item_code__c",item_code__c)
-                .toString();
-    }
-}

+ 0 - 51
src/main/java/com/uas/eis/beans/result/OpenUserIdResult.java

@@ -1,51 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-/**
- * 封装获取到的OpenUserId 结果的JavaBean
- * 
- * @author huanghp
- * @date 2015年8月28日
- */
-public class OpenUserIdResult extends BaseResult {
-
-    private static final long serialVersionUID = 7403143650678784355L;
-
-    /**
-     * openUserId
-     */
-    private String openUserId;
-
-    /**
-     * corpId
-     */
-    private String corpId;
-
-    public String getOpenUserId() {
-        return openUserId;
-    }
-
-    public void setOpenUserId(String openUserId) {
-        this.openUserId = openUserId;
-    }
-
-    public String getCorpId() {
-        return corpId;
-    }
-
-    public void setCorpId(String corpId) {
-        this.corpId = corpId;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("errorCode", errorCode)
-                .add("errorMessage", errorMessage)
-                .add("openUserId", openUserId)
-                .add("corpId", corpId)
-                .toString();
-    }
-
-}

+ 0 - 156
src/main/java/com/uas/eis/beans/result/Product.java

@@ -1,156 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-import java.io.Serializable;
-
-public class Product implements Serializable {
-
-    private static final long serialVersionUID = 3486839815456351252L;
-
-    private String dataObjectApiName;
-    private String _id;
-    private Double field_ea4Nh__c;//成本单价(含税)
-    private String field_i0v47__c;//样品仓库存
-    private String field_iW998__c;//批量仓库存
-    private String field_dioys__c;//物料类型
-    private String product_code;//物料编号
-    private String UDSText1__c;//品牌
-    private String field_cwppk__c;//封装
-    private String field_r02le__c;//最小包装
-    private String unit;//单位
-    private String name;//物料名称
-    private Double price;//标准价格
-    private String category;//分类
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getField_cwppk__c() {
-        return field_cwppk__c;
-    }
-
-    public void setField_cwppk__c(String field_cwppk__c) {
-        this.field_cwppk__c = field_cwppk__c;
-    }
-
-
-
-    public String getProduct_code() {
-        return product_code;
-    }
-
-    public void setProduct_code(String product_code) {
-        this.product_code = product_code;
-    }
-
-    public String getUDSText1__c() {
-        return UDSText1__c;
-    }
-
-    public void setUDSText1__c(String UDSText1__c) {
-        this.UDSText1__c = UDSText1__c;
-    }
-
-    public String getField_r02le__c() {
-        return field_r02le__c;
-    }
-
-    public void setField_r02le__c(String field_r02le__c) {
-        this.field_r02le__c = field_r02le__c;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public String getDataObjectApiName() {
-        return dataObjectApiName;
-    }
-
-    public void setDataObjectApiName(String dataObjectApiName) {
-        this.dataObjectApiName = dataObjectApiName;
-    }
-
-    public String get_id() {
-        return _id;
-    }
-
-    public void set_id(String _id) {
-        this._id = _id;
-    }
-
-    public Double getField_ea4Nh__c() {
-        return field_ea4Nh__c;
-    }
-
-    public void setField_ea4Nh__c(Double field_ea4Nh__c) {
-        this.field_ea4Nh__c = field_ea4Nh__c;
-    }
-
-    public String getField_i0v47__c() {
-        return field_i0v47__c;
-    }
-
-    public void setField_i0v47__c(String field_i0v47__c) {
-        this.field_i0v47__c = field_i0v47__c;
-    }
-
-    public String getField_iW998__c() {
-        return field_iW998__c;
-    }
-
-    public void setField_iW998__c(String field_iW998__c) {
-        this.field_iW998__c = field_iW998__c;
-    }
-
-    public String getField_dioys__c() {
-        return field_dioys__c;
-    }
-
-    public void setField_dioys__c(String field_dioys__c) {
-        this.field_dioys__c = field_dioys__c;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("dataObjectApiName", dataObjectApiName)
-                .add("_id",_id)
-                .add("field_ea4Nh__c", field_ea4Nh__c)
-                .add("field_i0v47__c", field_i0v47__c)
-                .add("field_iW998__c", field_iW998__c)
-                .add("field_dioys__c", field_dioys__c)
-                .add("product_code",product_code)
-                .add("UDSText1__c", UDSText1__c)
-                .add("field_cwppk__c", field_cwppk__c)
-                .add("field_r02le__c", field_r02le__c)
-                .add("unit", unit)
-                .toString();
-    }
-}

+ 0 - 41
src/main/java/com/uas/eis/beans/result/ProductAddResult.java

@@ -1,41 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-/**
- *
- */
-public class ProductAddResult extends BaseResult {
-
-    private static final long serialVersionUID = -1877511411491870320L;
-
-    private Integer productId;
-    private String productCode;
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public String getProductCode() {
-        return productCode;
-    }
-
-    public void setProductCode(String productCode) {
-        this.productCode = productCode;
-    }
-
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("errorCode", errorCode)
-                .add("errorMessage", errorMessage)
-                .add("productId", productId)
-                .add("productCode", productCode)
-                .toString();
-    }
-}

+ 0 - 53
src/main/java/com/uas/eis/beans/result/ProductDto.java

@@ -1,53 +0,0 @@
-package com.uas.eis.beans.result;
-
-import com.google.common.base.MoreObjects;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- *
- */
-public class ProductDto implements Serializable {
-
-    private String dataObjectApiName;
-    private List<Map<String,Object>> spec_and_value;
-    private String spu_id;
-
-    public List<Map<String, Object>> getSpec_and_value() {
-        return spec_and_value;
-    }
-
-    public void setSpec_and_value(List<Map<String, Object>> spec_and_value) {
-        this.spec_and_value = spec_and_value;
-    }
-
-
-
-    public String getDataObjectApiName() {
-        return dataObjectApiName;
-    }
-
-    public void setDataObjectApiName(String dataObjectApiName) {
-        this.dataObjectApiName = dataObjectApiName;
-    }
-
-    public String getSpu_id() {
-        return spu_id;
-    }
-
-    public void setSpu_id(String spu_id) {
-        this.spu_id = spu_id;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("dataObjectApiName", dataObjectApiName)
-                .add("spec_and_value", spec_and_value)
-                .add("spu_id", spu_id)
-                .toString();
-    }
-}

+ 0 - 39
src/main/java/com/uas/eis/beans/result/Result.java

@@ -1,39 +0,0 @@
-package com.uas.eis.beans.result;
-
-import java.io.Serializable;
-
-public class Result<T> implements Serializable {
-
-    private static final long serialVersionUID = 5753982789557686887L;
-
-    private Integer code = 0;
-
-    private String msg = "成功";
-
-    private T data;
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public T getData() {
-        return data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-
-}

+ 0 - 36
src/main/java/com/uas/eis/config/KingdeeConfig.java

@@ -1,36 +0,0 @@
-package com.uas.eis.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * @author: zhouy
- * @date: 2021/9/26 14:10
- * @desc: 金蝶接口配置
- */
-@Component
-@ConfigurationProperties(prefix = "extral.kingdee")
-@Data
-public class KingdeeConfig {
-    /**
-     * WebApi地址
-     * */
-    private String url;
-    /**
-     * 数据库Id
-     * */
-    private String dbId;
-    /**
-     * 用户Id
-     * */
-    private String uid;
-    /**
-     * 密码
-     * */
-    private String pwd;
-    /**
-     * 语言
-     * */
-    private Integer lang;
-}

+ 0 - 23
src/main/java/com/uas/eis/config/PNSConfig.java

@@ -1,23 +0,0 @@
-package com.uas.eis.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConfigurationProperties(prefix = "extral.panasonic")
-@Data
-public class PNSConfig {
-    /**
-     * 请求路径
-     */
-   private String route ;
-   /**
-    * 密钥
-    * */
-   private String if_key;
-   /**
-    * 经销商ID
-    * */
-   private String cust_id;
-}

+ 0 - 19
src/main/java/com/uas/eis/config/SynaConfig.java

@@ -1,19 +0,0 @@
-package com.uas.eis.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConfigurationProperties(prefix = "synaptics")
-@Data
-public class SynaConfig {
-    private String username;
-    private String password;
-    private String url_850;
-    private String url_860;
-    private String url_867;
-    private String bill_to_address;
-    private String BTEDILocationCode;
-    private boolean isProd;
-}

+ 5 - 27
src/main/java/com/uas/eis/controller/ERPController.java

@@ -1,6 +1,6 @@
 package com.uas.eis.controller;
 
-import com.uas.eis.service.SynaService;
+import com.uas.eis.service.ERPService;
 import io.xlate.edi.schema.EDISchemaException;
 import io.xlate.edi.stream.EDIStreamException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,38 +9,16 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
 
 @RestController
 public class ERPController {
     @Autowired
-    private SynaService synaService;
+    private ERPService erpService;
 
-    @RequestMapping(value="/erp/sendPurchase")
+    @RequestMapping(value="/erp/sendProdIO")
     @ResponseBody
-    public Map<String, Object> sendPurchase(String master,Integer id) throws EDISchemaException, EDIStreamException, IOException {
-        return synaService.sendPurchaseToSyna(master,id);
-    }
-
-    @RequestMapping(value="/erp/sendPurchaseChange")
-    @ResponseBody
-    public Map<String, Object> sendPurchaseChange(String master,Integer id) throws EDISchemaException, EDIStreamException, IOException {
-        return synaService.sendPurchaseChangeToSyna(master,id);
-    }
-
-    @RequestMapping(value="/erp/sendPOS")
-    @ResponseBody
-    public Map<String, Object> sendPOS(String master,Integer id) throws EDISchemaException, EDIStreamException, IOException {
-        return synaService.sendPosToSyna(master,id);
-    }
-
-    @RequestMapping(value="/erp/testEIS")
-    @ResponseBody
-    public Map<String, Object> testEIS(String master,Integer id) throws EDISchemaException, EDIStreamException, IOException {
-        Map<String, Object> modelMap = new HashMap<String, Object>();
-        modelMap.put("master", master);
-        modelMap.put("success", true);
-        return modelMap;
+    public Map<String, Object> sendProdIO(String master,Integer id,String action) throws Exception {
+        return erpService.sendProdIO(master,id, action);
     }
 }

+ 0 - 56
src/main/java/com/uas/eis/controller/EventCallbackController.java

@@ -1,56 +0,0 @@
-package com.uas.eis.controller;
-
-import com.uas.eis.beans.arg.CrmCallBackArg;
-import com.uas.eis.beans.result.CrmCallBackResult;
-import com.uas.eis.utils.SignUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-@Slf4j
-@RestController
-@RequestMapping("/event/")
-public class EventCallbackController extends BaseController{
-    private static final String SUCCESS = "success";
-    private String aesKey = "cXdlcnR5dWlvcGFzZGZnaGprbHp4Y3Zibm1xd2VycXc=";
-
-    @ResponseBody
-    @RequestMapping(value = "crmCallback", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
-    public CrmCallBackResult crmCallBack(CrmCallBackArg arg) throws Exception {
-        Integer retryTimes = arg.getRetryTimes();
-        String signature = null;
-        if (retryTimes != null) {
-            signature = SignUtil.shaEncode(arg.getTimestamp() + arg.getNonce() + arg.getMessageId() + retryTimes + arg.getEnterpriseAccount() + arg.getEncryptedContent() + aesKey);
-        } else {
-            signature = SignUtil.shaEncode(arg.getTimestamp() + arg.getNonce() + arg.getMessageId() + arg.getEnterpriseAccount() + arg.getEncryptedContent() + aesKey);
-        }
-        //校验signature
-        if (!arg.getSignature().equals(signature)) {
-            Long returnTimestamp = System.currentTimeMillis();
-            String returnEncryptedResult = SignUtil.encryptAes("sinature is wrong", aesKey);
-            String returnNonce = (int) (Math.random() * 100000) + "";
-            String returnSignature = SignUtil.shaEncode(returnTimestamp + returnNonce + returnEncryptedResult + aesKey);
-            CrmCallBackResult crmCallBackResult = new CrmCallBackResult();
-            crmCallBackResult.setTimestamp(returnTimestamp);
-            crmCallBackResult.setEncryptedResult(returnEncryptedResult);
-            crmCallBackResult.setNonce(returnNonce);
-            crmCallBackResult.setSignature(returnSignature);
-            log.warn("crmCallBack={}", crmCallBackResult);
-            return crmCallBackResult;
-        }
-        //处理第三方业务逻辑
-        String json = SignUtil.decryptAes(arg.getEncryptedContent(), aesKey);
-        //....
-        //返回结果
-        Long returnTimestamp = System.currentTimeMillis();
-        String returnEncryptedResult = SignUtil.encryptAes("success", aesKey);
-        String returnNonce = (int) (Math.random() * 1000000) + "";
-        String returnSignature = SignUtil.shaEncode(returnTimestamp + returnNonce + returnEncryptedResult + aesKey);
-        CrmCallBackResult crmCallBackResult = new CrmCallBackResult();
-        crmCallBackResult.setTimestamp(returnTimestamp);
-        crmCallBackResult.setEncryptedResult(returnEncryptedResult);
-        crmCallBackResult.setNonce(returnNonce);
-        crmCallBackResult.setSignature(returnSignature);
-        log.info("json={},crmCallBack={}", json, crmCallBackResult);
-        return crmCallBackResult;
-    }
-}

+ 0 - 46
src/main/java/com/uas/eis/controller/GEController.java

@@ -1,46 +0,0 @@
-package com.uas.eis.controller;
-
-import com.uas.eis.sdk.entity.ApiResult;
-import com.uas.eis.sdk.entity.GRApiResult;
-import com.uas.eis.service.GEService;
-import io.xlate.edi.schema.EDISchemaException;
-import io.xlate.edi.stream.EDIStreamException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import com.uas.eis.dto.*;
-
-import java.io.IOException;
-import java.util.Map;
-
-@RestController
-public class GEController {
-    @Autowired
-    private GEService gEService;
-
-    /**
-     * 获取订单
-     */
-    @PostMapping("/api/getPoordergr")
-    public GRApiResult<String> getPoordergr(HttpServletRequest request, @RequestBody PoInternalDTO dto){
-        return gEService.getPoordergr(request, dto);
-    }
-
-    /**
-     * 推送出货信息
-     */
-    @PostMapping("/api/pushSenderInfo")
-    public ApiResult<String> pushSenderInfo( @RequestBody PoOrderGrDTO dto){
-        return gEService.pushSenderInfo(dto);
-    }
-
-    /**
-     * 推送出货ASN
-     */
-    @RequestMapping(value="/api/sendAsnShipment")
-    @ResponseBody
-    public ApiResult<String> sendAsnShipment(String master, Integer id) throws EDISchemaException, EDIStreamException, IOException {
-        return gEService.sendAsnShipment(master,id);
-    }
-}

+ 0 - 459
src/main/java/com/uas/eis/core/X12Converter.java

@@ -1,459 +0,0 @@
-package com.uas.eis.core;
-
-import com.uas.eis.config.SynaConfig;
-import com.uas.eis.dao.BaseDao;
-import com.uas.eis.entity.*;
-import com.uas.eis.utils.StringUtil;
-import io.xlate.edi.schema.EDISchemaException;
-import io.xlate.edi.schema.Schema;
-import io.xlate.edi.schema.SchemaFactory;
-import io.xlate.edi.stream.EDIOutputFactory;
-import io.xlate.edi.stream.EDIStreamConstants;
-import io.xlate.edi.stream.EDIStreamException;
-import io.xlate.edi.stream.EDIStreamWriter;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class X12Converter {
-   static final String X12_VERSION = "00401";
-
-    private EDIStreamWriter newEDIWriter(OutputStream stream) throws EDISchemaException {
-        EDIOutputFactory factory = EDIOutputFactory.newFactory();
-        SchemaFactory schemaFactory = SchemaFactory.newFactory();
-        Schema controlSchema = schemaFactory.getControlSchema(EDIStreamConstants.Standards.X12, new String[] { X12_VERSION });
-        EDIStreamWriter writer = factory.createEDIStreamWriter(stream);
-        writer.setControlSchema(controlSchema);
-        return  writer;
-    }
-    private void startSegment(EDIStreamWriter writer,String ediId,SynaConfig synaConfig) throws EDIStreamException {
-        writer.writeStartSegment("ISA")
-                .writeElement("00")
-                .writeElement("          ")
-                .writeElement("00")
-                .writeElement("          ")
-                .writeElement("ZZ")
-                .writeElement("WORLDSHINE     ")
-                .writeElement("ZZ")
-                .writeElement("SYNAPTICST     ")
-                .writeElement(new SimpleDateFormat("yyMMdd").format(new Date())) // GS04 (日期)
-                .writeElement(new SimpleDateFormat("HHmm").format(new Date()))   // GS05 (时间)
-                .writeElement("U")
-                .writeElement(X12_VERSION)
-                .writeElement(ediId)
-                .writeElement("0");
-        if(synaConfig.isProd()){
-            writer .writeElement("P");//T,表示测试数据;P,表示生产数据,这里是T
-        }else{
-            writer .writeElement("T");//T,表示测试数据;P,表示生产数据,这里是T
-        }
-        writer.writeElement("^").writeEndSegment();
-    }
-    private void addGS(EDIStreamWriter writer,String type,String id,String rule) throws EDIStreamException {
-        writer.writeStartSegment("GS").writeElement(type)
-                .writeElement("WORLDSHINE") // GS02
-                .writeElement("SYNAPTICSD") // GS03
-                .writeElement(new SimpleDateFormat("yyyyMMdd").format(new Date())) // GS04 (日期)
-                .writeElement(new SimpleDateFormat("HHmm").format(new Date()))     // GS05 (时间)
-                .writeElement(id)        // GS06
-                .writeElement(rule)        // T-运输数据协调委员会(TDCC),X-公认标准委员会
-                .writeElement("004010")//X12版本
-                .writeEndSegment();  // GS08
-    }
-    public String convertToX12(Purchase po,String ediId,SynaConfig synaConfig) throws EDISchemaException, EDIStreamException {
-        OutputStream stream=new ByteArrayOutputStream();
-        EDIStreamWriter writer = newEDIWriter(stream);
-        //开始
-        writer.startInterchange();
-
-        startSegment(writer,ediId,synaConfig);
-        //PO
-        addGS(writer,"PO",String.valueOf(po.getPu_id()),"T");
-
-        int txCount = 1;
-        writer.writeStartSegment("ST").writeElement("850").writeElement("4221").writeEndSegment(); // 事务集控制编号
-        txCount++;
-
-        writer.writeStartSegment("BEG")
-                .writeElement("00") // 事务集目的代码
-                .writeElement("DS") // 采购订单类型
-                .writeElement(po.getPu_code()) // 采购订单编号
-                .writeElement("") // 释放编号
-                .writeElement(new SimpleDateFormat("yyyyMMdd").format(po.getPu_date())).writeEndSegment(); // 日期
-        txCount++;
-
-        writer.writeStartSegment("CUR")
-                .writeElement("SE")
-                .writeElement(po.getPu_currency()).writeEndSegment();
-        txCount++;
-
-        writer.writeStartSegment("N1")
-                .writeElement("ST")
-                .writeElement(po.getPu_shipaddresscode())
-                .writeElement("92")
-                .writeElement(po.getPu_deliveryparty()).writeEndSegment();
-        txCount++;
-
-        writer.writeStartSegment("N1")
-                .writeElement("BT")
-                .writeElement(synaConfig.getBill_to_address())//收票地址
-                .writeElement("92")
-                .writeElement(synaConfig.getBTEDILocationCode()).writeEndSegment();
-        txCount++;
-
-        writer.writeStartSegment("REF")
-                .writeElement("SA")
-                .writeElement(po.getPu_isr()) .writeEndSegment();
-        txCount++;
-        for(PurchaseDetail pd:po.getItems()){
-            writer.writeStartSegment("PO1")
-                    .writeElement(String.valueOf(pd.getPd_detno())) // 分配编号
-                    .writeElement(String.valueOf(pd.getPd_qty())) // 数量
-                    .writeElement("EA") // 单位
-                    .writeElement(String.valueOf(pd.getPd_price())) // 单价
-                    .writeElement("PE") // 基础单位代码
-                    .writeElement("VP") // 产品ID限定符
-                    .writeElement(pd.getPr_orispeccode()) // 供应商零件编号
-                    .writeElement("BP")
-                    .writeElement((pd.getPd_custprodcode()==null?"":pd.getPd_custprodcode())).writeEndSegment();
-            txCount++;
-            writer.writeStartSegment("REF")
-                    .writeElement("PR")
-                    .writeElement(pd.getPd_quote()).writeEndSegment();
-            txCount++;
-            String shippingInstruction="";
-            if(StringUtil.hasText(pd.getPd_shippinginstruction())){
-                shippingInstruction=pd.getPd_shippinginstruction();
-            }
-            writer.writeStartSegment("FOB")
-                    .writeElement("DF")
-                    .writeElement("ZZ")
-                    .writeElement(shippingInstruction).writeEndSegment();// Shipping Instruction
-            txCount++;
-            writer.writeStartSegment("SCH")
-                    .writeElement(String.valueOf(pd.getPd_qty()))
-                    .writeElement("EA")
-                    .writeElement("")
-                    .writeElement("")
-                    .writeElement("002")
-                    .writeElement(new SimpleDateFormat("yyyyMMdd").format(pd.getPd_delivery())).writeEndSegment();//交期
-            txCount++;
-        }
-        // 订单小计 (CTT)
-        writer.writeStartSegment("CTT")
-                .writeElement(String.valueOf(po.getItems().size())).writeEndSegment();// 明细行数
-        txCount++;
-        // 结束事务集 (SE) - 需要手动计算段数量
-        writer.writeStartSegment("SE")
-                .writeElement(String.valueOf(txCount)) // 段数量 (ST到SE之间的段数,包括ST和SE)
-                .writeElement("4221").writeEndSegment(); // 事务集控制编号 (与ST中的一致)
-
-        writer.writeStartSegment("GE")
-                .writeElement("1")
-                .writeElement(String.valueOf(po.getPu_id())) .writeEndSegment();
-        writer.writeStartSegment("IEA")
-                .writeElement("1")
-                .writeElement(ediId) .writeEndSegment();
-        writer.endInterchange();
-
-        writer.close();
-        return stream.toString();
-    }
-
-    public String convertToX12(PurchaseChange pc, String ediId,SynaConfig synaConfig) throws EDISchemaException, EDIStreamException {
-        OutputStream stream=new ByteArrayOutputStream();
-        EDIStreamWriter writer = newEDIWriter(stream);
-
-        writer.startInterchange();
-        startSegment(writer,ediId,synaConfig);
-        addGS(writer,"PC",String.valueOf(pc.getPc_id()),"X");
-
-        int txCount = 1;
-        writer.writeStartSegment("ST").writeElement("860").writeElement("0001").writeEndSegment(); // 事务集控制编号
-        txCount++;
-        writer.writeStartSegment("BCH")
-                .writeElement("04") // 变更
-                .writeElement("CP") // Change to Purchase Order
-                .writeElement(pc.getPu_code()) // 采购订单编号
-                .writeElement("") // 释放编号
-                .writeElement("") // 释放编号
-                .writeElement(new SimpleDateFormat("yyyyMMdd").format(pc.getPu_date())).writeEndSegment();
-        txCount++;
-
-        writer.writeStartSegment("N1")
-                .writeElement("ST")
-                .writeElement(pc.getPu_shipaddresscode())
-                .writeElement("92")
-                .writeElement(pc.getPc_deliveryparty()).writeEndSegment();
-        txCount++;
-
-        writer.writeStartSegment("N1")
-                .writeElement("BT")
-                .writeElement(synaConfig.getBill_to_address())
-                .writeElement("92")
-                .writeElement(synaConfig.getBTEDILocationCode()).writeEndSegment();
-        txCount++;
-
-        writer.writeStartSegment("REF")
-                .writeElement("SA")
-                .writeElement(pc.getPc_isr()).writeEndSegment();
-        txCount++;
-        for(PurchaseChangeDetail pcd:pc.getItems()){
-            writer.writeStartSegment("POC")
-                    .writeElement(pcd.getPcd_so())//新思单号 香港华商龙做变更单时填写
-                    /*Code specifying the type of change to the line item 变更类型
-                    RS  交期变更
-                    PC  Price Change
-                    QD  Quantity Decrease 数量调增
-                    QI  Quantity Increase 数量调减
-
-                    PQ  Unit Price/Quantity Change  价格+数量
-                    PR  Unit Price/Reschedule Change 价格+交期
-                    RQ  Reschedule/Quantity Change   交期+数量
-
-                    MU  (Multiple) For Unit Price Quantity Reschedule Change 价格+数量+交期
-                    * */
-                        .writeElement("RS")//.writeElement(pcd.getChangetype()) 目前只调整交期
-                    .writeElement(String.valueOf(pcd.getPcd_newqty()))//数量
-                    .writeElement(String.valueOf(pcd.getPcd_newqty()))//数量
-                    /*.writeElement(String.valueOf(pcd.getPd_leftqty()))//Quantity Left to Receive 剩余数量*/
-                    .writeElement("EA")
-                    .writeElement(String.valueOf(pcd.getPcd_newprice())) // 单价
-                    //.writeElement(String.valueOf(pcd.getPd_ori_price())) // 单价
-                    .writeElement("")
-                    .writeElement("VP")
-                    .writeElement(pcd.getPr_orispeccode())
-                    .writeElement("BP")
-                    .writeElement((pcd.getPd_custprodcode()==null?"":pcd.getPd_custprodcode())).writeEndSegment();
-            txCount++;
-            writer.writeStartSegment("REF")
-                    .writeElement("PR")
-                    .writeElement(pcd.getQuote()).writeEndSegment();
-            txCount++;
-            writer.writeStartSegment("SCH")
-                    .writeElement(String.valueOf(pcd.getPcd_newqty()))//数量
-                    .writeElement("EA")
-                    .writeElement("")//SCH03
-                    .writeElement("")//SCH04
-                    /*SCH05 Date/Time Qualifier
-                    * */
-                    .writeElement("002")//Delivery Requested
-                    .writeElement(new SimpleDateFormat("yyyyMMdd").format(pcd.getPcd_newdelivery())).writeEndSegment();//交期
-            txCount++;
-        }
-        // 订单小计 (CTT)
-        writer.writeStartSegment("CTT")
-                .writeElement(String.valueOf(pc.getItems().size())).writeEndSegment();// 明细行数
-        txCount++;
-        // 结束事务集 (SE) - 需要手动计算段数量
-        writer.writeStartSegment("SE")
-                .writeElement(String.valueOf(txCount)) // 段数量 (ST到SE之间的段数,包括ST和SE)
-                .writeElement("0001").writeEndSegment(); // 事务集控制编号 (与ST中的一致)
-
-        writer.writeStartSegment("GE")
-                .writeElement("1")
-                .writeElement(String.valueOf(pc.getPc_id())) .writeEndSegment();
-        writer.writeStartSegment("IEA")
-                .writeElement("1")
-                .writeElement(ediId) .writeEndSegment();
-        writer.endInterchange();
-        writer.close();
-        return stream.toString();
-    }
-    //867
-    public String convertToX12(POS pos, String ediId, SynaConfig synaConfig) throws EDISchemaException, EDIStreamException {
-        OutputStream stream=new ByteArrayOutputStream();
-        EDIStreamWriter writer = newEDIWriter(stream);
-        writer.startInterchange();
-        //开始
-        startSegment(writer,ediId,synaConfig);
-        addGS(writer,"PT",String.valueOf(pos.getPs_id()),"X");
-
-        int txCount = 1;
-        writer.writeStartSegment("ST").writeElement("867").writeElement("0001").writeEndSegment(); // 事务集控制编号
-        txCount++;
-
-        writer.writeStartSegment("BPT")
-              .writeElement("00")
-              .writeElement(pos.getPs_code())
-              .writeElement(new SimpleDateFormat("yyyyMMdd").format(pos.getPs_date()))
-              .writeElement("02").writeEndSegment();
-        txCount++;
-
-        writer.writeStartSegment("DTM")
-              .writeElement("090")
-              .writeElement(new SimpleDateFormat("yyyyMMdd").format(pos.getPs_fromdate()))//日期区间-开始
-              .writeEndSegment();
-        txCount++;
-
-        writer.writeStartSegment("DTM")
-                .writeElement("091")
-                .writeElement(new SimpleDateFormat("yyyyMMdd").format(pos.getPs_enddate()))//日期区间-结束
-                .writeEndSegment();
-        txCount++;
-
-        writer.writeStartSegment("N1")
-                .writeElement("DB")
-                .writeElement("WORLDSHINE TECHNOLOGY LIMITED")
-                .writeElement("91")
-                .writeElement("2973")
-                .writeEndSegment();
-        txCount++;
-        writer.writeStartSegment("N3")
-              .writeElement("HK")
-              .writeEndSegment();
-        txCount++;
-
-        for(POSDetail pd:pos.getItems()){
-            /*  SD: Ship and Debit Sales (MSSC in SYNA)
-                BS: Buy and Sales (MSST in SYNA)
-                RB: Return Order / RMA (MERT in SYNA)
-            * */
-            writer.writeStartSegment("PTD")
-                    .writeElement(pd.getPd_transactionCode())//?
-                    .writeEndSegment();
-            txCount++;
-
-            /*Disti Provided Bill To Country, please provide the TERRITORY_SHORT_NAME and TERRITORY_CODE as following mapping sheet.*/
-            writer.writeStartSegment("N1")
-                    .writeElement("BT")
-                    .writeElement(pd.getPd_billtocust())//Disti Provided Bill To Customer Ex:CSOT CHINA
-                    .writeEndSegment();
-            txCount++;
-            writer.writeStartSegment("N4")
-                    .writeElement(pd.getPd_billtoCountryName())
-                    .writeElement("")
-                    .writeElement("")
-                    .writeElement(pd.getPd_billtoCountry())
-                    .writeEndSegment();
-            txCount++;
-
-            writer.writeStartSegment("N1")
-                    .writeElement("ST")
-                    .writeElement(pd.getPd_endCustomer())//Disti Provided End Customer: Actual end customer name which is sold by disti without code.
-                    .writeEndSegment();
-            txCount++;
-            /*Disti Provided Ship To Country, please provide the TERRITORY_SHORT_NAME and TERRITORY_CODE as following mapping sheet.*/
-            writer.writeStartSegment("N4")
-                    .writeElement(pd.getPd_ShipToCountryname())
-                    .writeElement("")
-                    .writeElement("")
-                    .writeElement(pd.getPd_ShipToCountry())
-                    .writeEndSegment();
-            txCount++;
-
-            writer.writeStartSegment("N1")
-                    .writeElement("MA")
-                    .writeElement(pd.getPd_endCustomer())//终端客户
-                    .writeElement("92")
-                    .writeElement(pd.getPd_resaleCustomerNumber())//新思中客户编号
-                    .writeEndSegment();
-            txCount++;
-            writer.writeStartSegment("N1")
-                    .writeElement("BY")
-                    .writeElement(pd.getPd_endCustomer())//终端客户
-                    .writeEndSegment();
-            txCount++;
-            /*非必填 Actual end customer country which is sold by disti , please provide the TERRITORY_SHORT_NAME and TERRITORY_CODE as following mapping sheet.*/
-            writer.writeStartSegment("N4")
-                    .writeElement(pd.getPd_endCustomerCountryName())//Ex:China
-                    .writeElement("")
-                    .writeElement("")
-                    .writeElement(pd.getPd_endCustomerCountry())//Ex:CN
-                    .writeEndSegment();
-            txCount++;
-
-            writer.writeStartSegment("QTY")
-                    .writeElement("01")
-                    .writeElement(String.valueOf(pd.getPd_qty()))
-                    .writeElement("EA")
-                    .writeEndSegment();
-            txCount++;
-
-            writer.writeStartSegment("LIN")
-                    .writeElement("")
-                    .writeElement("VP")
-                    .writeElement(pd.getPd_orispeccode())
-                    .writeEndSegment();
-            txCount++;
-            //Book Price
-            writer.writeStartSegment("UIT")
-                    .writeElement("EA")
-                    .writeElement(String.valueOf(pd.getPd_bookPrice()))
-                    .writeElement("CA")
-                    .writeEndSegment();
-            txCount++;
-            //resalePrice
-            writer.writeStartSegment("UIT")
-                    .writeElement("EA")
-                    .writeElement(String.valueOf(pd.getPd_resalePrice()))
-                    .writeElement("RS")
-                    .writeEndSegment();
-            txCount++;
-            //非必填 distiRequestedCost
-            writer.writeStartSegment("UIT")
-                    .writeElement("EA")
-                    .writeElement(String.valueOf(pd.getPd_distiRequestedCost()))
-                    .writeElement("QT")
-                    .writeEndSegment();
-            txCount++;
-
-            writer.writeStartSegment("ITA")
-                    .writeElement("R")
-                    .writeElement("")
-                    .writeElement("")
-                    .writeElement("09")
-                    .writeElement(String.valueOf(pd.getPd_claimAmount()))
-                    .writeElement(String.valueOf(pd.getPd_distiMarginRate()))//Disti Margin Rate
-                    .writeEndSegment();
-            txCount++;
-
-            writer.writeStartSegment("REF")
-                    .writeElement("PD")
-                    .writeElement(pd.getPd_quoteNumber())
-                    .writeEndSegment();
-            txCount++;
-
-            writer.writeStartSegment("REF")
-                    .writeElement("DI")
-                    .writeElement(pd.getPd_resaleInvoiceNum()+"/"+pd.getPd_resaleInvoiceLineNum())
-                    .writeEndSegment();
-            txCount++;
-
-            writer.writeStartSegment("DTM")
-                    .writeElement("003")
-                    .writeElement(new SimpleDateFormat("yyyyMMdd").format(pd.getPd_resaleInvoiceDate()))
-                    .writeEndSegment();
-            txCount++;
-
-            writer.writeStartSegment("CUR")
-                    .writeElement("BY")
-                    .writeElement(pos.getPs_currency())
-                    .writeEndSegment();
-            txCount++;
-
-        }
-        //结束
-        // 订单小计 (CTT)
-        writer.writeStartSegment("CTT")
-                .writeElement(String.valueOf(pos.getItems().size())).writeEndSegment();// 明细行数
-        txCount++;
-        // 结束事务集 (SE) - 需要手动计算段数量
-        writer.writeStartSegment("SE")
-                .writeElement(String.valueOf(txCount)) // 段数量 (ST到SE之间的段数,包括ST和SE)
-                .writeElement("0001").writeEndSegment(); // 事务集控制编号 (与ST中的一致)
-
-        writer.writeStartSegment("GE")
-                .writeElement("1")
-                .writeElement(String.valueOf(pos.getPs_id())) .writeEndSegment();
-        writer.writeStartSegment("IEA")
-                .writeElement("1")
-                .writeElement(ediId) .writeEndSegment();
-        writer.endInterchange();
-        writer.close();
-        return stream.toString();
-    }
-}

+ 0 - 54
src/main/java/com/uas/eis/core/enums/ElecInVoiceSpecificFactor.java

@@ -1,54 +0,0 @@
-package com.uas.eis.core.enums;
-
-/**
- * @author: WUYX
- * @date: 2023/08/02
- * @desc: 发票特定要素
- *  0-普通 1-成品油发票 3-建筑服务 4-货物运输服务 6-不动产经营租赁服务 9-旅客运输服务 16-农产品收购 31-建安发票 32-房地产销售发票 33-二手车发票反向开具 34-电子烟 35-矿产品
- */
-public enum ElecInVoiceSpecificFactor {
-    PT(0,"普通"),
-    CPYFP(1,"成品油发票"),
-    JZFW(3,"建筑服务"),
-    HWYXFU(4,"货物运输服务"),
-    BDCJYZLFW(6,"不动产经营租赁服务"),
-    LKYSFW(9,"旅客运输服务"),
-    NCPSG(16,"农产品收购"),
-    JAFP(31,"建安发票"),
-    FDCXSFP(32,"房地产销售发票"),
-    ESCFPFXKJ(33,"二手车发票反向开具"),
-    DZY(34,"电子烟"),
-    KCP(35,"矿产品")
-    ;
-    private int sid;
-    private String description;
-
-    private ElecInVoiceSpecificFactor(int sid,String description){
-        this.sid = sid;
-        this.description = description;
-    }
-
-    public int getSid() {
-        return sid;
-    }
-
-    public void setSid(int sid) {
-        this.sid = sid;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-    public static String getDescription(int sid_) {
-        for (ElecInVoiceSpecificFactor sf : values()) {
-            if (sf.getSid() == sid_) {
-                return sf.getDescription();
-            }
-        }
-        return String.valueOf(sid_);
-    }
-}

+ 0 - 81
src/main/java/com/uas/eis/core/enums/ElecInVoicekind.java

@@ -1,81 +0,0 @@
-package com.uas.eis.core.enums;
-
-/**
- * @author: WUYX
- * @date: 2023/08/02
- * @desc: 发票特定要素
- *  发票种类
- *  合并冲销时为空
- *  p:普通发票(电票)
- *  c:普通发票(纸票)
- *  s:专用发票(纸票)
- *  b:专用发票(电子)
- *  e:收购发票(电票)
- *  f:收购发票(纸质)
- *  r:普通发票(卷式)
- *  bs:数电专票(电子)
- *  pc:数电普票(电子)
- *  es:数电专票(纸质)
- *  ec:数电普票(纸质)
- * 发票种类,
- * 增值税电子普通发票、增值税普通发票、专用发票(电子)、增值税专用发票、收购发票(电子)、收购发票(纸质)、增值税普通发票(卷式)、机动车销售统一发票、
- * 二手车销售统一发票、电子发票(增值税专用发票)、电子发票(普通发票)、全电纸质发票(增值税专用发票)、全电纸质发票(普通发票);
- * 备注:电子发票(增值税专用发票)即 数电专票(电子),电子发票(普通发票)即 数电普票(电子)
- *
- */
-public enum ElecInVoicekind {
-    P("p","普通发票(电票)","增值税普通发票"),
-    C("c","普通发票(纸票)","增值税电子普通发票"),
-    S("s","专用发票(纸票)","增值税专用发票"),
-    B("b","专用发票(电子)","专用发票(电子)"),
-    E("e","收购发票(电票)","收购发票(电子)"),
-    F("f","收购发票(纸质)","收购发票(纸质)"),
-    R("r","普通发票(卷式)","增值税普通发票(卷式)"),
-    BS("bs","数电专票(电子)","电子发票(增值税专用发票)"),
-    PC("pc","数电普票(电子)","电子发票(普通发票)"),
-    ES("es","数电专票(纸质)","全电纸质发票(增值税专用发票)"),
-    EC("ec","数电普票(纸质)","全电纸质发票(普通发票)")
-    ;
-    private String line;//EI_INVOICELINE
-    private String name;
-    private String kind;//EI_INVOICEKIND
-
-    private ElecInVoicekind(String line,String name, String kind){
-        this.line = line;
-        this.name = name;
-        this.kind = kind;
-    }
-
-    public String getLine() {
-        return line;
-    }
-
-    public void setLine(String line) {
-        this.line = line;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getKind() {
-        return kind;
-    }
-
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    public static String getKind(String line) {
-        for (ElecInVoicekind sf : values()) {
-            if (sf.getLine() == line) {
-                return sf.getKind();
-            }
-        }
-        return String.valueOf(line);
-    }
-}

+ 0 - 23
src/main/java/com/uas/eis/core/enums/KingdeeFormId.java

@@ -1,23 +0,0 @@
-package com.uas.eis.core.enums;
-
-/**
- * @author: zhouy
- * @date: 2021/9/26 15:14
- * @desc: 金蝶业务类型
- */
-public enum KingdeeFormId {
-
-    SALOUTSTOCK("SAL_OUTSTOCK"), //销售出库单
-    PRDPICKMTRL("PRD_PickMtrl"), //生产领料单
-    SUBPICKMTRL("SUB_PickMtrl")//委外领料单
-    ;
-    private String formId;
-    private KingdeeFormId(String formId){
-        this.formId = formId;
-    }
-
-    public String getFormId(){
-        return formId;
-    }
-
-}

+ 0 - 9
src/main/java/com/uas/eis/dao/BaseNuoNuoQResp.java

@@ -1,9 +0,0 @@
-package com.uas.eis.dao;
-
-import lombok.Data;
-
-@Data
-public class BaseNuoNuoQResp {
-    private String code;
-    private String describe;
-}

+ 0 - 23
src/main/java/com/uas/eis/dao/BaseNuoNuoResp.java

@@ -1,23 +0,0 @@
-package com.uas.eis.dao;
-
-
-public class BaseNuoNuoResp {
-    private String status;
-    private String message;
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-}

+ 0 - 22
src/main/java/com/uas/eis/dao/BaseResp.java

@@ -1,22 +0,0 @@
-package com.uas.eis.dao;
-
-public class BaseResp {
-    private Integer code;
-    private String message;
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-}

+ 0 - 30
src/main/java/com/uas/eis/dao/RedInvoiceReq.java

@@ -1,30 +0,0 @@
-package com.uas.eis.dao;
-
-import lombok.Data;
-
-@Data
-public class RedInvoiceReq {
-    String billId;//非必填	32	红字确认单申请号,需要保持唯一,不传的话系统自动生成一个
-    String blueInvoiceLine;//必填	pc	2	对应蓝票发票种类: bs:电子发票(增值税专用发票), pc:电子发票(普通发票),es:全电纸质发票(增值税专用发票), ec:全电纸质发票(普通发票),p:普通发票(电票),c:普通发票(纸票),s:专用发票,b:增值税电子专用发票
-    String applySource;//必填	0	2	申请方(录入方)身份: 0 销方 1 购方
-    String blueInvoiceNumber;//非必填	20230508287375668802	20	对应蓝字发票号码(蓝票是增值税发票时必传,长度为8位数字,若传20位数字则视为是蓝字数电票号码)
-    String blueInvoiceCode;//非必填	 12	对应蓝字发票代码(蓝票是增值税发票时必传)
-    String blueElecInvoiceNumber;//非必填	 20	对应蓝字数电票号码(数电普票、数电专票、数纸普票、数纸专票都需要传,蓝票是增值税发票时不传)
-    String billTime;//非必填 	填开时间(时间戳格式),默认为当前时间
-    String sellerTaxNo;//必填	91440101MA5APD8X8J	20	销方税号
-    String sellerName;//必填	广东航天信息爱信诺科技有限公司	100	销方名称,申请说明为销方申请时可为空
-    String departmentId;//非必填		-	32	部门门店id(诺诺网系统中的id)
-    String clerkId;//非必填		-	32	开票员id(诺诺网系统中的id)
-    String buyerTaxNo;//非必填	91330106MA2AYNWD8M	20	购方税号
-    String buyerName;//	必填	浙江诺诺网络科技有限公司	100	购方名称
-    String vatUsage;//非必填		-	2	蓝字发票增值税用途(预留字段可为空): 1 勾选抵扣 2 出口退税 3 代办出口退税 4 不抵扣
-    String saleTaxUsage;//非必填		-	2	蓝字发票消费税用途(预留字段可为空)
-    String accountStatus;//非必填	-	2	发票入账状态(预留字段可为空): 0 未入账 1 已入账
-    String redReason;//必填	2	冲红原因: 1销货退回 2开票有误 3服务中止 4销售折让
-    String extensionNumber;//非必填	9998	5	分机号
-    String autoInvoice;//非必填	0	2	是否自动开票,0否(不传默认0)1是;传1时,所申请的确认单变为购销双方已确认或无需确认状态时,而自动开具红票。目前该字段不生效,电票都自动开,纸票都不自动
-    String orderNo;//非必填20	若有值,则在无需确认或购销双方已确认后去自动开红票,发票的开票单号用该值
-    String phone;//非必填	20	交付手机,红票优先取该值,不传默认取原蓝票
-    String email;//非必填50	交付邮箱,红票优先取该值,不传默认取原蓝票
-    String callbackUrl;//非必填225	确认单回传地址,回调内容可联系服务人员;自动开票时,会透传到开票接口
-}

+ 0 - 37
src/main/java/com/uas/eis/dao/RoleDao.java

@@ -1,37 +0,0 @@
-package com.uas.eis.dao;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.support.JdbcDaoSupport;
-import org.springframework.stereotype.Component;
-
-import com.uas.eis.core.support.TokenHandler;
-
-public class RoleDao extends JdbcDaoSupport{
-	
-	@Autowired
-	private BaseDao baseDao;
-	
-	public String login(String username, String password) {
-		return TokenHandler.createToken(username, password);
-	}
-	
-	public boolean getEnable(String username) {
-		int enable = baseDao.queryForObject("select er_enable from EIS_ROLE where er_name = '" + username + "'", Integer.class);
-		return enable == -1;
-	}
-	
-	public boolean checkActionAccess(String username, String action) {
-		String role = baseDao.queryForObject("select eu_role from EIS_USER; where eu_name = '" + username + "'", String.class);
-		String roles = baseDao.queryForObject("select ei_roles from EIS_INTERFACE where ei_path = '" + action + "'", String.class);
-		String[] allRoles = roles.split(",");
-		boolean flag = false;
-		
-		for(String r: allRoles){
-	        if(r.equals(role)) {
-	        	flag = true;
-	        	break;
-	        }
-	    }
-		return flag;
-	}
-}

+ 0 - 39
src/main/java/com/uas/eis/dto/AsnAddrInfoDTO.java

@@ -1,39 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class AsnAddrInfoDTO {
-    private String partyType;
-    private String partyName;
-    private String partyCode;
-    private String addiName1;
-    private String addiName2;
-    private String street1;
-    private String street2;
-    private String street3;
-    private String street4;
-    private String city;
-    private String state;
-    private String postalCode;
-    private String countryCode;
-    private String countryName;
-    private String district;
-    private String contactName;
-    private String contactEmail;
-    private String phone;
-    private String fax;
-    private String attr1;
-    private String attr2;
-    private String attr3;
-    private String attr4;
-    private String attr5;
-    private String attr6;
-    private String attr7;
-    private String attr8;
-    private String attr9;
-    private String attr10;
-
-}

+ 0 - 75
src/main/java/com/uas/eis/dto/AsnDTO.java

@@ -1,75 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class AsnDTO {
-    private String transId;
-    private String senderQualifier;
-    private String senderId;
-    private String receiverQualifier;
-    private String receiverId;
-    private String regionCode;
-    private String asnNo;
-    /*private Date asnDate;
-    private Date shipDate;*/
-    private String asnDate;
-    private String shipDate;
-    private String packType;
-    private String packCount;
-    private String totalGwt;
-    private String wtUom;
-    private String carrierType;
-    private String carrierCode;
-    private String carrierName;
-    private String ppgVol;
-    private String volUom;
-    private String transMethod;
-    private String routing;
-    private String poe;
-    private String agentCode;
-    private String agentName;
-    private String asnStatus;
-    private String incotermsCode;
-    private String mawbNo;
-    private String hawbNo;
-    private String flightNo;
-    private String waybillNo;
-    private String oceanCTNo;
-    private String invoiceNo;
-    private String voyageNo;
-    private String voyageName;
-    private String custPlant;
-    private String shipCondCode;
-    private String vendorCode;
-    private String vendorName;
-    private String shipperCode;
-    private Date ccDate;
-    private Date reqDate;
-    private Date pickUpDate;
-    /*private Date estCCDate;
-    private Date etd;*/
-    private String estCCDate;
-    private String etd;
-    private Date actDeptDate;
-    /*private Date eta;*/
-    private String eta;
-    private Date ata;
-    private String siteCode;
-    private String transactionId;
-    private String attr1;
-    private String attr2;
-    private String attr3;
-    private String attr4;
-    private String attr5;
-    private String attr6;
-    private String attr7;
-    private String attr8;
-    private String attr9;
-    private String attr10;
-    private List<AsnAddrInfoDTO> addrInfo;
-    private List<AsnOrderDTO> asnOrder;
-
-}

+ 0 - 23
src/main/java/com/uas/eis/dto/AsnDetDTO.java

@@ -1,23 +0,0 @@
-package com.uas.eis.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-@Data
-public class AsnDetDTO {
-    /*@JsonProperty("ASN")
-    private AsnDTO ASN;*/
-
-    @JSONField(name = "ASN")
-    private AsnDTO ASN;
-
-    // 手动实现 getter/setter
-    @JSONField(name = "ASN")
-    public AsnDTO getAsnField() {  // 不要叫 getASN()
-        return ASN;
-    }
-
-    public void setASN(AsnDTO ASN) { this.ASN = ASN; }
-
-}

+ 0 - 27
src/main/java/com/uas/eis/dto/AsnOrderDTO.java

@@ -1,27 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class AsnOrderDTO {
-    private String asnNo;
-    private String poNo;
-    private Date poDate;
-    private String attr1;
-    private String attr2;
-    private String attr3;
-    private String attr4;
-    private String attr5;
-    private String attr6;
-    private String attr7;
-    private String attr8;
-    private String attr9;
-    private String attr10;
-    private List<AsnPalletDTO> asnPallet;
-    private List<AsnPackDTO> asnPack;
-    private List<AsnOrderDetailDTO> asnOrderDetail;
-
-}

+ 0 - 44
src/main/java/com/uas/eis/dto/AsnOrderDetailDTO.java

@@ -1,44 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class AsnOrderDetailDTO {
-    private String asnNo;
-    private String poNo;
-    private String poLineNo;
-    private String packNo;
-    private String custPartNo;
-    private String custPartDesc;
-    private String vendorPartNo;
-    private String vendorPartDesc;
-    private String custPlant;
-    private String custStorLoc;
-    private String qty;
-    private String qtyUom;
-    private String attr1;
-    private String attr2;
-    private String attr3;
-    private String attr4;
-    private String attr5;
-    private String attr6;
-    private String attr7;
-    private String attr8;
-    private String attr9;
-    private String attr10;
-    private String attr11;
-    private String attr12;
-    private String attr13;
-    private String attr14;
-    private String attr15;
-    private String attr16;
-    private String attr17;
-    private String attr18;
-    private String attr19;
-    private String attr20;
-    private List<AsnSnDetailDTO> asnSNDetail;
-
-}

+ 0 - 44
src/main/java/com/uas/eis/dto/AsnPackDTO.java

@@ -1,44 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class AsnPackDTO {
-    private String asnNo;
-    private String poNo;
-    private String poLineNo;
-    private String packType;
-    private String packNo;
-    private String parentPackNo;
-    private String packCode;
-    private String palLayers;
-    private String layerPieces;
-    private String packCount;
-    private String packUnitWT;
-    private String wtUom;
-    private String length;
-    private String width;
-    private String height;
-    private String dimUom;
-    private String grossWT;
-    private String gVol;
-    private String volUom;
-    private String manPackCount;
-    private String innerPackCount;
-    private String sscc;
-    private String attr1;
-    private String attr2;
-    private String attr3;
-    private String attr4;
-    private String attr5;
-    private String attr6;
-    private String attr7;
-    private String attr8;
-    private String attr9;
-    private String attr10;
-    private List<AsnOrderDetailDTO> asnOrderDetail;
-
-}

+ 0 - 45
src/main/java/com/uas/eis/dto/AsnPalletDTO.java

@@ -1,45 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class AsnPalletDTO {
-    private String asnNo;
-    private String poNo;
-    private String poLineNo;
-    private String packType;
-    private String packNo;
-    private String parentPackNo;
-    private String packCode;
-    private String palLayers;
-    private String layerPieces;
-    private String packCount;
-    private String packUnitWt;
-    private String wtUom;
-    private String length;
-    private String width;
-    private String height;
-    private String dimUom;
-    private String grossWT;
-    private String gVol;
-    private String volUom;
-    private String manPackCount;
-    private String innerPackCount;
-    private String sscc;
-    private String attr1;
-    private String attr2;
-    private String attr3;
-    private String attr4;
-    private String attr5;
-    private String attr6;
-    private String attr7;
-    private String attr8;
-    private String attr9;
-    private String attr10;
-    private List<AsnPackDTO> asnPack;
-    private List<AsnOrderDetailDTO> asnOrderDetail;
-
-}

+ 0 - 27
src/main/java/com/uas/eis/dto/AsnSnDetailDTO.java

@@ -1,27 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class AsnSnDetailDTO {
-    private String asnNo;
-    private String poNo;
-    private String poLineNo;
-    private String packNo;
-    private String snNo;
-    private String productDate;
-    private String attr1;
-    private String attr2;
-    private String attr3;
-    private String attr4;
-    private String attr5;
-    private String attr6;
-    private String attr7;
-    private String attr8;
-    private String attr9;
-    private String attr10;
-
-}

+ 0 - 124
src/main/java/com/uas/eis/dto/FindOrderRelationInvoiceDTO.java

@@ -1,124 +0,0 @@
-package com.uas.eis.dto;
-
-import com.uas.eis.utils.NumberUtil;
-import com.uas.eis.utils.StringUtil;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class FindOrderRelationInvoiceDTO extends QSqlDTO{
-    private String sid;//发票流水号,返回合并冲销的开票单为空
-    private String orderNo;//开票单号
-    private String createtime;//开票单的创建时间
-    private Number invoiceType;//发票类型,合并冲销时为空;1:蓝票 2:红票
-    private String invoiceLine;//发票种类,合并冲销时为空 p:普通发票(电票) c:普通发票(纸票) s:专用发票(纸票) b:专用发票(电子) e:收购发票(电票) f:收购发票(纸质) r:普通发票(卷式) bs:数电专票(电子) pc:数电普票(电子) es:数电专票(纸质) ec:数电普票(纸质)
-    private String specificFactor;//1 成品油、35 矿产品;普通发票为空
-    private Number invoiceState;//开票状态,合并冲销时为空 1:开票成功 2:开票失败
-    private String exceptionMessage;//开票异常信息,开票失败状态时返回
-    private String invoiceCode;//发票代码,仅开票成功会返回,发票种类为bs和pc时为空
-    private String invoiceNumber;//发票号码,仅开票成功会返回,发票种类为bs和pc时为空
-    private String allElectronicInvoiceNumber;//数电发票号码,仅数电发票开票成功会返回
-    private String oldInvoiceCode;//原发票代码(红字发票开票成功后若有值回传),发票种类为bs和pc时为空
-    private String oldInvoiceNumber;//原发票号码(红字发票开票成功后若有值回传),发票种类为bs和pc时为空
-    private String oldAllElectronicInvoiceNu;//原数电发票号码(数电发票开票成功后若有值回传)
-    private String invoiceTime;//开票日期,仅开票成功会返回
-    private String invalidTime;//作废日期,暂时未用到
-    private String rushRedState;//发票冲红状态(0 未冲红,1 全部冲红,2 部分冲红)
-    private String pdfUrl;//发票pdf地址,仅开票成功时返回
-    private String ofdUrl;//发票ofd地址,仅开票成功时返回
-    private String imageUrl;//发票jpg地址,仅开票成功时返回
-    private Number calcExcludingTaxAmount;//不含税金额,开票失败时不返回,含税金额和不含税金额任一数值返回为0,即为合并冲销
-    private Number calcTaxAmount;//税额,开票失败时不返回
-    private Number caleOrderAmount;//含税金额,开票失败时不返回,含税金额和不含税金额任一数值返回为0,即为合并冲销
-    private String sellerTaxNo;//销方税号
-    private String sellerName;//销方名称,仅开票成功会返回
-    private String taxNo;//购方税号,仅开票成功会返回
-    private String buyerName;//购方名称,仅开票成功会返回
-    private String remark;//发票备注
-    private String clerker;//开票员
-    private String payee;//收款人
-    private String checker;//复核人
-    private String clerkId;//所属开票员id
-    private String deptId;//所属部门id
-    private String bField1;//主表自定义字段1
-    private String bField2;//主表自定义字段2
-    private String bField3;//主表自定义字段3
-    private List<OrderDetailCallBackVOSDTO> orderDetailCallBackVOS;//发票来源的订单明细list
-    private List<RelateRedInvoiceDTO> relateRedInvoiceList;//发票来源的订单明细list
-
-    public List<String> toMergeSql(int ioid,int detno){
-        List<String> sqls = new ArrayList<>();
-        String sql = "merge into (" +
-                "    select ei_id,ei_indate,ei_updatedate,ei_detno,ei_ioid,ei_iocode,ei_biid,ei_bicode " +
-                "        ,ei_refno,ei_sid,ei_orderno,ei_createtime,ei_invoicetype,ei_invoiceline,ei_specificfactor,ei_invoicestate,ei_exceptionmessage,ei_invoicecode,ei_invoicenumber " +
-                "        ,ei_allelectronicinvoicenumber,ei_oldinvoicecode,ei_oldinvoicenumber,ei_oldallelectronicinvoicenu,ei_invoicetime,ei_invalidtime,ei_rushredstate,ei_pdfurl,ei_ofdurl " +
-                "        ,ei_imageurl,ei_calcexcludingtaxamount,ei_calctaxamount,ei_caleorderamount,ei_sellertaxno,ei_sellername,ei_taxno,ei_buyername,ei_remark,ei_clerker " +
-                "        ,ei_payee,ei_checker,ei_bfield1,ei_bfield2,ei_bfield3,ei_pdfattach,ei_billstatus " +
-                "    from elecinvoice where ei_ioid = " +ioid+
-                " ) a USING ( " +
-                "    select io_id,io_code,io_biid,io_bicode, "+detno+" eiDetno " +
-                "        ,"+getRefno()+" eiRefno,"+stringField(getSid())+" eiSid,"+stringField(getOrderNo())+" eiOrderno,"+timeField(getCreatetime())+" eiCreatetime,"+numberField(getInvoiceType())+" eiInvoicetype,"+stringField(getInvoiceLine())+" eiinvoiceline,"+stringField(getSpecificFactor())+" eiSpecificfactor,"+numberField(getInvoiceState())+" eiInvoicestate" +
-                "        ,"+stringField(getExceptionMessage())+" eiExceptionmessage,"+stringField(getInvoiceCode())+" eiInvoicecode,"+stringField(getInvoiceNumber())+" eiInvoicenumber " +
-                "        ,"+stringField(getAllElectronicInvoiceNumber())+" eiAllelectronicinvoicenumber,"+stringField(getOldInvoiceCode())+" eiOldinvoicecode,"+stringField(getOldInvoiceNumber())+" eiOldinvoicenumber,"+stringField(getOldAllElectronicInvoiceNu())+" eiOldallelectronicinvoicenu " +
-                "        ,"+timeField(getInvoiceTime())+" eiInvoicetime,"+timeField(getInvalidTime())+" eiInvalidtime,"+(getRushRedState())+" eiRushredstate " +
-                "        ,"+stringField(getPdfUrl())+" eiPdfurl,"+stringField(getOfdUrl())+" eiOfdurl,"+stringField(getImageUrl())+" eiImageurl,"+numberField(getCalcExcludingTaxAmount())+" eiCalcexcludingtaxamount,"+numberField(getCalcTaxAmount())+" eiCalctaxamount,"+numberField(getCaleOrderAmount())+" eiCaleorderamount" +
-                "        ,"+stringField(getSellerTaxNo())+" eiSellertaxno,"+stringField(getSellerName())+" eiSellername,"+stringField(getTaxNo())+" eiTaxno " +
-                "        ,"+stringField(getBuyerName())+" eiBuyername,"+stringField(getRemark())+" eiRemark,"+stringField(getClerker())+" eiClerker,"+stringField(getPayee())+" eiPayee,"+stringField(getChecker())+" eiChecker" +
-                "        ,"+stringField(getBField1())+" eiBfield1,"+stringField(getBField2())+" eiBfield2,"+stringField(getBField3())+" eiBfield3 " +
-                "    from dual,(select io_id,io_code,io_biid,io_bicode from invoiceorder where io_id = "+ioid+") " +
-                ") b on (nvl(a.ei_orderno,' ') = b.eiorderno) " +
-                "when matched then update set ei_updatedate=sysdate " +
-                "    ,ei_detno = eidetno,ei_refno = eiRefno,ei_sid = eisid,ei_createtime = eicreatetime,ei_invoicetype = eiinvoicetype,ei_invoiceline = eiinvoiceline,ei_specificfactor = eispecificfactor " +
-                "    ,ei_invoicestate = eiinvoicestate,ei_exceptionmessage = eiexceptionmessage,ei_invoicecode = eiinvoicecode,ei_invoicenumber = eiinvoicenumber " +
-                "    ,ei_allelectronicinvoicenumber = eiallelectronicinvoicenumber,ei_oldinvoicecode = eioldinvoicecode,ei_oldinvoicenumber = eioldinvoicenumber,ei_oldallelectronicinvoicenu = eioldallelectronicinvoicenu " +
-                "    ,ei_invoicetime = eiinvoicetime,ei_invalidtime = eiinvalidtime,ei_rushredstate = eirushredstate " +
-                "    ,ei_pdfurl = eipdfurl,ei_ofdurl = eiofdurl,ei_imageurl = eiimageurl,ei_calcexcludingtaxamount = eicalcexcludingtaxamount,ei_calctaxamount = eicalctaxamount,ei_caleorderamount = eicaleorderamount " +
-                "    ,ei_sellertaxno = eisellertaxno,ei_sellername = eisellername,ei_taxno = eitaxno " +
-                "    ,ei_buyername = eibuyername,ei_remark = eiremark,ei_clerker = eiclerker,ei_payee = eipayee,ei_checker = eichecker,ei_bfield1 = eibfield1,ei_bfield2 = eibfield2,ei_bfield3 = eibfield3" +
-                "    ,ei_pdfattach=null,ei_billstatus=null " +//抓取后重新抓取附件
-                "when NOT MATCHED THEN insert (ei_id,ei_indate,ei_detno,ei_ioid,ei_iocode,ei_biid,ei_bicode " +
-                "    ,ei_refno,ei_sid,ei_orderno,ei_createtime,ei_invoicetype,ei_invoiceline,ei_specificfactor,ei_invoicestate,ei_exceptionmessage,ei_invoicecode,ei_invoicenumber " +
-                "    ,ei_allelectronicinvoicenumber,ei_oldinvoicecode,ei_oldinvoicenumber,ei_oldallelectronicinvoicenu,ei_invoicetime,ei_invalidtime,ei_rushredstate,ei_pdfurl,ei_ofdurl " +
-                "    ,ei_imageurl,ei_calcexcludingtaxamount,ei_calctaxamount,ei_caleorderamount,ei_sellertaxno,ei_sellername,ei_taxno,ei_buyername,ei_remark,ei_clerker " +
-                "    ,ei_payee,ei_checker,ei_bfield1,ei_bfield2,ei_bfield3) " +
-                "values(elecinvoice_seq.nextval,sysdate,eidetno,io_id,io_code,io_biid,io_bicode " +
-                "    ,eiRefno,eisid,eiorderno,eicreatetime,eiinvoicetype,eiinvoiceline,eispecificfactor,eiinvoicestate,eiexceptionmessage,eiinvoicecode,eiinvoicenumber " +
-                "    ,eiallelectronicinvoicenumber,eioldinvoicecode,eioldinvoicenumber,eioldallelectronicinvoicenu,eiinvoicetime,eiinvalidtime,eirushredstate,eipdfurl,eiofdurl " +
-                "    ,eiimageurl,eicalcexcludingtaxamount,eicalctaxamount,eicaleorderamount,eisellertaxno,eisellername,eitaxno,eibuyername,eiremark,eiclerker " +
-                "    ,eipayee,eichecker,eibfield1,eibfield2,eibfield3)";
-        sqls.add(sql);
-        if(relateRedInvoiceList !=null && relateRedInvoiceList.size()>0){//红冲数据更新
-            StringBuffer orderNos = new StringBuffer(); //红票开票单号 //  EI_redORDERNO
-            StringBuffer sids = new StringBuffer(); //红票流水号 EI_redSID
-            StringBuffer refnoS = new StringBuffer(); // 红字发票号 EI_RELATIVEREFNO
-            Double excludingTaxAmount = 0.0;//红票不含税金额 EI_TAXEXCLUDEDAMOUNT
-            Double taxAmount = 0.0;//红票税额  EI_TAXAMOUNT
-            // rushRedState 1 全冲  EI_RELATIVEREFNO	VARCHAR2(50 BYTE)	Yes		46	红字发票号
-            for (RelateRedInvoiceDTO rroDto : relateRedInvoiceList) {
-                orderNos.append(rroDto.getOrderNo()).append(",");
-                sids.append(rroDto.getSid()).append(",");
-                refnoS.append(StringUtil.nvl(rroDto.getAllElectronicInvoiceNumber(),rroDto.getInvoiceNumber())).append(",");
-                excludingTaxAmount = NumberUtil.add(excludingTaxAmount,rroDto.getExcludingTaxAmount());
-                taxAmount = NumberUtil.add(taxAmount,rroDto.getTaxAmount());
-            }
-            if(orderNos.length()>0){
-                sql = "update elecinvoice set " +
-                        "ei_redorderno='"+orderNos.substring(0,orderNos.length()-1)+"', " +
-                        "EI_redSID='"+sids.substring(0,sids.length()-1)+"', " +
-                        "ei_relativerefno='"+refnoS.substring(0,refnoS.length()-1)+"', " +
-                        "EI_TAXEXCLUDEDAMOUNT='"+excludingTaxAmount+"', " +
-                        "EI_TAXAMOUNT='"+taxAmount+"' " +
-                        ",ei_redpdfurl=null,ei_redpdfattach=null " +//抓取后重新抓取附件
-                        "where ei_ioid = "+ioid+" and ei_refno = "+getRefno();
-                sqls.add(sql);
-            }
-        }
-        return sqls;
-    }
-    private String getRefno(){
-        //ei_refno = (case when ei_invoiceLine in ('bs','pc','es','ec') then ei_allElectronicInvoiceNumber else ei_invoiceNumber end)
-        return stringField(StringUtil.nvl(getAllElectronicInvoiceNumber(),getInvoiceNumber()));
-    }
-}

+ 0 - 10
src/main/java/com/uas/eis/dto/FindOrderRelationInvoiceReq.java

@@ -1,10 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-@Data
-public class FindOrderRelationInvoiceReq {
-    String originalOrderNo;//订单编号
-    String saleTaxNum;//销方税号
-    String needInvoiceSourceDetail;//是否需要发票所来源的订单明细,1-是, 0-否(不填默认 0) 当为0时,将不回传orderDetailCallBackVOS
-}

+ 0 - 11
src/main/java/com/uas/eis/dto/FindOrderRelationInvoiceResp.java

@@ -1,11 +0,0 @@
-package com.uas.eis.dto;
-
-import com.uas.eis.dao.BaseNuoNuoResp;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class FindOrderRelationInvoiceResp extends BaseNuoNuoResp {
-    private List<FindOrderRelationInvoiceDTO> data;
-}

+ 0 - 24
src/main/java/com/uas/eis/dto/OrderDetailCallBackVOSDTO.java

@@ -1,24 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-@Data
-public class OrderDetailCallBackVOSDTO {
-    private String RowNo;//行编号
-    private String goodsName;//商品名称
-    private String spbm;//商品税收分类编码
-    private String spec;//规格型号
-    private Number num;//本次开票所提交的数量
-    private Number price;//单价,读取含税标志
-    private String unit;//单位
-    private Number taxAmount;//本次开票所提交的金额,读取含税标志
-    private String hsbz;//含税标志 0:不含税 1:含税
-    private String tax;//本次开票所提交的税额
-    private Number zke;//本次开票所提交的折扣额,读取含税标志
-    private Number taxRate;//税率
-    private String dField1;//自定义字段1
-    private String dField2;//自定义字段2
-    private String dField3;//自定义字段3
-    private String dField4;//自定义字段4
-    private String dField5;//自定义字段5
-}

+ 0 - 15
src/main/java/com/uas/eis/dto/PoInternalDTO.java

@@ -1,15 +0,0 @@
-package com.uas.eis.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class PoInternalDTO {
-    //private PoOrderGrDTO internalPO;
-    @JsonProperty("PO")
-    private PoOrderGrDTO po;
-
-}

+ 0 - 50
src/main/java/com/uas/eis/dto/PoOrderAddrinfosGrDTO.java

@@ -1,50 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PoOrderAddrinfosGrDTO {
-    private String addrId;
-    private String senderQualifier;
-    private String senderId;
-    private String receiverQualifier;
-    private String receiverId;
-    private String msgType;
-    private String msgAlias;
-    private String msgId;
-    private String partyType;
-    private String partyName;
-    private String partyCode;
-    private String addiName1;
-    private String addiName2;
-    private String street1;
-    private String street2;
-    private String street3;
-    private String street4;
-    private String city;
-    private String state;
-    private String postalCode;
-    private String countryCode;
-    private String countryName;
-    private String district;
-    private String contactName;
-    private String contactEmail;
-    private String phone;
-    private String fax;
-    private String attr1;
-    private String attr2;
-    private String attr3;
-    private String attr4;
-    private String attr5;
-    private String attr6;
-    private String attr7;
-    private String attr8;
-    private String attr9;
-    private String attr10;
-    private Integer apoid;
-
-
-
-}

+ 0 - 51
src/main/java/com/uas/eis/dto/PoOrderDetailsGrDTO.java

@@ -1,51 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class PoOrderDetailsGrDTO {
-    private String hid;
-    private String poNo;
-    private String poLineNo;
-    private String poLineType;
-    private String orderedQty;
-    private String qtyUom;
-    private String unitPrice;
-    private String priceUom;
-    private String custPartNo;
-    private String custPartDesc;
-    private String vendorPartNo;
-    private String vendorPartDesc;
-    private String manufactoryCode;
-    private String manufactoryName;
-    private String reqDate;
-    private String etd;
-    private String eta;
-    private String transMode;
-    private String soNo;
-    private String soLineNo;
-    private String totalAmount;
-    private String taxRate;
-    private String attr1;
-    private String attr2;
-    private String attr3;
-    private String attr4;
-    private String attr5;
-    private String attr6;
-    private String attr7;
-    private String attr8;
-    private String attr9;
-    private String attr10;
-    private String extraRefCode1;
-    private String extraRefText1;
-    private String extraRefCode2;
-    private String extraRefText2;
-    private Integer dpoid;
-    private Integer detid;
-    private List<PoOrderSubDetailsGrDTO> subDetails;
-
-
-}

+ 0 - 66
src/main/java/com/uas/eis/dto/PoOrderGrDTO.java

@@ -1,66 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class PoOrderGrDTO {
-    private String hid;
-    private String transId;
-    private String siteCode;
-    private String senderQualifier;
-    private String senderId;
-    private String receiverQualifier;
-    private String receiverId;
-    private String regionCode;
-    private String poType;
-    private String poHeadId;
-    private String poNo;
-    private String poVersion;
-    private String agentName;
-    private String poDate;
-    private String custRefNo;
-    private String currency;
-    private String rate;
-    private String totalAmount;
-    private String poe;
-    private String modelType;
-    private String manufactoryCode;
-    private String manufactoryName;
-    private String vendorCode;
-    private String vendorName;
-    private String soNo;
-    private String incotermsCode;
-    private String paymentTerm;
-    private String carrierType;
-    private String carrierCode;
-    private String carrierName;
-    private String transMode;
-    private String coc;
-    private String custStorLoc;
-    private String purGroup;
-    private String custCompCode;
-    private String poStatus;
-    private String transFlag;
-    private String transDate;
-    private String attr1;
-    private String attr2;
-    private String attr3;
-    private String attr4;
-    private String attr5;
-    private String attr6;
-    private String attr7;
-    private String attr8;
-    private String attr9;
-    private String attr10;
-    private String extraRefCode1;
-    private String extraRefText1;
-    private String extraRefCode2;
-    private String extraRefText2;
-    private Date porecorddate;
-    private Integer poid;
-    private List<PoOrderDetailsGrDTO> details;
-    private List<PoOrderAddrinfosGrDTO> addrInfos;
-
-}

+ 0 - 34
src/main/java/com/uas/eis/dto/PoOrderSubDetailsGrDTO.java

@@ -1,34 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-import java.util.Date;
-
-@Data
-public class PoOrderSubDetailsGrDTO {
-    private String hid;
-    private String poNo;
-    private String poLineNo;
-    private String poSubLineNo;
-    private String stOrgCode;
-    private String reqQty;
-    private String qtyUom;
-    private String reqDate;
-    private String subETD;
-    private String subETA;
-    private String attr1;
-    private String attr2;
-    private String attr3;
-    private String attr4;
-    private String attr5;
-    private String attr6;
-    private String attr7;
-    private String attr8;
-    private String attr9;
-    private String attr10;
-    private Integer sdpoid;
-    private Integer sdetid;
-
-
-
-
-}

+ 0 - 33
src/main/java/com/uas/eis/dto/QueryInvoiceRedConfirmDTO.java

@@ -1,33 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class QueryInvoiceRedConfirmDTO{
-    private String billNo;//描述:红字确认单编号 示例值:1403011906000990
-    private String billUuid;//描述:红字确认单uuid 示例值:1d7f08b6ddb64cb19b095b0360f074d7
-    private String billId;//描述:红字确认单申请号 示例值:1119316085226510000
-    private String billStatus;//描述:红字确认单状态: 01 无需确认 02 销方录入待购方确认 03 购方录入待销方确认 04 购销双方已确认 05 作废(销方录入购方否认) 06 作废(购方录入销方否认) 07 作废(超72小时未确认) 08 作废(发起方已撤销) 09 作废(确认后撤销) 15 申请中 16 申请失败 示例值:1
-    private String billMessage;//描述:描述 示例值:
-    private String invoiceSerialNum;//描述:红票流水号,若红字确认单已开红票(或已自动开红票)才会返回该值 示例值:
-    private String orderNo;//描述:红票订单号(开票单号),若红字确认单已开红票(或已自动开红票)才会返回该值 示例值:
-    private String requestStatus;//描述:操作状态:(根据操作方返回对应状态,可能为空) 01 撤销中 02撤销失败 03 确认中 04 确认失败 示例值:操作状态:(根据操作方返回对应状态,可能为空) 01 撤销中 02撤销失败 03 确认中 04 确认失败
-    private String openStatus;//描述:已开具红字发票标记: 1:已开具 0:未开具 示例值:0
-    private String applySource;//描述:录入方身份: 0 销方 1 购方 示例值:0
-    private String blueInvoiceLine;//描述:蓝字发票票种: bs:电子发票(增值税专用发票), pc:电子发票(普通发票),es:全电纸质发票(增值税专用发票), ec:全电纸质发票(普通发票) 示例值:bs
-    private String blueInvoiceNumber;//描述:对应蓝票号码 示例值:对应蓝票号码
-    private String blueInvoiceTime;//描述:蓝字发票开票日期 示例值:
-    private String billTime;//描述:申请日期 示例值:43916.7806481481
-    private String confirmTime;//描述:确认日期 示例值:43917.7806481481
-    private String sellerTaxNo;//描述:销方税号 示例值:150301199811285000
-    private String sellerName;//描述:销方名称 示例值:测试税号326
-    private String buyerTaxNo;//描述:购方税号 示例值:150301199811285000
-    private String buyerName;//描述:购方名称 示例值:测试税号326
-    private String taxExcludedAmount;//描述:冲红合计金额(不含税) 示例值:-0.94
-    private String taxAmount;//描述:冲红合计税额 示例值:-0.06
-    private String redReason;//描述:冲红原因: 1销货退回 2开票有误 3服务中止 4销售折让 示例值:
-    private String pdfUrl;//描述:申请表pdf地址(暂不支持) 示例值:
-    private List<QueryInvoiceRedConfirmDetDTO> detail; //红字确认单明细信息列表
-}

+ 0 - 21
src/main/java/com/uas/eis/dto/QueryInvoiceRedConfirmDetDTO.java

@@ -1,21 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class QueryInvoiceRedConfirmDetDTO {
-    private String blueDetailIndex;//描述:对应蓝票明细行序号 示例值:1
-    private String goodsName;//描述:商品名称 示例值:苹果
-    private String unit;//描述:单位 示例值:袋
-    private String specType;//描述:规格型号 示例值:规格型号
-    private String num;//描述:数量 示例值:-1
-    private String taxExcludedPrice;//描述:单价(不含税) 示例值:0.94
-    private String taxExcludedAmount;//描述:商品金额(不含税) 示例值:-0.94
-    private String taxAmount;//描述:商品税额 示例值:-0.06
-    private String taxRate;//描述:税率 示例值:0.06
-    private String goodsCode;//描述:商品编码 示例值:4020000000000000000
-    private String favouredPolicyFlag;//描述:01:简易征收 02:稀土产品 03:免税 04:不征税 05:先征后退 06:100%先征后退 07:50%先征后退 08:按3%简易征收 09:按5%简易征收 10:按5%简易征收减按1.5%计征 11:即征即退30% 12:即征即退50% 13:即征即退70% 14:即征即退100% 15:超税负3%即征即退 16:超税负8%即征即退 17:超税负12%即征即退 18:超税负6%即征即退 示例值:0
-    private String price;//描述:单价 示例值:0
-}

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

@@ -1,16 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-@Data
-public class QueryInvoiceRedConfirmReq {
-    private String identity;//必填:是 说明:操作方身份: 0销方 1购方
-    private String billStatus;//必填:否 说明:红字确认单状态(不传则查全部状态): 01 无需确认 02 销方录入待购方确认 03 购方录入待销方确认 04 购销双方已确认 05 作废(销方录入购方否认) 06 作废(购方录入销方否认) 07 作废(超72小时未确认) 08 作废(发起方已撤销) 09 作废(确认后撤销) 15 申请中 16 申请失败
-    private String billId;//必填:否 说明:红字确认单申请号
-    private String billNo;//必填:否 说明:红字确认单编号
-    private String billUuid;//必填:否 说明:红字确认单uuid
-    private String billTimeStart;//必填:否 说明:填开起始时间,确认单申请号/编号/uuid有值时,可为空,允许最大查询范围为90天
-    private String billTimeEnd;//必填:否 说明:填开结束时间,确认单申请号/编号/uuid有值时,可为空,允许最大查询范围为90天
-    private String pageSize;//必填:否 说明:每页数量(默认10,最大50)
-    private String pageNo;//必填:否 说明:当前页码(默认1)
-}

+ 0 - 9
src/main/java/com/uas/eis/dto/QueryInvoiceRedConfirmResp.java

@@ -1,9 +0,0 @@
-package com.uas.eis.dto;
-
-import com.uas.eis.dao.BaseNuoNuoQResp;
-import lombok.Data;
-
-@Data
-public class QueryInvoiceRedConfirmResp extends BaseNuoNuoQResp {
-    private QueryInvoiceRedConfirmRespDTO result;
-}

+ 0 - 12
src/main/java/com/uas/eis/dto/QueryInvoiceRedConfirmRespDTO.java

@@ -1,12 +0,0 @@
-package com.uas.eis.dto;
-
-import com.uas.eis.dao.BaseNuoNuoQResp;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class QueryInvoiceRedConfirmRespDTO {
-    private int total;
-    private List<QueryInvoiceRedConfirmDTO> list;
-}

+ 0 - 94
src/main/java/com/uas/eis/dto/QueryInvoiceResultDTO.java

@@ -1,94 +0,0 @@
-package com.uas.eis.dto;
-
-//import com.uas.eis.core.enums.ElecISpecificFactor;
-import com.uas.eis.core.enums.ElecInVoiceSpecificFactor;
-import com.uas.eis.utils.StringUtil;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class QueryInvoiceResultDTO extends QSqlDTO {
-    private String serialNo;//描述:发票请求流水号 示例值:19010211130401000000
-    private String orderNo;//描述:订单编号 示例值:1001000011161
-    private String status;//描述:发票状态: 2 :开票完成( 最终状 态),其他状态分别为: 20:开票中; 21:开票成功签章中;22:开票失败;24: 开票成功签章失败;3:发票已作废 31: 发票作废中 备注:22、24状态时,无需再查询,请确认开票失败原因以及签章失败原因; 注:请以该状态码区分发票状态 示例值:2
-    private String statusMsg;//描述:发票状态描述 示例值:开票完成(最终状态)
-    private String failCause;//描述:失败原因 示例值:
-    private String pdfUrl;//描述:发票pdf地址(若同时返回了ofdUrl与pdfUrl,则pdf文件不能做为原始凭证,请用ofd文件做为原始凭证) 示例值:https://invtest.jss.com.cn/group1/M00/0D/A4/wKjScVwsK6CAFzLgAABsVO-OKaE630.pdf
-    private String pictureUrl;//描述:发票图片地址 示例值:nnfpkf.jss.com.cn/ArQ6dFE3-9o5x4B
-    private String invoiceTime;//描述:开票时间 示例值:1546398919000
-    private String invoiceCode;//描述:发票代码(数电电票时为空,数电纸票时有值) 示例值:131880930199
-    private String invoiceNo;//描述:发票号码(数电电票时返回原来的20位数电票号码,数电纸票时为8位的纸票号码) 示例值:19902643
-    private String allElectronicInvoiceNumber;//描述:allElectronicInvoiceNumber 数电票号码(数电电票、数电纸票时均返回20位数电票号码) 示例值:22310000000000000000
-    private String exTaxAmount;//描述:不含税金额 示例值:0.38
-    private String taxAmount;//描述:合计税额 示例值:0.02
-    private String orderAmount;//描述:价税合计 示例值:0.4
-    private String payerName;//描述:购方名称(付款方名称) 示例值:个人2
-    private String payerTaxNo;//描述:购方税号(付款方税号) 示例值:110101TRDX8RQU1
-    private String address;//描述:购方地址 示例值:杭州西湖区
-    private String telephone;//描述:购方电话 示例值:13000000000
-    private String bankAccount;//描述:购方开户行及账号 示例值:中国工商银行000001
-    private String invoiceKind;//描述:发票种类,包含:增值税电子普通发票、增值税普通发票、专用发票(电子)、增值税专用发票、收购发票(电子)、收购发票(纸质)、增值税普通发票(卷式)、机动车销售统一发票、二手车销售统一发票、电子发票(增值税专用发票)、电子发票(普通发票)、全电纸质发票(增值税专用发票)、全电纸质发票(普通发票); 备注:电子发票(增值税专用发票)即 数电专票(电子),电子发票(普通发票)即 数电普票(电子) 示例值:增值税电子普通发票
-    private String checkCode;//描述:校验码(数电票时为空) 示例值:7.29697198825231E+19
-    private String qrCode;//描述:二维码 示例值:
-    private String machineCode;//描述:税控设备号(机器编码);数电票时为空 示例值:
-    private String cipherText;//描述:发票密文(数电票时为空) 示例值:
-    private String paperPdfUrl;//描述:含底图纸票pdf地址 示例值:http://invtest.nntest.cn/group1/M00/01/8B/wKjScV6-P0aAKKPHAAH965KBApQ812.pdf
-    private String ofdUrl;//描述:发票ofd地址(公共服务平台签章及数电电票时返回) 示例值:
-    private String xmlUrl;//描述:发票xml地址(数电电票且企业配置成支持获取xml时返回) 示例值:
-    private String clerk;//描述:开票员 示例值:张三
-    private String payee;//描述:收款人 示例值:李四
-    private String checker;//描述:复核人 示例值:王五
-    private String salerAccount;//描述:销方银行账号 示例值:2000098287777
-    private String salerTel;//描述:销方电话 示例值:0937-9384
-    private String salerAddress;//描述:销方地址 示例值:杭州西湖
-    private String salerTaxNum;//描述:销方税号 示例值:150301199811285000
-    private String saleName;//描述:销方名称 示例值:浙江诺诺网
-    private String remark;//描述:备注 示例值:备注mlk
-    private String productOilFlag;//描述:成品油标志:0非成品油,1成品油 示例值:0
-    private String imgUrls;//描述:图片地址(多个图片以逗号隔开) 示例值:http://invtest.nntest.cn/group1/M00/01/8B/wKjScV6-P0WAHjKkAAC17-oX9RE037.jpg
-    private String extensionNumber;//描述:分机号 示例值:1
-    private String terminalNumber;//描述:终端号 示例值:
-    private String deptId;//描述:部门门店id(诺诺系统中的id) 示例值:1
-    private String clerkId;//描述:开票员id(诺诺系统中的id) 示例值:1
-    private String oldInvoiceCode;//描述:对应蓝票发票代码,红票时有值(蓝票为数电电票时为空,数电纸票时有值) 示例值:
-    private String oldInvoiceNo;//描述:对应蓝票发票号码,红票时有值(蓝票为数电电票时返回原来的20位数电票号码,数电纸票时为8位的纸票号码) 示例值:
-    private String oldEleInvoiceNumber;//描述:对应蓝票数电票号码,红票时有值(蓝票为数电票(电子+纸质)时 20位) 示例值:
-    private String listFlag;//描述:清单标志:0,非清单;1,清单票 示例值:0
-    private String listName;//描述:清单项目名称:打印清单时对应发票票面项目名称,注意:税总要求清单项目名称为(详见销货清单) 示例值:
-    private String phone;//描述:购方手机(开票成功会短信提醒购方) 示例值:
-    private String notifyEmail;//描述:购方邮箱推送邮箱(开票成功会邮件提醒购方) 示例值:
-    private String vehicleFlag;//描述:是否机动车类专票 0-否 1-是 示例值:0
-    private String createTime;//描述:数据创建时间(回传其他信息时返回) 示例值:
-    private String updateTime;//描述:数据更新时间(回传其他信息时返回) 示例值:
-    private String stateUpdateTime;//描述:发票状态更新时间(回传其他信息时返回;涉及状态:开票中、开票失败、开票成功签章中、开票成功签章失败、开票完成、发票作废中、发票已作废) 示例值:
-    private String proxyInvoiceFlag;//描述:代开标志 0-非代开 1-代开(回传其他信息时返回) 示例值:
-    private String invoiceDate;//描述:用于开票的订单的时间(回传其他信息时返回) 示例值:
-    private String invoiceType;//描述:开票类型 1-蓝票 2-红票(回传其他信息时返回) 示例值:1
-    private String redReason;//描述:冲红原因 1:销货退回;2:开票有误;3:服务中止;4:发生销售折让(红票且票种为p、c、e、f、r(成品油发票除外)且回传其他信息时返回) 示例值:1
-    private String invalidTime;//描述:作废时间(已作废状态下的发票,且回传其他信息时返回) 示例值:1625475746
-    private String invalidSource;//描述:作废来源 1-诺诺工作台 2-API接口 3-开票软件 4-验签失败作废 5-其他(已作废状态下的发票,且回传其他信息时返回) 示例值:1
-    private String invalidReason;//描述:数电纸票作废原因 1:销货退回;2:开票有误;3:服务中止;4:其他(已作废状态下的发票,且票为数电纸票且回传其他信息时返回) 示例值:
-    private String specificReason;//描述:其他作废原因详情(作废原因为4 且回传其他信息时返回) 示例值:
-    private Integer specificFactor;//描述:发票特定要素:(后续枚举值会有扩展,回传其他信息时返回)0-普通 1-成品油发票 3-建筑服务 4-货物运输服务 6-不动产经营租赁服务 9-旅客运输服务 16-农产品收购 31-建安发票 32-房地产销售发票 33-二手车发票反向开具 34-电子烟 35-矿产品 示例值:0
-    private String emailNotifyStatus;//描述:邮箱交付状态(0-未交付,1-交付成功,2-交付失败,3-交付中,4-不会交付;注:回传其他信息时返回) 示例值:
-    private String phoneNotifyStatus;//描述:手机交付状态(0-未交付,1-交付成功,2-交付失败,3-交付中,4-不会交付;注:回传其他信息时返回) 示例值:
-    private String buyerManagerName;//描述:购买方经办人姓名(数电票特有字段) 示例值:张三
-    private String managerCardType;//描述:经办人证件类型:101-组织机构代码证, 102-营业执照, 103-税务登记证, 199-其他单位证件, 201-居民身份证, 202-军官证, 203-武警警官证, 204-士兵证, 205-军队离退休干部证, 206-残疾人证, 207-残疾军人证(1-8级), 208-外国护照, 210-港澳居民来往内地通行证, 212-中华人民共和国往来港澳通行证, 213-台湾居民来往大陆通行证, 214-大陆居民往来台湾通行证, 215-外国人居留证, 216-外交官证 299-其他个人证件(数电票特有) 示例值:201
-    private String managerCardNo;//描述:经办人证件号码(数电票特有字段) 示例值:
-    private String bField1;//描述:业务方自定义字段1 示例值:
-    private String bField2;//描述:业务方自定义字段2 示例值:
-    private String bField3;//描述:业务方自定义字段3 示例值:
-    private String naturalPersonFlag;//描述:购买方自然人标志:0-否,1-是(数电普票(电子)时才有可能返回,为1时,版式文件上在购方名称最后面会额外显示 (个人) ) 示例值:
-    public String updatePdfUrlSql(){//更新 红票PDFURL附件
-        String sql = "";
-        if(StringUtil.hasText(serialNo)){
-            sql= "update ElecInvoice set EI_REDPDFURL = "+stringField(pdfUrl)+ "||(case when EI_REDPDFURL is not null then ';'||EI_REDPDFURL else '' end) where ei_allelectronicinvoicenumber = "+getBlueRefno()
-                    +" and ei_relativerefno like "+((allElectronicInvoiceNumber == null || "".equals(allElectronicInvoiceNumber) || "NULL".equals(allElectronicInvoiceNumber.toUpperCase())) ? "null" : "'%"+allElectronicInvoiceNumber+"%'");
-        }
-        return sql;
-    }
-    private String getBlueRefno(){
-        return stringField(StringUtil.nvl(oldEleInvoiceNumber,oldInvoiceNo));
-    }
-}

+ 0 - 12
src/main/java/com/uas/eis/dto/QueryInvoiceResultReq.java

@@ -1,12 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class QueryInvoiceResultReq {
-    private List<String> serialNos; //发票流水号,两字段二选一,同时存在以流水号为准(最多查50个订单号)
-    private List<String> orderNos;//订单编号(最多查50个订单号)
-    private String isOfferInvoiceDetail;//是否需要提供明细 1-是, 0-否(不填默认 0)
-}

+ 0 - 11
src/main/java/com/uas/eis/dto/QueryInvoiceResultResp.java

@@ -1,11 +0,0 @@
-package com.uas.eis.dto;
-
-import com.uas.eis.dao.BaseNuoNuoQResp;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class QueryInvoiceResultResp extends BaseNuoNuoQResp {
-    private List<QueryInvoiceResultDTO> result;
-}

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

@@ -1,16 +0,0 @@
-package com.uas.eis.dto;
-
-import lombok.Data;
-
-@Data
-public class RelateRedInvoiceDTO {
-    private String orderNo;//红票开票单号
-    private String sid;//红票流水号
-    private String invoiceCode;//红票发票代码
-    private String invoiceNumber;//红票发票号码
-    private String allElectronicInvoiceNumber;//allElectronicInvoiceNumber,红票数电票号码
-    private String invoiceTime;//红票开票日期
-    private Double orderAmount;//红票含税金额
-    private Double excludingTaxAmount;//红票不含税金额
-    private Double taxAmount;//红票税额
-}

+ 0 - 30
src/main/java/com/uas/eis/entity/K3/AbstractAuditReq.java

@@ -1,30 +0,0 @@
-package com.uas.eis.entity.K3;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author: zhouy
- * @date: 2021/9/26 11:19
- * @desc: 审核请求对象
- */
-@Data
-public abstract class AbstractAuditReq<T> implements Serializable {
-    /**
-     * CreateOrgId:创建者组织内码,字符串类型(非必录)
-     * Numbers:单据编码集合,数组类型,格式:[No1,No2,...](使用编码时必录)
-     * Ids:单据内码集合,字符串类型,格式:"Id1,Id2,..."(使用内码时必录)
-     * InterationFlags:交互标志集合,字符串类型,分号分隔,格式:"flag1;flag2;..."(非必录) 例如(允许负库存标识:STK_InvCheckResult)
-     * NetworkCtrl:是否启用网控,布尔类型,默认false(非必录)
-     * IsVerifyProcInst:是否检验单据关联运行中的工作流实例,布尔类型,默认false(非必录)
-     * IgnoreInterationFlag:是否允许忽略交互,布尔类型,默认true(非必录)
-     * */
-    private String CreateOrgId;
-    private String[] Numbers;
-    private String Ids;
-    private String InterationFlags;
-    private boolean NetworkCtrl = false;
-    private boolean IsVerifyProcInst = false;
-    private boolean IgnoreInterationFlag = true;
-}

+ 0 - 42
src/main/java/com/uas/eis/entity/K3/CommonSaveReq.java

@@ -1,42 +0,0 @@
-package com.uas.eis.entity.K3;
-
-import com.alibaba.fastjson.JSONPObject;
-import lombok.Builder;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author: zhouy
- * @date: 2021/9/26 11:19
- * @desc: 保存请求对象
- */
-@Data
-public  class CommonSaveReq<T> implements Serializable{
-    /**
-     * NeedUpDateFields:需要更新的字段,数组类型,格式:[key1,key2,...] (非必录)注(更新单据体字段得加上单据体key)
-     * NeedReturnFields:需返回结果的字段集合,数组类型,格式:[key,entitykey.key,...](非必录) 注(返回单据体字段格式:entitykey.key)
-     * IsDeleteEntry:是否删除已存在的分录,布尔类型,默认true(非必录)
-     * SubSystemId:表单所在的子系统内码,字符串类型(非必录)
-     * IsVerifyBaseDataField:是否验证所有的基础资料有效性,布尔类,默认false(非必录)
-     * IsEntryBatchFill:是否批量填充分录,默认true(非必录)
-     * ValidateFlag:是否验证标志,布尔类型,默认true(非必录)
-     * NumberSearch:是否用编码搜索基础资料,布尔类型,默认true(非必录)
-     * IsAutoAdjustField:是否自动调整JSON字段顺序,布尔类型,默认false(非必录)
-     * InterationFlags:交互标志集合,字符串类型,分号分隔,格式:"flag1;flag2;..."(非必录) 例如(允许负库存标识:STK_InvCheckResult)
-     * IgnoreInterationFlag:是否允许忽略交互,布尔类型,默认true(非必录)
-     * Model:表单数据包,JSON类型(必录)
-     * */
-    private String[] NeedUpDateFields;
-    private String[] NeedReturnFields;
-    private boolean IsDeleteEntry = true;
-    private String SubSystemId;
-    private boolean IsVerifyBaseDataField = false;
-    private boolean IsEntryBatchFill= true;
-    private boolean ValidateFlag = true;
-    private boolean NumberSearch = true;
-    private boolean IsAutoAdjustField = false;
-    private String InterationFlags;
-    private boolean IgnoreInterationFlag;
-    private  T Model;
-}

+ 0 - 13
src/main/java/com/uas/eis/entity/K3/FNumberE.java

@@ -1,13 +0,0 @@
-package com.uas.eis.entity.K3;
-
-/**
- * @author: zhouy
- * @date: 2021/9/26 18:48
- * @desc:
- */
-public class FNumberE {
-    private Object FNumber;
-    public FNumberE (Object FNumber) {
-        this.FNumber = FNumber;
-    }
-}

+ 0 - 13
src/main/java/com/uas/eis/entity/K3/ProdInoutPickingF.java

@@ -1,13 +0,0 @@
-package com.uas.eis.entity.K3;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class ProdInoutPickingF{
-  private Integer FEntryID;
-  private FNumberE FParentMaterialId;
-  private String FMoBillNo;
-  List<ProdInoutPickingFSerialSub> FSerialSubEntity;
-}

+ 0 - 10
src/main/java/com/uas/eis/entity/K3/ProdInoutPickingFSerialSub.java

@@ -1,10 +0,0 @@
-package com.uas.eis.entity.K3;
-
-import lombok.Data;
-
-@Data
- public class ProdInoutPickingFSerialSub {
-     private Integer FDetailID;
-     private String FSerialNo;
-     private String FSerialNote;
-  }

+ 0 - 25
src/main/java/com/uas/eis/entity/K3/ProdInoutPickingSaveReqModel.java

@@ -1,25 +0,0 @@
-package com.uas.eis.entity.K3;
-
-import lombok.Builder;
-import lombok.Data;
-import net.sf.json.JSONObject;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author: zhouy
- * @date: 2021/9/26 16:08
- * @desc: 生产领料单对象
- */
-@Data
-@Builder
-public class ProdInoutPickingSaveReqModel{
-    private Integer FID;
-    private FNumberE FBillType;
-    private String FDate;
-    private FNumberE FStockOrgId;
-    private FNumberE FStockId0;
-    private List<ProdInoutPickingF> FEntity;
-}
-

+ 0 - 17
src/main/java/com/uas/eis/entity/POS.java

@@ -1,17 +0,0 @@
-package com.uas.eis.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class POS {
-    private int ps_id;
-    private String ps_code;
-    private String ps_currency;
-    private Date ps_fromdate;
-    private Date ps_enddate;
-    private Date ps_date;
-    private List<POSDetail> items;
-}

+ 0 - 33
src/main/java/com/uas/eis/entity/POSDetail.java

@@ -1,33 +0,0 @@
-package com.uas.eis.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class POSDetail {
-    private int pd_id;
-    private int pd_detno;
-    private String pd_orispeccode;
-    private String pd_billtocust;
-    private String pd_billtoCountry;
-    private String pd_billtoCountryName;
-    private String pd_endCustomer;
-    private String pd_ShipToCountry;
-    private String pd_ShipToCountryname;
-    private String pd_resaleCustomerNumber;
-    private int pd_qty;
-    private double pd_bookPrice;
-    private double pd_resalePrice;
-    private double pd_distiRequestedCost;
-    private double pd_claimAmount;
-    private String pd_quoteNumber;
-    private double pd_distiMarginRate;
-    private String pd_resaleInvoiceNum;
-    private int pd_resaleInvoiceLineNum;
-    private Date pd_resaleInvoiceDate;
-    private String pd_endCustomerCountry;
-    private String pd_endCustomerCountryName;
-    private String pd_transactionCode;
-}
-

+ 0 - 19
src/main/java/com/uas/eis/entity/Purchase.java

@@ -1,19 +0,0 @@
-package com.uas.eis.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class Purchase {
-    private int pu_id;
-    private String pu_code;
-    private Date pu_date;
-    private String pu_currency;
-    private String pu_isr;
-    private String pu_shipaddresscode;
-    private String pu_deliveryparty;
-    private String pu_article;
-    private List<PurchaseDetail> items;
-}

+ 0 - 22
src/main/java/com/uas/eis/entity/PurchaseChange.java

@@ -1,22 +0,0 @@
-package com.uas.eis.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class PurchaseChange {
-    private int pc_id;
-    private String pc_code;
-    private String pc_purccode;
-    private String pc_newcurrency;
-    private String pc_deliveryparty;
-    private String pc_isr;
-
-    private List<PurchaseChangeDetail> items;
-
-    private String pu_code;
-    private Date pu_date;
-    private String Pu_shipaddresscode;
-}

+ 0 - 25
src/main/java/com/uas/eis/entity/PurchaseChangeDetail.java

@@ -1,25 +0,0 @@
-package com.uas.eis.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PurchaseChangeDetail {
-    private int pcd_id;
-    private String pcd_newprodcode;
-    private int pcd_newqty;
-    private double pcd_newprice;
-    private int pcd_pddetno;
-    private Date pcd_newdelivery;
-    private String quote;
-    private String pcd_so;
-    private String changetype;
-
-    private String pd_custprodcode;
-    private double pd_ori_price;
-    private int pd_leftqty;//剩余数量pd_qty-pd_yqty
-
-    private String pr_orispeccode;
-
-}

+ 0 - 18
src/main/java/com/uas/eis/entity/PurchaseDetail.java

@@ -1,18 +0,0 @@
-package com.uas.eis.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PurchaseDetail {
-    private  int pd_detno;
-    private  int pd_qty;
-    private  double pd_price;
-    private Date pd_delivery;
-    private String pd_custprodcode;
-    private String pd_prodcode;
-    private String pd_quote;
-    private String pr_orispeccode;
-    private String pd_shippinginstruction;
-}

+ 0 - 48
src/main/java/com/uas/eis/entity/QueryArgs.java

@@ -1,48 +0,0 @@
-package com.uas.eis.entity;
-
-public class QueryArgs {
-
-	private Integer qa_id;
-	private String qa_qccode;
-	private String qa_param;
-	private String qa_paramtype;
-	private String qa_relation;
-	private Integer qa_detno;
-	public Integer getQa_id() {
-		return qa_id;
-	}
-	public void setQa_id(Integer qa_id) {
-		this.qa_id = qa_id;
-	}
-	public String getQa_qccode() {
-		return qa_qccode;
-	}
-	public void setQa_qccode(String qa_qccode) {
-		this.qa_qccode = qa_qccode;
-	}
-	public String getQa_param() {
-		return qa_param;
-	}
-	public void setQa_param(String qa_param) {
-		this.qa_param = qa_param;
-	}
-	public String getQa_paramtype() {
-		return qa_paramtype;
-	}
-	public void setQa_paramtype(String qa_paramtype) {
-		this.qa_paramtype = qa_paramtype;
-	}
-	public String getQa_relation() {
-		return qa_relation;
-	}
-	public void setQa_relation(String qa_relation) {
-		this.qa_relation = qa_relation;
-	}
-	public Integer getQa_detno() {
-		return qa_detno;
-	}
-	public void setQa_detno(Integer qa_detno) {
-		this.qa_detno = qa_detno;
-	}
-	
-}

+ 0 - 95
src/main/java/com/uas/eis/entity/QueryConfig.java

@@ -1,95 +0,0 @@
-package com.uas.eis.entity;
-
-/**
- * 标准查询配置
- * @author chenw
- *
- */
-public class QueryConfig {
-
-	private Integer qc_id;
-	private String qc_code;
-	private String qc_table;
-	private String qc_condition;
-	private String qc_mapkey;
-	private String qc_beforesql;
-	private String qc_return;
-	private Integer qc_detno;
-	private String qc_orderby;
-	private Integer qc_isArray;
-	private String qc_relationCode;
-	private String qc_mainVar;
-	public String getQc_mainVar() {
-		return qc_mainVar;
-	}
-	public void setQc_mainVar(String qc_mainVar) {
-		this.qc_mainVar = qc_mainVar;
-	}
-	public String getQc_relationCode() {
-		return qc_relationCode;
-	}
-	public void setQc_relationCode(String qc_relationCode) {
-		this.qc_relationCode = qc_relationCode;
-	}
-	public Integer getQc_id() {
-		return qc_id;
-	}
-	public void setQc_id(Integer qc_id) {
-		this.qc_id = qc_id;
-	}
-	public String getQc_code() {
-		return qc_code;
-	}
-	public void setQc_code(String qc_code) {
-		this.qc_code = qc_code;
-	}
-	public String getQc_table() {
-		return qc_table;
-	}
-	public void setQc_table(String qc_table) {
-		this.qc_table = qc_table;
-	}
-	public String getQc_condition() {
-		return qc_condition;
-	}
-	public void setQc_condition(String qc_condition) {
-		this.qc_condition = qc_condition;
-	}
-	public String getQc_mapkey() {
-		return qc_mapkey;
-	}
-	public void setQc_mapkey(String qc_mapkey) {
-		this.qc_mapkey = qc_mapkey;
-	}
-	public String getQc_return() {
-		return qc_return;
-	}
-	public void setQc_return(String qc_return) {
-		this.qc_return = qc_return;
-	}
-	public Integer getQc_detno() {
-		return qc_detno;
-	}
-	public void setQc_detno(Integer qc_detno) {
-		this.qc_detno = qc_detno;
-	}
-	public String getQc_orderby() {
-		return qc_orderby;
-	}
-	public void setQc_orderby(String qc_orderby) {
-		this.qc_orderby = qc_orderby;
-	}
-	public String getQc_beforesql() {
-		return qc_beforesql;
-	}
-	public void setQc_beforesql(String qc_beforesql) {
-		this.qc_beforesql = qc_beforesql;
-	}
-	public Integer getQc_isArray() {
-		return qc_isArray;
-	}
-	public void setQc_isArray(Integer qc_isArray) {
-		this.qc_isArray = qc_isArray;
-	}
-	
-}

+ 0 - 34
src/main/java/com/uas/eis/entity/QueryConfigDetail.java

@@ -1,34 +0,0 @@
-package com.uas.eis.entity;
-
-public class QueryConfigDetail {
-
-	private Integer qcd_id;
-	private Integer qcd_qcid;
-	private String qcd_field;
-	private String qcd_mappingkey;
-	public Integer getQcd_id() {
-		return qcd_id;
-	}
-	public void setQcd_id(Integer qcd_id) {
-		this.qcd_id = qcd_id;
-	}
-	public Integer getQcd_qcid() {
-		return qcd_qcid;
-	}
-	public void setQcd_qcid(Integer qcd_qcid) {
-		this.qcd_qcid = qcd_qcid;
-	}
-	public String getQcd_field() {
-		return qcd_field;
-	}
-	public void setQcd_field(String qcd_field) {
-		this.qcd_field = qcd_field;
-	}
-	public String getQcd_mappingkey() {
-		return qcd_mappingkey;
-	}
-	public void setQcd_mappingkey(String qcd_mappingkey) {
-		this.qcd_mappingkey = qcd_mappingkey;
-	}
-	
-}

+ 0 - 10
src/main/java/com/uas/eis/exception/AccessTokenException.java

@@ -1,10 +0,0 @@
-package com.uas.eis.exception;
-
-@SuppressWarnings("serial")
-public class AccessTokenException extends BaseException {
-
-    public AccessTokenException(int code, String msg) {
-        super(code, msg);
-    }
-
-}

+ 0 - 10
src/main/java/com/uas/eis/exception/AppAccessTokenRequestException.java

@@ -1,10 +0,0 @@
-package com.uas.eis.exception;
-
-@SuppressWarnings("serial")
-public class AppAccessTokenRequestException extends AccessTokenException {
-
-    public AppAccessTokenRequestException(int code, String msg) {
-        super(code, msg);
-    }
-
-}

+ 0 - 10
src/main/java/com/uas/eis/exception/CorpAccessTokenRequestException.java

@@ -1,10 +0,0 @@
-package com.uas.eis.exception;
-
-@SuppressWarnings("serial")
-public class CorpAccessTokenRequestException extends AccessTokenException {
-    
-    public CorpAccessTokenRequestException(int code, String msg) {
-        super(code, msg);
-    }
-    
-}

+ 0 - 191
src/main/java/com/uas/eis/sdk/dto/SubPickmtrlReq.java

@@ -1,191 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author: zhouy
- * @date: 2021/10/15 16:56
- * @desc: 领料单请求
- */
-public class SubPickmtrlReq implements Serializable {
-    private static final long serialVersionUID = -5809782578272943999L;
-
-    private String SUPPLIERNO;
-
-    List<SubPickmtrlENTRY> ENTRY;
-
-    public String getSUPPLIERNO() {
-        return SUPPLIERNO;
-    }
-
-    public void setSUPPLIERNO(String SUPPLIERNO) {
-        this.SUPPLIERNO = SUPPLIERNO;
-    }
-
-    public List<SubPickmtrlENTRY> getENTRY() {
-        return ENTRY;
-    }
-
-    public void setENTRY(List<SubPickmtrlENTRY> ENTRY) {
-        this.ENTRY = ENTRY;
-    }
-
-    public static class SubPickmtrlENTRY {
-        private String ENTRY_FNUMBER;
-        private String ENTRY_Unitno;
-        private Integer ENTRY_FActualQty;
-        private String ENTRY_StockNO;
-        private String ENTRY_ParentNO;
-        private Long ENTRY_FSrcInterId;
-        private Long ENTRY_FSrcEntryId;
-        private Long ENTRY_FSubReqId;
-        private Long ENTRY_FSRCBIZENTRYID;
-        private Long ENTRY_FSubReqEntryId;
-        private String ENTRY_FPPbomBillNo;
-        private Integer ENTRY_FPOOrderSeq;
-        private Integer ENTRY_FSubReqEntrySeq;
-        private String ENTRY_FSUBREQBILLNO;
-        private Integer ENTRY_FSRCENTRYSEQ;
-        private String ENTRY_FPOOrderBillNo;
-
-        public String getENTRY_FNUMBER() {
-            return ENTRY_FNUMBER;
-        }
-
-        public void setENTRY_FNUMBER(String ENTRY_FNUMBER) {
-            this.ENTRY_FNUMBER = ENTRY_FNUMBER;
-        }
-        public String getENTRY_Unitno() {
-            return ENTRY_Unitno;
-        }
-
-        public void setENTRY_Unitno(String ENTRY_Unitno) {
-            this.ENTRY_Unitno = ENTRY_Unitno;
-        }
-
-        public Integer getENTRY_FActualQty() {
-            return ENTRY_FActualQty;
-        }
-
-        public void setENTRY_FActualQty(Integer ENTRY_FActualQty) {
-            this.ENTRY_FActualQty = ENTRY_FActualQty;
-        }
-
-        public String getENTRY_StockNO() {
-            return ENTRY_StockNO;
-        }
-
-        public void setENTRY_StockNO(String ENTRY_StockNO) {
-            this.ENTRY_StockNO = ENTRY_StockNO;
-        }
-
-        public String getENTRY_ParentNO() {
-            return ENTRY_ParentNO;
-        }
-
-        public void setENTRY_ParentNO(String ENTRY_ParentNO) {
-            this.ENTRY_ParentNO = ENTRY_ParentNO;
-        }
-
-        public Long getENTRY_FSrcInterId() {
-            return ENTRY_FSrcInterId;
-        }
-
-        public void setENTRY_FSrcInterId(Long ENTRY_FSrcInterId) {
-            this.ENTRY_FSrcInterId = ENTRY_FSrcInterId;
-        }
-
-        public Long getENTRY_FSrcEntryId() {
-            return ENTRY_FSrcEntryId;
-        }
-
-        public void setENTRY_FSrcEntryId(Long ENTRY_FSrcEntryId) {
-            this.ENTRY_FSrcEntryId = ENTRY_FSrcEntryId;
-        }
-
-        public Long getENTRY_FSubReqId() {
-            return ENTRY_FSubReqId;
-        }
-
-        public void setENTRY_FSubReqId(Long ENTRY_FSubReqId) {
-            this.ENTRY_FSubReqId = ENTRY_FSubReqId;
-        }
-
-        public Long getENTRY_FSRCBIZENTRYID() {
-            return ENTRY_FSRCBIZENTRYID;
-        }
-
-        public void setENTRY_FSRCBIZENTRYID(Long ENTRY_FSRCBIZENTRYID) {
-            this.ENTRY_FSRCBIZENTRYID = ENTRY_FSRCBIZENTRYID;
-        }
-
-        public Long getENTRY_FSubReqEntryId() {
-            return ENTRY_FSubReqEntryId;
-        }
-
-        public void setENTRY_FSubReqEntryId(Long ENTRY_FSubReqEntryId) {
-            this.ENTRY_FSubReqEntryId = ENTRY_FSubReqEntryId;
-        }
-
-        public String getENTRY_FPPbomBillNo() {
-            return ENTRY_FPPbomBillNo;
-        }
-
-        public void setENTRY_FPPbomBillNo(String ENTRY_FPPbomBillNo) {
-            this.ENTRY_FPPbomBillNo = ENTRY_FPPbomBillNo;
-        }
-
-        public Integer getENTRY_FPOOrderSeq() {
-            return ENTRY_FPOOrderSeq;
-        }
-
-        public void setENTRY_FPOOrderSeq(Integer ENTRY_FPOOrderSeq) {
-            this.ENTRY_FPOOrderSeq = ENTRY_FPOOrderSeq;
-        }
-
-        public Integer getENTRY_FSubReqEntrySeq() {
-            return ENTRY_FSubReqEntrySeq;
-        }
-
-        public void setENTRY_FSubReqEntrySeq(Integer ENTRY_FSubReqEntrySeq) {
-            this.ENTRY_FSubReqEntrySeq = ENTRY_FSubReqEntrySeq;
-        }
-
-        public String getENTRY_FSUBREQBILLNO() {
-            return ENTRY_FSUBREQBILLNO;
-        }
-
-        public void setENTRY_FSUBREQBILLNO(String ENTRY_FSUBREQBILLNO) {
-            this.ENTRY_FSUBREQBILLNO = ENTRY_FSUBREQBILLNO;
-        }
-
-        public Integer getENTRY_FSRCENTRYSEQ() {
-            return ENTRY_FSRCENTRYSEQ;
-        }
-
-        public void setENTRY_FSRCENTRYSEQ(Integer ENTRY_FSRCENTRYSEQ) {
-            this.ENTRY_FSRCENTRYSEQ = ENTRY_FSRCENTRYSEQ;
-        }
-
-        public String getENTRY_FPOOrderBillNo() {
-            return ENTRY_FPOOrderBillNo;
-        }
-
-        public void setENTRY_FPOOrderBillNo(String ENTRY_FPOOrderBillNo) {
-            this.ENTRY_FPOOrderBillNo = ENTRY_FPOOrderBillNo;
-        }
-    }
-
-    public String toJSONString(){
-        JSONObject o = new JSONObject();
-        o.put("SUPPLIERNO", SUPPLIERNO);
-        o.put("ENTRY", JSONArray.fromObject(ENTRY).toString());
-        System.out.println("!!!!!!!!!!!!!!!!!!!!!!!");
-        System.out.println(o.toString());
-        return o.toString();
-    }
-}

+ 0 - 75
src/main/java/com/uas/eis/sdk/entity/GRApiResult.java

@@ -1,75 +0,0 @@
-package com.uas.eis.sdk.entity;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- *歌尔接口响应类
- */
-
-@Data
-public class GRApiResult<T> {
-
-   /* *//**
-     * 自定义业务码
-     * @return true:成功  false:失败
-     *//*
-    private String success;
-
-    *//**
-     * 交易为宜值,对应PO中的transId
-     * *//*
-    private String transId;
-
-    *//**
-     * 错误明细,数组,出现错误时需要返回
-     * *//*
-    private List<Errors> errors;*/
-
-    /**
-     * 错误明细,数组,出现错误时需要返回
-     * */
-    @JsonProperty("return")
-    private ReturnData returnData;
-
-    /*public String getSuccess() {
-        return success;
-    }
-
-    public GRApiResult<T> setSuccess(String success) {
-        this.success = success;
-        return this;
-    }
-
-    public String getTransId() {
-        return transId;
-    }
-
-    public GRApiResult<T> setTransId(String transId) {
-        this.transId = transId;
-        return this;
-    }*/
-
-    public GRApiResult(){
-
-    }
-
-    /*public GRApiResult(String success, String transId){
-        this.success = success;
-        this.transId = transId;
-    }
-
-    public GRApiResult(String success, String transId, List<Errors> errors){
-        this.success = success;
-        this.transId = transId;
-        this.errors = errors;
-    }*/
-
-    public GRApiResult(ReturnData returnData){
-        this.returnData = returnData;
-    }
-
-}

+ 0 - 30
src/main/java/com/uas/eis/sdk/entity/ReturnData.java

@@ -1,30 +0,0 @@
-package com.uas.eis.sdk.entity;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 歌尔响应接口错误信息类
- * */
-
-@Data
-public class ReturnData {
-
-    /**
-     * 自定义业务码
-     * @return true:成功  false:失败
-     */
-    private String success;
-
-    /**
-     * 交易为宜值,对应PO中的transId
-     * */
-    private String transId;
-
-    /**
-     * 错误明细,数组,出现错误时需要返回
-     * */
-    private List<Errors> errors;
-
-}

+ 0 - 21
src/main/java/com/uas/eis/sdk/entity/Seller.java

@@ -1,21 +0,0 @@
-package com.uas.eis.sdk.entity;
-
-import lombok.Data;
-
-/**
- * @author: zhouy
- * @date: 2021/9/17 9:10
- * @desc: 店铺
- */
-
-@Data
-public class Seller {
-    private  Integer sid;
-    private  Integer mid;
-    private  String name;
-    private  String account_name;
-    private  Integer seller_account_id;
-    private  String region;
-    private  String country;
-
-}

+ 0 - 106
src/main/java/com/uas/eis/sdk/okhttp/AKRestClient.java

@@ -1,106 +0,0 @@
-package com.uas.eis.sdk.okhttp;
-import com.alibaba.fastjson.JSON;
-import com.uas.eis.sdk.core.HttpMethod;
-import com.uas.eis.sdk.core.HttpRequest;
-import com.uas.eis.sdk.core.HttpResponse;
-import com.uas.eis.sdk.entity.Result;
-import com.uas.eis.sdk.resp.AccessTokenGetResp;
-import com.uas.eis.sdk.resp.SellerGetResp;
-import com.uas.eis.sdk.sign.ApiSign;
-import lombok.Builder;
-import lombok.Data;
-import java.util.HashMap;
-import java.util.Map;
-
-@Data
-@Builder
-public class AKRestClient {
-
-    private String endpoint;
-
-    public AKRestClient(String endpoint) {
-        this.endpoint = endpoint;
-    }
-
-    public AccessTokenGetResp getAccessToken(String appId, String appSecret) throws Exception {
-        HttpRequest<Result> build = HttpRequest.builder(Result.class)
-                .method(HttpMethod.POST)
-                .endpoint(this.endpoint)
-                .path("api/auth-server/oauth/access-token")
-                .queryParam("appId", appId)
-                .queryParam("appSecret", appSecret)
-                .build();
-        HttpResponse execute = HttpExecutor.create().execute(build);
-        return execute.readEntity(AccessTokenGetResp.class);
-    }
-
-    public Object refreshToken(String appId, String refreshToken) throws Exception {
-        HttpRequest<Object> build = HttpRequest.builder(Object.class)
-                .method(HttpMethod.POST)
-                .endpoint(this.endpoint)
-                .path("api/auth-server/oauth/refresh")
-                .queryParam("appId", appId)
-                .queryParam("refreshToken", refreshToken)
-                .build();
-        HttpResponse execute = HttpExecutor.create().execute(build);
-        return execute.readEntity(Object.class);
-    }
-
-    public Object sign(Map<String, Object> params) throws Exception {
-        HttpRequest<Object> build = HttpRequest.builder(Object.class)
-                .method(HttpMethod.POST)
-                .endpoint(this.endpoint)
-                .path("api/auth-server/oauth/api/authorize")
-                .queryParams(params)
-                .build();
-        HttpResponse execute = HttpExecutor.create().execute(build);
-        return execute.readEntity(Object.class);
-    }
-
-    public SellerGetResp getSellers(String appId, String access_token) throws Exception {
-        Map<String, Object> requestHeaders = defaultHeaders(appId, access_token);
-        String sign = getRequestSign(appId, requestHeaders, new HashMap<>());
-        HttpRequest<Object> build = HttpRequest.builder(Object.class)
-                .method(HttpMethod.GET)
-                .endpoint(this.endpoint)
-                .path("erp/sc/data/seller/lists")
-                .queryParams(requestHeaders)
-                .queryParam("sign", sign)
-                .build();
-        HttpResponse execute = HttpExecutor.create().execute(build);
-        return execute.readEntity(SellerGetResp.class);
-    }
-    public Object getSellerOrders(String appId,  String access_token, Map<String, Object> requestParams) throws Exception {
-        Map<String, Object> requestHeaders = defaultHeaders(appId, access_token);
-        String sign = getRequestSign(appId, requestHeaders, requestParams);
-        HttpRequest<Object> build = HttpRequest.builder(Object.class)
-                .method(HttpMethod.POST)
-                .endpoint(this.endpoint)
-                .path("erp/sc/data/mws/orders")
-                .queryParams(requestHeaders)
-                .queryParam("sign", sign)
-                .json(JSON.toJSONString(requestParams))
-                .build();
-        HttpResponse execute = HttpExecutor.create().execute(build);
-        return execute.readEntity(Object.class);
-    }
-
-    public Map<String,Object> defaultHeaders(String appId,String access_token) {
-        Map<String, Object> requestHeaders = new HashMap<>();
-        requestHeaders.put("timestamp", System.currentTimeMillis() / 1000 + "");
-        requestHeaders.put("access_token", access_token);
-        requestHeaders.put("app_key", appId);
-        return requestHeaders;
-    }
-
-    public String getRequestSign(String appSecret,  Map<String,Object> requestHeaders, Map<String,Object> requestParams) {
-        Map<String, Object> signMap = new HashMap<>();
-        signMap.putAll(requestHeaders);
-        if(!requestParams.isEmpty()) {
-            signMap.putAll(requestParams);
-        }
-        return ApiSign.sign(signMap, appSecret);
-
-    }
-
-}

+ 0 - 19
src/main/java/com/uas/eis/sdk/resp/SellerGetResp.java

@@ -1,19 +0,0 @@
-package com.uas.eis.sdk.resp;
-
-import com.uas.eis.sdk.entity.Seller;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author: zhouy
- * @date: 2021/9/16 17:51
- * @desc: 店铺接收对象
- */
-@Data
-public class SellerGetResp {
-    private String code;
-    private String msg;
-    private List<Seller> data;
-}

+ 0 - 108
src/main/java/com/uas/eis/sdk/webservice/SoapUtil.java

@@ -1,108 +0,0 @@
-package com.uas.eis.sdk.webservice;
-
-import com.uas.eis.sdk.dto.SubPickmtrlReq;
-import net.sf.json.JSONObject;
-import org.apache.axis.client.Call;
-import org.apache.axis.client.Service;
-import org.apache.axis.encoding.XMLType;
-import org.apache.axis.message.SOAPHeaderElement;
-import org.apache.axis.soap.SOAPConstants;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ParameterMode;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author: zhouy
- * @date: 2021/10/15 14:46
- * @desc: WebService 请求工具类
- * POST /MES/mes_k3.asmx HTTP/1.1
- * Host: 183.62.131.97
- * Content-Type: text/xml; charset=utf-8
- * Content-Length: length
- * SOAPAction: "http://tempuri.org/MES_K3"
- *
- */
-public class SoapUtil {
-
-    public static void main(String[] args) throws IOException {
-        callWebserviceASMX();
-    }
-    public static void callWebserviceASMX() throws IOException {
-        //获取webservice接口地址
-        String url = "http://183.62.131.97:9880/MES/mes_k3.asmx";
-        //获取域名地址,server定义的,一般默认是http://tempuri.org/,如果不对,找对方索要
-        String soapaction = "http://tempuri.org/";
-        String method = "MES_K3";
-        Service service = new Service();
-        String result = "";
-        try {
-            Call call = (Call) service.createCall();
-            call.setTargetEndpointAddress(url);
-            call.addHeader(initSOAPHeaderElement());
-            //设置要调用的方法
-            call.setOperationName(new QName(soapaction, method));
-            call.addParameter(new QName(soapaction, "type"), XMLType.XSD_STRING, ParameterMode.IN);
-            call.addParameter(new QName(soapaction, "data"), XMLType.XSD_ENTITY, ParameterMode.IN);
-            call.setEncodingStyle(null);
-            //设置要返回的数据类型(标准的类型)
-            call.setReturnType(XMLType.XSD_STRING);
-            call.setUseSOAPAction(true);
-            call.setSOAPVersion(SOAPConstants.SOAP12_CONSTANTS);
-            call.setSOAPActionURI(soapaction + method);
-            call.setEncodingStyle("GB2312");
-            //调用方法并传递参数
-            String type = "SUB_PICKMTRL";
-
-            SubPickmtrlReq req = new SubPickmtrlReq();
-            req.setSUPPLIERNO("D.02.008");
-            List<SubPickmtrlReq.SubPickmtrlENTRY> entryList = new ArrayList<SubPickmtrlReq.SubPickmtrlENTRY>();
-            SubPickmtrlReq.SubPickmtrlENTRY entry = new SubPickmtrlReq.SubPickmtrlENTRY();
-            entry.setENTRY_FNUMBER("01.EC0.3R3C201H10A");
-            entry.setENTRY_Unitno("Pcs");
-            entry.setENTRY_FActualQty(30);
-            entry.setENTRY_StockNO("20.01");
-            entry.setENTRY_ParentNO("02.PMA.D1C8192B003");
-            entry.setENTRY_FSrcInterId((long)147784);
-            entry.setENTRY_FSrcInterId((long)147784);
-            entry.setENTRY_FSrcEntryId((long)4860434);
-            entry.setENTRY_FSubReqId((long)127323) ;
-            entry.setENTRY_FSRCBIZENTRYID((long)138737) ;
-            entry.setENTRY_FSubReqEntryId((long)138737) ;
-            entry.setENTRY_FPPbomBillNo("SUBBOM00035139");
-            entry.setENTRY_FPOOrderBillNo("P202109160004");
-            entry.setENTRY_FPOOrderSeq(2);
-            entry.setENTRY_FSubReqEntrySeq(1);
-            entry.setENTRY_FSUBREQBILLNO("W20210916023");
-            entry.setENTRY_FSRCENTRYSEQ(1);
-            entryList.add(entry);
-            req.setENTRY(entryList);
-            System.out.println(req.toJSONString());
-           System.out.println( call.invoke(new Object[]{type, req.toJSONString()}));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    private static SOAPHeaderElement initSOAPHeaderElement(){
-        SOAPHeaderElement soapHeaderElement = new SOAPHeaderElement(new QName("http://tempuri.org/","UserValidationSoapHeader"));
-        try {
-           SOAPElement element = soapHeaderElement.addChildElement("UserName");
-            element.addTextNode("YR_MES");
-            element = soapHeaderElement.addChildElement("Password");
-            element.addTextNode("YR_MES!#%123");
-            return soapHeaderElement;
-
-        } catch (SOAPException e) {
-
-            e.printStackTrace();
-        }
-        return null;
-
-    }
-}

+ 1 - 0
src/main/java/com/uas/eis/service/ERPService.java

@@ -16,4 +16,5 @@ import java.util.Map;
  * @date 2021-12-06 18:25
  */
 public interface ERPService {
+    Map<String, Object> sendProdIO(String master, int id,String action) throws Exception;
 }

+ 0 - 30
src/main/java/com/uas/eis/service/GEService.java

@@ -1,30 +0,0 @@
-package com.uas.eis.service;
-
-
-import com.uas.eis.sdk.entity.ApiResult;
-import com.uas.eis.sdk.entity.GRApiResult;
-
-import javax.servlet.http.HttpServletRequest;
-import com.uas.eis.dto.*;
-import io.xlate.edi.schema.EDISchemaException;
-import io.xlate.edi.stream.EDIStreamException;
-
-import java.io.IOException;
-import java.util.Map;
-
-public interface GEService {
-
-    /**
-     * 获取订单
-     */
-    GRApiResult<String> getPoordergr(HttpServletRequest request, PoInternalDTO dto);
-
-    /**
-     * http调用歌尔856接口
-     * 暂时使用PoOrderGrDto,后期需要新建替换
-     * */
-    ApiResult<String> pushSenderInfo(PoOrderGrDTO dto);
-
-    ApiResult<String> sendAsnShipment(String master, Integer id) throws EDISchemaException, EDIStreamException, IOException;
-
-}

+ 130 - 0
src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -1,15 +1,29 @@
 package com.uas.eis.service.Impl;
 
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import com.uas.eis.core.config.SpObserver;
 import com.uas.eis.core.support.TokenProperties;
 import com.uas.eis.dao.*;
 import com.uas.eis.service.CommonService;
 import com.uas.eis.service.ERPService;
+import com.uas.eis.utils.HttpUtil;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
+import static com.uas.eis.utils.PSHttpUtils.doPost;
+
 @Service
 public class ERPServiceImpl implements ERPService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -20,4 +34,120 @@ public class ERPServiceImpl implements ERPService {
 
     @Autowired
     private CommonService commonService;
+
+    private static final String API_URL = "https://ecsb.crcloud.com/ecsb/gw/sys/rf/";
+    private static final String APP_SUB_ID = "001900060002";
+    private static final String APP_TOKEN = "791ced0c04fb43eb898db171286092c6";
+    private static final String API_ID = "crmic.crmicpdbgbpm.PDBGBPM.AgentService";
+    private static final String API_VERSION = "1.0";
+    private static final String PARTNER_ID = "00190000";
+    private static final String SYS_ID = "00190006";
+    private static final String SIGN_KEY = "8c77ccf46f0f4fcfad8e0639138a735b"; // 签名密钥
+    private static final String USER_TOKEN = "";
+    private static final String sapno="0000111563";
+    @Override
+    public Map<String, Object> sendProdIO(String master, int id,String action) throws Exception {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        SpObserver.putSp(master);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+        sdf.setTimeZone(TimeZone.getTimeZone("GMT+8"));
+        String time_Stamp= sdf.format(new Date());
+        // 1. 构造业务数据
+        JSONArray businessData = buildBusinessData(id,action);
+        String reqData = com.alibaba.fastjson.JSONArray.toJSONString(businessData);
+        System.out.println("reqData:"+reqData);
+        // 2. 构造公共参数
+        TreeMap<String, String> publicParams = buildPublicParams(time_Stamp);
+        // 3. 生成签名
+        String sign = generateSign(publicParams, reqData);
+        publicParams.put("Sign", sign);
+        // 4. 生成SSDP参数(Base64)
+        String ssdp = buildSsdp(publicParams);
+        System.out.println("ssdp:"+ssdp);
+        String url=API_URL+"?ssdp="+ssdp;
+        HttpUtil.Response response = HttpUtil.doPost(url, reqData, false, null);
+        String res=response.getResponseText();
+        System.out.println("res:"+res);
+        //{"returnCode":0,"returnMsg":"SECCUSS"}
+        String logSql="insert into dockProdIOLog(id_,date_,keyvalue,action_,time_Stamp,sign,ssdp,reqData,res) " +
+                " values(DOCKPRODIOLOG_SEQ.nextval,sysdate,"+id+",'"+action+"','"+time_Stamp+"','"+sign+"','"+ssdp+"','"+reqData+"','"+res+"')";
+        baseDao.execute(logSql);
+        return Collections.emptyMap();
+    }
+
+    /**
+     * 生成SSDP字符串并Base64编码
+     */
+    private static String buildSsdp(TreeMap<String, String> publicParams) {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : publicParams.entrySet()) {
+            sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&");
+        }
+        // 去掉最后一个&
+        if (sb.length() > 0) {
+            sb.setLength(sb.length() - 1);
+        }
+        System.out.println("buildSsdp:"+sb.toString());
+        String ssdp=Base64.encodeBase64String(sb.toString().getBytes(StandardCharsets.UTF_8));
+        //System.out.println("ssdp:"+ssdp);
+        return ssdp;
+    }
+
+    /**
+     * 生成签名(MD5 32位大写)
+     */
+    private String generateSign(Map<String, String> publicParams, String  reqData) {
+        Map<String, String> signMap = new TreeMap<>(publicParams);
+        signMap.put("REQUEST_DATA", reqData);
+        // 拼接公共参数
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : signMap.entrySet()) {
+            sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&");
+        }
+        // 拼接密钥
+        sb.append(SIGN_KEY);
+        System.out.println("generateSign:"+sb.toString());
+        // MD5 32位大写
+        return DigestUtils.md5Hex(sb.toString()).toUpperCase();
+    }
+    private TreeMap<String, String> buildPublicParams(String time_Stamp) {
+        TreeMap<String, String> params = new TreeMap<>();
+        params.put("Api_ID", API_ID);
+        params.put("Api_Version", API_VERSION);
+        params.put("App_Sub_ID", APP_SUB_ID);
+        params.put("App_Token", APP_TOKEN);
+        params.put("Partner_ID", PARTNER_ID);
+        params.put("Sys_ID", SYS_ID);
+        params.put("Time_Stamp", time_Stamp);
+        params.put("User_Token", "");
+        return params;
+    }
+
+    private JSONArray buildBusinessData(int id,String action) {
+        JSONArray array = new JSONArray();
+        SqlRowList rs = baseDao.queryForRowSet("select * from prodio_dock_view where pi_id="+id);
+        while (rs.next()) {
+            JSONObject item = new JSONObject();
+            item.put("year", rs.getGeneralInt("year_"));
+            item.put("month", rs.getGeneralInt("MONTH_"));
+            item.put("serialno", rs.getGeneralString("serialno"));
+            if("post".equals(action)){
+                item.put("shipmenttype", rs.getGeneralInt("shipmenttype")); // 1-销售出库 2-退货
+            }else{
+                if(rs.getGeneralInt("shipmenttype")==1){
+                    item.put("shipmenttype", 2); // 1-销售出库 2-退货
+                }else{
+                    item.put("shipmenttype", 1); // 1-销售出库 2-退货
+                }
+            }
+            item.put("sapno", sapno);
+            item.put("terminalaccount", rs.getGeneralString("TERMINALACCOUNT"));
+            item.put("productmodel",rs.getGeneralString("PRODUCTMODEL"));
+            item.put("outorderno", rs.getGeneralString("OUTORDERNO"));
+            item.put("saleprice",  rs.getGeneralDouble("SALEPRICE"));
+            item.put("qty",  rs.getGeneralInt("QTY"));
+            array.add(item);
+        }
+        return array;
+    }
 }

+ 0 - 517
src/main/java/com/uas/eis/service/Impl/GEServiceImpl.java

@@ -1,517 +0,0 @@
-package com.uas.eis.service.Impl;
-
-import com.alibaba.fastjson.JSON;
-import com.uas.eis.config.SynaConfig;
-import com.uas.eis.core.X12Converter;
-import com.uas.eis.core.config.SpObserver;
-import com.uas.eis.core.support.TokenProperties;
-import com.uas.eis.dao.BaseDao;
-import com.uas.eis.dao.SqlRowList;
-import com.uas.eis.entity.*;
-import com.uas.eis.sdk.entity.ApiResult;
-import com.uas.eis.sdk.entity.GRApiResult;
-import com.uas.eis.sdk.entity.Errors;
-import com.uas.eis.sdk.entity.ReturnData;
-import com.uas.eis.sdk.resp.ApiResponse;
-import com.uas.eis.service.CommonService;
-import com.uas.eis.service.GEService;
-import com.uas.eis.utils.HttpUtil;
-import com.uas.eis.utils.HuToolUtils;
-import com.uas.eis.vo.HttpResultResponse;
-import io.xlate.edi.schema.EDISchemaException;
-import io.xlate.edi.stream.EDIStreamException;
-import net.sf.json.JSONObject;
-import okhttp3.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.Null;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import com.uas.eis.dto.*;
-
-/**
- * @author zxl
- * @email zxl@usoftchina.com
- */
-@Service
-public class GEServiceImpl implements GEService {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-    private static Map<String, String> tokenConfig = TokenProperties.getAllProperty();
-
-    @Autowired
-    private BaseDao baseDao;
-
-    @Autowired
-    private SynaConfig synaConfig;
-    @Autowired
-    private CommonService commonService;
-
-    @Value("${api.url.geer.asn}")
-    private String asnUrl;
-
-
-    final static String SALE_PRICE_CCP = "select spd_id,spd_price,spd_taxrate from (select spd_id,spd_price,spd_taxrate,spd_remark,spd_ratio from SalePriceDetail left join SalePrice on spd_spid=sp_id"
-            + " where spd_arcustcode=? and spd_prodcode=? and spd_currency=? and to_char(sp_fromdate,'yyyymmdd')<=to_char(sysdate,'yyyymmdd') and nvl(spd_lapqty,0)<=? and"
-            + " to_char(sp_todate,'yyyymmdd')>=to_char(sysdate,'yyyymmdd') AND spd_statuscode='VALID' and sp_statuscode='AUDITED' ORDER BY SalePrice.sp_indate DESC,SalePriceDetail.spd_price) where rownum<2";
-    final static String SALE_PRICE_CCPR = "select spd_id,spd_price,spd_taxrate from (select spd_id,spd_price,spd_taxrate,spd_remark,spd_ratio from SalePriceDetail left join SalePrice on spd_spid=sp_id"
-            + " where spd_arcustcode=? and spd_prodcode=? and spd_currency=? AND spd_taxrate=? and to_char(sp_fromdate,'yyyymmdd')<=to_char(sysdate,'yyyymmdd') and nvl(spd_lapqty,0)<=? and"
-            + " to_char(sp_todate,'yyyymmdd')>=to_char(sysdate,'yyyymmdd') AND spd_statuscode='VALID' and sp_statuscode='AUDITED' ORDER BY SalePrice.sp_indate DESC,SalePriceDetail.spd_price) where rownum<2";
-    final static String SALE_PRICE_KCP = "select spd_id,spd_price,spd_taxrate from (select spd_id,spd_price,spd_taxrate,spd_remark,spd_ratio from SalePriceDetail left join SalePrice on spd_spid=sp_id"
-            + " where spd_prodcode=? and spd_currency=? and to_char(sp_fromdate,'yyyymmdd')<=to_char(sysdate,'yyyymmdd') and spd_pricetype=? and nvl(spd_lapqty,0)<=? and"
-            + " to_char(sp_todate,'yyyymmdd')>=to_char(sysdate,'yyyymmdd') AND spd_statuscode='VALID' and sp_statuscode='AUDITED' ORDER BY SalePrice.sp_indate DESC,SalePriceDetail.spd_price) where rownum<2";
-    final static String SALE_PRICE_PC = "select spd_id,spd_price,spd_taxrate from (select spd_id,spd_price,spd_taxrate,spd_remark,spd_ratio from SalePriceDetail left join SalePrice on spd_spid=sp_id"
-            + " where spd_prodcode=? and spd_currency=? and to_char(sp_fromdate,'yyyymmdd')<=to_char(sysdate,'yyyymmdd') and nvl(spd_lapqty,0)<=? and"
-            + " to_char(sp_todate,'yyyymmdd')>=to_char(sysdate,'yyyymmdd') AND spd_statuscode='VALID' and sp_statuscode='AUDITED' ORDER BY SalePrice.sp_indate DESC,SalePriceDetail.spd_price) where rownum<2";
-    final static String SALE_PRICE_PCR = "select spd_id,spd_price,spd_taxrate from (select spd_id,spd_price,spd_taxrate,spd_remark,spd_ratio from SalePriceDetail left join SalePrice on spd_spid=sp_id"
-            + " where spd_prodcode=? and spd_currency=? and spd_taxrate=? and to_char(sp_fromdate,'yyyymmdd')<=to_char(sysdate,'yyyymmdd') and nvl(spd_lapqty,0)<=? and"
-            + " to_char(sp_todate,'yyyymmdd')>=to_char(sysdate,'yyyymmdd') AND spd_statuscode='VALID' and sp_statuscode='AUDITED' ORDER BY SalePrice.sp_indate DESC,SalePriceDetail.spd_price) where rownum<2";
-    final static String SALE_PRICE_SCP = "select spd_id,spd_price,spd_taxrate from (select spd_id,spd_price,spd_taxrate,spd_remark,spd_ratio from SalePriceDetail left join SalePrice on spd_spid=sp_id"
-            + " where sp_kind=? and spd_prodcode=? and spd_currency=? and to_char(sp_fromdate,'yyyymmdd')<=to_char(sysdate,'yyyymmdd') and nvl(spd_lapqty,0)<=? and"
-            + " to_char(sp_todate,'yyyymmdd')>=to_char(sysdate,'yyyymmdd') AND spd_statuscode='VALID' and sp_statuscode='AUDITED' ORDER BY SalePrice.sp_indate DESC,SalePriceDetail.spd_price) where rownum<2";
-
-
-    @Override
-    public GRApiResult<String> getPoordergr(HttpServletRequest request, PoInternalDTO dtop) {
-        PoOrderGrDTO dto = dtop.getPo();
-        GRApiResult<String> grApiResult = new GRApiResult<String>();
-        String vendcode = dto.getDetails().get(0).getSubDetails().get(0).getAttr4();
-        if("18850".equals(vendcode)){
-            SpObserver.putSp("N_HUASL_QD");
-        }else if("14780".equals(vendcode)){
-            SpObserver.putSp("N_HUASL_T");
-        }else {
-            ReturnData returnData = new ReturnData();
-            returnData.setSuccess("false");
-            returnData.setTransId(dto.getTransId());
-            List<Errors> errorss = new ArrayList<Errors>();
-            Errors errors = new Errors();
-            errors.setErrorCode("E07");
-            errors.setErrorMsg("供应商编号不是18850或者14780!");
-            errorss.add(errors);
-            returnData.setErrors(errorss);
-            grApiResult.setReturnData(returnData);
-            return grApiResult;
-        }
-
-        List<String> sqls = new ArrayList<>();
-        //PO表增加主键ID
-        int poid = baseDao.getSeqId("POORDERGR_SEQ");
-        sqls.add("insert into POORDERGR (HID,TRANSID,SITECODE,SENDERQUALIFIER,SENDERID,RECEIVERQUALIFIER,RECEIVERID,REGIONCODE," +
-                "POTYPE,POHEADID,PONO,POVERSION,AGENTNAME," +
-                "PODATE,CUSTREFNO,CURRENCY,RATE,TOTALAMOUNT," +
-                "POE,MODELTYPE,MANUFACTORYCODE,MANUFACTORYNAME,VENDORCODE,VENDORNAME,SONO,INCOTERMSCODE,PAYMENTTERM," +
-                "CARRIERTYPE,CARRIERCODE,CARRIERNAME,TRANSMODE,COC,CUSTSTORLOC,PURGROUP,CUSTCOMPCODE,POSTATUS," +
-                "TRANSFLAG,TRANSDATE,ATTR1,ATTR2,ATTR3,ATTR4,ATTR5,ATTR6,ATTR7,ATTR8,ATTR9," +
-                "ATTR10,EXTRAREFCODE1,EXTRAREFTEXT1,EXTRAREFCODE2,EXTRAREFTEXT2,PORECORDDATE,POID) " +
-                "values ('"+dto.getHid()+"','"+dto.getTransId()+"','"+dto.getSiteCode()+"','"+dto.getSenderQualifier()+"','"+dto.getSenderId()+"','"+dto.getReceiverQualifier()+"','"+dto.getReceiverId()+"','"+dto.getRegionCode()+"'" +
-                ",'"+dto.getPoType()+"','"+dto.getPoHeadId()+"','"+dto.getPoNo()+"','"+dto.getPoVersion()+"','"+dto.getAgentName()+"'," +
-                "case when '"+dto.getPoDate()+"' = 'null' then null else TO_DATE('"+dto.getPoDate()+"', 'YYYY-MM-DD HH24:MI:SS') end,'"+dto.getCustRefNo()+"','"+dto.getCurrency()+"','"+dto.getRate()+"','"+dto.getTotalAmount()+"'" +
-                ",'"+dto.getPoe()+"','"+dto.getModelType()+"','"+dto.getManufactoryCode()+"','"+dto.getManufactoryName()+"','"+dto.getVendorCode()+"','"+dto.getVendorName()+"','"+dto.getSoNo()+"','"+dto.getIncotermsCode()+"','"+dto.getPaymentTerm()+"'" +
-                ",'"+dto.getCarrierType()+"','"+dto.getCarrierCode()+"','"+dto.getCarrierName()+"','"+dto.getTransMode()+"','"+dto.getCoc()+"','"+dto.getCustStorLoc()+"','"+dto.getPurGroup()+"','"+dto.getCustCompCode()+"','"+dto.getPoStatus()+"'" +
-                ",'"+dto.getTransFlag()+"'," +
-                "case when '"+dto.getTransDate()+"' = 'null' then null else TO_DATE('"+dto.getTransDate()+"', 'YYYY-MM-DD HH24:MI:SS') end,'"+dto.getAttr1()+"','"+dto.getAttr2()+"','"+dto.getAttr3()+"','"+dto.getAttr4()+"','"+dto.getAttr5()+"','"+dto.getAttr6()+"','"+dto.getAttr7()+"','"+dto.getAttr8()+"','"+dto.getAttr9()+"'" +
-                ",'"+dto.getAttr10()+"','"+dto.getExtraRefCode1()+"','"+dto.getExtraRefText1()+"','"+dto.getExtraRefCode2()+"','"+dto.getExtraRefText2()+"',sysdate,"+poid+")");
-        for (int i = 0; i < dto.getDetails().size(); i++) {
-            //PO明细表增加主键ID
-            int podetailid = baseDao.getSeqId("POORDERDETAILSGR_SEQ");
-            PoOrderDetailsGrDTO podetail = dto.getDetails().get(i);
-            sqls.add("insert into POORDERDETAILSGR (HID,PONO,POLINENO,POLINETYPE,ORDEREDQTY,QTYUOM,UNITPRICE,PRICEUOM," +
-                    "CUSTPARTNO,CUSTPARTDESC,VENDORPARTNO,VENDORPARTDESC,MANUFACTORYCODE,MANUFACTORYNAME," +
-                    "REQDATE,ETD,ETA," +
-                    "TRANSMODE,SONO,SOLINENO,TOTALAMOUNT,TAXRATE,ATTR1,ATTR2,ATTR3,ATTR4,ATTR5,ATTR6," +
-                    "ATTR7,ATTR8,ATTR9,ATTR10,EXTRAREFCODE1,EXTRAREFTEXT1,EXTRAREFCODE2,EXTRAREFTEXT2,DPOID,DETID) " +
-                    "values ('"+podetail.getHid()+"','"+podetail.getPoNo()+"','"+podetail.getPoLineNo()+"','"+podetail.getPoLineType()+"','"+podetail.getOrderedQty()+"','"+podetail.getQtyUom()+"','"+podetail.getUnitPrice()+"','"+podetail.getPriceUom()+"'" +
-                    ",'"+podetail.getCustPartNo()+"','"+podetail.getCustPartDesc()+"','"+podetail.getVendorPartNo()+"','"+podetail.getVendorPartDesc()+"','"+podetail.getManufactoryCode()+"','"+podetail.getManufactoryName()+"'" +
-                    ",case when '"+podetail.getReqDate()+"' = 'null' then null else TO_DATE('"+podetail.getReqDate()+"', 'YYYY-MM-DD HH24:MI:SS') end " +
-                    ",case when '"+podetail.getEtd()+"' = 'null' then null else TO_DATE('"+podetail.getEtd()+"', 'YYYY-MM-DD HH24:MI:SS') end " +
-                    ",case when '"+podetail.getEta()+"' = 'null' then null else TO_DATE('"+podetail.getEta()+"', 'YYYY-MM-DD HH24:MI:SS') end " +
-                    ",'"+podetail.getTransMode()+"','"+podetail.getSoNo()+"','"+podetail.getSoLineNo()+"','"+podetail.getTotalAmount()+"','"+podetail.getTaxRate()+"','"+podetail.getAttr1()+"','"+podetail.getAttr2()+"','"+podetail.getAttr3()+"','"+podetail.getAttr4()+"','"+podetail.getAttr5()+"','"+podetail.getAttr6()+"'" +
-                    ",'"+podetail.getAttr7()+"','"+podetail.getAttr8()+"','"+podetail.getAttr9()+"','"+podetail.getAttr10()+"','"+podetail.getExtraRefCode1()+"','"+podetail.getExtraRefText1()+"','"+podetail.getExtraRefCode2()+"','"+podetail.getExtraRefText2()+"',"+poid+","+podetailid+")");
-            for (int j = 0; j < podetail.getSubDetails().size(); j++) {
-                PoOrderSubDetailsGrDTO subdetails = dto.getDetails().get(i).getSubDetails().get(j);
-                subdetails.setSdpoid(poid);
-                subdetails.setSdetid(podetailid);
-                sqls.add("insert into POORDERSUBDETAILSGR (HID,PONO,POLINENO,POSUBLINENO,STORGCODE,REQQTY,QTYUOM," +
-                        "REQDATE," +
-                        "SUBETD,SUBETA,ATTR1,ATTR2,ATTR3,ATTR4,ATTR5,ATTR6,ATTR7," +
-                        "ATTR8,ATTR9,ATTR10,SDPOID,SDETID)" +
-                        "values ('"+subdetails.getHid()+"','"+subdetails.getPoNo()+"','"+subdetails.getPoLineNo()+"','"+subdetails.getPoSubLineNo()+"','"+subdetails.getStOrgCode()+"','"+subdetails.getReqQty()+"','"+subdetails.getQtyUom()+"'" +
-                        ",case when '"+subdetails.getReqDate()+"' = 'null' then null else TO_DATE('"+subdetails.getReqDate()+"', 'YYYY-MM-DD HH24:MI:SS') end " +
-                        ",case when '"+subdetails.getSubETD()+"' = 'null' then null else TO_DATE('"+subdetails.getSubETD()+"', 'YYYY-MM-DD HH24:MI:SS') end " +
-                        ",case when '"+subdetails.getSubETA()+"' = 'null' then null else TO_DATE('"+subdetails.getSubETA()+"', 'YYYY-MM-DD HH24:MI:SS') end " +
-                        ",'"+subdetails.getAttr1()+"','"+subdetails.getAttr2()+"','"+subdetails.getAttr3()+"','"+subdetails.getAttr4()+"','"+subdetails.getAttr5()+"','"+subdetails.getAttr6()+"','"+subdetails.getAttr7()+"'" +
-                        ",'"+subdetails.getAttr8()+"','"+subdetails.getAttr9()+"','"+subdetails.getAttr10()+"',"+poid+","+podetailid+")");
-            }
-        }
-        for (int i = 0; i < dto.getAddrInfos().size(); i++) {
-            PoOrderAddrinfosGrDTO addrinfos = dto.getAddrInfos().get(i);
-            sqls.add("insert into POORDERADDRINFOSGR (ADDRID,SENDERQUALIFIER,SENDERID,RECEIVERQUALIFIER,RECEIVERID,MSGTYPE,MSGALIAS,MSGID," +
-                    "PARTYTYPE,PARTYNAME,PARTYCODE,ADDINAME1,ADDINAME2,STREET1,STREET2,STREET3,STREET4," +
-                    "CITY,STATE,POSTALCODE,COUNTRYCODE,COUNTRYNAME,DISTRICT,CONTACTNAME,CONTACTEMAIL,PHONE," +
-                    "FAX,ATTR1,ATTR2,ATTR3,ATTR4,ATTR5,ATTR6,ATTR7,ATTR8," +
-                    "ATTR9,ATTR10,APOID)" +
-                    "values ('"+addrinfos.getAddrId()+"','"+addrinfos.getSenderQualifier()+"','"+addrinfos.getSenderId()+"','"+addrinfos.getReceiverQualifier()+"','"+addrinfos.getReceiverId()+"','"+addrinfos.getMsgType()+"','"+addrinfos.getMsgAlias()+"','"+addrinfos.getMsgId()+"'" +
-                    ",'"+addrinfos.getPartyType()+"','"+addrinfos.getPartyName()+"','"+addrinfos.getPartyCode()+"','"+addrinfos.getAddiName1()+"','"+addrinfos.getAddiName2()+"','"+addrinfos.getStreet1()+"','"+addrinfos.getStreet2()+"','"+addrinfos.getStreet3()+"','"+addrinfos.getStreet4()+"'" +
-                    ",'"+addrinfos.getCity()+"','"+addrinfos.getState()+"','"+addrinfos.getPostalCode()+"','"+addrinfos.getCountryCode()+"','"+addrinfos.getCountryName()+"','"+addrinfos.getDistrict()+"','"+addrinfos.getContactName()+"','"+addrinfos.getContactEmail()+"','"+addrinfos.getPhone()+"'" +
-                    ",'"+addrinfos.getFax()+"','"+addrinfos.getAttr1()+"','"+addrinfos.getAttr2()+"','"+addrinfos.getAttr3()+"','"+addrinfos.getAttr4()+"','"+addrinfos.getAttr5()+"','"+addrinfos.getAttr6()+"','"+addrinfos.getAttr7()+"','"+addrinfos.getAttr8()+"'" +
-                    ",'"+addrinfos.getAttr9()+"','"+addrinfos.getAttr10()+"',"+poid+")");
-        }
-
-        //插入系统中间表
-        int scgid = baseDao.getSeqId("SALECONFIRMGR_SEQ");
-        String scgcode = baseDao.sGetMaxNumber("SaleConfirmGr", 2);
-        sqls.add("insert into SALECONFIRMGR (SCG_ID,SCG_CODE,SCG_RECORDDATE,SCG_RECORDER,SCG_STATUS,SCG_STATUSCODE,SCG_REMARK,SCG_AUDITMAN,SCG_AUDITDATE," +
-                "SCG_CUSTGRCODE,SCG_CUSTGRNAME,SCG_CUSTCODE,SCG_CUSTNAME,SCG_SAKIND,SCG_POCODE,SCG_CURRENCY,SCG_RATE," +
-                "SCG_SADATE,SCG_GRPOCODE,SCG_GRHID,SCG_GRPOID)" +
-                "select "+scgid+",'"+scgcode+"',sysdate,'王平','在录入','ENTERING','','','', " +
-                "PARTYCODE,PARTYNAME,nvl(cd_varchar50_1,PARTYCODE),nvl(cd_varchar50_2,PARTYNAME),'正常订单',poNo,currency,case when rate = 'null' then '0' else rate end," +
-                "poDate,soNo,case when HID = 'null' then '0' else HID end,POID " +
-                "from POORDERGR left join POORDERADDRINFOSGR on APOID = POID and nvl(PARTYTYPE,' ') = 'BY'  " +
-                "left join N_HUASL_QD.CUSTOMTABLE on ct_caller='GECUSTDZ' and CT_STATUS = '已审核' left join N_HUASL_QD.CUSTOMTABLEDETAIL ON CD_CTID = CT_ID and cd_varchar50_4 = PARTYNAME " +
-                "where POID = " + poid);
-        sqls.add("insert into SALECONFIRMGRDETAIL (SCGD_ID,SCGD_SCGID,SCGD_DETNO,SCGD_REMARK,SCGD_GRDETNO,SCGD_GRPRCODE,SCGD_GRPRNAME," +
-                "SCGD_PRCODE,SCGD_PRDETAIL,SCGD_SELLERCODE,SCGD_SELLERNAME,SCGD_DELIVERY," +
-                "SCGD_QTY,SCGD_PRICE,SCGD_TOTAL," +
-                "SCGD_GRPOCODE,SCGD_GRHID,SCGD_GRPOID,SCGD_GRDPOID)" +
-                "select SALECONFIRMGRDETAIL_SEQ.nextval,"+scgid+",rownum,'',poLineNo,custPartNo,custPartDesc," +
-                "nvl(pc_prodcode,custPartNo),nvl(pr_detail,custPartDesc),cd_varchar50_3,cd_varchar50_4,reqDate," +
-                "case when orderedQty = 'null' then '0' else orderedQty end, case when unitPrice = 'null' then '0' else unitPrice end,case when totalAmount = 'null' then '0' else totalAmount end,  " +
-                "PONO,case when HID = 'null' then '0' else HID end,DPOID,DETID " +
-                "from POORDERDETAILSGR left join N_HUASL_QD.PRODUCTCUSTOMER on custPartNo = pc_custprodcode and pc_custcode = 'GOERTEK' left join Product on pc_prodid=pr_id  " +
-                "left join N_HUASL_QD.CUSTOMTABLE on CT_CALLER = 'GESELLERBRAND' and CT_STATUS = '已审核' left join N_HUASL_QD.CUSTOMTABLEDETAIL on CD_CTID = CT_ID and cd_varchar50_1 = pr_brand " +
-                "where DPOID = " + poid);
-        sqls.add("update SALECONFIRMGRDETAIL set SCGD_TOTAL = round(nvl(SCGD_QTY,0)*nvl(SCGD_PRICE,0),2) where SCGD_SCGID = " + scgid);
-        baseDao.execute(sqls);
-        getPrice(scgid);
-        ReturnData returnData = new ReturnData();
-        returnData.setSuccess("true");
-        returnData.setTransId(dto.getTransId());
-        return new GRApiResult(returnData);
-    }
-
-
-    public void getPrice(int scg_id) {
-        Object sakind = baseDao.getFieldDataByCondition("SALECONFIRMGR", "scg_sakind", "scg_id=" + scg_id);
-        Object pricekind = baseDao.getFieldDataByCondition("SaleKind", "sk_pricekind", "sk_name='" + sakind + "'");
-        List<Object[]> objects = baseDao.getFieldsDatasByCondition(
-                "SALECONFIRMGRDETAIL left join SALECONFIRMGR on SCGD_SCGID=SCG_ID left join Customer on scg_custcode=cu_code", new String[] { "scgd_prcode",
-                        "scg_custcode", "scg_currency", "scgd_qty", "scgd_id", "cu_pricetype", "nvl(scgd_xtprice,0)", "nvl(cu_taxrate,0)"}, " scg_id="
-                        + scg_id);
-        JSONObject js = null;
-        if(baseDao.isDBSetting("Sale","getPriceBySale")){
-            for (Object[] obj : objects) {
-                Double a = 0.0;
-                Double b = 0.0;
-                if(Double.parseDouble(obj[8].toString()) == 0.0){
-                    Object[] last = baseDao.getFieldsDataByCondition("(select * from sale left join saledetail on sa_id=sd_said where sa_custcode='"+obj[1]+"' and sa_currency='"+obj[2]+"' and sd_prodcode='"+obj[0]+"' and sa_statuscode='AUDITED' order by sa_date desc)", new String[]{"nvl(sd_price,0)","nvl(sd_taxrate,0)"}, "rownum<2");
-                    if(last != null){
-                        a = last[0] == null ? 0.0 : Double.parseDouble(last[0].toString());
-                        baseDao.execute("update SALECONFIRMGRDETAIL set scgd_xtprice="+a+" where scgd_id="+obj[4]);
-                    }
-                }
-            }
-        }else{
-            for (Object[] obj : objects) {
-                Object oqty = baseDao.getFieldDataByCondition("SALECONFIRMGRDETAIL", "sum(scgd_qty)",
-                        " SCGD_SCGID=" + scg_id + " and scgd_prcode='" + String.valueOf(obj[0]) + "'");
-                if (pricekind == null
-                        || (!"CCPR".equals(pricekind) && !"CCP".equals(pricekind) && !"KCP".equals(pricekind) && !"PC".equals(pricekind) && !"SCP"
-                        .equals(pricekind)&&!"PCR".equals(pricekind))) {
-
-                } else
-                    js = getSalePrice_N(String.valueOf(obj[1]), String.valueOf(sakind), String.valueOf(obj[0]), String.valueOf(obj[2]),
-                            String.valueOf(obj[5]), pricekind, Double.parseDouble(oqty.toString()), Double.parseDouble(obj[7].toString()));
-                double price = 0;
-                double tax = 0;
-                double p = 0;
-                int spdid = 0;
-                if (js != null) {
-                    price = js.getDouble("sd_price");
-                    tax = js.getDouble("sd_taxrate");
-                    spdid = js.getInt("spd_id");
-                }
-                if (price != 0) {
-                    p = price;
-                    baseDao.updateByCondition("SALECONFIRMGRDETAIL", "scgd_xtprice=" + p, "scgd_id=" + obj[4]);
-                }
-            }
-        }
-
-    }
-
-
-    public JSONObject getSalePrice_N(String custcode, String sakind, String prodcode, String currency, String cukind, Object pricekind,
-                                     Double sumqty, Double taxrate) {
-        SqlRowList rs = null;
-        /**
-         * 反馈编号:2017030117
-         * 西博泰科UAS:销售类型-取价原则,增加一种原则PCR:“料号+币别+税率”;
-         */
-        if (pricekind != null) {
-            if ("CCP".equals(pricekind)) {
-                rs = baseDao.queryForRowSet(SALE_PRICE_CCP, custcode, prodcode, currency, sumqty);
-            } else if ("CCPR".equals(pricekind)) {
-                rs = baseDao.queryForRowSet(SALE_PRICE_CCPR, custcode, prodcode, currency, taxrate, sumqty);
-            } else if ("KCP".equals(pricekind)) {
-                rs = baseDao.queryForRowSet(SALE_PRICE_KCP, prodcode, currency, cukind, sumqty);
-            } else if ("PC".equals(pricekind)) {
-                rs = baseDao.queryForRowSet(SALE_PRICE_PC, prodcode, currency, sumqty);
-            } else if ("SCP".equals(pricekind)) {
-                rs = baseDao.queryForRowSet(SALE_PRICE_SCP, sakind, prodcode, currency, sumqty);
-            } else if ("PCR".equals(pricekind)) {
-                rs = baseDao.queryForRowSet(SALE_PRICE_PCR,prodcode, currency, taxrate,sumqty);
-            }
-        }
-        if (rs.next()) {
-            JSONObject obj = new JSONObject();
-            obj.put("sd_price", rs.getObject("spd_price") == null ? 0 : rs.getObject("spd_price"));
-            obj.put("sd_taxrate", rs.getObject("spd_taxrate") == null ? 0 : rs.getObject("spd_taxrate"));
-            obj.put("spd_id", rs.getObject("spd_id") == null ? 0 : rs.getObject("spd_id"));
-            return obj;
-        }
-        return null;
-    }
-
-
-    @Override
-    public ApiResult<String> pushSenderInfo(PoOrderGrDTO dto) {
-
-        // todo 入参dto需要改成数据库查询出来的数据
-        //dtoFrom();  方法完善后放开
-
-        //接口返回
-        HttpResultResponse resultResponse = null;
-        try{
-            //resultResponse =  HuToolUtils.post(asnUrl,dto);
-            //头部请求参数
-            Map<String,String> headerMap =  new HashMap<>();
-            headerMap.put("user","WD");
-            headerMap.put("password","WD@test+1");
-            resultResponse =  HuToolUtils.post(asnUrl,dto,headerMap);
-            logger.info("推送发货信息到歌尔,接口返回结果:{}",resultResponse);
-        }catch (Exception e){
-            logger.error("推送发货信息到歌尔,调用接口异常:{}",e);
-            return ApiResponse.failRsp("400","推送发货信息到歌尔,接口调用异常 !", null,e.getMessage());
-        }
-        return ApiResponse.successRsp("200", JSON.toJSONString(resultResponse));
-    }
-
-    /**
-     * 数据转换,将数据参数转换成接口需要参数
-     * */
-    /*public 接口调用参数 dtoFrom(数据库查询出来的参数){
-        return 接口调用需要的参数;
-    }*/
-
-
-    @Override
-    public ApiResult<String> sendAsnShipment(String master, Integer id) throws EDISchemaException, EDIStreamException, IOException {
-        SpObserver.putSp(master);
-        Map<String, Object> modelMap = new HashMap<String, Object>();
-        int count = baseDao.getCount("select count(1)  from AsnShipment where as_id=" + id);
-        if (count>0){
-            //接口返回
-            HttpResultResponse resultResponse = null;
-            //头部请求参数
-            Map<String,String> headerMap =  new HashMap<>();
-            /*headerMap.put("user","WD");
-            headerMap.put("password","WD@test+1");*/
-            String username = "WD";
-            String password = "WD@test+1";
-            String auth = username + ":" + password;
-            String encodedAuth = Base64.getEncoder()
-                    .encodeToString(auth.getBytes(StandardCharsets.UTF_8));
-            headerMap.put("Authorization", "Basic " + encodedAuth);
-            headerMap.put("Content-Type", "application/json; charset=UTF-8");
-            AsnDetDTO asnDetDTO = new AsnDetDTO();
-            AsnDTO aAsnDTO = new AsnDTO();
-            SqlRowList rs = baseDao.queryForRowSet("select as_transid,as_asnno,TO_CHAR(as_recorddate, 'yyyy-MM-dd hh24:mi:ss') as_recorddate,TO_CHAR(asd_senddate, 'yyyy-MM-dd hh24:mi:ss') asd_senddate, " +
-                    "as_packtype,asd_fyqty,asd_invoice,asd_tycode,TO_CHAR(asd_arrivaldate, 'yyyy-MM-dd hh24:mi:ss') asd_arrivaldate,TO_CHAR(asd_lgdate, 'yyyy-MM-dd hh24:mi:ss') asd_lgdate,TO_CHAR(asd_dgdate, 'yyyy-MM-dd hh24:mi:ss') asd_dgdate," +
-                    "asd_countryqy,asd_cityqy,asd_transportation,asd_organizecode,asd_iswooden " +
-                    "from AsnShipment left join (select asd_asid,max(asd_senddate) asd_senddate,sum(nvl(asd_fyqty,0)) asd_fyqty,max(asd_invoice) asd_invoice,max(asd_tycode) asd_tycode,max(asd_arrivaldate) asd_arrivaldate, " +
-                    "max(asd_lgdate) asd_lgdate,max(asd_dgdate) asd_dgdate,max(asd_countryqy) asd_countryqy,max(asd_cityqy) asd_cityqy,max(asd_transportation) asd_transportation,max(asd_organizecode) asd_organizecode,max(asd_iswooden) asd_iswooden " +
-                    "from ASNSHIPMENTDETAIL group by asd_asid) on asd_asid = as_id " +
-                    "where as_id = ?",id);
-            while (rs.next()) {
-                //ASN
-                aAsnDTO.setTransId(rs.getGeneralString("as_transid"));
-                aAsnDTO.setSenderQualifier("ZZ");
-                aAsnDTO.setSenderId("WORLDSHINE");
-                aAsnDTO.setReceiverQualifier("ZZ");
-                aAsnDTO.setReceiverId("GOERTEK");
-                aAsnDTO.setAsnNo(rs.getGeneralString("as_asnno"));
-                aAsnDTO.setAsnDate(rs.getString("as_recorddate"));
-                aAsnDTO.setShipDate(rs.getString("asd_senddate"));
-
-                aAsnDTO.setPackType(rs.getGeneralString("as_packtype"));
-                aAsnDTO.setPackCount(rs.getGeneralString("asd_fyqty"));
-                aAsnDTO.setWaybillNo(rs.getGeneralString("asd_tycode"));
-                aAsnDTO.setInvoiceNo(rs.getGeneralString("asd_invoice"));
-                if ("N_HUASL_QD".equals(master)) {
-                    aAsnDTO.setVendorCode("18850");
-                } else if ("N_HUASL_T".equals(master)) {
-                    aAsnDTO.setVendorCode("14780");
-                }
-                aAsnDTO.setEstCCDate(rs.getString("asd_arrivaldate"));
-                aAsnDTO.setEtd(rs.getString("asd_lgdate"));
-                aAsnDTO.setEta(rs.getString("asd_dgdate"));
-                aAsnDTO.setAttr1(rs.getString("asd_organizecode"));
-                aAsnDTO.setAttr2("Y");
-                aAsnDTO.setAttr7("N");
-                aAsnDTO.setAttr8(rs.getGeneralString("asd_iswooden"));
-                aAsnDTO.setAttr5(rs.getGeneralString("asd_countryqy"));
-                aAsnDTO.setAttr6(rs.getGeneralString("asd_cityqy"));
-                aAsnDTO.setTransMethod(rs.getGeneralString("asd_transportation"));
-                //addrInfo
-                List<AsnAddrInfoDTO> asnAddrInfoDTOl = new ArrayList<AsnAddrInfoDTO>();
-                AsnAddrInfoDTO asnAddrInfoDTO = new AsnAddrInfoDTO();
-                asnAddrInfoDTO.setPartyType("SH");
-                if ("N_HUASL_QD".equals(master)) {
-                    asnAddrInfoDTO.setPartyName("青岛华商龙科技有限公司");
-                    asnAddrInfoDTO.setPartyCode("P114310078");
-                } else if ("N_HUASL_T".equals(master)) {
-                    asnAddrInfoDTO.setPartyName("华商龙科技有限公司");
-                    asnAddrInfoDTO.setPartyCode("SHPR083");
-                }
-
-                asnAddrInfoDTOl.add(asnAddrInfoDTO);
-                aAsnDTO.setAddrInfo(asnAddrInfoDTOl);
-                //asnOrder
-                List<AsnOrderDTO> AsnOrderDTOl = new ArrayList<AsnOrderDTO>();
-                SqlRowList rsOrder = baseDao.queryForRowSet("select distinct as_asnno,asd_cgcode,as_packtype " +
-                        "from AsnShipment left join ASNSHIPMENTDETAIL on as_id = asd_asid where as_id = ?",id);
-                while (rsOrder.next()) {
-                    AsnOrderDTO asnOrderDTO = new AsnOrderDTO();
-                    asnOrderDTO.setAsnNo(rsOrder.getString("as_asnno"));
-                    asnOrderDTO.setPoNo(rsOrder.getString("asd_cgcode"));
-                    if("箱序".equals(rsOrder.getString("as_packtype"))){
-                        //箱序  asnPack
-                        SqlRowList rsasnPack = baseDao.queryForRowSet("select as_asnno,aspo_cgcode,aspo_cgdetno,aspo_bzway,aspo_packno,aspo_bzqty,aspo_grossload, " +
-                                "aspo_tall,aspo_wide,aspo_long,aspo_quantity,aspo_custpartno,aspo_cgqty,aspo_countryyc,aspo_bztype,aspo_weight,aspo_invoice " +
-                                "from AsnShipment left join ASNSHIPMENTORDER on as_id = aspo_asid where as_id = ?",id);
-                        List<AsnPackDTO> AsnPackDTOl = new ArrayList<AsnPackDTO>();
-                        while (rsasnPack.next()) {
-                            AsnPackDTO asnPackDTO = new AsnPackDTO();
-                            asnPackDTO.setAsnNo(rsasnPack.getString("as_asnno"));
-                            asnPackDTO.setPoNo(rsasnPack.getString("aspo_cgcode"));
-                            asnPackDTO.setPoLineNo(rsasnPack.getString("aspo_cgdetno"));
-                            //asnPackDTO.setPackType(rsasnPack.getString("aspo_bzway"));
-                            asnPackDTO.setPackType("P");
-                            asnPackDTO.setPackNo(rsasnPack.getString("aspo_packno"));
-                            asnPackDTO.setPackCount(rsasnPack.getString("aspo_bzqty"));
-                            asnPackDTO.setPackUnitWT(rsasnPack.getString("aspo_grossload"));
-                            asnPackDTO.setGrossWT(rsasnPack.getString("aspo_grossload"));
-                            asnPackDTO.setLength(rsasnPack.getString("aspo_tall"));
-                            asnPackDTO.setWidth(rsasnPack.getString("aspo_wide"));
-                            asnPackDTO.setHeight(rsasnPack.getString("aspo_long"));
-                            asnPackDTO.setDimUom("CM");
-                            asnPackDTO.setManPackCount(rsasnPack.getString("aspo_quantity"));
-                            asnPackDTO.setInnerPackCount(rsasnPack.getString("aspo_quantity"));
-                            asnPackDTO.setAttr1("1");
-                            //asnOrderDetail
-                            List<AsnOrderDetailDTO> asnOrderDetailDTOl = new ArrayList<AsnOrderDetailDTO>();
-                            AsnOrderDetailDTO asnOrderDetailDTO = new AsnOrderDetailDTO();
-                            asnOrderDetailDTO.setAsnNo(rsasnPack.getString("as_asnno"));
-                            asnOrderDetailDTO.setPoNo(rsasnPack.getString("aspo_cgcode"));
-                            asnOrderDetailDTO.setPoLineNo(rsasnPack.getString("aspo_cgdetno"));
-                            asnOrderDetailDTO.setPackNo(rsasnPack.getString("aspo_packno"));
-                            asnOrderDetailDTO.setCustPlant(rsasnPack.getString("aspo_custpartno"));
-                            asnOrderDetailDTO.setCustPartDesc(rsasnPack.getString("aspo_custpartname"));
-                            asnOrderDetailDTO.setQty(rsasnPack.getString("aspo_cgqty"));
-                            asnOrderDetailDTO.setAttr4(rsasnPack.getString("aspo_cgqty"));
-                            asnOrderDetailDTO.setAttr5(rsasnPack.getString("aspo_grossload"));
-                            asnOrderDetailDTO.setAttr6("KG");
-                            asnOrderDetailDTO.setAttr7(rsasnPack.getGeneralString("aspo_weight"));
-                            asnOrderDetailDTO.setAttr8(rsasnPack.getGeneralString("aspo_invoice"));
-                            asnOrderDetailDTO.setAttr9(rsasnPack.getString("aspo_countryyc"));
-                            asnOrderDetailDTO.setAttr19(rsasnPack.getString("aspo_bztype"));
-
-                            //asnSNDetail
-                            List<AsnSnDetailDTO> asnSnDetailDTOl = new ArrayList<AsnSnDetailDTO>();
-                            AsnSnDetailDTO asnSnDetailDTO = new AsnSnDetailDTO();
-                            asnSnDetailDTO.setAsnNo(rsasnPack.getString("as_asnno"));
-                            asnSnDetailDTO.setPoNo(rsasnPack.getString("aspo_cgcode"));
-                            asnSnDetailDTO.setPoLineNo(rsasnPack.getString("aspo_cgdetno"));
-                            asnSnDetailDTO.setPackNo(rsasnPack.getString("aspo_packno"));
-                            asnSnDetailDTO.setSnNo(rsasnPack.getString("aspo_custpartno"));
-
-                            asnSnDetailDTOl.add(asnSnDetailDTO);
-                            asnOrderDetailDTO.setAsnSNDetail(asnSnDetailDTOl);
-
-                            asnOrderDetailDTOl.add(asnOrderDetailDTO);
-                            asnPackDTO.setAsnOrderDetail(asnOrderDetailDTOl);
-
-                            AsnPackDTOl.add(asnPackDTO);
-                            asnOrderDTO.setAsnPack(AsnPackDTOl);
-                        }
-                    }else{
-                        //无托箱  asnPack
-                        SqlRowList rsasnPack = baseDao.queryForRowSet("select as_asnno,aspo_cgcode,aspo_cgdetno,aspo_bzway,aspo_packno,aspo_bzqty,aspo_grossload, " +
-                                "aspo_tall,aspo_wide,aspo_long,aspo_quantity,aspo_custpartno,aspo_cgqty,aspo_countryyc,aspo_bztype,aspo_weight,aspo_invoice " +
-                                "from AsnShipment left join ASNSHIPMENTORDER on as_id = aspo_asid where as_id = ?",id);
-                        List<AsnOrderDetailDTO> asnOrderDetailDTOl = new ArrayList<AsnOrderDetailDTO>();
-                        while (rsasnPack.next()) {
-                            //asnOrderDetail
-                            AsnOrderDetailDTO asnOrderDetailDTO = new AsnOrderDetailDTO();
-                            asnOrderDetailDTO.setAsnNo(rsasnPack.getString("as_asnno"));
-                            asnOrderDetailDTO.setPoNo(rsasnPack.getString("aspo_cgcode"));
-                            asnOrderDetailDTO.setPoLineNo(rsasnPack.getString("aspo_cgdetno"));
-                            asnOrderDetailDTO.setPackNo(rsasnPack.getString("aspo_packno"));
-                            asnOrderDetailDTO.setCustPlant(rsasnPack.getString("aspo_custpartno"));
-                            asnOrderDetailDTO.setCustPartDesc(rsasnPack.getString("aspo_custpartname"));
-                            asnOrderDetailDTO.setQty(rsasnPack.getString("aspo_cgqty"));
-                            asnOrderDetailDTO.setAttr4(rsasnPack.getString("aspo_cgqty"));
-                            asnOrderDetailDTO.setAttr5(rsasnPack.getString("aspo_grossload"));
-                            asnOrderDetailDTO.setAttr6("KG");
-                            asnOrderDetailDTO.setAttr7(rsasnPack.getGeneralString("aspo_weight"));
-                            asnOrderDetailDTO.setAttr8(rsasnPack.getGeneralString("aspo_invoice"));
-                            asnOrderDetailDTO.setAttr9(rsasnPack.getString("aspo_countryyc"));
-                            asnOrderDetailDTO.setAttr19(rsasnPack.getString("aspo_bztype"));
-
-                            //asnSNDetail
-                            List<AsnSnDetailDTO> asnSnDetailDTOl = new ArrayList<AsnSnDetailDTO>();
-                            AsnSnDetailDTO asnSnDetailDTO = new AsnSnDetailDTO();
-                            asnSnDetailDTO.setAsnNo(rsasnPack.getString("as_asnno"));
-                            asnSnDetailDTO.setPoNo(rsasnPack.getString("aspo_cgcode"));
-                            asnSnDetailDTO.setPoLineNo(rsasnPack.getString("aspo_cgdetno"));
-                            asnSnDetailDTO.setPackNo(rsasnPack.getString("aspo_packno"));
-                            asnSnDetailDTO.setSnNo(rsasnPack.getString("aspo_custpartno"));
-
-                            asnSnDetailDTOl.add(asnSnDetailDTO);
-                            asnOrderDetailDTO.setAsnSNDetail(asnSnDetailDTOl);
-
-                            asnOrderDetailDTOl.add(asnOrderDetailDTO);
-                            asnOrderDTO.setAsnOrderDetail(asnOrderDetailDTOl);
-
-                        }
-                    }
-                    AsnOrderDTOl.add(asnOrderDTO);
-
-
-                }
-                aAsnDTO.setAsnOrder(AsnOrderDTOl);
-
-
-
-            }
-            asnDetDTO.setASN(aAsnDTO);
-            resultResponse =  HuToolUtils.post(asnUrl,asnDetDTO,headerMap);
-            //System.out.println("HttpUtils post 响应失败. url={"+asnUrl+"}, headerMap={"+headerMap+"}, response={"+asnDetDTO+"}");
-            logger.info("推送发货信息到歌尔,接口返回结果:{}",resultResponse);
-            return ApiResponse.successRsp("200", JSON.toJSONString(resultResponse));
-        }else{
-            logger.info("单据不存在:id={}",id);
-        }
-        return null;
-    }
-
-
-}

+ 0 - 189
src/main/java/com/uas/eis/service/Impl/SynaServiceImpl.java

@@ -1,189 +0,0 @@
-package com.uas.eis.service.Impl;
-
-import com.uas.eis.config.SynaConfig;
-import com.uas.eis.core.X12Converter;
-import com.uas.eis.core.config.SpObserver;
-import com.uas.eis.core.support.TokenProperties;
-import com.uas.eis.dao.BaseDao;
-import com.uas.eis.entity.*;
-import com.uas.eis.service.CommonService;
-import com.uas.eis.service.SynaService;
-import io.xlate.edi.schema.EDISchemaException;
-import io.xlate.edi.stream.EDIStreamException;
-import okhttp3.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * @author Dingyl
- */
-@Service
-public class SynaServiceImpl implements SynaService {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    private BaseDao baseDao;
-
-    @Autowired
-    private SynaConfig synaConfig;
-
-    @Override
-    public Map<String, Object> sendPurchaseToSyna(String master, Integer id) throws EDISchemaException, EDIStreamException, IOException {
-        SpObserver.putSp(master);
-        Map<String, Object> modelMap = new HashMap<String, Object>();
-        logger.info("sendPurchaseToSyna-beg:{}:{}",master,id);
-        Purchase po=getPO(id);
-        if(po!=null){
-            String ediId = getEDIId(master);
-            System.out.println(ediId);
-            X12Converter converter=new X12Converter();
-            String data=converter.convertToX12(po,ediId,synaConfig);
-            System.out.println("X12:");
-            System.out.println( data);
-            String url= synaConfig.getUrl_850();
-            logger.info("sendPurchaseToSyna:po:{} X12-data:{}",po.getPu_code(),data);
-            modelMap=toSynaptics(url,data,"850",id);
-            return modelMap;
-        }else{
-            logger.info("sendPurchaseToSyna:采购单不存在:id={}",id);
-        }
-        return Collections.emptyMap();
-    }
-    @Override
-    public Map<String, Object> sendPurchaseChangeToSyna(String master, Integer id) throws EDISchemaException, EDIStreamException, IOException {
-        SpObserver.putSp(master);
-        Map<String, Object> modelMap = new HashMap<String, Object>();
-        logger.info("sendPurchaseChangeToSyna-beg:{}:{}",master,id);
-        PurchaseChange pc=getPC(id);
-        if(pc!=null){
-            String ediId = getEDIId(master);
-            System.out.println(ediId);
-            X12Converter converter=new X12Converter();
-            String data=converter.convertToX12(pc,ediId,synaConfig);
-            System.out.println("X12:");
-            System.out.println( data);
-            String url= synaConfig.getUrl_860();
-            logger.info("sendPurchaseChangeToSyna:po:{} X12-data:{}",pc.getPc_code(),data);
-            modelMap=toSynaptics(url,data,"860",id);
-            return modelMap;
-        }else{
-            logger.info("sendPurchaseChangeToSyna:采购变更单不存在:id={}",id);
-        }
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public Map<String, Object> sendPosToSyna(String master, Integer id) throws EDISchemaException, EDIStreamException, IOException {
-        SpObserver.putSp(master);
-        Map<String, Object> modelMap = new HashMap<String, Object>();
-        logger.info("sendPOSToSyna-beg:{}:{}",master,id);
-        POS pos=getPOS(id);
-        if(pos!=null){
-            String ediId = getEDIId(master);
-            System.out.println(ediId);
-            X12Converter converter=new X12Converter();
-            String data=converter.convertToX12(pos,ediId,synaConfig);
-            System.out.println("X12:");
-            System.out.println( data);
-            String url= synaConfig.getUrl_867();
-            logger.info("sendPOSToSyna:po:{} X12-data:{}",pos.getPs_code(),data);
-            modelMap=toSynaptics(url,data,"867",id);
-            return modelMap;
-        }else{
-            logger.info("sendPurchaseChangeToSyna:POS单据不存在:id={}",id);
-        }
-        return Collections.emptyMap();
-    }
-
-    private POS getPOS(Integer id){
-        POS pos =baseDao.getJdbcTemplate().queryForObject("select * from POSREPORT_SYNA where ps_id=?", new BeanPropertyRowMapper<POS>(POS.class), id);
-       List<POSDetail> detail = baseDao.getJdbcTemplate().query("select * FROM posreport_syna_det WHERE PD_PsID=? ORDER BY PD_DETNO",
-                new BeanPropertyRowMapper<POSDetail>(POSDetail.class),  id);
-        /*测试用 否则数据太多 不好核对
-        List<POSDetail> detail = baseDao.getJdbcTemplate().query("select * FROM (select * from posreport_syna_det WHERE PD_PsID=? ORDER BY PD_DETNO) where rownum<5",
-                new BeanPropertyRowMapper<POSDetail>(POSDetail.class),  id);*/
-        pos.setItems(detail);
-        return pos;
-    }
-    private PurchaseChange getPC( Integer id){
-        PurchaseChange pc=baseDao.getJdbcTemplate().queryForObject("select pc_id,pc_code,pc_purccode,pc_newcurrency,pc_deliveryparty,pc_isr," +
-                " pu_code ,pu_date,Pu_shipaddresscode " +
-                " from PurchaseChange left join purchase on pc_purccode=pu_code where pc_id=?", new BeanPropertyRowMapper<PurchaseChange>(PurchaseChange.class), id);
-        List<PurchaseChangeDetail> detail = baseDao.getJdbcTemplate().query(
-                "select  pcd_id, pcd_newprodcode, pcd_newqty, pcd_newprice,pcd_pddetno,pcd_newdelivery,pcd_so,pd_custprodcode,pd_ori_price," +
-                        "nvl(pcd_quote,pd_quote) quote," +
-                        "(case when nvl(pcd_oldprice,0)<>nvl(pcd_newprice,0) and nvl(pcd_oldqty,0)<>nvl(pcd_newqty,0) and trunc(pcd_newdelivery) <>trunc(pcd_olddelivery) then 'MU' " +
-                        "      when nvl(pcd_oldprice,0)<>nvl(pcd_newprice,0) and nvl(pcd_oldqty,0)<>nvl(pcd_newqty,0)  then 'PQ' " +
-                        "      when nvl(pcd_oldprice,0)<>nvl(pcd_newprice,0) and trunc(pcd_newdelivery) <>trunc(pcd_olddelivery)  then 'PR' " +
-                        "      when trunc(pcd_newdelivery) <>trunc(pcd_olddelivery)  and nvl(pcd_oldqty,0)<>nvl(pcd_newqty,0) then 'RQ' " +
-                        "      when trunc(pcd_newdelivery) <>trunc(pcd_olddelivery) then 'RS' " +
-                        "      when nvl(pcd_oldprice,0)<>nvl(pcd_newprice,0) then 'PC' " +
-                        "      when nvl(pcd_oldqty,0)>nvl(pcd_newqty,0) then 'QD' " +
-                        "      when nvl(pcd_oldqty,0)<nvl(pcd_newqty,0) then 'QI' " +
-                        " end ) changetype," +
-                        "pu_date," +
-                        "pd_qty-nvl(pd_yqty,0) pd_leftqty," +
-                        "pr_orispeccode " +
-                        "from PurchaseChange left join PurchaseChangedetail on pcd_pcid=pc_id " +
-                        " left join Purchase on pc_purccode=pu_code" +
-                        " left join Purchasedetail on pd_puid=pu_id and pcd_pddetno=pd_detno " +
-                        " left join product on pcd_newprodcode =pr_code" +
-                        " where pc_id=? order by pcd_detno", new BeanPropertyRowMapper<PurchaseChangeDetail>(PurchaseChangeDetail.class),
-                id);
-        pc.setItems(detail);
-        return pc;
-    }
-    private Purchase getPO( Integer id){
-        Purchase po=baseDao.getJdbcTemplate().queryForObject("select * from Purchase where pu_id=?", new BeanPropertyRowMapper<Purchase>(Purchase.class), id);
-        List<PurchaseDetail> detail = baseDao.getJdbcTemplate().query(
-                "select  pd_detno, pd_qty, pd_price, pd_delivery,pd_custprodcode,pd_prodcode,pd_quote,pr_orispeccode,PD_SHIPPINGINSTRUCTION " +
-                        "from Purchasedetail left join product on pd_prodcode=pr_code where pd_puid=? order by pd_detno", new BeanPropertyRowMapper<PurchaseDetail>(PurchaseDetail.class),
-                id);
-        po.setItems(detail);
-        return po;
-    }
-    private String getEDIId(String master){
-        String ediId = baseDao.getJdbcTemplate()
-                .queryForObject("select lpad("+master+".EDI_SYNAPTICS_SEQ.nextval,9,'0') from dual", String.class);
-        return ediId;
-    }
-    private Map<String, Object> toSynaptics(String url,String data,String type,int id) throws IOException {
-        logger.info("请求开始:url:{}",url);
-        Map<String, Object> map = new HashMap<String, Object>();
-        String username=synaConfig.getUsername();
-        String password=synaConfig.getPassword();
-        String auth=username + ":" + password;
-        String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes());
-        String authHeader = "Basic " + encodedAuth;
-        OkHttpClient client = new OkHttpClient().newBuilder().build();
-        MediaType mediaType = MediaType.parse("application/EDI-X12");
-        RequestBody body = RequestBody.create(mediaType, data);
-        Request request = new Request.Builder()
-                .url(url)
-                .method("POST", body)
-                .addHeader("Content-Type", "application/EDI-X12")
-                .addHeader("Authorization", authHeader)
-                .build();
-        Response response = client.newCall(request).execute();
-        logger.info("response.code:{}",response.code());
-        System.out.println(response.code());
-        System.out.println(response.headers().get("x-oracle-ics-instance-id"));
-        map.put("code",response.code());
-        map.put("x-oracle-ics-instance-id",response.headers().get("x-oracle-ics-instance-id"));
-        //记录日志
-        String flagStr=response.headers().get("x-oracle-ics-instance-id")==null?"":response.headers().get("x-oracle-ics-instance-id");
-        logSyna(type,id,flagStr,String.valueOf(response.code()));
-        return map;
-    }
-
-    private void logSyna(String type,int id,String flagStr,String responseCode){
-        baseDao.execute("insert into edi_syna_log(id_,type_,pageid,date_,flag_,responsecode_)" +
-                " values(edi_syna_log_seq.nextval,'"+type+"',"+id+",sysdate,'"+flagStr+"','"+responseCode+"')");
-    }
-}

+ 0 - 15
src/main/java/com/uas/eis/service/SynaService.java

@@ -1,15 +0,0 @@
-package com.uas.eis.service;
-
-
-import io.xlate.edi.schema.EDISchemaException;
-import io.xlate.edi.stream.EDIStreamException;
-
-import java.io.IOException;
-import java.util.Map;
-
-public interface SynaService {
-    Map<String, Object> sendPurchaseToSyna(String master, Integer id) throws EDISchemaException, EDIStreamException, IOException;
-    Map<String, Object> sendPurchaseChangeToSyna(String master, Integer id) throws EDISchemaException, EDIStreamException, IOException;
-    Map<String, Object> sendPosToSyna(String master, Integer id) throws EDISchemaException, EDIStreamException, IOException;
-
-}

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini