From 30f750d98beccae02b87f5f97d114d030fbccd83 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 10:11:13 +0800
Subject: [PATCH] art: WebService接口修改，
---
src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java | 6 +-
src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java | 8 ++--
src/main/java/org/jeecg/modules/wms/dto/MESResponse.java | 8 ++--
src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java | 8 ++--
src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java | 4 +-
src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java | 17 ++++++--
src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java | 13 ++----
src/main/java/org/jeecg/modules/wms/request/WMSWebServiceSendItem.java | 38 +++++++++---------
pom.xml | 14 +------
9 files changed, 56 insertions(+), 60 deletions(-)
diff --git a/pom.xml b/pom.xml
index bc20c9f..5715852 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<log4j2.version>2.17.0</log4j2.version>
<logback.version>1.2.9</logback.version>
<!-- webservice -->
- <cxf.version>3.2.4</cxf.version>
+ <cxf.version>3.5.2</cxf.version>
</properties>
<repositories>
@@ -229,19 +229,9 @@
</dependency>
<!-- CXF webservice -->
-<!-- <dependency>-->
-<!-- <groupId>org.apache.cxf</groupId>-->
-<!-- <artifactId>cxf-spring-boot-starter-jaxws</artifactId>-->
-<!-- <version>${cxf.version}</version>-->
-<!-- </dependency>-->
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
+ <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
diff --git a/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java b/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java
index bc5f335..435c724 100644
--- a/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java
+++ b/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java
@@ -1,7 +1,6 @@
package org.jeecg.modules.wms.config;
import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBus;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.transport.servlet.CXFServlet;
import org.jeecg.modules.wms.service.MESWebServiceSoap;
@@ -16,12 +15,9 @@
@Configuration
public class WebServiceServerConfig {
@Autowired
- private MESWebServiceSoap webServiceSoap;
-
- @Bean(name = Bus.DEFAULT_BUS_ID)
- public Bus springBus() {
- return new SpringBus();
- }
+ private Bus bus;
+ @Autowired
+ private MESWebServiceSoap mesWebServiceSoap;
@Bean(name = "cxfServlet") // 娉ㄥ叆servlet bean name涓嶈兘dispatcherServlet ,鍚﹀垯浼氳鐩杁ispatcherServlet
public ServletRegistrationBean<CXFServlet> cxfServlet() {
@@ -31,9 +27,10 @@
@Bean
public Endpoint endpoint() {
// 鍙傛暟浜岋紝鏄疭EI瀹炵幇绫诲璞�
- Endpoint endpoint = new EndpointImpl(this.springBus(), webServiceSoap);
+ Endpoint endpoint = new EndpointImpl(bus, mesWebServiceSoap);
// 鍙戝竷鏈嶅姟
endpoint.publish("/MESWebService");
+
return endpoint;
}
}
diff --git a/src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java b/src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java
index 2e3eaad..39e9527 100644
--- a/src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java
+++ b/src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java
@@ -5,7 +5,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.wms.dto.WSResponse;
+import org.jeecg.modules.wms.dto.MESResponse;
import org.jeecg.modules.wms.request.*;
import org.jeecg.modules.wms.service.MESWebServiceSoap;
import org.jeecg.modules.wms.service.WMSWebServiceClient;
@@ -35,7 +35,7 @@
MESWebServiceSoap service = (MESWebServiceSoap) factory.create();
ReceiveWMSScanItemList request = new ReceiveWMSScanItemList();
request.setWmsWebServiceSendItemList(list);
- WSResponse response = service.receiveWMSScanItemList(request);
+ MESResponse response = service.receiveWMSScanItemList(request);
return Result.ok(response);
}
diff --git a/src/main/java/org/jeecg/modules/wms/dto/MESResponse.java b/src/main/java/org/jeecg/modules/wms/dto/MESResponse.java
index 3a928d6..4aa1594 100644
--- a/src/main/java/org/jeecg/modules/wms/dto/MESResponse.java
+++ b/src/main/java/org/jeecg/modules/wms/dto/MESResponse.java
@@ -11,13 +11,13 @@
@Getter
@Setter
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "WSResponse", propOrder = {
+@XmlType(name = "MESResponse", propOrder = {
"errorCode",
"errorDesc"
-})
+}, namespace = "http://xhj008.server.webservice.com/")
public class MESResponse {
- @XmlElement(name = "ErrorCode")
+ @XmlElement(name = "ErrorCode", namespace = "http://xhj008.server.webservice.com/")
protected String errorCode;
- @XmlElement(name = "ErrorDesc")
+ @XmlElement(name = "ErrorDesc", namespace = "http://xhj008.server.webservice.com/")
protected String errorDesc;
}
diff --git a/src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java b/src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java
index 02877a0..6b5c57a 100644
--- a/src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java
+++ b/src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java
@@ -8,11 +8,11 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"receiveWMSScanItemListResult"
-})
-@XmlRootElement(name = "ReceiveWMSScanItemListResponse")
+}, namespace = "http://xhj008.server.webservice.com/")
+@XmlRootElement(name = "ReceiveWMSScanItemListResponse", namespace = "http://xhj008.server.webservice.com/")
@Getter
@Setter
public class ReceiveWMSScanItemListResponse {
- @XmlElement(name = "ReceiveWMSScanItemListResult")
+ @XmlElement(name = "ReceiveWMSScanItemListResult", namespace = "http://xhj008.server.webservice.com/")
protected MESResponse receiveWMSScanItemListResult;
}
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 1ccdc62..5e22ba5 100644
--- a/src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java
+++ b/src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java
@@ -9,13 +9,13 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"wmsWebServiceSendItemList"
-})
-@XmlRootElement(name = "ReceiveWMSScanItemList")
+}, namespace = "http://xhj008.server.webservice.com/")
+@XmlRootElement(name = "ReceiveWMSScanItemList", namespace = "http://xhj008.server.webservice.com/")
@Getter
@Setter
public class ReceiveWMSScanItemList {
- @XmlElementWrapper(name = "ArrayOfWMSWebServiceSendItem")
- @XmlElement(name = "WMSWebServiceSendItem", nillable = true)
+ @XmlElementWrapper(name = "ArrayOfWMSWebServiceSendItem", namespace = "http://xhj008.server.webservice.com/")
+ @XmlElement(name = "WMSWebServiceSendItem", nillable = true, namespace = "http://xhj008.server.webservice.com/")
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
index 2e527e0..3fe2499 100644
--- a/src/main/java/org/jeecg/modules/wms/request/WMSWebServiceSendItem.java
+++ b/src/main/java/org/jeecg/modules/wms/request/WMSWebServiceSendItem.java
@@ -31,62 +31,62 @@
"stageID",
"remark",
"orderCode"
-})
+}, namespace = "http://xhj008.server.webservice.com/")
@XmlAccessorType(XmlAccessType.FIELD)
public class WMSWebServiceSendItem {
/**宸ュ巶缂栫爜 */
- @XmlElement(name = "FactoryCode")
+ @XmlElement(name = "FactoryCode", namespace = "http://xhj008.server.webservice.com/")
private String factoryCode;
/** 鐗╂枡缂栫爜 */
- @XmlElement(name = "SkuCode")
+ @XmlElement(name = "SkuCode", namespace = "http://xhj008.server.webservice.com/")
private String skuCode;
/** 棰勭暀鍙� */
- @XmlElement(name = "ReservationOrder")
+ @XmlElement(name = "ReservationOrder", namespace = "http://xhj008.server.webservice.com/")
private String reservationOrder;
/** MES绉诲簱鍗曞彿 */
- @XmlElement(name = "Align")
+ @XmlElement(name = "Align", namespace = "http://xhj008.server.webservice.com/")
private String align;
/** 鎵樺彿 */
- @XmlElement(name = "Pallet")
+ @XmlElement(name = "Pallet", namespace = "http://xhj008.server.webservice.com/")
private String pallet;
/** 鍖呰缂栫爜 */
- @XmlElement(name = "PackageNo")
+ @XmlElement(name = "PackageNo", namespace = "http://xhj008.server.webservice.com/")
private String packageNo;
/** 鎵规鍙� */
- @XmlElement(name = "TrackLot")
+ @XmlElement(name = "TrackLot", namespace = "http://xhj008.server.webservice.com/")
private String trackLot;
/** 绯诲垪鍙� */
- @XmlElement(name = "Series")
+ @XmlElement(name = "Series", namespace = "http://xhj008.server.webservice.com/")
private String series;
/** MES搴撳瓨ID */
- @XmlElement(name = "MesStockID")
+ @XmlElement(name = "MesStockID", namespace = "http://xhj008.server.webservice.com/")
private String mesStockID;
/** 鏁伴噺 */
- @XmlElement(name = "Quantity")
+ @XmlElement(name = "Quantity", namespace = "http://xhj008.server.webservice.com/")
private BigDecimal quantity;
/** SAP鎵规鍙� */
- @XmlElement(name = "SapTrackLot")
+ @XmlElement(name = "SapTrackLot", namespace = "http://xhj008.server.webservice.com/")
private String sapTrackLot;
/** 鍙戦�佸簱瀛樺湴 */
- @XmlElement(name = "Section")
+ @XmlElement(name = "Section", namespace = "http://xhj008.server.webservice.com/")
private String section;
/** 鐩爣搴撳瓨鍦� */
- @XmlElement(name = "DestSection")
+ @XmlElement(name = "DestSection", namespace = "http://xhj008.server.webservice.com/")
private String destSection;
/** 渚涘簲鍟嗕唬鐮� */
- @XmlElement(name = "SupplierCode")
+ @XmlElement(name = "SupplierCode", namespace = "http://xhj008.server.webservice.com/")
private String supplierCode;
/** 渚涘簲鍟嗘壒娆″彿 */
- @XmlElement(name = "SupplierTrackLot")
+ @XmlElement(name = "SupplierTrackLot", namespace = "http://xhj008.server.webservice.com/")
private String supplierTrackLot;
/** 闃舵ID */
- @XmlElement(name = "StageID")
+ @XmlElement(name = "StageID", namespace = "http://xhj008.server.webservice.com/")
private String stageID;
/** 澶囨敞 */
- @XmlElement(name = "Remark")
+ @XmlElement(name = "Remark", namespace = "http://xhj008.server.webservice.com/")
private String remark;
/** 璁㈠崟缂栫爜 */
- @XmlElement(name = "OrderCode")
+ @XmlElement(name = "OrderCode", namespace = "http://xhj008.server.webservice.com/")
private String orderCode;
}
diff --git a/src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java b/src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java
index 5740e1b..0dffadb 100644
--- a/src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java
+++ b/src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java
@@ -1,18 +1,27 @@
package org.jeecg.modules.wms.service;
-import org.jeecg.modules.wms.dto.WSResponse;
+import org.jeecg.modules.wms.dto.MESResponse;
import org.jeecg.modules.wms.request.ReceiveWMSScanItemList;
import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
@WebService(name = "MESWebServiceSoap", targetNamespace = "http://xhj008.server.webservice.com/")
public interface MESWebServiceSoap {
/**
* 鎺ユ敹WMS绉诲簱淇℃伅
- * @param request
+ * @param wmsWebServiceSendItemList
* @return
*/
- @WebMethod
- WSResponse receiveWMSScanItemList(ReceiveWMSScanItemList request);
+ @WebMethod(operationName = "ReceiveWMSScanItemList", action = "http://xhj008.server.webservice.com/ReceiveWMSScanItemList")
+ @RequestWrapper(localName = "ReceiveWMSScanItemList", targetNamespace = "http://xhj008.server.webservice.com/", className = "ReceiveWMSScanItemList")
+ @ResponseWrapper(localName = "ReceiveWMSScanItemListResponse", targetNamespace = "http://xhj008.server.webservice.com/", className = "ReceiveWMSScanItemListResponse")
+ @WebResult(name = "ReceiveWMSScanItemListResult", targetNamespace = "http://xhj008.server.webservice.com/")
+ MESResponse receiveWMSScanItemList(
+ @WebParam(name = "wmsWebServiceSendItemList", targetNamespace = "http:/xhj008.server.webservice.com/")
+ ReceiveWMSScanItemList wmsWebServiceSendItemList);
}
diff --git a/src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java b/src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java
index f0e64fc..d80623a 100644
--- a/src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java
+++ b/src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java
@@ -21,7 +21,7 @@
import org.jeecg.modules.mes.enums.TransferOrderStatusEnum;
import org.jeecg.modules.mes.service.IMesMaterialTransferRequestService;
import org.jeecg.modules.mes.service.IMesTransferOrderPrintService;
-import org.jeecg.modules.wms.dto.WSResponse;
+import org.jeecg.modules.wms.dto.MESResponse;
import org.jeecg.modules.wms.request.ReceiveWMSScanItemList;
import org.jeecg.modules.wms.request.WMSWebServiceSendItem;
import org.jeecg.modules.wms.service.MESWebServiceSoap;
@@ -34,7 +34,7 @@
@Slf4j
-@Service
+@Service("MESWebServiceSoap")
@WebService(name = "MESWebServiceSoap", targetNamespace = "http://xhj008.server.webservice.com", endpointInterface = "org.jeecg.modules.wms.service.MESWebServiceSoap")
public class MESWebServiceSoapImpl implements MESWebServiceSoap {
@@ -56,8 +56,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
@ApiLog(apiName = "鎺ユ敹WMS鐨勭Щ搴撲俊鎭�(ReceiveWMSScanItemList(MES)", apiCategory = ApiLogCategoryEnum.WMS)
- public WSResponse receiveWMSScanItemList(ReceiveWMSScanItemList request) {
- WSResponse response = new WSResponse();
+ public MESResponse receiveWMSScanItemList(ReceiveWMSScanItemList request) {
+ MESResponse response = new MESResponse();
if (request == null || CollectionUtil.isEmpty(request.getWmsWebServiceSendItemList())) {
response.setErrorCode("N");
response.setErrorDesc("浼犲叆鐨勫弬鏁颁负绌猴紒");
--
Gitblit v1.9.3