Forráskód Böngészése

jd拉取打印测试类

zmm 3 éve
szülő
commit
eb15b0eea2
28 módosított fájl, 1481 hozzáadás és 59 törlés
  1. 4 0
      build.gradle
  2. BIN
      lib/open-api-sdk-2.0.jar
  3. 82 0
      src/main/java/com/cwms/qm/model/jd/pullData/PrePrintDataInfo.java
  4. 52 0
      src/main/java/com/cwms/qm/model/jd/pullData/PrintingPrintDataPullDataRequest.java
  5. 29 0
      src/main/java/com/cwms/qm/model/jd/pullData/PrintingPrintDataPullDataResponse.java
  6. 70 0
      src/main/java/com/cwms/qm/model/jd/pullData/PullDataReqDTO.java
  7. 69 0
      src/main/java/com/cwms/qm/model/jd/pullData/PullDataRespDTO.java
  8. 68 0
      src/main/java/com/cwms/qm/model/jd/pullData/WayBillInfo.java
  9. 54 0
      src/main/java/com/cwms/qm/model/jd/template/ColumnDo.java
  10. 139 0
      src/main/java/com/cwms/qm/model/jd/template/CustomAreaDo.java
  11. 69 0
      src/main/java/com/cwms/qm/model/jd/template/CustomAreaKeyResult.java
  12. 82 0
      src/main/java/com/cwms/qm/model/jd/template/GetTemplateListReqDTO.java
  13. 54 0
      src/main/java/com/cwms/qm/model/jd/template/GetTemplateListRespDTO.java
  14. 82 0
      src/main/java/com/cwms/qm/model/jd/template/IsvResourceDo.java
  15. 53 0
      src/main/java/com/cwms/qm/model/jd/template/PrintingTemplateGetTemplateListRequest.java
  16. 28 0
      src/main/java/com/cwms/qm/model/jd/template/PrintingTemplateGetTemplateListResponse.java
  17. 41 0
      src/main/java/com/cwms/qm/model/jd/template/StandardTemplate.java
  18. 68 0
      src/main/java/com/cwms/qm/model/jd/template/StandardTemplateDTO.java
  19. 69 0
      src/main/java/com/cwms/qm/model/jd/template/TemplateDTO.java
  20. 41 0
      src/main/java/com/cwms/qm/model/jd/template/UserTemplate.java
  21. 69 0
      src/main/java/com/cwms/qm/model/jd/template/UserTemplateDTO.java
  22. 144 0
      src/main/java/com/cwms/qm/model/jdDto.java
  23. 13 3
      src/main/java/com/cwms/qm/model/outorder/OrderLine.java
  24. 12 0
      src/main/java/com/cwms/qm/model/outorder/ReceiverInfo.java
  25. 41 26
      src/test/java/DeliveryOrderTest.java
  26. 38 21
      src/test/java/QmCancelTest.java
  27. 1 1
      src/test/java/SingleItemTest.java
  28. 9 8
      src/test/java/omsPickInboundTest.java

+ 4 - 0
build.gradle

@@ -24,11 +24,14 @@ sourceCompatibility = 1.8
 repositories {
     mavenLocal()
     maven {url "http://maven.aliyun.com/nexus/content/groups/public/"}
+    maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
 }
 
 
 dependencies {
     compile('org.springframework.boot:spring-boot-starter')
+    compile 'org.codehaus.jackson:jackson-core-asl:1.9.9'
+    compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.9'
     testCompile('org.springframework.boot:spring-boot-starter-test')
     compile("org.springframework.boot:spring-boot-starter-web")
     compile("org.springframework.boot:spring-boot-starter-aop")
@@ -38,6 +41,7 @@ dependencies {
     compile("org.javassist:javassist")
     compile("org.jboss.netty:netty:3.2.10.Final")
     compile 'com.alibaba:fastjson:1.2.23'
+    compile 'cn.hutool:hutool-all:4.5.10'
     compile 'org.apache.httpcomponents:httpclient:4.3.5'
     compile 'commons-beanutils:commons-beanutils-core:1.8.3'
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'

BIN
lib/open-api-sdk-2.0.jar


+ 82 - 0
src/main/java/com/cwms/qm/model/jd/pullData/PrePrintDataInfo.java

@@ -0,0 +1,82 @@
+package com.cwms.qm.model.jd.pullData;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+
+public class PrePrintDataInfo implements Serializable
+{
+    private String wayBillNo;
+
+    private String code;
+
+    private String msg;
+
+    private String perPrintData;
+
+    private String packageCode;
+
+    public PrePrintDataInfo()
+    {
+    }
+
+    @JsonProperty("wayBillNo")
+    public void setWayBillNo(String wayBillNo)
+    {
+        this.wayBillNo = wayBillNo;
+    }
+
+    @JsonProperty("wayBillNo")
+    public String getWayBillNo()
+    {
+        return this.wayBillNo;
+    }
+
+    @JsonProperty("code")
+    public void setCode(String code)
+    {
+        this.code = code;
+    }
+
+    @JsonProperty("code")
+    public String getCode()
+    {
+        return this.code;
+    }
+
+    @JsonProperty("msg")
+    public void setMsg(String msg)
+    {
+        this.msg = msg;
+    }
+
+    @JsonProperty("msg")
+    public String getMsg()
+    {
+        return this.msg;
+    }
+
+    @JsonProperty("perPrintData")
+    public void setPerPrintData(String perPrintData)
+    {
+        this.perPrintData = perPrintData;
+    }
+
+    @JsonProperty("perPrintData")
+    public String getPerPrintData()
+    {
+        return this.perPrintData;
+    }
+
+    @JsonProperty("packageCode")
+    public void setPackageCode(String packageCode)
+    {
+        this.packageCode = packageCode;
+    }
+
+    @JsonProperty("packageCode")
+    public String getPackageCode()
+    {
+        return this.packageCode;
+    }
+}

+ 52 - 0
src/main/java/com/cwms/qm/model/jd/pullData/PrintingPrintDataPullDataRequest.java

@@ -0,0 +1,52 @@
+package com.cwms.qm.model.jd.pullData;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+import com.jd.open.api.sdk.internal.util.JsonUtil;
+import com.jd.open.api.sdk.request.AbstractRequest;
+import com.jd.open.api.sdk.request.JdRequest;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class PrintingPrintDataPullDataRequest extends AbstractRequest
+    implements JdRequest<PrintingPrintDataPullDataResponse>
+{
+    private PullDataReqDTO param1;
+
+    public PrintingPrintDataPullDataRequest()
+    {
+    }
+
+    public String getApiMethod()
+    {
+        return "jingdong.printing.printData.pullData";
+    }
+
+    public String getAppJsonParams()
+        throws IOException
+    {
+        Map<String, Object> pmap = new TreeMap();
+        pmap.put("param1", this.param1);
+        return JsonUtil.toJson(pmap);
+    }
+
+    public Class<PrintingPrintDataPullDataResponse> getResponseClass()
+    {
+        return PrintingPrintDataPullDataResponse.class;
+    }
+
+    @JsonProperty("param1")
+    public void setParam1(PullDataReqDTO param1)
+    {
+        this.param1 = param1;
+    }
+
+    @JsonProperty("param1")
+    public PullDataReqDTO getParam1()
+    {
+        return this.param1;
+    }
+
+
+}

+ 29 - 0
src/main/java/com/cwms/qm/model/jd/pullData/PrintingPrintDataPullDataResponse.java

@@ -0,0 +1,29 @@
+package com.cwms.qm.model.jd.pullData;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+import com.jd.open.api.sdk.response.AbstractResponse;
+
+public class PrintingPrintDataPullDataResponse extends AbstractResponse
+{
+    private PullDataRespDTO returnType;
+
+    public PrintingPrintDataPullDataResponse()
+    {
+    }
+
+    @JsonProperty("returnType")
+    public void setReturnType(PullDataRespDTO returnType)
+    {
+        this.returnType = returnType;
+    }
+
+    @JsonProperty("returnType")
+    public PullDataRespDTO getReturnType()
+    {
+        return this.returnType;
+    }
+
+
+
+
+}

+ 70 - 0
src/main/java/com/cwms/qm/model/jd/pullData/PullDataReqDTO.java

@@ -0,0 +1,70 @@
+package com.cwms.qm.model.jd.pullData;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+public class PullDataReqDTO implements Serializable
+{
+    private String objectId;
+
+    private Map<String, String> parameters;
+
+    private List<WayBillInfo> wayBillInfos;
+
+    private String cpCode;
+
+    public PullDataReqDTO()
+    {
+    }
+
+    @JsonProperty("objectId")
+    public void setObjectId(String objectId)
+    {
+        this.objectId = objectId;
+    }
+
+    @JsonProperty("objectId")
+    public String getObjectId()
+    {
+        return this.objectId;
+    }
+
+    @JsonProperty("parameters")
+    public void setParameters(Map<String, String> parameters)
+    {
+        this.parameters = parameters;
+    }
+
+    @JsonProperty("parameters")
+    public Map<String, String> getParameters()
+    {
+        return this.parameters;
+    }
+
+    @JsonProperty("wayBillInfos")
+    public void setWayBillInfos(List<WayBillInfo> wayBillInfos)
+    {
+        this.wayBillInfos = wayBillInfos;
+    }
+
+    @JsonProperty("wayBillInfos")
+    public List<WayBillInfo> getWayBillInfos()
+    {
+        return this.wayBillInfos;
+    }
+
+    @JsonProperty("cpCode")
+    public void setCpCode(String cpCode)
+    {
+        this.cpCode = cpCode;
+    }
+
+    @JsonProperty("cpCode")
+    public String getCpCode()
+    {
+        return this.cpCode;
+    }
+}

+ 69 - 0
src/main/java/com/cwms/qm/model/jd/pullData/PullDataRespDTO.java

@@ -0,0 +1,69 @@
+package com.cwms.qm.model.jd.pullData;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class PullDataRespDTO implements Serializable
+{
+    private String message;
+
+    private List<PrePrintDataInfo> prePrintDatas;
+
+    private String objectId;
+
+    private String code;
+
+    public PullDataRespDTO()
+    {
+    }
+
+    @JsonProperty("message")
+    public void setMessage(String message)
+    {
+        this.message = message;
+    }
+
+    @JsonProperty("message")
+    public String getMessage()
+    {
+        return this.message;
+    }
+
+    @JsonProperty("prePrintDatas")
+    public void setPrePrintDatas(List<PrePrintDataInfo> prePrintDatas)
+    {
+        this.prePrintDatas = prePrintDatas;
+    }
+
+    @JsonProperty("prePrintDatas")
+    public List<PrePrintDataInfo> getPrePrintDatas()
+    {
+        return this.prePrintDatas;
+    }
+
+    @JsonProperty("objectId")
+    public void setObjectId(String objectId)
+    {
+        this.objectId = objectId;
+    }
+
+    @JsonProperty("objectId")
+    public String getObjectId()
+    {
+        return this.objectId;
+    }
+
+    @JsonProperty("code")
+    public void setCode(String code)
+    {
+        this.code = code;
+    }
+
+    @JsonProperty("code")
+    public String getCode()
+    {
+        return this.code;
+    }
+}

+ 68 - 0
src/main/java/com/cwms/qm/model/jd/pullData/WayBillInfo.java

@@ -0,0 +1,68 @@
+package com.cwms.qm.model.jd.pullData;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+
+public class WayBillInfo implements Serializable
+{
+    private String orderNo;
+
+    private Integer popFlag;
+
+    private String wayBillCode;
+
+    private String jdWayBillCode;
+
+    public WayBillInfo()
+    {
+    }
+
+    @JsonProperty("orderNo")
+    public void setOrderNo(String orderNo)
+    {
+        this.orderNo = orderNo;
+    }
+
+    @JsonProperty("orderNo")
+    public String getOrderNo()
+    {
+        return this.orderNo;
+    }
+
+    @JsonProperty("popFlag")
+    public void setPopFlag(Integer popFlag)
+    {
+        this.popFlag = popFlag;
+    }
+
+    @JsonProperty("popFlag")
+    public Integer getPopFlag()
+    {
+        return this.popFlag;
+    }
+
+    @JsonProperty("wayBillCode")
+    public void setWayBillCode(String wayBillCode)
+    {
+        this.wayBillCode = wayBillCode;
+    }
+
+    @JsonProperty("wayBillCode")
+    public String getWayBillCode()
+    {
+        return this.wayBillCode;
+    }
+
+    @JsonProperty("jdWayBillCode")
+    public void setJdWayBillCode(String jdWayBillCode)
+    {
+        this.jdWayBillCode = jdWayBillCode;
+    }
+
+    @JsonProperty("jdWayBillCode")
+    public String getJdWayBillCode()
+    {
+        return this.jdWayBillCode;
+    }
+}

+ 54 - 0
src/main/java/com/cwms/qm/model/jd/template/ColumnDo.java

@@ -0,0 +1,54 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+
+public class ColumnDo implements Serializable
+{
+    private String key;
+
+    private String name;
+
+    private String type;
+
+    public ColumnDo()
+    {
+    }
+
+    @JsonProperty("key")
+    public void setKey(String key)
+    {
+        this.key = key;
+    }
+
+    @JsonProperty("key")
+    public String getKey()
+    {
+        return this.key;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    @JsonProperty("name")
+    public String getName()
+    {
+        return this.name;
+    }
+
+    @JsonProperty("type")
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    @JsonProperty("type")
+    public String getType()
+    {
+        return this.type;
+    }
+}

+ 139 - 0
src/main/java/com/cwms/qm/model/jd/template/CustomAreaDo.java

@@ -0,0 +1,139 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class CustomAreaDo implements Serializable
+{
+    private Integer customAreaId;
+
+    private String customAreaUrl;
+
+    private List<String> keys;
+
+    private String customAreaName;
+
+    private String cpCode;
+
+    private String standardTemplateUrl;
+
+    private String standardTemplateId;
+
+    private String standardTemplateName;
+
+    private List<CustomAreaKeyResult> customAreaKeys;
+
+    public CustomAreaDo()
+    {
+    }
+
+    @JsonProperty("customAreaId")
+    public void setCustomAreaId(Integer customAreaId)
+    {
+        this.customAreaId = customAreaId;
+    }
+
+    @JsonProperty("customAreaId")
+    public Integer getCustomAreaId()
+    {
+        return this.customAreaId;
+    }
+
+    @JsonProperty("customAreaUrl")
+    public void setCustomAreaUrl(String customAreaUrl)
+    {
+        this.customAreaUrl = customAreaUrl;
+    }
+
+    @JsonProperty("customAreaUrl")
+    public String getCustomAreaUrl()
+    {
+        return this.customAreaUrl;
+    }
+
+    @JsonProperty("keys")
+    public void setKeys(List<String> keys)
+    {
+        this.keys = keys;
+    }
+
+    @JsonProperty("keys")
+    public List<String> getKeys()
+    {
+        return this.keys;
+    }
+
+    @JsonProperty("customAreaName")
+    public void setCustomAreaName(String customAreaName)
+    {
+        this.customAreaName = customAreaName;
+    }
+
+    @JsonProperty("customAreaName")
+    public String getCustomAreaName()
+    {
+        return this.customAreaName;
+    }
+
+    @JsonProperty("cpCode")
+    public void setCpCode(String cpCode)
+    {
+        this.cpCode = cpCode;
+    }
+
+    @JsonProperty("cpCode")
+    public String getCpCode()
+    {
+        return this.cpCode;
+    }
+
+    @JsonProperty("standardTemplateUrl")
+    public void setStandardTemplateUrl(String standardTemplateUrl)
+    {
+        this.standardTemplateUrl = standardTemplateUrl;
+    }
+
+    @JsonProperty("standardTemplateUrl")
+    public String getStandardTemplateUrl()
+    {
+        return this.standardTemplateUrl;
+    }
+
+    @JsonProperty("standardTemplateId")
+    public void setStandardTemplateId(String standardTemplateId)
+    {
+        this.standardTemplateId = standardTemplateId;
+    }
+
+    @JsonProperty("standardTemplateId")
+    public String getStandardTemplateId()
+    {
+        return this.standardTemplateId;
+    }
+
+    @JsonProperty("standardTemplateName")
+    public void setStandardTemplateName(String standardTemplateName)
+    {
+        this.standardTemplateName = standardTemplateName;
+    }
+
+    @JsonProperty("standardTemplateName")
+    public String getStandardTemplateName()
+    {
+        return this.standardTemplateName;
+    }
+
+    @JsonProperty("customAreaKeys")
+    public void setCustomAreaKeys(List<CustomAreaKeyResult> customAreaKeys)
+    {
+        this.customAreaKeys = customAreaKeys;
+    }
+
+    @JsonProperty("customAreaKeys")
+    public List<CustomAreaKeyResult> getCustomAreaKeys()
+    {
+        return this.customAreaKeys;
+    }
+}

+ 69 - 0
src/main/java/com/cwms/qm/model/jd/template/CustomAreaKeyResult.java

@@ -0,0 +1,69 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class CustomAreaKeyResult implements Serializable
+{
+    private String key;
+
+    private String type;
+
+    private String name;
+
+    private List<ColumnDo> columns;
+
+    public CustomAreaKeyResult()
+    {
+    }
+
+    @JsonProperty("key")
+    public void setKey(String key)
+    {
+        this.key = key;
+    }
+
+    @JsonProperty("key")
+    public String getKey()
+    {
+        return this.key;
+    }
+
+    @JsonProperty("type")
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    @JsonProperty("type")
+    public String getType()
+    {
+        return this.type;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    @JsonProperty("name")
+    public String getName()
+    {
+        return this.name;
+    }
+
+    @JsonProperty("columns")
+    public void setColumns(List<ColumnDo> columns)
+    {
+        this.columns = columns;
+    }
+
+    @JsonProperty("columns")
+    public List<ColumnDo> getColumns()
+    {
+        return this.columns;
+    }
+}

+ 82 - 0
src/main/java/com/cwms/qm/model/jd/template/GetTemplateListReqDTO.java

@@ -0,0 +1,82 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+
+public class GetTemplateListReqDTO implements Serializable
+{
+    private String templateId;
+
+    private String templateType;
+
+    private String wayTempleteType;
+
+    private String cpCode;
+
+    private String isvResourceType;
+
+    public GetTemplateListReqDTO()
+    {
+    }
+
+    @JsonProperty("templateId")
+    public void setTemplateId(String templateId)
+    {
+        this.templateId = templateId;
+    }
+
+    @JsonProperty("templateId")
+    public String getTemplateId()
+    {
+        return this.templateId;
+    }
+
+    @JsonProperty("templateType")
+    public void setTemplateType(String templateType)
+    {
+        this.templateType = templateType;
+    }
+
+    @JsonProperty("templateType")
+    public String getTemplateType()
+    {
+        return this.templateType;
+    }
+
+    @JsonProperty("wayTempleteType")
+    public void setWayTempleteType(String wayTempleteType)
+    {
+        this.wayTempleteType = wayTempleteType;
+    }
+
+    @JsonProperty("wayTempleteType")
+    public String getWayTempleteType()
+    {
+        return this.wayTempleteType;
+    }
+
+    @JsonProperty("cpCode")
+    public void setCpCode(String cpCode)
+    {
+        this.cpCode = cpCode;
+    }
+
+    @JsonProperty("cpCode")
+    public String getCpCode()
+    {
+        return this.cpCode;
+    }
+
+    @JsonProperty("isvResourceType")
+    public void setIsvResourceType(String isvResourceType)
+    {
+        this.isvResourceType = isvResourceType;
+    }
+
+    @JsonProperty("isvResourceType")
+    public String getIsvResourceType()
+    {
+        return this.isvResourceType;
+    }
+}

+ 54 - 0
src/main/java/com/cwms/qm/model/jd/template/GetTemplateListRespDTO.java

@@ -0,0 +1,54 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+
+public class GetTemplateListRespDTO implements Serializable
+{
+    private String message;
+
+    private String code;
+
+    private TemplateDTO datas;
+
+    public GetTemplateListRespDTO()
+    {
+    }
+
+    @JsonProperty("message")
+    public void setMessage(String message)
+    {
+        this.message = message;
+    }
+
+    @JsonProperty("message")
+    public String getMessage()
+    {
+        return this.message;
+    }
+
+    @JsonProperty("code")
+    public void setCode(String code)
+    {
+        this.code = code;
+    }
+
+    @JsonProperty("code")
+    public String getCode()
+    {
+        return this.code;
+    }
+
+    @JsonProperty("datas")
+    public void setDatas(TemplateDTO datas)
+    {
+        this.datas = datas;
+    }
+
+    @JsonProperty("datas")
+    public TemplateDTO getDatas()
+    {
+        return this.datas;
+    }
+}

+ 82 - 0
src/main/java/com/cwms/qm/model/jd/template/IsvResourceDo.java

@@ -0,0 +1,82 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+
+public class IsvResourceDo implements Serializable
+{
+    private String resourceContent;
+
+    private Integer resourceId;
+
+    private String resourceName;
+
+    private String resourceType;
+
+    private String resourceUrl;
+
+    public IsvResourceDo()
+    {
+    }
+
+    @JsonProperty("resourceContent")
+    public void setResourceContent(String resourceContent)
+    {
+        this.resourceContent = resourceContent;
+    }
+
+    @JsonProperty("resourceContent")
+    public String getResourceContent()
+    {
+        return this.resourceContent;
+    }
+
+    @JsonProperty("resourceId")
+    public void setResourceId(Integer resourceId)
+    {
+        this.resourceId = resourceId;
+    }
+
+    @JsonProperty("resourceId")
+    public Integer getResourceId()
+    {
+        return this.resourceId;
+    }
+
+    @JsonProperty("resourceName")
+    public void setResourceName(String resourceName)
+    {
+        this.resourceName = resourceName;
+    }
+
+    @JsonProperty("resourceName")
+    public String getResourceName()
+    {
+        return this.resourceName;
+    }
+
+    @JsonProperty("resourceType")
+    public void setResourceType(String resourceType)
+    {
+        this.resourceType = resourceType;
+    }
+
+    @JsonProperty("resourceType")
+    public String getResourceType()
+    {
+        return this.resourceType;
+    }
+
+    @JsonProperty("resourceUrl")
+    public void setResourceUrl(String resourceUrl)
+    {
+        this.resourceUrl = resourceUrl;
+    }
+
+    @JsonProperty("resourceUrl")
+    public String getResourceUrl()
+    {
+        return this.resourceUrl;
+    }
+}

+ 53 - 0
src/main/java/com/cwms/qm/model/jd/template/PrintingTemplateGetTemplateListRequest.java

@@ -0,0 +1,53 @@
+package com.cwms.qm.model.jd.template;
+
+import com.alibaba.fastjson.JSON;
+import com.jd.open.api.sdk.request.AbstractRequest;
+import com.jd.open.api.sdk.request.JdRequest;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class PrintingTemplateGetTemplateListRequest extends AbstractRequest
+    implements JdRequest<PrintingTemplateGetTemplateListResponse>
+{
+    private GetTemplateListReqDTO param1;
+
+    public PrintingTemplateGetTemplateListRequest()
+    {
+    }
+
+    public String getApiMethod()
+    {
+        return "jingdong.printing.template.getTemplateList";
+    }
+
+    public String getAppJsonParams()
+        throws IOException
+    {
+        Map<String, Object> pmap = new TreeMap();
+        pmap.put("param1", this.param1);
+        return JSON.toJSONString(pmap);
+    }
+
+    public Class<PrintingTemplateGetTemplateListResponse> getResponseClass()
+    {
+        return PrintingTemplateGetTemplateListResponse.class;
+    }
+
+    @JsonProperty("param1")
+    public void setParam1(GetTemplateListReqDTO param1)
+    {
+        this.param1 = param1;
+    }
+
+    @JsonProperty("param1")
+    public GetTemplateListReqDTO getParam1()
+    {
+        return this.param1;
+    }
+
+
+
+}

+ 28 - 0
src/main/java/com/cwms/qm/model/jd/template/PrintingTemplateGetTemplateListResponse.java

@@ -0,0 +1,28 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+import com.jd.open.api.sdk.response.AbstractResponse;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class PrintingTemplateGetTemplateListResponse extends AbstractResponse
+{
+    private GetTemplateListRespDTO returnType;
+
+    public PrintingTemplateGetTemplateListResponse()
+    {
+    }
+
+    @JsonProperty("returnType")
+    public void setReturnType(GetTemplateListRespDTO returnType)
+    {
+        this.returnType = returnType;
+    }
+
+    @JsonProperty("returnType")
+    public GetTemplateListRespDTO getReturnType()
+    {
+        return this.returnType;
+    }
+}

+ 41 - 0
src/main/java/com/cwms/qm/model/jd/template/StandardTemplate.java

@@ -0,0 +1,41 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class StandardTemplate implements Serializable
+{
+    private String cpCode;
+
+    private List<StandardTemplateDTO> standardTemplates;
+
+    public StandardTemplate()
+    {
+    }
+
+    @JsonProperty("cpCode")
+    public void setCpCode(String cpCode)
+    {
+        this.cpCode = cpCode;
+    }
+
+    @JsonProperty("cpCode")
+    public String getCpCode()
+    {
+        return this.cpCode;
+    }
+
+    @JsonProperty("standardTemplates")
+    public void setStandardTemplates(List<StandardTemplateDTO> standardTemplates)
+    {
+        this.standardTemplates = standardTemplates;
+    }
+
+    @JsonProperty("standardTemplates")
+    public List<StandardTemplateDTO> getStandardTemplates()
+    {
+        return this.standardTemplates;
+    }
+}

+ 68 - 0
src/main/java/com/cwms/qm/model/jd/template/StandardTemplateDTO.java

@@ -0,0 +1,68 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+
+public class StandardTemplateDTO implements Serializable
+{
+    private Integer standardTemplateId;
+
+    private String standardTemplateName;
+
+    private String standardTemplateUrl;
+
+    private String standardWaybillType;
+
+    public StandardTemplateDTO()
+    {
+    }
+
+    @JsonProperty("standardTemplateId")
+    public void setStandardTemplateId(Integer standardTemplateId)
+    {
+        this.standardTemplateId = standardTemplateId;
+    }
+
+    @JsonProperty("standardTemplateId")
+    public Integer getStandardTemplateId()
+    {
+        return this.standardTemplateId;
+    }
+
+    @JsonProperty("standardTemplateName")
+    public void setStandardTemplateName(String standardTemplateName)
+    {
+        this.standardTemplateName = standardTemplateName;
+    }
+
+    @JsonProperty("standardTemplateName")
+    public String getStandardTemplateName()
+    {
+        return this.standardTemplateName;
+    }
+
+    @JsonProperty("standardTemplateUrl")
+    public void setStandardTemplateUrl(String standardTemplateUrl)
+    {
+        this.standardTemplateUrl = standardTemplateUrl;
+    }
+
+    @JsonProperty("standardTemplateUrl")
+    public String getStandardTemplateUrl()
+    {
+        return this.standardTemplateUrl;
+    }
+
+    @JsonProperty("standardWaybillType")
+    public void setStandardWaybillType(String standardWaybillType)
+    {
+        this.standardWaybillType = standardWaybillType;
+    }
+
+    @JsonProperty("standardWaybillType")
+    public String getStandardWaybillType()
+    {
+        return this.standardWaybillType;
+    }
+}

+ 69 - 0
src/main/java/com/cwms/qm/model/jd/template/TemplateDTO.java

@@ -0,0 +1,69 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class TemplateDTO implements Serializable
+{
+    private List<StandardTemplate> sDatas;
+
+    private List<UserTemplate> uDatas;
+
+    private List<IsvResourceDo> diyDatas;
+
+    private List<CustomAreaDo> udiyDatas;
+
+    public TemplateDTO()
+    {
+    }
+
+    @JsonProperty("sDatas")
+    public void setSDatas(List<StandardTemplate> sDatas)
+    {
+        this.sDatas = sDatas;
+    }
+
+    @JsonProperty("sDatas")
+    public List<StandardTemplate> getSDatas()
+    {
+        return this.sDatas;
+    }
+
+    @JsonProperty("uDatas")
+    public void setUDatas(List<UserTemplate> uDatas)
+    {
+        this.uDatas = uDatas;
+    }
+
+    @JsonProperty("uDatas")
+    public List<UserTemplate> getUDatas()
+    {
+        return this.uDatas;
+    }
+
+    @JsonProperty("diyDatas")
+    public void setDiyDatas(List<IsvResourceDo> diyDatas)
+    {
+        this.diyDatas = diyDatas;
+    }
+
+    @JsonProperty("diyDatas")
+    public List<IsvResourceDo> getDiyDatas()
+    {
+        return this.diyDatas;
+    }
+
+    @JsonProperty("udiyDatas")
+    public void setUdiyDatas(List<CustomAreaDo> udiyDatas)
+    {
+        this.udiyDatas = udiyDatas;
+    }
+
+    @JsonProperty("udiyDatas")
+    public List<CustomAreaDo> getUdiyDatas()
+    {
+        return this.udiyDatas;
+    }
+}

+ 41 - 0
src/main/java/com/cwms/qm/model/jd/template/UserTemplate.java

@@ -0,0 +1,41 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class UserTemplate implements Serializable
+{
+    private String cpCode;
+
+    private List<UserTemplateDTO> userStdTemplates;
+
+    public UserTemplate()
+    {
+    }
+
+    @JsonProperty("cpCode")
+    public void setCpCode(String cpCode)
+    {
+        this.cpCode = cpCode;
+    }
+
+    @JsonProperty("cpCode")
+    public String getCpCode()
+    {
+        return this.cpCode;
+    }
+
+    @JsonProperty("userStdTemplates")
+    public void setUserStdTemplates(List<UserTemplateDTO> userStdTemplates)
+    {
+        this.userStdTemplates = userStdTemplates;
+    }
+
+    @JsonProperty("userStdTemplates")
+    public List<UserTemplateDTO> getUserStdTemplates()
+    {
+        return this.userStdTemplates;
+    }
+}

+ 69 - 0
src/main/java/com/cwms/qm/model/jd/template/UserTemplateDTO.java

@@ -0,0 +1,69 @@
+package com.cwms.qm.model.jd.template;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class UserTemplateDTO implements Serializable
+{
+    private List<String> keys;
+
+    private String userStdTemplateUrl;
+
+    private Integer userStdTemplateId;
+
+    private String userStdTemplateName;
+
+    public UserTemplateDTO()
+    {
+    }
+
+    @JsonProperty("keys")
+    public void setKeys(List<String> keys)
+    {
+        this.keys = keys;
+    }
+
+    @JsonProperty("keys")
+    public List<String> getKeys()
+    {
+        return this.keys;
+    }
+
+    @JsonProperty("userStdTemplateUrl")
+    public void setUserStdTemplateUrl(String userStdTemplateUrl)
+    {
+        this.userStdTemplateUrl = userStdTemplateUrl;
+    }
+
+    @JsonProperty("userStdTemplateUrl")
+    public String getUserStdTemplateUrl()
+    {
+        return this.userStdTemplateUrl;
+    }
+
+    @JsonProperty("userStdTemplateId")
+    public void setUserStdTemplateId(Integer userStdTemplateId)
+    {
+        this.userStdTemplateId = userStdTemplateId;
+    }
+
+    @JsonProperty("userStdTemplateId")
+    public Integer getUserStdTemplateId()
+    {
+        return this.userStdTemplateId;
+    }
+
+    @JsonProperty("userStdTemplateName")
+    public void setUserStdTemplateName(String userStdTemplateName)
+    {
+        this.userStdTemplateName = userStdTemplateName;
+    }
+
+    @JsonProperty("userStdTemplateName")
+    public String getUserStdTemplateName()
+    {
+        return this.userStdTemplateName;
+    }
+}

+ 144 - 0
src/main/java/com/cwms/qm/model/jdDto.java

@@ -0,0 +1,144 @@
+package com.cwms.qm.model;
+
+import com.cwms.qm.model.jd.pullData.*;
+import com.cwms.qm.model.jd.template.*;
+import com.jd.open.api.sdk.DefaultJdClient;
+import com.jd.open.api.sdk.JdClient;
+import com.jd.open.api.sdk.JdException;
+
+import java.util.*;
+
+public class jdDto
+{
+    public static void main(String[] args)
+        throws JdException
+    {
+        getTemplate("362fc0934c154aa6a709be64523a67c4mmwo","","1");
+    }
+
+    public static String getPullData(String accessToken,String venderId,String sourceOrderCode,String jdWayBillCode,String cpCode)
+        throws JdException
+    {
+        JdClient client=new DefaultJdClient("https://api.jd.com/routerjson",
+            accessToken,
+            "107CDF48EB97B21EC97DBC5DFC83B3FB",
+            "35404fa6292e44babfd23f82f1ef6081");
+        PrintingPrintDataPullDataRequest request=new PrintingPrintDataPullDataRequest();
+        PullDataReqDTO pullDataReqDTO=new PullDataReqDTO();
+        pullDataReqDTO.setCpCode(cpCode);
+        pullDataReqDTO.setObjectId(sourceOrderCode);//京东平台单号
+        Map<String, String> parameters = new HashMap<>();
+//        parameters.put("ewCustomerCode",customerId);//customerId
+//        parameters.put("eCustomerCode",venderId);//venderId
+        pullDataReqDTO.setParameters(parameters);
+        List<WayBillInfo> wayBillInfos = new ArrayList<>();
+        WayBillInfo wayBillInfo = new WayBillInfo();
+        wayBillInfo.setOrderNo("");
+        wayBillInfo.setPopFlag(0);
+        wayBillInfo.setWayBillCode("");
+        wayBillInfo.setJdWayBillCode(jdWayBillCode);
+        wayBillInfos.add(wayBillInfo);
+        pullDataReqDTO.setWayBillInfos(wayBillInfos);
+//        logger.info("接口 pullData,网关调用请求body 数据" +JSON.toJSON(pullDataReqDTO));
+        request.setParam1(pullDataReqDTO);
+        PrintingPrintDataPullDataResponse response= null;
+        try
+        {
+            response = client.execute(request);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+//        logger.info("接口 pullData,响应数据" +JSON.toJSON(response));
+//        System.out.println("接口 pullData,响应数据" +JSON.toJSON(response));
+        if(response.getReturnType().getCode().equals("1"))
+        {
+            List<PrePrintDataInfo> prePrintDataInfos = response.getReturnType().getPrePrintDatas();
+            for (PrePrintDataInfo prePrintDataInfo : prePrintDataInfos)
+            {
+//                JSONObject jsonPrint = new JSONObject();
+//                jsonPrint.put("printData",prePrintDataInfo.getPerPrintData());
+//                //获取面单Url
+//                String url = getTemplate(accessToken,"JD","1");
+//                jsonPrint.put("templetUrl",url);
+//                logger.info("接口 pullData,响应数据" +JSON.toJSON(jsonPrint));
+                return prePrintDataInfo.getPerPrintData();
+            }
+
+//            logger.info("接口 pullData,响应数据" + JSON.toJSON(prePrintDataInfos));//所有物流公司标准模板列表
+        }
+        else
+        {
+//            throw new CommonException("京东获取打印数据响应报文报错" + response.getReturnType().getMessage());
+        }
+
+//        System.out.println(JSON.toJSON(response).toString());//ISV自定义模板以及自定义项内容
+        return null;
+    }
+
+    /**
+     *
+     * @param accessToken 授权token
+     * @param cpCode 承运商
+     * @param standardWaybillType 面单类型:1 快递标准面单 ,2 快递三联面单, 3 快递便携式三联单, 4 快运标准面单, 5 快运三联面单, 6 快递一联单
+     * @return
+     * @throws JdException
+     */
+    public static String getTemplate(String accessToken,String cpCode,String standardWaybillType)
+        throws JdException
+    {
+        String url = "https://api.jd.com/routerjson";
+        String key = "107CDF48EB97B21EC97DBC5DFC83B3FB";
+        String appSecret = "35404fa6292e44babfd23f82f1ef6081";
+        url = "https://api.jd.com/routerjson";
+        key = "107CDF48EB97B21EC97DBC5DFC83B3FB";
+        appSecret = "35404fa6292e44babfd23f82f1ef6081";
+//        accessToken = "362fc0934c154aa6a709be64523a67c4mmwo";
+
+        JdClient client=new DefaultJdClient(url,
+            accessToken,
+            key,
+            appSecret);
+
+        PrintingTemplateGetTemplateListRequest request=new PrintingTemplateGetTemplateListRequest();
+        GetTemplateListReqDTO param1=new GetTemplateListReqDTO();
+        param1.setCpCode(cpCode);
+        request.setParam1(param1);
+        PrintingTemplateGetTemplateListResponse response= null;
+        try
+        {
+            response = client.execute(request);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        if(response.getReturnType().getCode().equals("1"))
+        {
+//            System.out.println(JSON.toJSON(response.getReturnType().getDatas().getSDatas().get(0)).toString());//所有物流公司标准模板列表
+            List<StandardTemplate> standardTemplateList = response.getReturnType().getDatas().getSDatas();
+            for (StandardTemplate standardTemplate : standardTemplateList)
+            {
+                List<StandardTemplateDTO> standardTemplateDTOList = standardTemplate.getStandardTemplates();
+                for (StandardTemplateDTO standardTemplateDTO : standardTemplateDTOList)
+                {
+                    if(standardTemplateDTO.getStandardWaybillType().equals(standardWaybillType))
+                    {
+                        return standardTemplateDTO.getStandardTemplateUrl();
+                    }
+                }
+
+            }
+//            System.out.println(JSON.toJSON(response.getReturnType().getDatas().getDiyDatas()).toString());//ISV自定义模板以及自定义项内容
+            System.out.println(response.getReturnType().getDatas().getUDatas());//用户使用的模板
+            System.out.println(response.getReturnType().getDatas().getUdiyDatas());//商家自定义区内容
+        }
+        else
+        {
+//            throw new CommonException("京东获取打印模板响应报文报错" + response.getReturnType().getMessage());
+        }
+        return "";
+    }
+
+}

+ 13 - 3
src/main/java/com/cwms/qm/model/outorder/OrderLine.java

@@ -1,7 +1,5 @@
 package com.cwms.qm.model.outorder;
 
-import javax.xml.bind.annotation.XmlElement;
-
 public class OrderLine
 {
     private String orderLineNo;
@@ -20,7 +18,9 @@ public class OrderLine
 
     private Double actualPrice;
 
-    protected String sourceOrderCode;
+    private String sourceOrderCode;
+
+    private String subSourceOrderCode;
 
     public Double getActualPrice()
     {
@@ -111,4 +111,14 @@ public class OrderLine
     {
         this.sourceOrderCode = sourceOrderCode;
     }
+
+    public String getSubSourceOrderCode()
+    {
+        return subSourceOrderCode;
+    }
+
+    public void setSubSourceOrderCode(String subSourceOrderCode)
+    {
+        this.subSourceOrderCode = subSourceOrderCode;
+    }
 }

+ 12 - 0
src/main/java/com/cwms/qm/model/outorder/ReceiverInfo.java

@@ -26,6 +26,18 @@ public class ReceiverInfo
 
     private String detailAddress;
 
+    private String oaid;
+
+    public String getOaid()
+    {
+        return oaid;
+    }
+
+    public void setOaid(String oaid)
+    {
+        this.oaid = oaid;
+    }
+
     public String getTown()
     {
         return town;

+ 41 - 26
src/test/java/DeliveryOrderTest.java

@@ -1,18 +1,22 @@
 import com.cwms.qm.model.outorder.*;
-import com.cwms.qm.model.sitem.Item;
-import com.cwms.qm.model.sitem.SingleItem;
 import com.cwms.qm.util.QimenSignUtils;
 import com.cwms.qm.util.WebUtils;
+import com.taobao.api.Constants;
+import com.taobao.api.internal.util.StringUtils;
 
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.security.GeneralSecurityException;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Map;
-import java.util.Random;
 
 public class DeliveryOrderTest
 {
@@ -21,8 +25,8 @@ public class DeliveryOrderTest
     public static void main(String[] args)
         throws JAXBException, IOException
     {
-        System.out.println(new Date());
-//        for (int i=0;i<=4;i++)
+//        System.out.println(new Date());
+//        for (int i=0;i<=100;i++)
         {
             create();
         }
@@ -36,41 +40,52 @@ public class DeliveryOrderTest
         deliveryOrder.setPlaceOrderTime(sdf.format(new Date()));
         deliveryOrder.setCreateTime(sdf.format(new Date()));
         deliveryOrder.setOperateTime(sdf.format(new Date()));
-        deliveryOrder.setDeliveryOrderCode("JYS2108185560");
-        deliveryOrder.setLogisticsCode("ZTO");
-        deliveryOrder.setLogisticsAreaCode("大头笔");
+        deliveryOrder.setDeliveryOrderCode("49525752058-SDO188827561136");
+        deliveryOrder.setLogisticsCode("YTOJD");
+        deliveryOrder.setLogisticsAreaCode("");
         deliveryOrder.setOrderType("JYCK");
         deliveryOrder.setWarehouseCode("PKZXC");
-        deliveryOrder.setShopNick("(001.037)抖音finish官方旗舰店");
+        deliveryOrder.setShopNick("抖音汤臣倍健享康专卖店");
         deliveryOrder.setSourcePlatformCode("DYXD");
-        deliveryOrder.setExpressCode("SF1882623965105");
+        deliveryOrder.setExpressCode("");
         ReceiverInfo receiverInfo = new ReceiverInfo();
         receiverInfo.setCountryCode("中国");
-        receiverInfo.setProvince("吉林省");
-        receiverInfo.setCity("长春市");
-        receiverInfo.setArea("南关区");
-        receiverInfo.setDetailAddress("吉林省 长春市 南关区 长春明珠小区D28-2-1102");
-        receiverInfo.setMobile("18686654653");
-        receiverInfo.setName("蒋蕾");
+        receiverInfo.setProvince("西藏自治区");
+        receiverInfo.setCity("林芝市");
+        receiverInfo.setArea("巴宜区");
+        receiverInfo.setTown("");
+        receiverInfo.setDetailAddress("西藏自治区 林芝市 巴宜区 八一镇 幸福小区蜜雪冰城");
+        receiverInfo.setMobile("15739076970");
+        receiverInfo.setZipCode("000000");
+        receiverInfo.setName("银琪琦");
+        receiverInfo.setOaid("");
         deliveryOrder.setReceiverInfo(receiverInfo);
         deliveryOrderDto.setDeliveryOrder(deliveryOrder);
         SenderInfo senderInfo = new SenderInfo();
-        senderInfo.setName("上海颂琪");
-        senderInfo.setProvince("上海");
-        senderInfo.setCity("上海市");
-        senderInfo.setDetailAddress("崧辉路100号");
-        senderInfo.setMobile("021-623185959");
+        senderInfo.setName("孙志坤");
+        senderInfo.setProvince("江苏省");
+        senderInfo.setCity("南京市");
+        senderInfo.setArea("江宁区");
+        senderInfo.setTown("");
+        senderInfo.setDetailAddress("启航大道1号A3-25号门(空港跨境电子商务产业园)");
+        senderInfo.setMobile("15205152575");
+        senderInfo.setTel("");
+        senderInfo.setCompany(" ");
+        senderInfo.setCountryCode(" ");
         deliveryOrder.setSenderInfo(senderInfo);
         OrderLines orderLines = new OrderLines();
         OrderLine item1 = new OrderLine();
-        item1.setItemCode("E03447E201044");
+//        item1.setItemCode("6971539461140");//AHLCJK
+        item1.setItemCode("E03447E201044");//PK
+//        item1.setItemId("ST2106070000002");
+//        item1.setItemName("309.00;309.00;309.00");
         item1.setInventoryType("ZP");
-        item1.setItemName("COCOVEL五月玫瑰空气感香氛护发乳500ml");
         item1.setOrderLineNo("1");
         item1.setOwnerCode("PK");
-        item1.setActualPrice(75d);
+        item1.setActualPrice(409d);
         item1.setPlanQty("1");
-        item1.setSourceOrderCode("4832647319721934679");
+        item1.setSourceOrderCode("4821550945298734897");
+        item1.setSubSourceOrderCode("4821550945298734897");
         orderLines.getOrderLine().add(item1);
 //        OrderLine item2 = new OrderLine();
 //       item2.setItemCode("CVEWY06040");
@@ -104,7 +119,7 @@ public class DeliveryOrderTest
 
         String sign = QimenSignUtils.sign(requestParamter, xml, secretKey);
         requestParamter.put("sign", sign);
-        String url = "http://127.0.0.1:8081/BH_CLIS/qimen" + "?" + QimenSignUtils.joinRequestParams(requestParamter);
+        String url = "http://172.172.172.48:8080/BH_CLIS/qimen" + "?" + QimenSignUtils.joinRequestParams(requestParamter);
         String result = WebUtils.doQmPost(url, xml);
 
         System.out.println(result);

+ 38 - 21
src/test/java/QmCancelTest.java

@@ -17,34 +17,51 @@ public class QmCancelTest {
     public static void readTxtFile(String args)
         throws IOException, JAXBException
     {
-        QmCancel qmCancel = new QmCancel();
-        qmCancel.setOrderCode("JYS2107267211");
-        qmCancel.setOrderType("JYCK");
+        List<String> cancelOrders =
+            FileUtil.readLines("/Users/dzl/IdeaProjects/qm/data/1.txt", "utf8");
 
-        JAXBContext jc = JAXBContext.newInstance(QmCancel.class);
-        Marshaller ms = jc.createMarshaller();
-        StringWriter writer = new StringWriter();
-        ms.marshal(qmCancel, writer);
-        String xml = writer.toString();
 
-        String appKey = "21226717";
+//        for (String cancelOrder : cancelOrders)
+        {
+//            String.format("%s 今年%d 岁","我", "24");
 
-        String qmCustomerId = "PK";
+//            String sql =  "INSERT INTO CWMS.WMS_SN_INVENTORY (ID, CREATED_BY, CREATION_METHOD, CREATION_TIME, DELETE_FLAG, UPDATE_METHOD, UPDATE_TIME, UPDATED_BY, ACCOUNT_ID, BOX_NO, BRAND_ID, BUSINESS_LOCK_FLAG, CUSTOMER_CODE, CUSTOMER_ID, CUSTOMER_NAME, CUSTOMER_REFFERENCE_ID, ITEM_CODE, ITEM_GROUP_CODE, ITEM_GROUP_ID, ITEM_GROUP_NAME, ITEM_ID, ITEM_NAME, ITEM_SUPPLIER_CODE, ITEM_SUPPLIER_ID, ITEM_SUPPLIER_NAME, LATEST_DEPOTCHECK_TIME, LATEST_WAREHOUSING_NUMBER, LATEST_WAREHOUSING_TIME, LOCATION_CONTAINER_ID, LOCATION_ID, LOCATION_NAME, NORMAL_FLAG, PACKING_LIST_ID, PALLET_NO, RELATIONED_CUSTOMER_ALIAS, RELATIONED_CUSTOMER_CODE, RELATIONED_CUSTOMER_ID, RELATIONED_CUSTOMER_NAME, REMARK, SHELVES_TASK_DETAIL_ID, SN_NO, STATUS, UNITS, WAREHOUSE_ID, WAREHOUSE_NAME, ZONE_ID, ZONE_NAME) " +
+//                " VALUES ( sys_guid(), '徐俊', 'edi', TO_DATE('2021-05-28 09:59:15', 'YYYY-MM-DD HH24:MI:SS'), 0, 'edi', TO_DATE('2021-05-28 09:59:15', 'YYYY-MM-DD HH24:MI:SS'), '徐俊', '1911250000001', null, null, 0, 'SHEDEI', '2010100000001', '沱牌舍得', 'ZJDB2103040164-1579601', '03.04.04.01.004.42.500.06.00', '酒类', '8aaa15ec7511d9db01751a8cc6400284', '酒类', 'ST2010200000097', '舍之道42%vol 500ml×6', null, null, null, null, 6, null, null, null, null, '正常品', null, null, null, 'SHEDEI', '2010100000001', '沱牌舍得', null, 'SJ2105280000013',"+ "'" + cancelOrder + "'" + ", null, '13446', '8aaa3dfe750cb409017510a41a700211', '南京溧水仓', null, null); " ;
 
-        String secretKey = "5cac8b2203e0e65cffb6e1c465d55a4f";
+//                "VALUES (sys_guid()," + id + ", '2019-7-04 10:44:07', 425, 'CN'," + arrStr[0]+ ", '700', '', '700', '44552', '30', NULL, '2019-07-04', '10:44:00', 1, '', '', 'ABSSS', '', '', '700A010A9999', '201907041112', '', '', NULL, NULL, NULL, NULL, '', '', '', '', NULL, '', '', '', '', '', '', '', '', '', 2, '2019-07-04 10:44:08', 0, NULL, 99, NULL, '', '', '', '', '');";
+//            String sql = String.format("\n" +
+//                "",cancelOrder);
 
-        Map<String, String> requestParamter =
+            QmCancel qmCancel = new QmCancel();
+            qmCancel.setOrderCode("lzw-202107071359240001");
+            qmCancel.setOrderType("JYCK");
+
+            JAXBContext jc = JAXBContext.newInstance(QmCancel.class);
+            Marshaller ms = jc.createMarshaller();
+            StringWriter writer = new StringWriter();
+            ms.marshal(qmCancel, writer);
+            String xml = writer.toString();
+
+            String appKey = "21226717";
+
+            String qmCustomerId = "PK";
+
+            String secretKey = "5cac8b2203e0e65cffb6e1c465d55a4f";
+
+            Map<String, String> requestParamter =
                 WebUtils.getRequestParameter("order.cancel", appKey, qmCustomerId);
 
-        String sign = QimenSignUtils.sign(requestParamter, xml, secretKey);
-        requestParamter.put("sign", sign);
-        String url = "http://172.172.172.211:8080/BH_CLIS/qimen" + "?" + QimenSignUtils.joinRequestParams(requestParamter);
-        String result = WebUtils.doQmPost(url, xml);
+            String sign = QimenSignUtils.sign(requestParamter, xml, secretKey);
+            requestParamter.put("sign", sign);
+            String url = "http://172.172.172.81:8080/BH_CLIS/qimen" + "?" + QimenSignUtils.joinRequestParams(requestParamter);
+            String result = WebUtils.doQmPost(url, xml);
 //
-        System.out.println(result);
+            System.out.println(result);
+        }
+
+
+        Map<String,Object> map = new HashMap<>();
 
-//        Map<String,Object> map = new HashMap<>();
-//
 //        try {
 //            String encoding="UTF-8";
 //            File file=new File(args);
@@ -88,11 +105,11 @@ public class QmCancelTest {
     }
 
     public static void main(String[] args)
-        throws FileNotFoundException, MalformedURLException
+        throws IOException, JAXBException
     {
         String filePath = "/Users/miao/Documents/1.71.log";
 //      "res/";
-//        readTxtFile(filePath);
+        readTxtFile(filePath);
     }
 
 

+ 1 - 1
src/test/java/SingleItemTest.java

@@ -20,7 +20,7 @@ public class SingleItemTest
         throws JAXBException, IOException
     {
         SingleItem singleItem = new SingleItem();
-        singleItem.setActionType("ADD");
+        singleItem.setActionType("add");
         singleItem.setOwnerCode("XHR01");
         singleItem.setWarehouseCode("yhc");
         Item item = new Item();

+ 9 - 8
src/test/java/omsPickInboundTest.java

@@ -40,17 +40,18 @@ public class omsPickInboundTest {
 
         QmInboundRequestDto.OrderLines orderLines = new QmInboundRequestDto.OrderLines();
         QmInboundRequestDto.OrderLines.OrderLine orderLine = new QmInboundRequestDto.OrderLines.OrderLine();
-        orderLine.setOwnerCode("zs");
-        orderLine.setItemCode("iPhone11");
+        orderLine.setOwnerCode("PK");
+        orderLine.setItemCode("E03447E201044");
         orderLine.setPlanQty("18");
+        orderLine.setInventoryType("cc");
 
         QmInboundRequestDto.EntryOrder.ExtendProps extendProps = new QmInboundRequestDto.EntryOrder.ExtendProps();
         extendProps.setKey1("KHWTH001");
         extendProps.setKey2("KHWTH0012");
 
         entryOrder.setEntryOrderCode("CG00" + (long)(Math.random() * 1000000000));
-        entryOrder.setOwnerCode("zs");
-        entryOrder.setWarehouseCode("081");
+        entryOrder.setOwnerCode("PK");
+        entryOrder.setWarehouseCode("PKZXC");
         entryOrder.setOrderType("CGRK");
         entryOrder.setLogisticsCode("ZTO");
         entryOrder.setLogisticsName("中通");
@@ -67,11 +68,11 @@ public class omsPickInboundTest {
         ms.marshal(qmInboundDto, writer);
         String xml = writer.toString();
 
-        String appKey = "201811071023";
+        String appKey = "25978608";
 
-        String qmCustomerId = "zs";
+        String qmCustomerId = "PK";
 
-        String secretKey = "123456";
+        String secretKey = "25978608";
 
         Map<String, String> requestParamter =
                 WebUtils.getRequestParameter("entryorder.create", appKey, qmCustomerId);
@@ -80,7 +81,7 @@ public class omsPickInboundTest {
 
         String sign = QimenSignUtils.sign(requestParamter, xml, secretKey);
         requestParamter.put("sign", sign);
-        String url = "http://localhost:8003/BH_CLIS/qimen" + "?" + QimenSignUtils.joinRequestParams(requestParamter);
+        String url = "http://172.172.172.157:8080/BH_CLIS/qimen" + "?" + QimenSignUtils.joinRequestParams(requestParamter);
         String result = WebUtils.doQmPost(url, xml);
 
         System.out.println(result);