From 2c43632ad199905f759b1ba69cce2dcbc71c709f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 10 九月 2025 16:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java | 36 +++---
src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java | 15 +-
src/main/java/org/jeecg/modules/wms/controller/ReceiveWMSScanItemListController.java | 30 +++++
src/main/java/org/jeecg/modules/wms/dto/MESResponse.java | 15 --
src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java | 42 +++---
src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java | 16 --
src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java | 20 --
src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java | 72 ++++++------
src/main/java/org/jeecg/modules/wms/request/WMSWebServiceSendItem.java | 62 +++-------
9 files changed, 139 insertions(+), 169 deletions(-)
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 435c724..df2d1f0 100644
--- a/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java
+++ b/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java
@@ -1,36 +1,36 @@
-package org.jeecg.modules.wms.config;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.cxf.transport.servlet.CXFServlet;
-import org.jeecg.modules.wms.service.MESWebServiceSoap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.xml.ws.Endpoint;
-
-
-@Configuration
-public class WebServiceServerConfig {
- @Autowired
- private Bus bus;
- @Autowired
- private MESWebServiceSoap mesWebServiceSoap;
-
- @Bean(name = "cxfServlet") // 娉ㄥ叆servlet bean name涓嶈兘dispatcherServlet ,鍚﹀垯浼氳鐩杁ispatcherServlet
- public ServletRegistrationBean<CXFServlet> cxfServlet() {
- return new ServletRegistrationBean<>(new CXFServlet(), "/webservice/*");
- }
-
- @Bean
- public Endpoint endpoint() {
- // 鍙傛暟浜岋紝鏄疭EI瀹炵幇绫诲璞�
- Endpoint endpoint = new EndpointImpl(bus, mesWebServiceSoap);
- // 鍙戝竷鏈嶅姟
- endpoint.publish("/MESWebService");
-
- return endpoint;
- }
-}
+//package org.jeecg.modules.wms.config;
+//
+//import org.apache.cxf.Bus;
+//import org.apache.cxf.jaxws.EndpointImpl;
+//import org.apache.cxf.transport.servlet.CXFServlet;
+//import org.jeecg.modules.wms.service.MESWebServiceSoap;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.web.servlet.ServletRegistrationBean;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//import javax.xml.ws.Endpoint;
+//
+//
+//@Configuration
+//public class WebServiceServerConfig {
+// @Autowired
+// private Bus bus;
+// @Autowired
+// private MESWebServiceSoap mesWebServiceSoap;
+//
+// @Bean(name = "cxfServlet") // 娉ㄥ叆servlet bean name涓嶈兘dispatcherServlet ,鍚﹀垯浼氳鐩杁ispatcherServlet
+// public ServletRegistrationBean<CXFServlet> cxfServlet() {
+// return new ServletRegistrationBean<>(new CXFServlet(), "/webservice/*");
+// }
+//
+// @Bean
+// public Endpoint endpoint() {
+// // 鍙傛暟浜岋紝鏄疭EI瀹炵幇绫诲璞�
+// Endpoint endpoint = new EndpointImpl(bus, mesWebServiceSoap);
+// // 鍙戝竷鏈嶅姟
+// endpoint.publish("/MESWebService");
+//
+// return endpoint;
+// }
+//}
diff --git a/src/main/java/org/jeecg/modules/wms/controller/ReceiveWMSScanItemListController.java b/src/main/java/org/jeecg/modules/wms/controller/ReceiveWMSScanItemListController.java
new file mode 100644
index 0000000..e8893b4
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/wms/controller/ReceiveWMSScanItemListController.java
@@ -0,0 +1,30 @@
+package org.jeecg.modules.wms.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.wms.dto.MESResponse;
+import org.jeecg.modules.wms.request.WMSWebServiceSendItem;
+import org.jeecg.modules.wms.service.MESWebServiceSoap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api(tags = "MES瀵瑰鎺ュ彛")
+@RestController
+@RequestMapping("/api/mes")
+@Slf4j
+public class ReceiveWMSScanItemListController {
+ @Autowired
+ private MESWebServiceSoap mesWebServiceSoap;
+
+ @ApiOperation(value = "WMS闆嗘垚娴嬭瘯-鎺ユ敹WMS绉诲簱缁撴灉", notes = "WMS闆嗘垚娴嬭瘯-鎺ユ敹WMS绉诲簱缁撴灉")
+ @PostMapping("/receiveWMSScanItemList")
+ public MESResponse receiveWMSScanItemList(@RequestBody List<WMSWebServiceSendItem> list) {
+ return mesWebServiceSoap.receiveWMSScanItemList(list);
+ }
+}
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 39e9527..a609fbe 100644
--- a/src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java
+++ b/src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java
@@ -23,22 +23,6 @@
@Autowired
private WMSWebServiceClient webServiceClient;
- private final static String localUrl = "http://localhost:9989/webservice/MESWebService?wsdl";
-
-
- @ApiOperation(value = "WMS闆嗘垚娴嬭瘯-鎺ユ敹WMS绉诲簱缁撴灉", notes = "WMS闆嗘垚娴嬭瘯-鎺ユ敹WMS绉诲簱缁撴灉")
- @PostMapping("/testReceiveWMSScanItemList")
- public Result<?> testReceiveWMSScanItemList(@RequestBody List<WMSWebServiceSendItem> list) {
- JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
- factory.setAddress(localUrl);
- factory.setServiceClass(MESWebServiceSoap.class);
- MESWebServiceSoap service = (MESWebServiceSoap) factory.create();
- ReceiveWMSScanItemList request = new ReceiveWMSScanItemList();
- request.setWmsWebServiceSendItemList(list);
- MESResponse response = service.receiveWMSScanItemList(request);
- return Result.ok(response);
- }
-
@ApiOperation(value = "WMS闆嗘垚娴嬭瘯-HelloWord娴嬭瘯", notes = "WMS闆嗘垚娴嬭瘯-HelloWord娴嬭瘯")
@PostMapping("/testHelloWorld")
public Result<?> testHelloWorld() {
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 4aa1594..6c2cbbf 100644
--- a/src/main/java/org/jeecg/modules/wms/dto/MESResponse.java
+++ b/src/main/java/org/jeecg/modules/wms/dto/MESResponse.java
@@ -1,23 +1,14 @@
package org.jeecg.modules.wms.dto;
+import com.fasterxml.jackson.annotation.JsonProperty;
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
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MESResponse", propOrder = {
- "errorCode",
- "errorDesc"
-}, namespace = "http://xhj008.server.webservice.com/")
public class MESResponse {
- @XmlElement(name = "ErrorCode", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("ErrorCode")
protected String errorCode;
- @XmlElement(name = "ErrorDesc", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("ErrorDesc")
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 6b5c57a..2637ea2 100644
--- a/src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java
+++ b/src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java
@@ -1,18 +1,18 @@
-package org.jeecg.modules.wms.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.xml.bind.annotation.*;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "receiveWMSScanItemListResult"
-}, namespace = "http://xhj008.server.webservice.com/")
-@XmlRootElement(name = "ReceiveWMSScanItemListResponse", namespace = "http://xhj008.server.webservice.com/")
-@Getter
-@Setter
-public class ReceiveWMSScanItemListResponse {
- @XmlElement(name = "ReceiveWMSScanItemListResult", namespace = "http://xhj008.server.webservice.com/")
- protected MESResponse receiveWMSScanItemListResult;
-}
+//package org.jeecg.modules.wms.dto;
+//
+//import lombok.Getter;
+//import lombok.Setter;
+//
+//import javax.xml.bind.annotation.*;
+//
+//@XmlAccessorType(XmlAccessType.FIELD)
+//@XmlType(name = "", propOrder = {
+// "receiveWMSScanItemListResult"
+//}, namespace = "http://xhj008.server.webservice.com/")
+//@XmlRootElement(name = "ReceiveWMSScanItemListResponse", namespace = "http://xhj008.server.webservice.com/")
+//@Getter
+//@Setter
+//public class ReceiveWMSScanItemListResponse {
+// @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 5e22ba5..89583f7 100644
--- a/src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java
+++ b/src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java
@@ -1,21 +1,21 @@
-package org.jeecg.modules.wms.request;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.xml.bind.annotation.*;
-import java.util.List;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "wmsWebServiceSendItemList"
-}, namespace = "http://xhj008.server.webservice.com/")
-@XmlRootElement(name = "ReceiveWMSScanItemList", namespace = "http://xhj008.server.webservice.com/")
-@Getter
-@Setter
-public class ReceiveWMSScanItemList {
-
- @XmlElementWrapper(name = "ArrayOfWMSWebServiceSendItem", namespace = "http://xhj008.server.webservice.com/")
- @XmlElement(name = "WMSWebServiceSendItem", nillable = true, namespace = "http://xhj008.server.webservice.com/")
- protected List<WMSWebServiceSendItem> wmsWebServiceSendItemList;
-}
+//package org.jeecg.modules.wms.request;
+//
+//import lombok.Getter;
+//import lombok.Setter;
+//
+//import javax.xml.bind.annotation.*;
+//import java.util.List;
+//
+//@XmlAccessorType(XmlAccessType.FIELD)
+//@XmlType(name = "", propOrder = {
+// "wmsWebServiceSendItemList"
+//}, namespace = "http://xhj008.server.webservice.com/")
+//@XmlRootElement(name = "ReceiveWMSScanItemList", namespace = "http://xhj008.server.webservice.com/")
+//@Getter
+//@Setter
+//public class ReceiveWMSScanItemList {
+//
+// @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 3fe2499..8401094 100644
--- a/src/main/java/org/jeecg/modules/wms/request/WMSWebServiceSendItem.java
+++ b/src/main/java/org/jeecg/modules/wms/request/WMSWebServiceSendItem.java
@@ -1,92 +1,68 @@
package org.jeecg.modules.wms.request;
+import com.fasterxml.jackson.annotation.JsonProperty;
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;
import java.math.BigDecimal;
@Getter
@Setter
-@XmlType(name = "WMSWebServiceSendItem", propOrder = {
- "factoryCode",
- "skuCode",
- "reservationOrder",
- "align",
- "pallet",
- "packageNo",
- "trackLot",
- "series",
- "mesStockID",
- "quantity",
- "sapTrackLot",
- "section",
- "destSection",
- "supplierCode",
- "supplierTrackLot",
- "stageID",
- "remark",
- "orderCode"
-}, namespace = "http://xhj008.server.webservice.com/")
-@XmlAccessorType(XmlAccessType.FIELD)
public class WMSWebServiceSendItem {
/**宸ュ巶缂栫爜 */
- @XmlElement(name = "FactoryCode", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("FactoryCode")
private String factoryCode;
/** 鐗╂枡缂栫爜 */
- @XmlElement(name = "SkuCode", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("SkuCode")
private String skuCode;
/** 棰勭暀鍙� */
- @XmlElement(name = "ReservationOrder", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("ReservationOrder")
private String reservationOrder;
/** MES绉诲簱鍗曞彿 */
- @XmlElement(name = "Align", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("Align")
private String align;
/** 鎵樺彿 */
- @XmlElement(name = "Pallet", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("Pallet")
private String pallet;
/** 鍖呰缂栫爜 */
- @XmlElement(name = "PackageNo", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("PackageNo")
private String packageNo;
/** 鎵规鍙� */
- @XmlElement(name = "TrackLot", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("TrackLot")
private String trackLot;
/** 绯诲垪鍙� */
- @XmlElement(name = "Series", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("Series")
private String series;
/** MES搴撳瓨ID */
- @XmlElement(name = "MesStockID", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("MesStockID")
private String mesStockID;
/** 鏁伴噺 */
- @XmlElement(name = "Quantity", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("Quantity")
private BigDecimal quantity;
/** SAP鎵规鍙� */
- @XmlElement(name = "SapTrackLot", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("SapTrackLot")
private String sapTrackLot;
/** 鍙戦�佸簱瀛樺湴 */
- @XmlElement(name = "Section", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("Section")
private String section;
/** 鐩爣搴撳瓨鍦� */
- @XmlElement(name = "DestSection", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("DestSection")
private String destSection;
/** 渚涘簲鍟嗕唬鐮� */
- @XmlElement(name = "SupplierCode", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("SupplierCode")
private String supplierCode;
/** 渚涘簲鍟嗘壒娆″彿 */
- @XmlElement(name = "SupplierTrackLot", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("SupplierTrackLot")
private String supplierTrackLot;
/** 闃舵ID */
- @XmlElement(name = "StageID", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("StageID")
private String stageID;
/** 澶囨敞 */
- @XmlElement(name = "Remark", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("Remark")
private String remark;
/** 璁㈠崟缂栫爜 */
- @XmlElement(name = "OrderCode", namespace = "http://xhj008.server.webservice.com/")
+ @JsonProperty("OrderCode")
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 0dffadb..b2a20b1 100644
--- a/src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java
+++ b/src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java
@@ -1,27 +1,15 @@
package org.jeecg.modules.wms.service;
import org.jeecg.modules.wms.dto.MESResponse;
-import org.jeecg.modules.wms.request.ReceiveWMSScanItemList;
+import org.jeecg.modules.wms.request.WMSWebServiceSendItem;
-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;
+import java.util.List;
-@WebService(name = "MESWebServiceSoap", targetNamespace = "http://xhj008.server.webservice.com/")
public interface MESWebServiceSoap {
/**
* 鎺ユ敹WMS绉诲簱淇℃伅
- * @param wmsWebServiceSendItemList
+ * @param list
* @return
*/
- @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);
+ MESResponse receiveWMSScanItemList(List<WMSWebServiceSendItem> list);
}
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 8ccba0d..89dd85b 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
@@ -23,20 +23,18 @@
import org.jeecg.modules.mes.service.IMesMaterialTransferRequestService;
import org.jeecg.modules.mes.service.IMesTransferOrderPrintService;
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.jws.WebService;
import java.math.BigDecimal;
+import java.util.List;
@Slf4j
-@Service("MESWebServiceSoap")
-@WebService(name = "MESWebServiceSoap", targetNamespace = "http://xhj008.server.webservice.com", endpointInterface = "org.jeecg.modules.wms.service.MESWebServiceSoap")
+@Service
public class MESWebServiceSoapImpl implements MESWebServiceSoap {
@Autowired
@@ -57,9 +55,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
@ApiLog(apiName = "鎺ユ敹WMS鐨勭Щ搴撲俊鎭�(ReceiveWMSScanItemList(MES)", apiCategory = ApiLogCategoryEnum.WMS)
- public MESResponse receiveWMSScanItemList(ReceiveWMSScanItemList request) {
+ public MESResponse receiveWMSScanItemList(List<WMSWebServiceSendItem> list) {
MESResponse response = new MESResponse();
- if (request == null || CollectionUtil.isEmpty(request.getWmsWebServiceSendItemList())) {
+ if (CollectionUtil.isEmpty(list)) {
response.setErrorCode("N");
response.setErrorDesc("浼犲叆鐨勫弬鏁颁负绌猴紒");
return response;
@@ -67,7 +65,7 @@
int errorCount = 0;
int successCount = 0;
StringBuilder errorMsg = new StringBuilder();
- for (WMSWebServiceSendItem item : request.getWmsWebServiceSendItemList()) {
+ for (WMSWebServiceSendItem item : list) {
if (StringUtils.isNotBlank(item.getReservationOrder())) {
//鐗╂枡鎷夊姩鍥炶皟
MesMaterialTransferRequest transferRequest = materialTransferRequestService.queryByReservationCode(item.getReservationOrder());
@@ -164,6 +162,9 @@
}
transferOrderPrintService.updateById(transferOrder);
successCount++;
+ } else {
+ errorCount++;
+ errorMsg.append("绉诲簱鍗曞拰棰勭暀鍙烽兘涓虹┖锛乗n");
}
}
//澶勭悊杩斿洖缁撴灉
--
Gitblit v1.9.3