111

k94314517

2023-10-16 ca73a173f008c8d7a9d700bad897ca24fe2d2203

 server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java

@@ -323,9 +323,9 @@
        if(!Objects.isNull(i.getInWarehouseId())){
            sub.append(i.getInWarehouseId());
        }
//        if(!Objects.isNull(i.getOutLocationId())){
//            sub.append(i.getOutLocationId());
//        }
        if(!Objects.isNull(i.getOutLocationId())){
            sub.append(i.getOutLocationId());
        }
//        if(!Objects.isNull(i.getInLocationId())){
//            sub.append(i.getInLocationId());
//        }
@@ -416,6 +416,7 @@
                wTransferDetail.setTransferId(wTransfer.getId());
                wTransferDetail.setOutDepartId(wTransfer.getOutDepartId());
                wTransferDetail.setOutWarehouseId(wTransfer.getOutWarehouseId());
                wTransferDetail.setOutLocationId(w.getOutLocationId());
                wTransferDetail.setInDepartId(wTransfer.getInDepartId());
                wTransferDetail.setInWarehouseId(wTransfer.getInWarehouseId());
                wTransferDetail.setInLcoationId(w.getInLocationId());
@@ -893,6 +894,9 @@
            queryWStockDto.setQualityType(wTransferDetail.getQualityType());
            if(!Objects.isNull(wTransferDetail.getProcedureId())){
                queryWStockDto.setProcedureId(wTransferDetail.getProcedureId());
            }
            if(!Objects.isNull(wTransferDetail.getOutLocationId())){
                queryWStockDto.setLocationId(wTransferDetail.getOutLocationId());
            }
            //获取仓库信息 根据
            Warehouse warehouse = warehouseMapper.selectById(wTransferDetail.getOutWarehouseId());
@@ -2300,7 +2304,7 @@
                wOutboundDetail.setOutboundId(wOutbound.getId());
                wOutboundDetail.setMaterialId(wTransferDetail.getMaterialId());
                wOutboundDetail.setUnitId(wTransferDetail.getUnitId());
                wOutboundDetail.setBatch(wTransferDetail.getBatch());
                wOutboundDetail.setBatch(wStock.getBatch());
                wOutboundDetail.setWarehouseId(wOutbound.getWarehouseId());
                wOutboundDetail.setLocationId(wStock.getLocationId());
                wOutboundDetail.setNum(wTransferDetail.getOutActnum());