潘彐君 před 4 roky
rodič
revize
5e30d7eb51

+ 72 - 68
src/main/java/com/hrsoft/edi/stub/EntryOrderCreateTestSN.java

@@ -2,34 +2,38 @@ package com.hrsoft.edi.stub;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.RandomUtil;
-import com.hrsoft.edi.stub.internal.CustomerQimenClient;
 import com.hrsoft.edi.stub.consant.AppInfo;
+import com.hrsoft.edi.stub.internal.CustomerQimenClient;
 import com.hrsoft.edi.stub.request.EntryorderCreateRequest;
 import com.qimen.api.response.EntryorderCreateResponse;
 import com.taobao.api.ApiException;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @author zxf
  * @date 2019/8/6 13:33
  */
 @Slf4j
-public class EntryOrderCreateTestSN {
+public class EntryOrderCreateTestSN
+{
     private static final String URL = "http://172.172.172.213:8765/api/edi/qimen/service";
 
     private static final String APP_KEY = "20200721";
 
     private static final String SECRET = "20200721";
+
     public static void create()
         throws ApiException
     {
         CustomerQimenClient client = new CustomerQimenClient(AppInfo.URL, AppInfo.APP_KEY, AppInfo.SECRET);
-        EntryorderCreateRequest createRequest=new EntryorderCreateRequest();
+        EntryorderCreateRequest createRequest = new EntryorderCreateRequest();
         createRequest.setCustomerId(AppInfo.CUSTOMER_ID);
         createRequest.setVersion("2.0");
-        EntryorderCreateRequest.EntryOrder entryOrder=new EntryorderCreateRequest.EntryOrder();
+        EntryorderCreateRequest.EntryOrder entryOrder = new EntryorderCreateRequest.EntryOrder();
         entryOrder.setWarehouseCode(AppInfo.WAREHOUSE_CODE);
         entryOrder.setOwnerCode(AppInfo.OWNER_CODE);
         entryOrder.setLogisticsCode("YTO");
@@ -38,15 +42,15 @@ public class EntryOrderCreateTestSN {
         entryOrder.setExpectStartTime(DateUtil.formatDateTime(new Date()));
         entryOrder.setOperateTime(DateUtil.formatDateTime(new Date()));
         entryOrder.setBusinessId("dssdasdas");
-        entryOrder.setPurchaseOrderCode("SN"+RandomUtil.randomNumbers(15));
+        entryOrder.setPurchaseOrderCode("SN" + RandomUtil.randomNumbers(15));
         entryOrder.setOrderType("CGRK");
-        EntryorderCreateRequest.SenderInfo senderInfo=new EntryorderCreateRequest.SenderInfo();
+        EntryorderCreateRequest.SenderInfo senderInfo = new EntryorderCreateRequest.SenderInfo();
         senderInfo.setName("我是客户");
         senderInfo.setMobile("15252154523");
         senderInfo.setProvince("广东省");
         senderInfo.setCity("广州市");
         senderInfo.setDetailAddress("我是客户");
-        EntryorderCreateRequest.ReceiverInfo receiverInfo=new EntryorderCreateRequest.ReceiverInfo();
+        EntryorderCreateRequest.ReceiverInfo receiverInfo = new EntryorderCreateRequest.ReceiverInfo();
         receiverInfo.setName("我是客户");
         receiverInfo.setMobile("15252154523");
         receiverInfo.setProvince("广东省");
@@ -55,72 +59,68 @@ public class EntryOrderCreateTestSN {
         entryOrder.setReceiverInfo(receiverInfo);
         entryOrder.setSenderInfo(senderInfo);
         createRequest.setEntryOrder(entryOrder);
-        EntryorderCreateRequest.RelatedOrder relatedOrder=new EntryorderCreateRequest.RelatedOrder();
+        EntryorderCreateRequest.RelatedOrder relatedOrder = new EntryorderCreateRequest.RelatedOrder();
         relatedOrder.setOrderCode("111");
         relatedOrder.setOrderType("CG");
-        List<EntryorderCreateRequest.RelatedOrder> list=new ArrayList<>();
+        List<EntryorderCreateRequest.RelatedOrder> list = new ArrayList<>();
         list.add(relatedOrder);
         entryOrder.setRelatedOrders(list);
-        EntryorderCreateRequest.OrderLine orderLine1=new EntryorderCreateRequest.OrderLine();
+        EntryorderCreateRequest.OrderLine orderLine1 = new EntryorderCreateRequest.OrderLine();
         orderLine1.setItemCode("826002");
         orderLine1.setItemName("826002");
         orderLine1.setPlanQty("5");
         orderLine1.setActualPrice("1");
         orderLine1.setInventoryType("ZP");
         orderLine1.setOwnerCode(AppInfo.OWNER_CODE);
-//        EntryorderCreateRequest.SnList snList = new EntryorderCreateRequest.SnList();
-//        List<String> list1 = new ArrayList<>();
-//        list1.add("CJSN010026");
-//        list1.add("CJSN010027");
-//        list1.add("CJSN010028");
-//        list1.add("CJSN010029");
-//        list1.add("CJSN010030");
-//        snList.setSn(list1);
-//        EntryorderCreateRequest.OrderLine.ExtendProps extendProps1 = new EntryorderCreateRequest.OrderLine.ExtendProps();
-//        extendProps1.setSnBoxCode("BoxCJSN01001");
-//        orderLine1.setExtendProps(extendProps1);
-//        orderLine1.setSnList(snList);
+        List<String> list1 = new ArrayList<>();
+        list1.add("CSSN020026");
+        list1.add("CSSN020027");
+        list1.add("CSSN020028");
+        list1.add("CSSN020029");
+        list1.add("CSSN010030");
+        EntryorderCreateRequest.OrderLine.ExtendProps extendProps1 =
+            new EntryorderCreateRequest.OrderLine.ExtendProps();
+        extendProps1.setSnBoxCode("BoxCSSN02001");
+        orderLine1.setExtendProps(extendProps1);
+        orderLine1.setSnList(list1);
 
-        EntryorderCreateRequest.OrderLine orderLine2=new EntryorderCreateRequest.OrderLine();
+        EntryorderCreateRequest.OrderLine orderLine2 = new EntryorderCreateRequest.OrderLine();
         orderLine2.setItemCode("826002");
         orderLine2.setItemName("826002");
         orderLine2.setPlanQty("5");
         orderLine2.setActualPrice("1");
         orderLine2.setInventoryType("ZP");
         orderLine2.setOwnerCode(AppInfo.OWNER_CODE);
-        EntryorderCreateRequest.OrderLine.ExtendProps extendProps2 = new EntryorderCreateRequest.OrderLine.ExtendProps();
-        extendProps2.setSnBoxCode("BoxCJSN01002");
+        EntryorderCreateRequest.OrderLine.ExtendProps extendProps2 =
+            new EntryorderCreateRequest.OrderLine.ExtendProps();
+        extendProps2.setSnBoxCode("BoxCSSN02002");
         orderLine2.setExtendProps(extendProps2);
-        EntryorderCreateRequest.SnList snList1 = new EntryorderCreateRequest.SnList();
         List<String> list2 = new ArrayList<>();
-//        list2.add(new EntryorderCreateRequest.Sn("CJSN010031"));
-//        list2.add(new EntryorderCreateRequest.Sn("CJSN010032"));
-//        list2.add("CJSN010032");
-//        list2.add("CJSN010033");
-        list2.add("CJSN010034");
-        list2.add("CJSN010035");
-        snList1.setSn(list2);
+        list2.add("CSSN010031");
+        list2.add("CSSN010032");
+        list2.add("CSSN010033");
+        list2.add("CSSN010034");
+        list2.add("CSSN010035");
         orderLine2.setSnList(list2);
 
-//        EntryorderCreateRequest.OrderLine orderLine3=new EntryorderCreateRequest.OrderLine();
-//        orderLine3.setItemCode("826002");
-//        orderLine3.setItemName("826002");
-//        orderLine3.setPlanQty("5");
-//        orderLine3.setActualPrice("1");
-//        orderLine3.setInventoryType("ZP");
-//        orderLine3.setOwnerCode(AppInfo.OWNER_CODE);
-//        EntryorderCreateRequest.OrderLine.ExtendProps extendProps3 = new EntryorderCreateRequest.OrderLine.ExtendProps();
-//        extendProps3.setSnBoxCode("BoxCJSN01003");
-//        orderLine3.setExtendProps(extendProps3);
-//        EntryorderCreateRequest.SnList snList2 = new EntryorderCreateRequest.SnList();
-//        List<String> list3 = new ArrayList<>();
-//        list3.add("CJSN010036");
-//        list3.add("CJSN010037");
-//        list3.add("CJSN010038");
-//        list3.add("CJSN010039");
-//        list3.add("CJSN010040");
-//        snList2.setSn(list3);
-//        orderLine3.setSnList(snList2);
+        EntryorderCreateRequest.OrderLine orderLine3 = new EntryorderCreateRequest.OrderLine();
+        orderLine3.setItemCode("826002");
+        orderLine3.setItemName("826002");
+        orderLine3.setPlanQty("5");
+        orderLine3.setActualPrice("1");
+        orderLine3.setInventoryType("ZP");
+        orderLine3.setOwnerCode(AppInfo.OWNER_CODE);
+        EntryorderCreateRequest.OrderLine.ExtendProps extendProps3 =
+            new EntryorderCreateRequest.OrderLine.ExtendProps();
+        extendProps3.setSnBoxCode("BoxCSSN02003");
+        orderLine3.setExtendProps(extendProps3);
+        List<String> list3 = new ArrayList<>();
+        list3.add("CSSN010036");
+        list3.add("CSSN010037");
+        list3.add("CSSN010038");
+        list3.add("CSSN010039");
+        list3.add("CSSN010040");
+        orderLine3.setSnList(list3);
 
 //        EntryorderCreateRequest.OrderLine orderLine4=new EntryorderCreateRequest.OrderLine();
 //        orderLine4.setItemCode("826002");
@@ -130,15 +130,15 @@ public class EntryOrderCreateTestSN {
 //        orderLine4.setInventoryType("ZP");
 //        orderLine4.setOwnerCode(AppInfo.OWNER_CODE);
 //        EntryorderCreateRequest.OrderLine.ExtendProps extendProps4 = new EntryorderCreateRequest.OrderLine.ExtendProps();
-//        extendProps4.setSnBoxCode("BoxCJSN01004");
+//        extendProps4.setSnBoxCode("BoxCSSN01004");
 //        orderLine4.setExtendProps(extendProps4);
 //        EntryorderCreateRequest.SnList snList3 = new EntryorderCreateRequest.SnList();
 //        List<String> list4 = new ArrayList<>();
-//        list4.add("CJSN010041");
-//        list4.add("CJSN010042");
-//        list4.add("CJSN010043");
-//        list4.add("CJSN010044");
-//        list4.add("CJSN010045");
+//        list4.add("CSSN010041");
+//        list4.add("CSSN010042");
+//        list4.add("CSSN010043");
+//        list4.add("CSSN010044");
+//        list4.add("CSSN010045");
 //        snList3.setSn(list4);
 //        orderLine4.setSnList(snList3);
 //
@@ -150,20 +150,18 @@ public class EntryOrderCreateTestSN {
 //        orderLine5.setInventoryType("ZP");
 //        orderLine5.setOwnerCode(AppInfo.OWNER_CODE);
 //        EntryorderCreateRequest.OrderLine.ExtendProps extendProps5 = new EntryorderCreateRequest.OrderLine.ExtendProps();
-//        extendProps5.setSnBoxCode("BoxCJSN01005");
+//        extendProps5.setSnBoxCode("BoxCSSN01005");
 //        orderLine5.setExtendProps(extendProps5);
 //        EntryorderCreateRequest.SnList snList4 = new EntryorderCreateRequest.SnList();
 //        List<String> list5 = new ArrayList<>();
-//        list5.add("CJSN010046");
-//        list5.add("CJSN010047");
-//        list5.add("CJSN010048");
-//        list5.add("CJSN010049");
-//        list5.add("CJSN010050");
+//        list5.add("CSSN010046");
+//        list5.add("CSSN010047");
+//        list5.add("CSSN010048");
+//        list5.add("CSSN010049");
+//        list5.add("CSSN010050");
 //        snList4.setSn(list5);
 //        orderLine5.setSnList(snList4);
 
-
-
         List<EntryorderCreateRequest.OrderLine> orderLines = new ArrayList<>();
         orderLines.add(orderLine1);
         orderLines.add(orderLine2);
@@ -174,8 +172,14 @@ public class EntryOrderCreateTestSN {
         long time1 = System.currentTimeMillis();
         EntryorderCreateResponse response = client.execute(createRequest);
         long time2 = System.currentTimeMillis();
-        log.info("响应:{} ERP订单编码:{} wms仓储编码:{} 耗时:{}",response.getFlag(),response.getMessage(),entryOrder.getEntryOrderCode(),response.getEntryOrderId(),time2-time1);
+        log.info("响应:{} ERP订单编码:{} wms仓储编码:{} 耗时:{}",
+            response.getFlag(),
+            response.getMessage(),
+            entryOrder.getEntryOrderCode(),
+            response.getEntryOrderId(),
+            time2 - time1);
     }
+
     public static void main(String[] args)
 
         throws ApiException

+ 2 - 2
src/main/java/com/hrsoft/edi/stub/internal/XmlWriter.java

@@ -160,7 +160,6 @@ public class XmlWriter
 
                 if (null != apiListItem)
                 {
-                    this.startTag(apiListItem.rootName());
                     if (!isChildren || !this.stopProps.contains(name))
                     {
                         Method accessor = prop.getReadMethod();
@@ -174,12 +173,13 @@ public class XmlWriter
                             Object value = accessor.invoke(object, (Object[])null);
                             if (value != null && value instanceof Collection)
                             {
+                                this.startTag(apiListItem.rootName());
                                 this.array((Collection)value, apiListItem.value());
+                                this.endTag(apiListItem.rootName());
                             }
                         }
                     }
 
-                    this.endTag(apiListItem.rootName());
                 }
                 else
                 {