diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderChildController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderChildController.java index 925af9a4..7d6d976c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderChildController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderChildController.java @@ -44,12 +44,19 @@ public class SysSalesOrderChildController extends BaseController @PostMapping("/list") @ResponseBody public TableDataInfo list(SysSalesOrderChild SysSalesOrderChild) + { + startPage(); + List list = SysSalesOrderChildService.selectSysSalesOrderChildList(SysSalesOrderChild); + return getDataTable(list); + } + @PostMapping("/listAll") + @ResponseBody + public TableDataInfo listAll(SysSalesOrderChild SysSalesOrderChild) { startPage(); List list = SysSalesOrderChildService.selectSysSalesOrderChildListAll(SysSalesOrderChild); return getDataTable(list); } - /** * 导出客户报价子列表 */ diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml index 23a2cdc2..994fec89 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml @@ -377,6 +377,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where parent_id = 0 and material_no = #{materialNo} + and audit_status = '1'