From 48bb1cfb3ea60090d1b0110e02e22ec24dc7287e Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 14 Jun 2024 13:50:38 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E7=94=9F=E6=88=90=E8=AE=A2=E5=8D=95=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysMakeOrderController.java    | 56 ++++++++++++++++++-
 .../mapper/system/SysMakeOrderMapper.xml      |  8 ++-
 .../templates/system/customerQuote/add.html   |  3 +-
 .../system/makeorder/addProcessInbound.html   |  2 -
 .../system/makeorder/addProduceInbound.html   |  2 +-
 .../templates/system/makeorder/addpick.html   |  2 +-
 .../templates/system/makeorder/bmps.html      |  2 +-
 .../templates/system/makeorder/bmzgqr.html    | 36 ++++++------
 .../templates/system/makeorder/gcsh.html      |  2 +-
 .../templates/system/makeorder/makeorder.html |  9 ++-
 10 files changed, 94 insertions(+), 28 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java
index 2a1aabbb..c15c513f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java
@@ -77,6 +77,14 @@ public class SysMakeOrderController extends BaseController
     public String bmps(@PathVariable("id") Long id, ModelMap mmap)
     {
         SysMakeOrder sysMakeOrder = sysMakeOrderService.selectSysMakeOrderById(id);
+        SysSalesOrder sysSalesOrder = salesOrderService.selectSysSalesOrderBySalesOrderCode(sysMakeOrder.getSaleNo());
+        if(StringUtils.isNotNull(sysSalesOrder)){
+            sysMakeOrder.setOrderType(sysSalesOrder.getSalesOrderType());
+            sysMakeOrder.setSalesman(sysSalesOrder.getBusinessMembers());
+            sysMakeOrder.setCustomerName(sysSalesOrder.getEnterpriseName());
+            sysMakeOrder.setCustomerId(sysSalesOrder.getEnterpriseCode());
+            sysMakeOrder.setCustomerOderCode(sysSalesOrder.getSalesOrderNumber());
+        }
         mmap.put("sysMakeOrder", sysMakeOrder);
         return prefix + "/bmps";
     }
@@ -89,6 +97,14 @@ public class SysMakeOrderController extends BaseController
     {
         mmap.put("currentUser", ShiroUtils.getSysUser());
         SysMakeOrder sysMakeOrder = sysMakeOrderService.selectSysMakeOrderById(id);
+        SysSalesOrder sysSalesOrder = salesOrderService.selectSysSalesOrderBySalesOrderCode(sysMakeOrder.getSaleNo());
+        if(StringUtils.isNotNull(sysSalesOrder)){
+            sysMakeOrder.setOrderType(sysSalesOrder.getSalesOrderType());
+            sysMakeOrder.setSalesman(sysSalesOrder.getBusinessMembers());
+            sysMakeOrder.setCustomerName(sysSalesOrder.getEnterpriseName());
+            sysMakeOrder.setCustomerId(sysSalesOrder.getEnterpriseCode());
+            sysMakeOrder.setCustomerOderCode(sysSalesOrder.getSalesOrderNumber());
+        }
         mmap.put("sysMakeOrder", sysMakeOrder);
         return prefix + "/bmzgqr";
     }
@@ -101,6 +117,14 @@ public class SysMakeOrderController extends BaseController
     {
         mmap.put("currentUser", ShiroUtils.getSysUser());
         SysMakeOrder sysMakeOrder = sysMakeOrderService.selectSysMakeOrderById(id);
+        SysSalesOrder sysSalesOrder = salesOrderService.selectSysSalesOrderBySalesOrderCode(sysMakeOrder.getSaleNo());
+        if(StringUtils.isNotNull(sysSalesOrder)){
+            sysMakeOrder.setOrderType(sysSalesOrder.getSalesOrderType());
+            sysMakeOrder.setSalesman(sysSalesOrder.getBusinessMembers());
+            sysMakeOrder.setCustomerName(sysSalesOrder.getEnterpriseName());
+            sysMakeOrder.setCustomerId(sysSalesOrder.getEnterpriseCode());
+            sysMakeOrder.setCustomerOderCode(sysSalesOrder.getSalesOrderNumber());
+        }
         mmap.put("sysMakeOrder", sysMakeOrder);
         return prefix + "/gcsh";
     }
@@ -116,6 +140,10 @@ public class SysMakeOrderController extends BaseController
         SysSalesOrder sysSalesOrder = salesOrderService.selectSysSalesOrderBySalesOrderCode(sysMakeOrder.getSaleNo());
         if(StringUtils.isNotNull(sysSalesOrder)){
             sysMakeOrder.setOrderType(sysSalesOrder.getSalesOrderType());
+            sysMakeOrder.setSalesman(sysSalesOrder.getBusinessMembers());
+            sysMakeOrder.setCustomerName(sysSalesOrder.getEnterpriseName());
+            sysMakeOrder.setCustomerId(sysSalesOrder.getEnterpriseCode());
+            sysMakeOrder.setCustomerOderCode(sysSalesOrder.getSalesOrderNumber());
         }
         mmap.put("sysMakeOrder", sysMakeOrder);
         return prefix + "/addPick";
@@ -132,6 +160,10 @@ public class SysMakeOrderController extends BaseController
         SysSalesOrder sysSalesOrder = salesOrderService.selectSysSalesOrderBySalesOrderCode(sysMakeOrder.getSaleNo());
         if(StringUtils.isNotNull(sysSalesOrder)){
             sysMakeOrder.setOrderType(sysSalesOrder.getSalesOrderType());
+            sysMakeOrder.setSalesman(sysSalesOrder.getBusinessMembers());
+            sysMakeOrder.setCustomerName(sysSalesOrder.getEnterpriseName());
+            sysMakeOrder.setCustomerId(sysSalesOrder.getEnterpriseCode());
+            sysMakeOrder.setCustomerOderCode(sysSalesOrder.getSalesOrderNumber());
         }
         mmap.put("sysMakeOrder", sysMakeOrder);
         return prefix + "/addProcessInbound";
@@ -145,6 +177,14 @@ public class SysMakeOrderController extends BaseController
     {
         mmap.put("currentUser", ShiroUtils.getSysUser());
         SysMakeOrder sysMakeOrder = sysMakeOrderService.selectSysMakeOrderById(id);
+        SysSalesOrder sysSalesOrder = salesOrderService.selectSysSalesOrderBySalesOrderCode(sysMakeOrder.getSaleNo());
+        if(StringUtils.isNotNull(sysSalesOrder)){
+            sysMakeOrder.setOrderType(sysSalesOrder.getSalesOrderType());
+            sysMakeOrder.setSalesman(sysSalesOrder.getBusinessMembers());
+            sysMakeOrder.setCustomerName(sysSalesOrder.getEnterpriseName());
+            sysMakeOrder.setCustomerId(sysSalesOrder.getEnterpriseCode());
+            sysMakeOrder.setCustomerOderCode(sysSalesOrder.getSalesOrderNumber());
+        }
         mmap.put("sysMakeOrder", sysMakeOrder);
         return prefix + "/addProduceInbound";
     }
@@ -220,13 +260,27 @@ public class SysMakeOrderController extends BaseController
     @RequiresPermissions("system:makeorder:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(SysMakeOrder sysMakeOrder)
+    public TableDataInfo list(SysMakeOrder sysMakeOrder) throws RuntimeException,NumberFormatException
     {
         SysUser sysUser = ShiroUtils.getSysUser();
         String deptNumber = sysUser.getDept().getDeptNumber();
         sysMakeOrder.setDeptNumber(deptNumber);
         startPage();
         List<SysMakeOrder> list = sysMakeOrderService.selectSysMakeOrderList(sysMakeOrder);
+        for(SysMakeOrder makeOrder:list){
+            if(StringUtils.isNotNull(makeOrder.getSaleNo())){
+                SysSalesOrder sysSalesOrder = salesOrderService.selectSysSalesOrderBySalesOrderCode(makeOrder.getSaleNo());
+                if(StringUtils.isNotNull(sysSalesOrder)){
+                    makeOrder.setOrderType(sysSalesOrder.getSalesOrderType());
+                    makeOrder.setSalesman(sysSalesOrder.getBusinessMembers());
+                    makeOrder.setCustomerName(sysSalesOrder.getEnterpriseName());
+                    makeOrder.setCustomerId(sysSalesOrder.getEnterpriseCode());
+                    makeOrder.setCustomerOderCode(sysSalesOrder.getSalesOrderNumber());
+                    makeOrder.setMaterial(String.valueOf(sysSalesOrder.getMaterialSum()));
+                    makeOrder.setMaterialSum(sysSalesOrder.getEnterpriseSum());
+                }
+            }
+        }
         return getDataTable(list);
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
index 489cd7f7..f982a194 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="makeNo"    column="makeNo"    />
         <result property="saleNo"    column="saleNo"    />
         <result property="Salesman"    column="Salesman"    />
+        <result property="orderType" column="order_type"    />
         <result property="customerId"    column="customerId"    />
         <result property="customerName"    column="customerName"    />
         <result property="customerOderCode"    column="customerOderCode"    />
@@ -41,7 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSysMakeOrderList" parameterType="SysMakeOrder" resultMap="SysMakeOrderResult">
-        select a.id, a.make_status, a.eceipt_status, a.quality_status, a.use_status, a.makeNo, a.saleNo, a.Salesman, a.customerId, a.customerName, a.customerOderCode, a.material
+        select a.id, a.make_status, a.eceipt_status, a.quality_status, a.use_status, a.makeNo, a.saleNo,
+               a.Salesman, a.customerId, a.customerName, a.customerOderCode, a.material
             , a.materialSum, a.finishNum, a.eceiptNum, a.noRate, a.rate
             , a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.del_flag
             , b.dept_leader_confirm_status
@@ -83,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="makeNo != null">makeNo,</if>
             <if test="saleNo != null">saleNo,</if>
             <if test="Salesman != null">Salesman,</if>
+            <if test="orderType != null">order_type,</if>
             <if test="customerId != null">customerId,</if>
             <if test="customerName != null">customerName,</if>
             <if test="customerOderCode != null">customerOderCode,</if>
@@ -107,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="makeNo != null">#{makeNo},</if>
             <if test="saleNo != null">#{saleNo},</if>
             <if test="Salesman != null">#{Salesman},</if>
+            <if test="orderType != null">#{orderType},</if>
             <if test="customerId != null">#{customerId},</if>
             <if test="customerName != null">#{customerName},</if>
             <if test="customerOderCode != null">#{customerOderCode},</if>
@@ -135,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="makeNo != null">makeNo = #{makeNo},</if>
             <if test="saleNo != null">saleNo = #{saleNo},</if>
             <if test="Salesman != null">Salesman = #{Salesman},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
             <if test="customerId != null">customerId = #{customerId},</if>
             <if test="customerName != null">customerName = #{customerName},</if>
             <if test="customerOderCode != null">customerOderCode = #{customerOderCode},</if>
@@ -181,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useStatus != null">use_status = #{useStatus},</if>
             <if test="saleNo != null">saleNo = #{saleNo},</if>
             <if test="Salesman != null">Salesman = #{Salesman},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
             <if test="customerId != null">customerId = #{customerId},</if>
             <if test="customerName != null">customerName = #{customerName},</if>
             <if test="customerOderCode != null">customerOderCode = #{customerOderCode},</if>
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
index 5d218ee8..6a619602 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
@@ -4,6 +4,8 @@
     <th:block th:include="include :: header('新增客户报价')" />
     <th:block th:include="include :: select2-css" />
     <th:block th:include="include :: bootstrap-editable-css" />
+    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
+    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -231,7 +233,6 @@
             });
         })
         $('#customerCode').on('select2:select', function (e) {
-            console.log("e",e);
             var data = e.params.data;
             console.log("data",data);
             $("input[name='customerName']").val(data.enterpriseName);
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html
index 1cf2b9d4..e53c9266 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html
@@ -48,10 +48,8 @@
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
         var prefix = ctx + "system/makeorder";
-
         var curUser = [[${currentUser}]];
         var curUsrDeptNumber = curUser.dept.deptNumber;
-
         // 字典
         var processMethodDatas = [[${@dict.getType('processMethod')}]];
         var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html
index ffac4dbb..2cacdcab 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html
@@ -29,7 +29,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">订单类型：</label>
                 <div class="col-sm-8">
-                    <select disabled name="salesOrderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" required>
+                    <select disabled name="orderType"  class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" required th:field="*{orderType}">
                         <option value="">请选择</option>
                         <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                     </select>
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html
index 172577f8..ac0a84b9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html
@@ -28,7 +28,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">订单类型：</label>
                 <div class="col-sm-8">
-                    <select name="orderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" th:field="*{orderType}" required>
+                    <select name="orderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" th:field="*{orderType}" disabled required>
                         <option value="">请选择</option>
                         <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                     </select>
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html
index 90e22631..f427b174 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html
@@ -29,7 +29,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">订单类型：</label>
                 <div class="col-sm-8">
-                    <select disabled name="salesOrderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" required>
+                    <select disabled name="orderType"  class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" required th:field="*{orderType}">
                         <option value="">请选择</option>
                         <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                     </select>
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html
index 59dbcfe1..ab7516e6 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html
@@ -29,20 +29,20 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">订单类型：</label>
                 <div class="col-sm-8">
-                    <select disabled name="salesOrderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" required>
+                    <select disabled name="orderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" th:field="*{orderType}" required>
                         <option value="">请选择</option>
                         <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                     </select>
                 </div>
             </div>
-
+        </form>
+        <div class="container">
             <div class="row">
                 <div class="col-sm-12 select-table table-striped">
                     <table id="bootstrap-sub-table-1"></table>
                 </div>
             </div>
-
-        </form>
+        </div>
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
@@ -494,20 +494,20 @@
             // alert(JSON.stringify(data));
             // saveModal 保存不关闭
             $.operate.save(prefix + "/deptLeaderConfirm", data);
-            // var data = $('#bootstrap-sub-table-1').bootstrapTable('getData');
-            // var count = data.length;
-            // var allFormData;
-            // for (let i = 0; i < count; i++) {
-            //     var childTableFormId = 'child_table_form_'+i;
-            //     if($("#"+childTableFormId).length>0){
-            //         if(i==0){
-            //             allFormData = $("#"+childTableFormId).serialize();
-            //         }else{
-            //             allFormData = allFormData +'&'+ $("#"+childTableFormId).serialize();
-            //         }
-            //     }
-            // }
-            // $.operate.save(prefix + "/deptReview", allFormData);
+            var data = $('#bootstrap-sub-table-1').bootstrapTable('getData');
+            var count = data.length;
+            var allFormData;
+            for (let i = 0; i < count; i++) {
+                var childTableFormId = 'child_table_form_'+i;
+                if($("#"+childTableFormId).length>0){
+                    if(i==0){
+                        allFormData = $("#"+childTableFormId).serialize();
+                    }else{
+                        allFormData = allFormData +'&'+ $("#"+childTableFormId).serialize();
+                    }
+                }
+            }
+            $.operate.save(prefix + "/deptReview", allFormData);
         }
 
     </script>
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html
index ea5afe12..6bedda0e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html
@@ -29,7 +29,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">订单类型：</label>
                 <div class="col-sm-8">
-                    <select disabled name="salesOrderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" required>
+                    <select disabled name="orderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}"  required th:field="*{orderType}">
                         <option value="">请选择</option>
                         <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                     </select>
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
index 39ab1bad..aa622b12 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
@@ -107,7 +107,7 @@
         var qualityStatusDatas = [[${@dict.getType('qualityStatus')}]];
         var useStatusDatas = [[${@dict.getType('useStatus')}]];
         var prefix = ctx + "system/makeorder";
-
+        var orderTypeDatas = [[${@dict.getType('sys_order_type')}]];
         $(function() {
             var options = {
                 url: prefix + "/list",
@@ -167,6 +167,13 @@
                 {
                     field: 'Salesman',
                     title: '业务员'
+                },
+                    {
+                    field: 'orderType',
+                    title: '订单类型',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(orderTypeDatas, value);
+                        }
                 },
                 {
                     field: 'customerId',