[feat]销售管理

修改销售订单的详情、修改页面和多个审批页面的子表查询接口；
新增listAll接口；
修改bom的根据物料查询接口，新增审批字段

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<SysSalesOrderChild> list = SysSalesOrderChildService.selectSysSalesOrderChildList(SysSalesOrderChild);
+        return getDataTable(list);
+    }
+    @PostMapping("/listAll")
+    @ResponseBody
+    public TableDataInfo listAll(SysSalesOrderChild SysSalesOrderChild)
     {
         startPage();
         List<SysSalesOrderChild> list = SysSalesOrderChildService.selectSysSalesOrderChildListAll(SysSalesOrderChild);
         return getDataTable(list);
     }
-
     /**
      * 导出客户报价子列表
      */

ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml

@@ -377,6 +377,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectErpBomVo"/>
         where parent_id = 0
         and material_no = #{materialNo}
+        and audit_status = '1'
     </select>
 
     <select id="selectErpBomByMaterialNo" parameterType="String" resultMap="ErpBomResult">

ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html

@@ -330,7 +330,7 @@
     $(function() {
         var options = {
             id:'bootstrap-sub-table-editOrder',
-            url: ctx + "system/orderChild/list",
+            url: ctx + "system/orderChild/listAll",
             queryParams: queryParams,
             sidePagination: "client",
             showSearch: false,

ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html

@@ -343,7 +343,7 @@
     $(function() {
         var options = {
             id:'bootstrap-table-editOrder',
-            url: ctx + "system/orderChild/list",
+            url: ctx + "system/orderChild/listAll",
             pagination: false,
             queryParams: queryParams,
             sidePagination: "client",

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html

@@ -334,7 +334,7 @@
     $(function() {
         var options = {
             id:'bootstrap-sub-table-editOrder4',
-            url: ctx + "system/orderChild/list",
+            url: ctx + "system/orderChild/listAll",
             pagination: false,
             queryParams: queryParams,
             sidePagination: "client",

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html

@@ -328,7 +328,7 @@
     $(function() {
         var options = {
             id:'bootstrap-sub-table-editOrder1',
-            url: ctx + "system/orderChild/list",
+            url: ctx + "system/orderChild/listAll",
             pagination: false,
             queryParams: queryParams,
             sidePagination: "client",

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html

@@ -327,7 +327,7 @@
     $(function() {
         var options = {
             id:'bootstrap-sub-table-editOrder2',
-            url: ctx + "system/orderChild/list",
+            url: ctx + "system/orderChild/listAll",
             pagination: false,
             queryParams: queryParams,
             sidePagination: "client",

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

@@ -328,7 +328,7 @@
     $(function() {
         var options = {
             id:'bootstrap-sub-table-editOrder3',
-            url: ctx + "system/orderChild/list",
+            url: ctx + "system/orderChild/listAll",
             pagination: false,
             queryParams: queryParams,
             sidePagination: "client",