art: 热处理外协入库、小内圈外协入库、物料调拨

zhangherong

3 天以前 91bf52413fded1d71f3c6d0e359d3c5c2bbd8900

 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,7 +22,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 +35,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 +57,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("传入的参数为空！");
@@ -98,6 +99,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 +108,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++;