From 182c04e399f5db26406234767f7ef34b5adc0015 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 20 八月 2025 18:19:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java | 71 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 26 deletions(-)
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 08d60e0..9732f55 100644
--- a/src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java
+++ b/src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java
@@ -3,44 +3,38 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.cxf.transport.http.HTTPConduit;
-import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.wms.WMSWebService;
import org.jeecg.modules.wms.dto.WSResponse;
-import org.jeecg.modules.wms.request.ReceiveWMSScanItemList;
+import org.jeecg.modules.wms.request.*;
import org.jeecg.modules.wms.service.MESWebServiceSoap;
-import org.jeecg.modules.wms.service.WebServiceSoap;
+import org.jeecg.modules.wms.service.WMSWebServiceClient;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
@Api(tags = "WMS闆嗘垚娴嬭瘯")
@RestController
@RequestMapping("/wms/client")
@Slf4j
public class WMSTestController {
- @Value("${webservice.url}")
- private String url;
@Autowired
- private WMSWebService webService;
+ private WMSWebServiceClient webServiceClient;
- private final static String localUrl = "http://localhost:9989/jeecg-boot/webservice/ReceiveWMSScanItemList?wsdl";
+ private final static String localUrl = "http://localhost:9989/ebservice/ReceiveWMSScanItemList?wsdl";
@ApiOperation(value = "WMS闆嗘垚娴嬭瘯-鎺ユ敹WMS绉诲簱缁撴灉", notes = "WMS闆嗘垚娴嬭瘯-鎺ユ敹WMS绉诲簱缁撴灉")
@PostMapping("/testReceiveWMSScanItemList")
- public Result<?> 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);
WSResponse response = service.receiveWMSScanItemList(request);
return Result.ok(response);
}
@@ -54,20 +48,45 @@
// WebServiceSoap service = (WebServiceSoap) factory.create();
// String response = service.helloWorld();
// return Result.ok(response);
- WebServiceSoap port = webService.getWebServiceSoap12();
+// WebServiceSoap port = webService.getWebServiceSoap();
// 2. 鑾峰彇 CXF 搴曞眰 Client 瀵硅薄
- Client client = ClientProxy.getClient(port);
+// Client client = ClientProxy.getClient(port);
// 3. 鑾峰彇 HTTPConduit 骞惰缃秴鏃�
- HTTPConduit http = (HTTPConduit) client.getConduit();
- HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
+// HTTPConduit http = (HTTPConduit) client.getConduit();
+// HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
+//
+// httpClientPolicy.setConnectionTimeout(10 * 1000); // 杩炴帴瓒呮椂 10 绉�
+// httpClientPolicy.setReceiveTimeout(300 * 1000); // 璇诲彇瓒呮椂 60 绉掞紙閲嶇偣锛侊級
- httpClientPolicy.setConnectionTimeout(10 * 1000); // 杩炴帴瓒呮椂 10 绉�
- httpClientPolicy.setReceiveTimeout(300 * 1000); // 璇诲彇瓒呮椂 60 绉掞紙閲嶇偣锛侊級
-
- http.setClient(httpClientPolicy);
- String result = port.helloWorld();
- return Result.ok(result);
+// http.setClient(httpClientPolicy);
+ Map<String, Object> stringObjectMap = webServiceClient.helloWorld();
+ return Result.ok(stringObjectMap);
}
+
+ @ApiOperation(value = "WMS闆嗘垚娴嬭瘯-鐗╂枡鎷夊姩", notes = "WMS闆嗘垚娴嬭瘯-鐗╂枡鎷夊姩")
+ @PostMapping("/receiveReservation")
+ public Result<?> receiveReservation(@RequestBody WebReservationOrder request) {
+ Map<String, Object> stringObjectMap = webServiceClient.receiveReservation(request);
+ return Result.ok(stringObjectMap);
+
+ }
+
+ @ApiOperation(value = "WMS闆嗘垚娴嬭瘯-绉诲簱鐢宠", notes = "WMS闆嗘垚娴嬭瘯-绉诲簱鐢宠")
+ @PostMapping("/receiveMESScanItemList")
+ public Result<?> receiveMESScanItemList(@RequestBody List<WebServiceSendItem> webServiceSendItem) {
+ ArrayOfWebServiceSendItem request = new ArrayOfWebServiceSendItem();
+ request.setWebServiceSendItem(webServiceSendItem);
+ Map<String, Object> stringObjectMap = webServiceClient.receiveMESScanItemList(request);
+ return Result.ok(stringObjectMap);
+ }
+
+ @ApiOperation(value = "WMS闆嗘垚娴嬭瘯-绉诲簱鐢宠鎾ら攢", notes = "WMS闆嗘垚娴嬭瘯-绉诲簱鐢宠鎾ら攢")
+ @PostMapping("/deliOrderDelete")
+ public Result<?> deliOrderDelete(@RequestParam String sFactoryCode, @RequestParam String sStockRecord) {
+ Map<String, Object> stringObjectMap = webServiceClient.deliOrderDelete(sFactoryCode, sStockRecord);
+ return Result.ok(stringObjectMap);
+ }
+
}
--
Gitblit v1.9.3