From ede06fe470a7b1268a4c9231b349c3a2b01e23d9 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Fri, 16 Dec 2022 15:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=84=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E7=9A=84=E7=A6=81=E7=94=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DepositoryRecordMapper.xml         | 20 +++++++++++++++++++
 .../pages/application/application-in.html     | 12 ++---------
 .../material/selectPlaceByDepository.html     |  1 -
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 7cc9e25a..4299cb7e 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -288,6 +288,19 @@
             LIMIT #{begin},#{size}
         </if>
     </select>
+
+
+    <!--根据条件查询入库记录-->
+    <select id="findApplicationInRecordByDepository" parameterType="String" resultMap="applicationInRecord">
+        select
+        <include refid="ApplicationInRecordInfo"/>
+        from applicationInRecordInfo
+        where 1 = 1
+        <if test="depositoryId != null and depositoryId != ''">
+            and did = #{depositoryId}
+        </if>
+    </select>
+
 <!--根据条件查询入库记录-->
     <select id="findApplicationInRecordPByCondition" parameterType="map" resultMap="applicationInRecord">
         select
@@ -313,6 +326,13 @@
             LIMIT #{begin},#{size}
         </if>
     </select>
+    <!--根据条件查询出库记录-->
+    <select id="findApplicationOutRecordByDepository" parameterType="String" resultMap="applicationOutRecord">
+        select
+        <include refid="ApplicationOutRecordInfo"/>
+        from applicationOutRecordInfo
+        where 1 = 1 and depositoryId = #{depositoryId}
+    </select>
 <!--根据条件查询出库记录-->
     <select id="findApplicationOutRecordPByCondition" parameterType="map" resultMap="applicationOutRecord">
         select
diff --git a/target/classes/templates/pages/application/application-in.html b/target/classes/templates/pages/application/application-in.html
index 91ccd433..65853fb4 100644
--- a/target/classes/templates/pages/application/application-in.html
+++ b/target/classes/templates/pages/application/application-in.html
@@ -48,6 +48,7 @@
 <div class="layuimini-container">
     <div class="layuimini-main">
         <div class="layui-fluid">
+
             <!--                    入库申请提交-->
             <div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto; ">
                 <div carousel-item style="overflow: inherit">
@@ -262,8 +263,6 @@
                 title: '提交成功'
             }]
         });
-
-
         // 用于提交操作
         form.on('submit(formStep)', function (data) {
             data = data.field;
@@ -320,8 +319,7 @@
             });
             return false;
         });
-
-
+        // 用于提交操作(组合)
         form.on('submit(formStep2)', function (data) {
             step.next('#stepForm');
             return false;
@@ -433,7 +431,6 @@
             $("#stepForm").css("height", height + 587 + 'px');
             $("#" + parentId).after(materialItem);
         };
-
         // 实现卡片删除
         deleteItem = function (obj) {
             // 获取父节点
@@ -447,8 +444,6 @@
             params = remove(params, parentId);
             reparent.removeChild(parent);
         };
-
-
         //删除数组中指定元素
         function remove(arr, item) {
             var result = [];
@@ -460,7 +455,6 @@
             }
             return result;
         }
-
         // 用于选择生产日期
         selectDate = function (obj) {
             var name = obj.id;
@@ -470,8 +464,6 @@
                 , show: true
             });
         };
-
-
         // 用于实现通过编码查询物料
         selectCode = function (obj) {
             // 输入code
diff --git a/target/classes/templates/pages/material/selectPlaceByDepository.html b/target/classes/templates/pages/material/selectPlaceByDepository.html
index 048cc0c9..02ab75bd 100644
--- a/target/classes/templates/pages/material/selectPlaceByDepository.html
+++ b/target/classes/templates/pages/material/selectPlaceByDepository.html
@@ -69,7 +69,6 @@
         });
 
         outQuantityCheck = function (placeId) {
-            console.log(quantity)
             layer.prompt({
                 formType: 0,
                 value: quantity,