diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsFinancialDocumentBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsFinancialDocumentBo.java index b5bdb431..697743ef 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsFinancialDocumentBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsFinancialDocumentBo.java @@ -2,7 +2,6 @@ package com.klp.domain.bo; import com.klp.common.core.domain.BaseEntity; import com.klp.domain.WmsJournalEntry; -import com.klp.domain.WmsStockIoDetail; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 5c53a595..c4300174 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -155,6 +155,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.eq(bo.getItemId() !=null, "mc.item_id", bo.getItemId()); //逻辑删除 qw.eq("mc.del_flag", 0); + //把team字段作为筛选条件 + qw.eq(StringUtils.isNotBlank(bo.getTeam()), "mc.team", bo.getTeam()); //根据开始时间和结束时间筛选修改时间 qw.ge(bo.getStartTime() != null, "mc.update_time", bo.getStartTime()); qw.le(bo.getEndTime() != null, "mc.update_time", bo.getEndTime());