|
|
|
@ -1,28 +1,24 @@
|
|
|
|
|
package org.dromara.wms.service.impl;
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.github.yulichang.toolkit.JoinWrappers;
|
|
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
|
|
import org.checkerframework.checker.units.qual.A;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import org.dromara.common.core.utils.MapstructUtils;
|
|
|
|
|
import org.dromara.common.core.utils.StringUtils;
|
|
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
|
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
|
|
import org.dromara.common.satoken.utils.LoginHelper;
|
|
|
|
|
import org.dromara.wms.domain.BaseMaterialCategory;
|
|
|
|
|
import org.dromara.wms.domain.WmsBaseWarehouse;
|
|
|
|
|
import org.dromara.wms.domain.WmsConfiguration;
|
|
|
|
|
import org.dromara.wms.domain.WmsInstockOrder;
|
|
|
|
|
import org.dromara.wms.domain.bo.WmsConfigurationBo;
|
|
|
|
|
import org.dromara.wms.domain.bo.WmsInstockOrderBo;
|
|
|
|
|
import org.dromara.wms.domain.vo.WmsInstockOrderVo;
|
|
|
|
|
import org.dromara.wms.mapper.WmsInstockOrderMapper;
|
|
|
|
|
import org.dromara.wms.service.IWmsConfigurationService;
|
|
|
|
|
import org.dromara.wms.service.IWmsInstockDetailService;
|
|
|
|
|
import org.dromara.wms.service.IWmsInstockOrderService;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
@ -30,12 +26,11 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
import java.util.Collection;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.Collection;
|
|
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
|
|
import java.util.concurrent.atomic.AtomicLong;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 入库单Service业务层处理
|
|
|
|
@ -114,6 +109,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
|
|
|
|
|
.select(WmsBaseWarehouse::getWarehouseCode)
|
|
|
|
|
.leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsInstockOrder::getWarehouseId)
|
|
|
|
|
|
|
|
|
|
.eq(StringUtils.isNotBlank(bo.getInstockMethond()), WmsInstockOrder::getInstockMethond, bo.getInstockMethond())
|
|
|
|
|
.eq(bo.getInstockId() != null, WmsInstockOrder::getInstockId, bo.getInstockId())
|
|
|
|
|
.eq(StringUtils.isNotBlank(bo.getInstockCode()), WmsInstockOrder::getInstockCode, bo.getInstockCode())
|
|
|
|
|
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInstockOrder::getMaterialCategoryId, bo.getMaterialCategoryId())
|
|
|
|
|