From 659c74e7aaf751cc10ac47b7e0939f235a17d873 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 10:12:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

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