Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 2c43632ad199905f759b1ba69cce2dcbc71c709f

 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");
            }
        }
        //处理返回结果