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/service/impl/MESWebServiceSoapImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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..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
@@ -11,6 +11,7 @@
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.entity.LswMaterialOutbound;
+import org.jeecg.modules.lsw.enums.MaterialInboundCategory;
import org.jeecg.modules.lsw.service.ILswMaterialInboundService;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.service.ILswMaterialOutboundService;
@@ -21,21 +22,19 @@
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.request.ReceiveWMSScanItemList;
+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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.jws.WebService;
import java.math.BigDecimal;
+import java.util.List;
@Slf4j
@Service
-@WebService(name = "MESWebServiceSoap", targetNamespace = "http://xhj008.server.webservice.com", endpointInterface = "org.jeecg.modules.wms.service.MESWebServiceSoap")
public class MESWebServiceSoapImpl implements MESWebServiceSoap {
@Autowired
@@ -56,9 +55,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
@ApiLog(apiName = "鎺ユ敹WMS鐨勭Щ搴撲俊鎭�(ReceiveWMSScanItemList(MES)", apiCategory = ApiLogCategoryEnum.WMS)
- public WSResponse receiveWMSScanItemList(ReceiveWMSScanItemList request) {
- WSResponse response = new WSResponse();
- if (request == null || CollectionUtil.isEmpty(request.getWmsWebServiceSendItemList())) {
+ public MESResponse receiveWMSScanItemList(List<WMSWebServiceSendItem> list) {
+ MESResponse response = new MESResponse();
+ if (CollectionUtil.isEmpty(list)) {
response.setErrorCode("N");
response.setErrorDesc("浼犲叆鐨勫弬鏁颁负绌猴紒");
return response;
@@ -66,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());
@@ -98,6 +97,8 @@
//娣诲姞鍏ュ簱淇℃伅
LswMaterialInbound inbound = new LswMaterialInbound();
+ inbound.setOriginalCode(transferRequest.getOriginalWarehouseId());
+ inbound.setOriginalName("WMS");
inbound.setWarehouseId(transferRequest.getTargetWarehouseId());
inbound.setReceiver("WMS");
inbound.setMaterialNumber(transferRequest.getMaterialNumber());
@@ -105,6 +106,7 @@
inbound.setBatchNumber(item.getTrackLot());
inbound.setQuantity(item.getQuantity());
inbound.setFactoryId(warehouse.getFactoryId());
+ inbound.setInboundCategory(MaterialInboundCategory.MATERIAL_TRANSFER_REQUEST.name());
boolean b = materialInboundService.inboundMaterial(inbound);
if (!b) {
errorCount++;
@@ -160,6 +162,9 @@
}
transferOrderPrintService.updateById(transferOrder);
successCount++;
+ } else {
+ errorCount++;
+ errorMsg.append("绉诲簱鍗曞拰棰勭暀鍙烽兘涓虹┖锛乗n");
}
}
//澶勭悊杩斿洖缁撴灉
--
Gitblit v1.9.3