From c423672ff11461a8d9f7311f6f7d569fe9656b4a Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Mon, 30 Jan 2023 15:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/mapper/DepositoryRecordMapper.xml   | 6 ++++++
 .../depository_manage/mapper/StockTakingMapper.xml        | 3 +++
 .../templates/pages/application/application-in.html       | 4 ++--
 .../templates/pages/warehouse/depository_add.html         | 8 ++++----
 .../templates/pages/warehouse/warehouse_view.html         | 6 +++---
 .../depository_manage/mapper/DepositoryRecordMapper.xml   | 6 ++++++
 .../depository_manage/mapper/StockTakingMapper.xml        | 3 +++
 .../templates/pages/application/application-in.html       | 4 ++--
 .../classes/templates/pages/warehouse/depository_add.html | 8 ++++----
 .../classes/templates/pages/warehouse/warehouse_view.html | 6 +++---
 10 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 613425d2..f24bd983 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -184,6 +184,7 @@
             and (departmentHeadTime != 0 and FIND_IN_SET(#{userId},departmenthead) != 0)
             or (depositoryManagerTime != 0 and FIND_IN_SET(#{userId},depositoryManager) != 0)
         </if>
+
     </select>
     <!-- 查询所有数据 -->
     <select id="findCountByCondition" resultType="integer" parameterType="map">
@@ -291,6 +292,7 @@
             or (depositoryManagerTime != 0 and FIND_IN_SET(#{userId},depositoryManager) != 0 and depositoryManagerPass != 3)
         </if>
         group by aorid
+        ORDER BY applicantTime desc
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
         </if>
@@ -329,9 +331,11 @@
         <if test="applicantTime != null and applicantTime != ''">
             and applicant_time >= #{applicantTime}
         </if>
+        order by applicant_time desc
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
         </if>
+
     </select>
     <!--根据条件查询出库记录-->
     <select id="findApplicationOutRecordByDepository" parameterType="String" resultMap="applicationOutRecord">
@@ -404,6 +408,8 @@
             and placeId = #{placeId}
         </if>
         GROUP BY aorid
+
+        ORDER BY applicantTime desc
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
         </if>
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml
index c2694529..62a82a01 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml
@@ -214,6 +214,7 @@
         <if test="originator != null and originator!=''">
             and st.originator = #{originator}
         </if>
+
     </select>
 
 
@@ -293,6 +294,7 @@
             and (state != 3 and departmentManagerState != 3 and FIND_IN_SET(#{userId},st.departmentManager) != 0 )
             or (state != 3 and departmentManagerState != 3 and #{userId} = st.originator)
         </if>
+        ORDER BY st.createTime desc
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
         </if>
@@ -321,6 +323,7 @@
         from stocktaking st
         where 1 = 1
         and originator =  #{userId}
+        ORDER BY st.createTime desc
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
         </if>
diff --git a/src/main/resources/templates/pages/application/application-in.html b/src/main/resources/templates/pages/application/application-in.html
index 32326b0b..b436056b 100644
--- a/src/main/resources/templates/pages/application/application-in.html
+++ b/src/main/resources/templates/pages/application/application-in.html
@@ -659,7 +659,7 @@
             // 获取当前高度
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
             params.push(NewIdNumber);
-            $("#stepForm").css("height", height + 623 + 'px');
+            $("#stepForm").css("height", height + 558 + 'px');
             $("#" + parentId).after(materialItem);
         };
         // 实现卡片删除
@@ -671,7 +671,7 @@
             // 获取祖父节点
             var reparent = parent.parentNode;
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            $("#stepForm").css("height", height - 623 + 'px');
+            $("#stepForm").css("height", height - 558 + 'px');
             params = remove(params, parentId);
             reparent.removeChild(parent);
         };
diff --git a/src/main/resources/templates/pages/warehouse/depository_add.html b/src/main/resources/templates/pages/warehouse/depository_add.html
index 8cd697d4..d7290274 100644
--- a/src/main/resources/templates/pages/warehouse/depository_add.html
+++ b/src/main/resources/templates/pages/warehouse/depository_add.html
@@ -40,7 +40,7 @@
 
                                     <label class="layui-form-label">部门</label>
                                     <div class="layui-input-block">
-                                        <select name="adminorg" id="adminorg"></select>
+                                        <select name="adminorg" id="adminorg" lay-verify="required"></select>
                                     </div>
 
                                 </div>
@@ -55,7 +55,7 @@
                                     <label class="layui-form-label">地址:</label>
                                     <div class="layui-input-block">
                                         <input type="text" placeholder="请填写仓库地址" class="layui-input"
-                                               name="address" lay-verify="required"/>
+                                               name="address" />
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
@@ -69,14 +69,14 @@
                                     <label class="layui-form-label">最大存储量:</label>
                                     <div class="layui-input-block">
                                         <input name="maxNumber" placeholder="请填写最大存储量..."
-                                                  class="layui-input" value="500"></input>
+                                               class="layui-input" value="5000"/>
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">最小存储量:</label>
                                     <div class="layui-input-block">
                                         <input name="minNumber" placeholder="请填写最小存储量..."
-                                                  class="layui-input" value="0"></input>
+                                               class="layui-input" value="0"/>
                                     </div>
                                 </div>
 
diff --git a/src/main/resources/templates/pages/warehouse/warehouse_view.html b/src/main/resources/templates/pages/warehouse/warehouse_view.html
index b3c05da5..162d6e3b 100644
--- a/src/main/resources/templates/pages/warehouse/warehouse_view.html
+++ b/src/main/resources/templates/pages/warehouse/warehouse_view.html
@@ -43,7 +43,7 @@
   <div class="layui-form-item" style="display: inline-block">
     <label class="layui-form-label">部门</label>
     <div class="layui-input-inline">
-      <select name="adminorg" id="adminorg">
+      <select name="adminorg" id="adminorg" lay-verify="required">
       <option value="">请选择部门</option>
       <option th:each="post,iterStar:${postList}" th:text="${post?.getName()}" th:value="${post?.getId()}" th:selected="${record.getAdminorg().equals(post.getId().toString())}"></option>
       </select>
@@ -52,13 +52,13 @@
   <div class="layui-form-item">
     <label class="layui-form-label">仓库地址</label>
     <div class="layui-input-block">
-      <input type="text" th:value="${record.getAddress()}" name="address" required  lay-verify="required" autocomplete="off" class="layui-input">
+      <input type="text" th:value="${record.getAddress()}" name="address"  autocomplete="off" class="layui-input">
     </div>
   </div>
   <div class="layui-form-item">
     <label class="layui-form-label">仓库介绍</label>
     <div class="layui-input-block">
-      <input type="text" th:value="${record.getIntroduce()}" name="introduce" required  lay-verify="required" autocomplete="off" class="layui-input">
+      <input type="text" th:value="${record.getIntroduce()}" name="introduce"   autocomplete="off" class="layui-input">
     </div>
   </div>
   <div class="layui-form-item">
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 613425d2..f24bd983 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -184,6 +184,7 @@
             and (departmentHeadTime != 0 and FIND_IN_SET(#{userId},departmenthead) != 0)
             or (depositoryManagerTime != 0 and FIND_IN_SET(#{userId},depositoryManager) != 0)
         </if>
+
     </select>
     <!-- 查询所有数据 -->
     <select id="findCountByCondition" resultType="integer" parameterType="map">
@@ -291,6 +292,7 @@
             or (depositoryManagerTime != 0 and FIND_IN_SET(#{userId},depositoryManager) != 0 and depositoryManagerPass != 3)
         </if>
         group by aorid
+        ORDER BY applicantTime desc
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
         </if>
@@ -329,9 +331,11 @@
         <if test="applicantTime != null and applicantTime != ''">
             and applicant_time >= #{applicantTime}
         </if>
+        order by applicant_time desc
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
         </if>
+
     </select>
     <!--根据条件查询出库记录-->
     <select id="findApplicationOutRecordByDepository" parameterType="String" resultMap="applicationOutRecord">
@@ -404,6 +408,8 @@
             and placeId = #{placeId}
         </if>
         GROUP BY aorid
+
+        ORDER BY applicantTime desc
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
         </if>
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml
index c2694529..62a82a01 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml
@@ -214,6 +214,7 @@
         <if test="originator != null and originator!=''">
             and st.originator = #{originator}
         </if>
+
     </select>
 
 
@@ -293,6 +294,7 @@
             and (state != 3 and departmentManagerState != 3 and FIND_IN_SET(#{userId},st.departmentManager) != 0 )
             or (state != 3 and departmentManagerState != 3 and #{userId} = st.originator)
         </if>
+        ORDER BY st.createTime desc
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
         </if>
@@ -321,6 +323,7 @@
         from stocktaking st
         where 1 = 1
         and originator =  #{userId}
+        ORDER BY st.createTime desc
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
         </if>
diff --git a/target/classes/templates/pages/application/application-in.html b/target/classes/templates/pages/application/application-in.html
index 32326b0b..b436056b 100644
--- a/target/classes/templates/pages/application/application-in.html
+++ b/target/classes/templates/pages/application/application-in.html
@@ -659,7 +659,7 @@
             // 获取当前高度
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
             params.push(NewIdNumber);
-            $("#stepForm").css("height", height + 623 + 'px');
+            $("#stepForm").css("height", height + 558 + 'px');
             $("#" + parentId).after(materialItem);
         };
         // 实现卡片删除
@@ -671,7 +671,7 @@
             // 获取祖父节点
             var reparent = parent.parentNode;
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            $("#stepForm").css("height", height - 623 + 'px');
+            $("#stepForm").css("height", height - 558 + 'px');
             params = remove(params, parentId);
             reparent.removeChild(parent);
         };
diff --git a/target/classes/templates/pages/warehouse/depository_add.html b/target/classes/templates/pages/warehouse/depository_add.html
index 8cd697d4..d7290274 100644
--- a/target/classes/templates/pages/warehouse/depository_add.html
+++ b/target/classes/templates/pages/warehouse/depository_add.html
@@ -40,7 +40,7 @@
 
                                     <label class="layui-form-label">部门</label>
                                     <div class="layui-input-block">
-                                        <select name="adminorg" id="adminorg"></select>
+                                        <select name="adminorg" id="adminorg" lay-verify="required"></select>
                                     </div>
 
                                 </div>
@@ -55,7 +55,7 @@
                                     <label class="layui-form-label">地址:</label>
                                     <div class="layui-input-block">
                                         <input type="text" placeholder="请填写仓库地址" class="layui-input"
-                                               name="address" lay-verify="required"/>
+                                               name="address" />
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
@@ -69,14 +69,14 @@
                                     <label class="layui-form-label">最大存储量:</label>
                                     <div class="layui-input-block">
                                         <input name="maxNumber" placeholder="请填写最大存储量..."
-                                                  class="layui-input" value="500"></input>
+                                               class="layui-input" value="5000"/>
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">最小存储量:</label>
                                     <div class="layui-input-block">
                                         <input name="minNumber" placeholder="请填写最小存储量..."
-                                                  class="layui-input" value="0"></input>
+                                               class="layui-input" value="0"/>
                                     </div>
                                 </div>
 
diff --git a/target/classes/templates/pages/warehouse/warehouse_view.html b/target/classes/templates/pages/warehouse/warehouse_view.html
index b3c05da5..162d6e3b 100644
--- a/target/classes/templates/pages/warehouse/warehouse_view.html
+++ b/target/classes/templates/pages/warehouse/warehouse_view.html
@@ -43,7 +43,7 @@
   <div class="layui-form-item" style="display: inline-block">
     <label class="layui-form-label">部门</label>
     <div class="layui-input-inline">
-      <select name="adminorg" id="adminorg">
+      <select name="adminorg" id="adminorg" lay-verify="required">
       <option value="">请选择部门</option>
       <option th:each="post,iterStar:${postList}" th:text="${post?.getName()}" th:value="${post?.getId()}" th:selected="${record.getAdminorg().equals(post.getId().toString())}"></option>
       </select>
@@ -52,13 +52,13 @@
   <div class="layui-form-item">
     <label class="layui-form-label">仓库地址</label>
     <div class="layui-input-block">
-      <input type="text" th:value="${record.getAddress()}" name="address" required  lay-verify="required" autocomplete="off" class="layui-input">
+      <input type="text" th:value="${record.getAddress()}" name="address"  autocomplete="off" class="layui-input">
     </div>
   </div>
   <div class="layui-form-item">
     <label class="layui-form-label">仓库介绍</label>
     <div class="layui-input-block">
-      <input type="text" th:value="${record.getIntroduce()}" name="introduce" required  lay-verify="required" autocomplete="off" class="layui-input">
+      <input type="text" th:value="${record.getIntroduce()}" name="introduce"   autocomplete="off" class="layui-input">
     </div>
   </div>
   <div class="layui-form-item">