From ad6d69185283b3f65f8ad64a408cdf35af112290 Mon Sep 17 00:00:00 2001
From: Ji Liu <jiliu@JideMac-mini.local>
Date: Wed, 23 Apr 2025 17:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application-druid.yml |  2 +-
 .../resources/templates/manage/delivery/add.html     | 12 +++++++-----
 .../resources/templates/manage/delivery/edit.html    | 12 +++++++-----
 .../templates/manage/delivery/selectOrder.html       |  7 +++----
 .../main/resources/templates/manage/order/edit.html  | 12 ++++++++++--
 .../main/resources/mapper/manage/OrderInfoMapper.xml |  4 ++--
 6 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index ba985d44..89eb9432 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&rewriteBatchedStatements=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&rewriteBatchedStatements=true&allowMultiQueries=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: unis@db
             # 从库数据源
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
index 35918807..1b0830f2 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
@@ -11,9 +11,11 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">关联合同：</label>
                     <div class="col-sm-8">
-                        <input style="display: none" name="orderId" class="form-control" readonly type="text"  required>
-                        <input name="orderName" class="form-control" readonly type="text" onclick="openList()" required>
-
+                        <div class="input-group">
+                            <input style="display: none" name="orderId" class="form-control" readonly type="text"  required>
+                            <input name="orderName" class="form-control" type="text" onclick="selectOrder()" required>
+                            <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -158,12 +160,12 @@
             minView: "month",
             autoclose: true
         });
-        function openList(id){
+        function selectOrder(id){
             var options = {
                 title: "关联合同",
                 url: prefix + '/selectOrder',
                 skin: 'layui-layer-gray',
-                btn: false,
+                btn: true,
                 maxmin: false,
                 full: false,
                 index:1000
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
index ed4b1579..5faa8c6e 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
@@ -12,9 +12,11 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">关联合同：</label>
                     <div class="col-sm-8">
-                        <input style="display: none" th:orderId="*{orderId}" name="orderId" class="form-control" readonly type="text" required>
-                        <input name="orderName" th:orderName="*{orderName}" class="form-control" readonly type="text" onclick="openList()" required>
-
+                        <div class="input-group">
+                            <input style="display: none" th:orderId="*{orderId}" name="orderId" class="form-control" readonly type="text" required>
+                            <input name="orderName" th:orderName="*{orderName}" class="form-control" type="text" onclick="selectOrder()" required>
+                            <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -161,12 +163,12 @@
             minView: "month",
             autoclose: true
         });
-        function openList(){
+        function selectOrder(){
             var options = {
                 title: "关联合同",
                 url: prefix + '/selectOrder',
                 skin: 'layui-layer-gray',
-                btn: false,
+                btn: true,
                 maxmin: false,
                 full: false,
                 index:1000
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
index 2d0fa3b8..d07fbce0 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
@@ -4,13 +4,12 @@
   <th:block th:include="include :: header('关联合同')" />
 </head>
 <body  class="gray-bg">
-<div class="col-sm-12 select-table table-striped"  >
+  <div class="col-sm-12 select-table table-striped"  >
+    <table id="bootstrap-table"></table>
+  </div>
 
-  <table id="bootstrap-table"></table>
-</div>
 <th:block th:include="include :: footer" />
 
-
 <script>
   var prefixOrder = ctx + "manage/order";
   $(function() {
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
index 6bc641cd..edce78c5 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
@@ -207,9 +207,17 @@
                     title: "序号",
                     formatter: function (value, row, index) {
                     	// var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
-                        //var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].id' value='%s'>", index, value);
                         var html = $.common.sprintf("<input type='hidden' name='orderListList[%s].id' value='%s'>", index, value);
-                    	return html+$.table.serialNumber(index);
+                    	return $.table.serialNumber(index);
+                    }
+                },
+                {
+                    field: 'id',
+                    align: 'center',
+                    title: "id",
+                    formatter: function (value, row, index) {
+                        var html = $.common.sprintf("<input type='hidden' name='orderListList[%s].id' value='%s'>", index, value);
+                        return html;
                     }
                 },
                 {
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
index 8608c714..9703edc9 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
@@ -221,9 +221,9 @@
         <foreach item="item" index="index" collection="list" separator=";">
             update order_list
             <trim prefix="SET" suffixOverrides=",">
-                <if test="item.quantity != null ">quantity = #{item.quantity},</if>
+                <if test="item.quantity != null">quantity = #{item.quantity},</if>
                 <if test="item.amount != null">amount = #{item.amount},</if>
-                <if test="item.remark != null and item.remark!=''">remark = #{item.remark},</if>
+                <if test="item.remark != null">remark = #{item.remark},</if>
                 updated_at = NOW(),
             </trim>
             where id = #{item.id}