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 2e61cbba3..73a432850 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 @@ -146,7 +146,6 @@ public class EmisWarehouseInController extends EmisBaseController return AjaxResult.success(emisWarehouseInService.selectEmisWarehouseInById(id)); } - @GetMapping("/getWarehouseInInfo") public AjaxResult getWarehouseInInfo(String inNo) { diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml index 0a2ed000f..ac7ee26e1 100644 --- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml @@ -176,6 +176,13 @@ 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.pickup_method in('1','3') and ewb.order_status in ('0','1','3') + ) + + + order by create_time desc