From 1da174394ddde2c92331ee6b253c0720f068a983 Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 29 Dec 2024 13:24:25 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/web/emis/EmisWarehouseInController.java | 5 +++++ emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java index 47024a17b..2e61cbba3 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java @@ -62,6 +62,8 @@ public class EmisWarehouseInController extends EmisBaseController { startPage(); + setPrivParams(emisWarehouseIn); + if(!StringUtils.isEmpty(emisWarehouseIn.getBillCode())){ emisWarehouseIn.setBillCode( WaybillHelper.formatQueryValue(emisWarehouseIn.getBillCode())); String[] billCodeSortList = emisWarehouseIn.getBillCode().split(","); @@ -113,6 +115,9 @@ public class EmisWarehouseInController extends EmisBaseController public TableDataInfo listSimple(EmisWarehouseIn emisWarehouseIn) { startPage(); + + setPrivParams(emisWarehouseIn); + emisWarehouseIn.setUsedStatus("0"); List list = emisWarehouseInService.selectEmisWarehouseInList(emisWarehouseIn); return getDataTable(list); diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml index ac07742ab..72502fbe0 100644 --- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml @@ -170,6 +170,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + + and EXISTS (select 1 from emis_waybill ewb where a.bill_code=ewb.bill_code and ewb.into_warehouse_code=#{params.privSiteCode}) + + order by create_time desc