From 959e5318189e66ad58d07c5bb94789c815b4d2e9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 16 八月 2025 11:42:37 +0800
Subject: [PATCH] art: WebService服务端相关代码修改
---
/dev/null | 107 -----------------
src/main/java/org/jeecg/modules/wms/request/WebServiceSendItem.java | 121 +++++++++++++-------
src/main/java/org/jeecg/modules/wms/request/ArrayOfWebServiceSendItem.java | 4
src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java | 9 +
src/main/java/org/jeecg/modules/wms/request/WMSWebServiceSendItem.java | 91 +++++++++++++++
5 files changed, 177 insertions(+), 155 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/wms/dto/WebServiceSendItem.java b/src/main/java/org/jeecg/modules/wms/dto/WebServiceSendItem.java
deleted file mode 100644
index 4db2e35..0000000
--- a/src/main/java/org/jeecg/modules/wms/dto/WebServiceSendItem.java
+++ /dev/null
@@ -1,107 +0,0 @@
-
-package org.jeecg.modules.wms.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>WebServiceSendItem complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType name="WebServiceSendItem">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="FactoryCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="SkuCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="Align" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="Pallet" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="PackageNo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="TrackLot" type="{http://www.w3.org/2001/XMLSchema}long"/>
- * <element name="Series" type="{http://www.w3.org/2001/XMLSchema}long"/>
- * <element name="MesStockID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="Quantity" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
- * <element name="SapTrackLot" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="Section" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="DestSection" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="SupplierCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="SupplierTrackLot" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="StageID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="Remark" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="OrderCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "WebServiceSendItem", propOrder = {
- "factoryCode",
- "skuCode",
- "align",
- "pallet",
- "packageNo",
- "trackLot",
- "series",
- "mesStockID",
- "quantity",
- "sapTrackLot",
- "section",
- "destSection",
- "supplierCode",
- "supplierTrackLot",
- "stageID",
- "remark",
- "orderCode"
-})
-@Getter
-@Setter
-public class WebServiceSendItem {
-
- @XmlElement(name = "FactoryCode")
- protected String factoryCode;
- @XmlElement(name = "SkuCode")
- protected String skuCode;
- @XmlElement(name = "Align")
- protected String align;
- @XmlElement(name = "Pallet")
- protected String pallet;
- @XmlElement(name = "PackageNo")
- protected String packageNo;
- @XmlElement(name = "TrackLot")
- protected long trackLot;
- @XmlElement(name = "Series")
- protected long series;
- @XmlElement(name = "MesStockID")
- protected String mesStockID;
- @XmlElement(name = "Quantity", required = true)
- protected BigDecimal quantity;
- @XmlElement(name = "SapTrackLot")
- protected String sapTrackLot;
- @XmlElement(name = "Section")
- protected String section;
- @XmlElement(name = "DestSection")
- protected String destSection;
- @XmlElement(name = "SupplierCode")
- protected String supplierCode;
- @XmlElement(name = "SupplierTrackLot")
- protected String supplierTrackLot;
- @XmlElement(name = "StageID")
- protected String stageID;
- @XmlElement(name = "Remark")
- protected String remark;
- @XmlElement(name = "OrderCode")
- protected String orderCode;
-}
diff --git a/src/main/java/org/jeecg/modules/wms/request/ArrayOfWebServiceSendItem.java b/src/main/java/org/jeecg/modules/wms/request/ArrayOfWebServiceSendItem.java
index 2f75f8f..98f4d53 100644
--- a/src/main/java/org/jeecg/modules/wms/request/ArrayOfWebServiceSendItem.java
+++ b/src/main/java/org/jeecg/modules/wms/request/ArrayOfWebServiceSendItem.java
@@ -1,8 +1,6 @@
package org.jeecg.modules.wms.request;
-import org.jeecg.modules.wms.dto.WebServiceSendItem;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
@@ -57,7 +55,7 @@
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link org.jeecg.modules.wms.dto.WebServiceSendItem }
+ * {@link WebServiceSendItem }
*
*
*/
diff --git a/src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java b/src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java
index c728815..1ccdc62 100644
--- a/src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java
+++ b/src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java
@@ -4,15 +4,18 @@
import lombok.Setter;
import javax.xml.bind.annotation.*;
+import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "wmsScanItemList"
+ "wmsWebServiceSendItemList"
})
@XmlRootElement(name = "ReceiveWMSScanItemList")
@Getter
@Setter
public class ReceiveWMSScanItemList {
- @XmlElement(name = "WMSScanItemList")
- protected ArrayOfWebServiceSendItem wmsScanItemList;
+
+ @XmlElementWrapper(name = "ArrayOfWMSWebServiceSendItem")
+ @XmlElement(name = "WMSWebServiceSendItem", nillable = true)
+ protected List<WMSWebServiceSendItem> wmsWebServiceSendItemList;
}
diff --git a/src/main/java/org/jeecg/modules/wms/request/WMSWebServiceSendItem.java b/src/main/java/org/jeecg/modules/wms/request/WMSWebServiceSendItem.java
new file mode 100644
index 0000000..0e491a8
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/wms/request/WMSWebServiceSendItem.java
@@ -0,0 +1,91 @@
+
+package org.jeecg.modules.wms.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+@Getter
+@Setter
+@XmlType(name = "WMSWebServiceSendItem", propOrder = {
+ "factoryCode",
+ "skuCode",
+ "reservationOrder",
+ "align",
+ "pallet",
+ "packageNo",
+ "trackLot",
+ "series",
+ "mesStockID",
+ "quantity",
+ "sapTrackLot",
+ "section",
+ "destSection",
+ "supplierCode",
+ "supplierTrackLot",
+ "stageID",
+ "remark",
+ "orderCode"
+})
+@XmlAccessorType(XmlAccessType.FIELD)
+public class WMSWebServiceSendItem {
+
+ /**宸ュ巶缂栫爜 */
+ @XmlElement(name = "FactoryCode")
+ private String factoryCode;
+ /** 鐗╂枡缂栫爜 */
+ @XmlElement(name = "SkuCode")
+ private String skuCode;
+ /** 棰勭暀鍙� */
+ @XmlElement(name = "ReservationOrder")
+ private String reservationOrder;
+ /** 瀵归綈鏂瑰紡 */
+ @XmlElement(name = "Align")
+ private String align;
+ /** 鎵樺彿 */
+ @XmlElement(name = "Pallet")
+ private String pallet;
+ /** 鍖呰缂栫爜 */
+ @XmlElement(name = "PackageNo")
+ private String packageNo;
+ /** 鎵规鍙� */
+ @XmlElement(name = "TrackLot")
+ private String trackLot;
+ /** 绯诲垪鍙� */
+ @XmlElement(name = "Series")
+ private String series;
+ /** MES搴撳瓨ID */
+ @XmlElement(name = "MesStockID")
+ private String mesStockID;
+ /** 鏁伴噺 */
+ @XmlElement(name = "Quantity")
+ private String quantity;
+ /** SAP鎵规鍙� */
+ @XmlElement(name = "SapTrackLot")
+ private String sapTrackLot;
+ /** 鍙戦�佸簱瀛樺湴 */
+ @XmlElement(name = "Section")
+ private String section;
+ /** 鐩爣搴撳瓨鍦� */
+ @XmlElement(name = "DestSection")
+ private String destSection;
+ /** 渚涘簲鍟嗕唬鐮� */
+ @XmlElement(name = "SupplierCode")
+ private String supplierCode;
+ /** 渚涘簲鍟嗘壒娆″彿 */
+ @XmlElement(name = "SupplierTrackLot")
+ private String supplierTrackLot;
+ /** 闃舵ID */
+ @XmlElement(name = "StageID")
+ private String stageID;
+ /** 澶囨敞 */
+ @XmlElement(name = "Remark")
+ private String remark;
+ /** 璁㈠崟缂栫爜 */
+ @XmlElement(name = "OrderCode")
+ private String orderCode;
+}
diff --git a/src/main/java/org/jeecg/modules/wms/request/WebServiceSendItem.java b/src/main/java/org/jeecg/modules/wms/request/WebServiceSendItem.java
index d87832f..ab7e44e 100644
--- a/src/main/java/org/jeecg/modules/wms/request/WebServiceSendItem.java
+++ b/src/main/java/org/jeecg/modules/wms/request/WebServiceSendItem.java
@@ -1,70 +1,107 @@
+
package org.jeecg.modules.wms.request;
import lombok.Getter;
import lombok.Setter;
+import java.math.BigDecimal;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import java.io.Serializable;
-import java.math.BigDecimal;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p>WebServiceSendItem complex type鐨� Java 绫汇��
+ *
+ * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
+ *
+ * <pre>
+ * <complexType name="WebServiceSendItem">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="FactoryCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="SkuCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="Align" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="Pallet" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="PackageNo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="TrackLot" type="{http://www.w3.org/2001/XMLSchema}long"/>
+ * <element name="Series" type="{http://www.w3.org/2001/XMLSchema}long"/>
+ * <element name="MesStockID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="Quantity" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ * <element name="SapTrackLot" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="Section" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="DestSection" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="SupplierCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="SupplierTrackLot" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="StageID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="Remark" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="OrderCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "WebServiceSendItem", propOrder = {
+ "factoryCode",
+ "skuCode",
+ "align",
+ "pallet",
+ "packageNo",
+ "trackLot",
+ "series",
+ "mesStockID",
+ "quantity",
+ "sapTrackLot",
+ "section",
+ "destSection",
+ "supplierCode",
+ "supplierTrackLot",
+ "stageID",
+ "remark",
+ "orderCode"
+})
@Getter
@Setter
-@XmlAccessorType(XmlAccessType.FIELD)
-public class WebServiceSendItem implements Serializable {
- /**宸ュ巶缂栫爜 */
+public class WebServiceSendItem {
+
@XmlElement(name = "FactoryCode")
- private String factoryCode;
- /** 鐗╂枡缂栫爜 */
+ protected String factoryCode;
@XmlElement(name = "SkuCode")
- private String skuCode;
- /** 棰勭暀鍙� */
- @XmlElement(name = "ReservationOrder")
- private String reservationOrder;
- /** 瀵归綈鏂瑰紡 */
+ protected String skuCode;
@XmlElement(name = "Align")
- private String align;
- /** 鎵樺彿 */
+ protected String align;
@XmlElement(name = "Pallet")
- private String pallet;
- /** 鍖呰缂栫爜 */
+ protected String pallet;
@XmlElement(name = "PackageNo")
- private String packageNo;
- /** 鎵规鍙� */
+ protected String packageNo;
@XmlElement(name = "TrackLot")
- private String trackLot;
- /** 绯诲垪鍙� */
+ protected long trackLot;
@XmlElement(name = "Series")
- private String series;
- /** MES搴撳瓨ID */
+ protected long series;
@XmlElement(name = "MesStockID")
- private String mesStockID;
- /** 鏁伴噺 */
- @XmlElement(name = "Quantity")
- private BigDecimal quantity;
- /** SAP鎵规鍙� */
+ protected String mesStockID;
+ @XmlElement(name = "Quantity", required = true)
+ protected BigDecimal quantity;
@XmlElement(name = "SapTrackLot")
- private String sapTrackLot;
- /** 鍙戦�佸簱瀛樺湴 */
+ protected String sapTrackLot;
@XmlElement(name = "Section")
- private String section;
- /** 鐩爣搴撳瓨鍦� */
+ protected String section;
@XmlElement(name = "DestSection")
- private String destSection;
- /** 渚涘簲鍟嗕唬鐮� */
+ protected String destSection;
@XmlElement(name = "SupplierCode")
- private String supplierCode;
- /** 渚涘簲鍟嗘壒娆″彿 */
+ protected String supplierCode;
@XmlElement(name = "SupplierTrackLot")
- private String supplierTrackLot;
- /** 闃舵ID */
+ protected String supplierTrackLot;
@XmlElement(name = "StageID")
- private String stageID;
- /** 澶囨敞 */
+ protected String stageID;
@XmlElement(name = "Remark")
- private String remark;
- /** 璁㈠崟缂栫爜 */
+ protected String remark;
@XmlElement(name = "OrderCode")
- private String orderCode;
+ protected String orderCode;
}
--
Gitblit v1.9.3