搜索功能

ruoyi-admin/src/main/resources/templates/login.html

@@ -128,7 +128,6 @@
 
 <script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
 <!-- 全局js -->
-<script src="https://www.jq22.com/jquery/jquery-1.10.2.js"></script>
 <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
 <script src="../static/js/bootstrap.min.js" th:src="@{/js/bootstrap.min.js}"></script>
 <!-- 验证插件 -->

ruoyi-admin/src/main/resources/templates/system/PrepareInstoreInfo/PrepareInstoreInfo.html

@@ -18,6 +18,28 @@
                                 <label>堆垛机编号：</label>
                                 <input type="text" name="pilerCode"/>
                             </li>
+                            <li>
+                                <label>物料编码：</label>
+                                <input type="text" name="materialCode">
+                            </li>
+                            <li>
+                                <label>物料类别：</label>
+                                <input type="text" name="materialType">
+                            </li>
+                            <li>
+                                <label>入库类型：</label>
+                                <select name="operationType" th:with="type=${@dict.getType('warehousing_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>入库状态：</label>
+                                <select name="instoreStatus" th:with="type=${@dict.getType('warehousing_status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>

ruoyi-admin/src/main/resources/templates/system/prepareoutstoreinfo/prepareoutstoreinfo.html

@@ -18,6 +18,32 @@
                                 <label>堆垛机编号：</label>
                                 <input type="text" name="pilerCode"/>
                             </li>
+                            <li>
+                                <label>箱体编码：</label>
+                                <input type="text" name="boxCode">
+                            </li>
+                            <li>
+                                <label>物料编码：</label>
+                                <input type="text" name="materialCode">
+                            </li>
+                            <li>
+                                <label>物料类型：</label>
+                                <input type="text" name="materialType">
+                            </li>
+                            <li>
+                                <label>出库类型：</label>
+                                <select name="operationType" th:with="type=${@dict.getType('issue_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>出库状态：</label>
+                                <select name="outstoreStauts"th:with="type=${@dict.getType('outbound_status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>

ruoyi-system/src/main/resources/mapper/system/PrepareInstoreInfoMapper.xml

@@ -32,6 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="taskCode != null  and taskCode != ''"> and task_code like concat(concat('%', #{taskCode}), '%')</if>
             <if test="params.beginPilerCode != null and params.beginPilerCode != '' and params.endPilerCode != null and params.endPilerCode != ''"> and piler_code between #{params.beginPilerCode} and #{params.endPilerCode}</if>
+            <if test="materialCode != null and materialCode != ''"> and material_code like concat(concat('%', #{materialCode}), '%')</if>
+            <if test="materialType != null and materialType != ''"> and material_type = #{materialType}</if>
+            <if test="operationType != null"> and operation_type = #{operationType}</if>
+            <if test="instoreStatus != null"> and instore_status = #{instoreStatus}</if>
         </where>
         <include refid="orderByRecordDate"/>
     </select>

ruoyi-system/src/main/resources/mapper/system/PrepareOutstoreInfoMapper.xml

@@ -33,6 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="taskCode != null  and taskCode != ''"> and task_code = #{taskCode}</if>
             <if test="pilerCode != null  and pilerCode != ''"> and piler_code = #{pilerCode}</if>
+            <if test="materialCode != null  and materialCode != ''"> and material_code like concat(concat('%', #{materialCode}), '%')</if>
+            <if test="materialType != null  and materialType != ''"> and material_type = #{materialType}</if>
+            <if test="operationType != null"> and operation_type = #{operationType}</if>
+            <if test="outstoreStauts != null"> and outstore_stauts = #{outstoreStauts}</if>
         </where>
     </select>