From a6c0b784b159b4f5046df21ff1cbf0fea63a6bd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E5=B1=BF=E6=B5=B7=E5=B7=B7?= <15711450175@163.com>
Date: Sat, 18 Sep 2021 11:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=20=20=20?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/RecordErrorController.java          |  2 +-
 .../system/basestoreinfo/basestoreinfo.html   |  7 +++
 .../templates/system/recorderror/add.html     |  4 +-
 .../templates/system/recorderror/edit.html    |  4 +-
 .../system/recorderror/recorderror.html       | 49 ++++---------------
 .../templates/system/recordinstore/add.html   |  8 ++-
 .../system/recordinstore/recordinstore.html   | 20 +++++++-
 .../system/recordoutstore/recordoutstore.html | 14 ++++++
 .../com/ruoyi/system/domain/RecordError.java  |  8 +--
 .../ruoyi/system/domain/RecordInstore.java    |  2 +
 .../system/mapper/RecordErrorMapper.java      |  2 +-
 .../system/service/IRecordErrorService.java   |  2 +-
 .../service/impl/RecordErrorServiceImpl.java  |  2 +-
 .../mapper/system/BaseStoreInfoMapper.xml     |  1 +
 .../mapper/system/RecordErrorMapper.xml       |  9 ----
 .../mapper/system/RecordInstoreMapper.xml     |  3 ++
 .../mapper/system/RecordOutstoreMapper.xml    |  3 ++
 17 files changed, 76 insertions(+), 64 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/RecordErrorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/RecordErrorController.java
index 3f62f06..61250df 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/RecordErrorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/RecordErrorController.java
@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 异常记录Controller
  * 
  * @author Frank zhou
- * @date 2021-09-16
+ * @date 2021-09-18
  */
 @Controller
 @RequestMapping("/system/recorderror")
diff --git a/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html b/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html
index 51ae5b3..a07c94c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html
@@ -18,6 +18,13 @@
                                 <label>仓库名称：</label>
                                 <input type="text" name="storeName"/>
                             </li>
+                            <li>
+                                <label>仓库状态：</label>
+                                <select name="storeStatus" th:with="type=${@dict.getType('warehouse_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>
diff --git a/ruoyi-admin/src/main/resources/templates/system/recorderror/add.html b/ruoyi-admin/src/main/resources/templates/system/recorderror/add.html
index eb40f74..42d081c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recorderror/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recorderror/add.html
@@ -46,7 +46,9 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">库位区域：</label>
                 <div class="col-sm-8">
-                    <input name="locationArea" class="form-control" type="text">
+                    <select name="locationArea" class="form-control m-b" th:with="type=${@dict.getType('location_info')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    
diff --git a/ruoyi-admin/src/main/resources/templates/system/recorderror/edit.html b/ruoyi-admin/src/main/resources/templates/system/recorderror/edit.html
index 46e7caf..6690caa 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recorderror/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recorderror/edit.html
@@ -47,7 +47,9 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">库位区域：</label>
                 <div class="col-sm-8">
-                    <input name="locationArea" th:field="*{locationArea}" class="form-control" type="text">
+                    <select name="locationArea" class="form-control m-b" th:with="type=${@dict.getType('location_info')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{locationArea}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    
diff --git a/ruoyi-admin/src/main/resources/templates/system/recorderror/recorderror.html b/ruoyi-admin/src/main/resources/templates/system/recorderror/recorderror.html
index 1ee39e5..e47f3c9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recorderror/recorderror.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recorderror/recorderror.html
@@ -18,56 +18,23 @@
                                 <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>
-                                <input type="text" name="storeCode"/>
-                            </li>
                             <li>
                                 <label>库位编码：</label>
                                 <input type="text" name="locationCode"/>
                             </li>
                             <li>
                                 <label>库位区域：</label>
-                                <input type="text" name="locationArea"/>
-                            </li>
-                            <li>
-                                <label>操作类型：</label>
-                                <input type="text" name="operationType"/>
-                            </li>-->
-                            <li>
-                                <label>任务类型：</label>
-                                <input type="text" name="taskType"/>
+                                <select name="locationArea" th:with="type=${@dict.getType('location_info')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
                             </li>
-                            <li>
+                           <!-- <li>
                                 <label>任务状态：</label>
                                 <select name="taskStatus" th:with="type=${@dict.getType('task_status')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
-                            </li>
-                           <!-- <li>
-                                <label>返回标识：</label>
-                                <input type="text" name="returnFlag"/>
-                            </li>
-                            <li>
-                                <label>开始时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择开始时间" name="beginTime"/>
-                            </li>
-                            <li>
-                                <label>结束时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择结束时间" name="endTime"/>
-                            </li>
-                            <li>
-                                <label>记录时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择记录时间" name="recordTime"/>
                             </li>-->
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -101,6 +68,7 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:recorderror:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:recorderror:remove')}]];
+        var locationAreaDatas = [[${@dict.getType('location_info')}]];
         var taskStatusDatas = [[${@dict.getType('task_status')}]];
         var prefix = ctx + "system/recorderror";
 
@@ -146,7 +114,10 @@
                 },
                 {
                     field: 'locationArea',
-                    title: '库位区域'
+                    title: '库位区域',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(locationAreaDatas, value);
+                    }
                 },
                 {
                     field: 'operationType',
diff --git a/ruoyi-admin/src/main/resources/templates/system/recordinstore/add.html b/ruoyi-admin/src/main/resources/templates/system/recordinstore/add.html
index acf541d..56f9af8 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recordinstore/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recordinstore/add.html
@@ -42,11 +42,9 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">入库状态：</label>
                 <div class="col-sm-8">
-                    <div class="radio-box">
-                        <input type="radio" name="instoreStatus" value="">
-                        <label th:for="instoreStatus" th:text="未知"></label>
-                    </div>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                    <select name="operationType" class="form-control m-b" th:with="type=${@dict.getType('warehousing_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    
diff --git a/ruoyi-admin/src/main/resources/templates/system/recordinstore/recordinstore.html b/ruoyi-admin/src/main/resources/templates/system/recordinstore/recordinstore.html
index 847c29c..8610e9d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recordinstore/recordinstore.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recordinstore/recordinstore.html
@@ -18,6 +18,20 @@
                                 <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>
@@ -51,6 +65,7 @@
         var editFlag = [[${@permission.hasPermi('system:recordinstore:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:recordinstore:remove')}]];
         var operationTypeDatas = [[${@dict.getType('warehousing_type')}]];
+        var operationStstusDatas = [[${@dict.getType('warehousing_status')}]];
         var prefix = ctx + "system/recordinstore";
 
         $(function() {
@@ -94,7 +109,10 @@
                 },
                 {
                     field: 'instoreStatus',
-                    title: '入库状态'
+                    title: '入库状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(operationStstusDatas, value);
+                    }
                 },
                 {
                     field: 'beginTime',
diff --git a/ruoyi-admin/src/main/resources/templates/system/recordoutstore/recordoutstore.html b/ruoyi-admin/src/main/resources/templates/system/recordoutstore/recordoutstore.html
index d48e3ad..085f10f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recordoutstore/recordoutstore.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recordoutstore/recordoutstore.html
@@ -18,6 +18,20 @@
                                 <label>物料编码：</label>
                                 <input type="text" name="materialCode"/>
                             </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="outstoreStatus" 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>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordError.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordError.java
index 9b533cc..ad9eb3f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordError.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordError.java
@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 异常记录对象 record_task
  * 
  * @author Frank zhou
- * @date 2021-09-16
+ * @date 2021-09-18
  */
 public class RecordError extends BaseEntity
 {
@@ -65,17 +65,17 @@ public class RecordError extends BaseEntity
     private String returnFlag;
 
     /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date beginTime;
 
     /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
     /** 记录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordInstore.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordInstore.java
index cdd515b..e5f6fdf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordInstore.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordInstore.java
@@ -46,10 +46,12 @@ public class RecordInstore extends BaseEntity
 
     /** 开始时间 */
     @Excel(name = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String beginTime;
 
     /** 结束时间 */
     @Excel(name = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String endTime;
 
     /** 记录时间 */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordErrorMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordErrorMapper.java
index 1d483a9..8a35ab1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordErrorMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordErrorMapper.java
@@ -7,7 +7,7 @@ import com.ruoyi.system.domain.RecordError;
  * 异常记录Mapper接口
  * 
  * @author Frank zhou
- * @date 2021-09-16
+ * @date 2021-09-18
  */
 public interface RecordErrorMapper 
 {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordErrorService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordErrorService.java
index 816d660..9e719fa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordErrorService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordErrorService.java
@@ -7,7 +7,7 @@ import com.ruoyi.system.domain.RecordError;
  * 异常记录Service接口
  * 
  * @author Frank zhou
- * @date 2021-09-16
+ * @date 2021-09-18
  */
 public interface IRecordErrorService 
 {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordErrorServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordErrorServiceImpl.java
index bbb5e54..3d84657 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordErrorServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordErrorServiceImpl.java
@@ -12,7 +12,7 @@ import com.ruoyi.common.core.text.Convert;
  * 异常记录Service业务层处理
  * 
  * @author Frank zhou
- * @date 2021-09-16
+ * @date 2021-09-18
  */
 @Service
 public class RecordErrorServiceImpl implements IRecordErrorService 
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseStoreInfoMapper.xml
index 11fd7e3..1004503 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseStoreInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseStoreInfoMapper.xml
@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="storeCode != null  and storeCode != ''"> and store_code like concat(concat('%', #{storeCode}), '%')</if>
             <if test="storeName != null  and storeName != ''"> and store_name like concat(concat('%', #{storeName}), '%')</if>
+            <if test="storeStatus != null"> and store_status = #{storeStatus} </if>
         </where>
     </select>
     
diff --git a/ruoyi-system/src/main/resources/mapper/system/RecordErrorMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RecordErrorMapper.xml
index f6bd6e1..23d7475 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RecordErrorMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RecordErrorMapper.xml
@@ -31,18 +31,9 @@ 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="boxCode != null  and boxCode != ''"> and box_code like concat(concat('%', #{boxCode}), '%')</if>
-            <if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>
-            <if test="materialType != null "> and material_type = #{materialType}</if>
-            <if test="storeCode != null  and storeCode != ''"> and store_code = #{storeCode}</if>
             <if test="locationCode != null  and locationCode != ''"> and location_code = #{locationCode}</if>
             <if test="locationArea != null  and locationArea != ''"> and location_area = #{locationArea}</if>
-            <if test="operationType != null "> and operation_type = #{operationType}</if>
-            <if test="taskType != null "> and task_type = #{taskType}</if>
             <if test="taskStatus != null "> and task_status = #{taskStatus}</if>
-            <if test="returnFlag != null  and returnFlag != ''"> and return_flag = #{returnFlag}</if>
-            <if test="beginTime != null "> and begin_time = #{beginTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
-            <if test="recordTime != null "> and record_time = #{recordTime}</if>
         </where>
     </select>
     
diff --git a/ruoyi-system/src/main/resources/mapper/system/RecordInstoreMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RecordInstoreMapper.xml
index 661a06e..9c9bc61 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RecordInstoreMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RecordInstoreMapper.xml
@@ -26,6 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="materialCode != null  and materialCode != ''"> and material_code like concat(concat('%', #{materialCode}), '%')</if>
             <if test="materialType != null  and materialType != ''"> and material_type like concat(concat('%', #{materialType}), '%')</if>
+
+            <if test="operationType != null"> and operation_type =#{operationType} </if>
+            <if test="instoreStatus != null"> and instore_status =#{instoreStatus} </if>
         </where>
     </select>
     
diff --git a/ruoyi-system/src/main/resources/mapper/system/RecordOutstoreMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RecordOutstoreMapper.xml
index 688703a..8628282 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RecordOutstoreMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RecordOutstoreMapper.xml
@@ -27,6 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="boxCode != null  and boxCode != ''"> and box_code like concat(concat('%', #{boxCode}), '%')</if>
             <if test="materialCode != null  and materialCode != ''"> and material_code like concat(concat('%', #{materialCode}), '%')</if>
+
+            <if test="operationType != null"> and operation_type =#{operationType} </if>
+            <if test="outstoreStatus != null"> and outstore_status =#{outstoreStatus} </if>
         </where>
     </select>