lizw 7 місяців тому
батько
коміт
1b8ec23aef
21 змінених файлів з 206 додано та 4 видалено
  1. 3 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/WMSService.java
  2. 11 4
      soap-gateway/src/main/java/com/galaxis/soap/wms/WMSServiceImpl.java
  3. 9 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_01.java
  4. 8 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_02.java
  5. 8 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_03.java
  6. 2 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_04.java
  7. 2 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_06_ITEM.java
  8. 2 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_08_ITEM.java
  9. 2 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_09_ITEM.java
  10. 2 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_14.java
  11. 4 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_16_ITEM.java
  12. 21 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_23.java
  13. 41 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_RT_23.java
  14. 8 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_01.java
  15. 8 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_02.java
  16. 2 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_04.java
  17. 2 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_06.java
  18. 2 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_08.java
  19. 4 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_09.java
  20. 2 0
      soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_14.java
  21. 63 0
      soap-gateway/src/main/resources/YN_WMSService.xml

+ 3 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/WMSService.java

@@ -67,4 +67,7 @@ public interface WMSService {
 
     @WebMethod(action="wms22")
     List<DT_KUNNR_IN_RT_22> MT_KUNNR_IN_WMS22(@WebParam List<DT_KUNNR_IN_22> params);
+
+    @WebMethod(action="wms23")
+    List<DT_KUNNR_IN_RT_23> POS2WMS_WMS23(@WebParam List<DT_KUNNR_IN_23> params);
 }

+ 11 - 4
soap-gateway/src/main/java/com/galaxis/soap/wms/WMSServiceImpl.java

@@ -15,10 +15,7 @@ import javax.xml.ws.Service;
 import java.io.File;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -323,4 +320,14 @@ public class WMSServiceImpl implements WMSService {
                 WMSService::MT_KUNNR_IN_WMS22
         );
     }
+
+    @Override
+    public List<DT_KUNNR_IN_RT_23> POS2WMS_WMS23(List<DT_KUNNR_IN_23> params) {
+        return distribute(
+                "POS2WMS_WMS23",
+                params,
+                DT_KUNNR_IN_23::getWH_CODE,
+                WMSService::POS2WMS_WMS23
+        );
+    }
 }

+ 9 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_01.java

@@ -109,4 +109,13 @@ public class DT_KUNNR_IN_01 {
     // 库存地点
     private String LOC_PLACE;
 
+    /**
+     * (一心堂)监管码采集(零售)
+     */
+    private String CUS_JIANG_FLG;
+    /**
+     * (一心堂)监管码采集(批发)
+     */
+    private String WHOLESALE_JIANG_FLG;
+
 }

+ 8 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_02.java

@@ -31,5 +31,13 @@ public class DT_KUNNR_IN_02 {
     private String BRANCH;
     // 区域
     private String ZONE;
+    /**
+     * 是否监管
+     */
+    private String JIANGFLG;
+    /**
+     * 客户性质
+     */
+    private String CUSTOMERNATURE;
 
 }

+ 8 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_03.java

@@ -35,5 +35,13 @@ public class DT_KUNNR_IN_03 {
     private String BRANCH;
     // 区域
     private String ZONE;
+    /**
+     * 是否监管
+     */
+    private String JIANGFLG;
+    /**
+     * 客户性质
+     */
+    private String CUSTOMERNATURE;
 
 }

+ 2 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_04.java

@@ -39,6 +39,8 @@ public class DT_KUNNR_IN_04 {
     private String ZZYSFS;
     // 是否容许多次收货,(1:容许;2:不容许)
     private String IS_DCSH;
+    // 调拨出库单单号
+    private String YEWDJ_NO_CK;
 
     // 明细
     private List<DT_KUNNR_IN_04_ITEM> items;

+ 2 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_06_ITEM.java

@@ -28,4 +28,6 @@ public class DT_KUNNR_IN_06_ITEM {
     private String SHENGCHAN_DATE;
     // 有效期
     private String YOUX_DATE;
+    //批次跟踪号
+    private String TRACKNUMBER;
 }

+ 2 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_08_ITEM.java

@@ -36,4 +36,6 @@ public class DT_KUNNR_IN_08_ITEM {
     private String TH_REMARK;
     // 箱号
     private String PACK_NO;
+    //批次跟踪号
+    private String TRACKNUMBER;
 }

+ 2 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_09_ITEM.java

@@ -29,4 +29,6 @@ public class DT_KUNNR_IN_09_ITEM {
     private String FAVOURABLE_PRICE;
     // 优惠单价
     private String PREFERENTIAL_UNIT_PRICE;
+    //批次跟踪号
+    private String TRACKNUMBER;
 }

+ 2 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_14.java

@@ -41,5 +41,7 @@ public class DT_KUNNR_IN_14 {
     private String LGORT;
     // 文本,批号
     private String SGTXT;
+    /** 批次跟踪号*/
+    private String TRACKNUMBER;
 
 }

+ 4 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_16_ITEM.java

@@ -21,5 +21,9 @@ public class DT_KUNNR_IN_16_ITEM {
     private String PREFERENTIAL_UNIT_PRICE;
     //批号要求
     private String LOT;
+    /** 批号*/
+    private String CHARG;
+    /** 批次跟踪号*/
+    private String TRACKNUMBER;
 
 }

+ 21 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_23.java

@@ -0,0 +1,21 @@
+package com.galaxis.soap.wms.obj;
+
+import lombok.Data;
+
+@Data
+public class DT_KUNNR_IN_23 {
+
+    /**
+     * 企业编码
+     */
+    private String OWNER_CODE;
+    /**
+     * 物流中心编码
+     */
+    private String WH_CODE;
+    /**
+     * DERP业务单号
+     */
+    private String ORDER_OUT_CODE;
+
+}

+ 41 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_RT_23.java

@@ -0,0 +1,41 @@
+package com.galaxis.soap.wms.obj;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DT_KUNNR_IN_RT_23 {
+
+    /**
+     * 企业编码
+     */
+    private String OWNER_CODE;
+    /**
+     * 物流中心编码
+     */
+    private String WH_CODE;
+    /**
+     * DERP业务单号
+     */
+    private String ORDER_OUT_CODE;
+
+    private List<DT_KUNNR_IN_RT_23_ITEM> dt_kunnr_in_rt_23_items;
+
+    @Data
+    public static class DT_KUNNR_IN_RT_23_ITEM{
+        /**
+         * 商品编码
+         */
+        private String ITEM_CODE;
+        /**
+         * 批号
+         */
+        private String LOT01;
+        /**
+         * 电子监管码
+         */
+        private String DRUP_CODE;
+    }
+
+}

+ 8 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_01.java

@@ -109,4 +109,12 @@ public class WMS_KUNNR_IN_01 {
     private String BARCODE2;
     // 库存地点
     private String LOC_PLACE;
+    /**
+     * (一心堂)监管码采集(零售)
+     */
+    private String CUS_JIANG_FLG;
+    /**
+     * (一心堂)监管码采集(批发)
+     */
+    private String WHOLESALE_JIANG_FLG;
 }

+ 8 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_02.java

@@ -48,4 +48,12 @@ public class WMS_KUNNR_IN_02 {
     private String BRANCH;
     // 区域
     private String ZONE;
+    /**
+     * 是否监管
+     */
+    private String JIANGFLG;
+    /**
+     * 客户性质
+     */
+    private String CUSTOMERNATURE;
 }

+ 2 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_04.java

@@ -70,5 +70,7 @@ public class WMS_KUNNR_IN_04 {
     private String SHENGCHAN_DATE;
     // 有效期
     private String YOUX_DATE;
+    // 调拨出库单单号
+    private String YEWDJ_NO_CK;
 
 }

+ 2 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_06.java

@@ -63,4 +63,6 @@ public class WMS_KUNNR_IN_06 {
     private String SHENGCHAN_DATE;
     // 有效期
     private String YOUX_DATE;
+    //批次跟踪号
+    private String TRACKNUMBER;
 }

+ 2 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_08.java

@@ -65,5 +65,7 @@ public class WMS_KUNNR_IN_08 {
     private String TH_REMARK;
     // 箱号
     private String PACK_NO;
+    //批次跟踪号
+    private String TRACKNUMBER;
 
 }

+ 4 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_09.java

@@ -105,4 +105,8 @@ public class WMS_KUNNR_IN_09 {
     private String IS_BOX;
     // 收件人街道/村镇
     private String RECEIVER_TOWN;
+    /** 批号*/
+    private String CHARG;
+    //批次跟踪号
+    private String TRACKNUMBER;
 }

+ 2 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/WMS_KUNNR_IN_14.java

@@ -41,5 +41,7 @@ public class WMS_KUNNR_IN_14 {
     private String LGORT;
     //文本
     private String SGTXT;
+    /** 批次跟踪号*/
+    private String TRACKNUMBER;
 
 }

+ 63 - 0
soap-gateway/src/main/resources/YN_WMSService.xml

@@ -33,6 +33,8 @@
   <xs:element name="MT_KUNNR_IN_WMS22Response" type="tns:MT_KUNNR_IN_WMS22Response"/>
   <xs:element name="POS2WMS_WMS19" type="tns:POS2WMS_WMS19"/>
   <xs:element name="POS2WMS_WMS19Response" type="tns:POS2WMS_WMS19Response"/>
+  <xs:element name="POS2WMS_WMS23" type="tns:POS2WMS_WMS23"/>
+  <xs:element name="POS2WMS_WMS23Response" type="tns:POS2WMS_WMS23Response"/>
   <xs:element name="handle_WMS01" type="tns:handle_WMS01"/>
   <xs:element name="handle_WMS01Response" type="tns:handle_WMS01Response"/>
   <xs:element name="handle_WMS09" type="tns:handle_WMS09"/>
@@ -182,6 +184,7 @@
       <xs:element minOccurs="0" name="MEINS" type="xs:string"/>
       <xs:element minOccurs="0" name="POSNR" type="xs:string"/>
       <xs:element minOccurs="0" name="PREFERENTIAL_UNIT_PRICE" type="xs:string"/>
+      <xs:element minOccurs="0" name="TRACKNUMBER" type="xs:string"/>
       <xs:element minOccurs="0" name="WERKS" type="xs:string"/>
       <xs:element minOccurs="0" name="ZPRICE_TAX" type="xs:string"/>
     </xs:sequence>
@@ -220,6 +223,7 @@
       <xs:element minOccurs="0" name="MENGE" type="xs:string"/>
       <xs:element minOccurs="0" name="MJAHR" type="xs:string"/>
       <xs:element minOccurs="0" name="SGTXT" type="xs:string"/>
+      <xs:element minOccurs="0" name="TRACKNUMBER" type="xs:string"/>
       <xs:element minOccurs="0" name="UMWRK" type="xs:string"/>
       <xs:element minOccurs="0" name="XBLNR" type="xs:string"/>
       <xs:element minOccurs="0" name="ZEILE" type="xs:string"/>
@@ -229,6 +233,35 @@
   <xs:complexType name="handle_WMS14Response">
     <xs:sequence/>
   </xs:complexType>
+  <xs:complexType name="POS2WMS_WMS23">
+    <xs:sequence>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="arg0" type="tns:dtKUNNRIN23"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="dtKUNNRIN23">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="ITEM_CODE" type="xs:string"/>
+      <xs:element minOccurs="0" name="LOT01" type="xs:string"/>
+      <xs:element minOccurs="0" name="ORDER_OUT_CODE" type="xs:string"/>
+      <xs:element minOccurs="0" name="OWNER_CODE" type="xs:string"/>
+      <xs:element minOccurs="0" name="WH_CODE" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="POS2WMS_WMS23Response">
+    <xs:sequence>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="return" type="tns:dtKUNNRINRT23"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="dtKUNNRINRT23">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="DRUP_CODE" type="xs:string"/>
+      <xs:element minOccurs="0" name="ITEM_CODE" type="xs:string"/>
+      <xs:element minOccurs="0" name="LOT01" type="xs:string"/>
+      <xs:element minOccurs="0" name="ORDER_OUT_CODE" type="xs:string"/>
+      <xs:element minOccurs="0" name="OWNER_CODE" type="xs:string"/>
+      <xs:element minOccurs="0" name="WH_CODE" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
   <xs:complexType name="MT_KUNNR_IN_WMS22">
     <xs:sequence>
       <xs:element maxOccurs="unbounded" minOccurs="0" name="arg0" type="tns:dtKUNNRIN22"/>
@@ -494,6 +527,7 @@
       <xs:element minOccurs="0" name="LIFNR" type="xs:string"/>
       <xs:element minOccurs="0" name="TELF1" type="xs:string"/>
       <xs:element minOccurs="0" name="VERKF" type="xs:string"/>
+      <xs:element minOccurs="0" name="YEWDJ_NO_CK" type="xs:string"/>
       <xs:element minOccurs="0" name="ZAPPR_DAT" type="xs:string"/>
       <xs:element minOccurs="0" name="ZBUSI_NAM" type="xs:string"/>
       <xs:element minOccurs="0" name="ZBUSI_TYP" type="xs:string"/>
@@ -563,6 +597,7 @@
       <xs:element minOccurs="0" name="RECEIVER_NAME" type="xs:string"/>
       <xs:element minOccurs="0" name="RECEIVER_PROVINCE" type="xs:string"/>
       <xs:element minOccurs="0" name="RECEIVER_TELEPHO" type="xs:string"/>
+      <xs:element minOccurs="0" name="RECEIVER_TOWN" type="xs:string"/>
       <xs:element minOccurs="0" name="VBELN" type="xs:string"/>
       <xs:element minOccurs="0" name="ZBUSI_NAM" type="xs:string"/>
     </xs:sequence>
@@ -570,12 +605,15 @@
   <xs:complexType name="dtKUNNRIN16ITEM">
     <xs:sequence>
       <xs:element minOccurs="0" name="BASE_PRICE" type="xs:string"/>
+      <xs:element minOccurs="0" name="CHARG" type="xs:string"/>
       <xs:element minOccurs="0" name="DERP_LINE" type="xs:string"/>
       <xs:element minOccurs="0" name="KUB_ERP" type="xs:string"/>
+      <xs:element minOccurs="0" name="LOT" type="xs:string"/>
       <xs:element minOccurs="0" name="MATNR" type="xs:string"/>
       <xs:element minOccurs="0" name="POSNR" type="xs:string"/>
       <xs:element minOccurs="0" name="PREFERENTIAL_UNIT_PRICE" type="xs:string"/>
       <xs:element minOccurs="0" name="QUANTITY" type="xs:string"/>
+      <xs:element minOccurs="0" name="TRACKNUMBER" type="xs:string"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="MT_KUNNR_IN_WMS16Response">
@@ -739,6 +777,7 @@
       <xs:element minOccurs="0" name="POSNR" type="xs:string"/>
       <xs:element minOccurs="0" name="TH_REMARK" type="xs:string"/>
       <xs:element minOccurs="0" name="TH_TYPE" type="xs:string"/>
+      <xs:element minOccurs="0" name="TRACKNUMBER" type="xs:string"/>
       <xs:element minOccurs="0" name="VFDAT" type="xs:string"/>
       <xs:element minOccurs="0" name="WERKS" type="xs:string"/>
       <xs:element minOccurs="0" name="ZNAME1" type="xs:string"/>
@@ -799,6 +838,7 @@
       <xs:element minOccurs="0" name="MEINS" type="xs:string"/>
       <xs:element minOccurs="0" name="MENGE" type="xs:string"/>
       <xs:element minOccurs="0" name="SHENGCHAN_DATE" type="xs:string"/>
+      <xs:element minOccurs="0" name="TRACKNUMBER" type="xs:string"/>
       <xs:element minOccurs="0" name="YOUX_DATE" type="xs:string"/>
       <xs:element minOccurs="0" name="ZPRICE_TAX" type="xs:string"/>
     </xs:sequence>
@@ -880,6 +920,10 @@
     <wsdl:part element="tns:handle_WMS14" name="parameters">
     </wsdl:part>
   </wsdl:message>
+  <wsdl:message name="POS2WMS_WMS23Response">
+    <wsdl:part element="tns:POS2WMS_WMS23Response" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
   <wsdl:message name="Exception">
     <wsdl:part element="tns:Exception" name="Exception">
     </wsdl:part>
@@ -956,6 +1000,10 @@
     <wsdl:part element="tns:handle_WMS09" name="parameters">
     </wsdl:part>
   </wsdl:message>
+  <wsdl:message name="POS2WMS_WMS23">
+    <wsdl:part element="tns:POS2WMS_WMS23" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
   <wsdl:message name="MT_KUNNR_IN_WMS20Response">
     <wsdl:part element="tns:MT_KUNNR_IN_WMS20Response" name="parameters">
     </wsdl:part>
@@ -1057,6 +1105,12 @@
       <wsdl:fault message="tns:Exception" name="Exception">
     </wsdl:fault>
     </wsdl:operation>
+    <wsdl:operation name="POS2WMS_WMS23">
+      <wsdl:input message="tns:POS2WMS_WMS23" name="POS2WMS_WMS23">
+    </wsdl:input>
+      <wsdl:output message="tns:POS2WMS_WMS23Response" name="POS2WMS_WMS23Response">
+    </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="MT_KUNNR_IN_WMS22">
       <wsdl:input message="tns:MT_KUNNR_IN_WMS22" name="MT_KUNNR_IN_WMS22">
     </wsdl:input>
@@ -1204,6 +1258,15 @@
         <soap:fault name="Exception" use="literal"/>
       </wsdl:fault>
     </wsdl:operation>
+    <wsdl:operation name="POS2WMS_WMS23">
+      <soap:operation soapAction="wms23" style="document"/>
+      <wsdl:input name="POS2WMS_WMS23">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="POS2WMS_WMS23Response">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="MT_KUNNR_IN_WMS22">
       <soap:operation soapAction="wms22" style="document"/>
       <wsdl:input name="MT_KUNNR_IN_WMS22">