فهرست منبع

测试环境合并

luojun 1 روز پیش
والد
کامیت
a3fcd25d5b

+ 12 - 16
soap-gateway/src/main/java/com/galaxis/soap/wms/WMSService.java

@@ -13,31 +13,34 @@ import java.util.List;
 )
 public interface WMSService {
 
-    @WebMethod(action="wms01")
+    @WebMethod(action = "wms01")
     List<DT_KUNNR_IN_RT_01> MT_KUNNR_IN_WMS01(@WebParam List<DT_KUNNR_IN_01> params);
 
-    @WebMethod(action="wms02")
+    @WebMethod(action="wms01_1")
+    List<DT_KUNNR_IN_RT_01_1> MT_KUNNR_IN_WMS01_1(@WebParam List<DT_KUNNR_IN_01_1> params);
+
+    @WebMethod(action = "wms02")
     List<DT_KUNNR_IN_RT_02> MT_KUNNR_IN_WMS02(@WebParam List<DT_KUNNR_IN_02> params);
 
-    @WebMethod(action="wms03")
+    @WebMethod(action = "wms03")
     List<DT_KUNNR_IN_RT_03> MT_KUNNR_IN_WMS03(@WebParam List<DT_KUNNR_IN_03> params);
 
-    @WebMethod(action="wms04")
+    @WebMethod(action = "wms04")
     List<DT_KUNNR_IN_RT_04> MT_KUNNR_IN_WMS04(@WebParam List<DT_KUNNR_IN_04> params);
 
-    @WebMethod(action="wms06")
+    @WebMethod(action = "wms06")
     List<DT_KUNNR_IN_RT_06> MT_KUNNR_IN_WMS06(@WebParam List<DT_KUNNR_IN_06> params);
 
-    @WebMethod(action="wms08")
+    @WebMethod(action = "wms08")
     List<DT_KUNNR_IN_RT_08> MT_KUNNR_IN_WMS08(@WebParam List<DT_KUNNR_IN_08> params);
 
-    @WebMethod(action="wms09")
+    @WebMethod(action = "wms09")
     List<DT_KUNNR_IN_RT_09> MT_KUNNR_IN_WMS09(@WebParam List<DT_KUNNR_IN_09> params);
 
-    @WebMethod(action="wms14")
+    @WebMethod(action = "wms14")
     List<DT_KUNNR_IN_RT_14> MT_KUNNR_IN_WMS14(@WebParam List<DT_KUNNR_IN_14> params);
 
-    @WebMethod(action="wms10_2")
+    @WebMethod(action = "wms10_2")
     List<DT_KUNNR_IN_RT_10_2> MT_KUNNR_IN_WMS10_2(List<DT_KUNNR_IN_10_2> params);
 
     @WebMethod(action="wms16")
@@ -49,13 +52,6 @@ public interface WMSService {
     @WebMethod(action="wms18")
     List<DT_KUNNR_IN_RT_18> MT_KUNNR_IN_WMS18(@WebParam List<DT_KUNNR_IN_18> params);
 
-//    void handle_WMS18(DT_KUNNR_IN_RT_18 res, DT_KUNNR_IN_18 item)  throws Exception ;
-//    void handle_WMS01(DT_KUNNR_IN_RT_01 res, DT_KUNNR_IN_01 item)  throws Exception ;
-//
-//
-//    void handle_WMS09(DT_KUNNR_IN_RT_09 res, DT_KUNNR_IN_09 item)  throws Exception ;
-//    void handle_WMS14(DT_KUNNR_IN_RT_14 res, List<DT_KUNNR_IN_14> paramlist) throws Exception;
-
     @WebMethod(action="wms19")
     List<DT_KUNNR_IN_RT_19> POS2WMS_WMS19(@WebParam List<DT_KUNNR_IN_19> params);
 

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

@@ -174,6 +174,15 @@ public class WMSServiceImpl implements WMSService {
                 WMSService::MT_KUNNR_IN_WMS01
         );
     }
+    @Override
+    public List<DT_KUNNR_IN_RT_01_1> MT_KUNNR_IN_WMS01_1(List<DT_KUNNR_IN_01_1> params) {
+        return distribute(
+                "MT_KUNNR_IN_WMS01_1",
+                params,
+                DT_KUNNR_IN_01_1::getBWKEY,
+                WMSService::MT_KUNNR_IN_WMS01_1
+        );
+    }
 
     @Override
     public List<DT_KUNNR_IN_RT_02> MT_KUNNR_IN_WMS02(List<DT_KUNNR_IN_02> params) {

+ 26 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_01_1.java

@@ -0,0 +1,26 @@
+package com.galaxis.soap.wms.obj;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DT_KUNNR_IN_01_1 {
+    /**
+     * 物流中心编码
+     */
+    private String BWKEY;
+    /**
+     * 公司代码
+     */
+    private String BUKRS;
+    /**
+     * 商品编码
+     */
+    private String ITEM_CODE;
+    /**
+     * 条码明细
+     */
+    private List<DT_KUNNR_IN_01_1_ITEM> BARCODE_LIST;
+
+}

+ 29 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_01_1_ITEM.java

@@ -0,0 +1,29 @@
+package com.galaxis.soap.wms.obj;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class DT_KUNNR_IN_01_1_ITEM {
+    /**
+     * 条码
+     */
+    private String BARCODE;
+    /**
+     * 条码类型
+     */
+    private String BARCODE_TYPE;
+    /**
+     * 包装级别
+     */
+    private String PACKAGE_LEVEL;
+    /**
+     * 包装单位
+     */
+    private String PACKAGE_UNIT;
+    /**
+     * 包装数量
+     */
+    private String PACKAGE_MEAS;
+}

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

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

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

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

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

@@ -37,9 +37,6 @@ public class DT_KUNNR_IN_09 {
     // 是否按一箱一行上传
     private String ISBOX;
 
-    // 马上放心平台
-    private String REAL_OWNER;
-
     // 明细
     private List<DT_KUNNR_IN_09_ITEM> items;
 }

+ 19 - 0
soap-gateway/src/main/java/com/galaxis/soap/wms/obj/DT_KUNNR_IN_RT_01_1.java

@@ -0,0 +1,19 @@
+package com.galaxis.soap.wms.obj;
+
+import lombok.Data;
+
+@Data
+public class DT_KUNNR_IN_RT_01_1 {
+
+    // 物流中心编码
+    private String BWKEY;
+    // 公司代码
+    private String BUKRS;
+    // 商品编码
+    private String ITEM_CODE;
+    // 消息类型,S成功/E失败
+    private String MSGTY;
+    // 消息描述
+    private String MSGTX;
+
+}

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

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

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

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

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

@@ -109,6 +109,4 @@ public class WMS_KUNNR_IN_09 {
     private String CHARG;
     //批次跟踪号
     private String TRACKNUMBER;
-    //马上放心平台
-    private String REAL_OWNER;
 }