|
|
@@ -17,6 +17,7 @@ import com.sckw.product.dao.KwpGoodsMapper;
|
|
|
import com.sckw.product.enums.GoodsStatusEnum;
|
|
|
import com.sckw.product.model.GoodsListExport;
|
|
|
import com.sckw.product.model.KwpGoods;
|
|
|
+import com.sckw.product.model.KwpGoodsUnit;
|
|
|
import com.sckw.product.model.OperationGoodsListExport;
|
|
|
import com.sckw.product.model.dto.OperatorGoodsListQueryDTO;
|
|
|
import com.sckw.product.model.vo.req.OperatorGoodsExportQueryVO;
|
|
|
@@ -140,6 +141,9 @@ public class GoodsManagerService {
|
|
|
wrapper.in(KwpGoods::getGoodsType, goodsTypes);
|
|
|
}
|
|
|
}
|
|
|
+ if (StringUtils.isNotBlank(params.getSupplyEntId())) {
|
|
|
+ wrapper.eq(KwpGoods::getSupplyEntId, params.getSupplyEntId());
|
|
|
+ }
|
|
|
wrapper.eq(KwpGoods::getDelFlag, Global.NO).orderByDesc(KwpGoods::getCreateTime);
|
|
|
return wrapper;
|
|
|
}
|