From 15bac9f85fbf86033ff5693060a745b1f8d2660b Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Tue, 12 Nov 2024 14:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/manage/domain/RecordInSort.java |  2 +-
 .../manage/record_in_sort/record_in_sort.html | 34 +++++++------------
 .../manage/record_out/record_out.html         |  5 +++
 .../record_out_sort/record_out_sort.html      | 16 ++++-----
 4 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java
index 7d4fb03..873fb2c 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java
@@ -20,7 +20,7 @@ public class RecordInSort extends BaseEntity
 
     /** 主键 */
     private Long objid;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "入库时间" , width = 30, dateFormat = "yyyy-MM-dd")
     private Date createTime;
     /** 批次码 */
diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html b/ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html
index bb536d0..5f690eb 100644
--- a/ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html
+++ b/ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html
@@ -53,7 +53,8 @@
         </div>
         <div class="btn-group-sm" id="toolbar" role="group">
 <!--            <i class="fa fa-info-circle" style="color: red;"></i> 勾选数据导出指定列，否则为全部-->
-            <a class="btn btn-warning" onclick="exportSelected()">
+<!--            <a class="btn btn-warning" onclick="exportSelected()">-->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()">
                 <i class="fa fa-download"></i> 导出
             </a>
         </div>
@@ -84,12 +85,11 @@
 </div>
 <script>
     var prefix = ctx + "manage/record_in";
-    var datas = [{"createBy":"admin","createTime":"2024-06-06 02:06:39","updateBy":null,"updateTime":null,"remark":"\u6B63\u5E38\u72B6\u6001","dictCode":6,"dictSort":1,"dictLabel":"\u6B63\u5E38","dictValue":"0","dictType":"sys_normal_disable","cssClass":"","listClass":"primary","isDefault":"Y","status":"0","default":true},{"createBy":"admin","createTime":"2024-06-06 02:06:39","updateBy":null,"updateTime":null,"remark":"\u505C\u7528\u72B6\u6001","dictCode":7,"dictSort":2,"dictLabel":"\u505C\u7528","dictValue":"1","dictType":"sys_normal_disable","cssClass":"","listClass":"danger","isDefault":"N","status":"0","default":false}];
+    // var datas = [{"createBy":"admin","createTime":"2024-06-06 02:06:39","updateBy":null,"updateTime":null,"remark":"\u6B63\u5E38\u72B6\u6001","dictCode":6,"dictSort":1,"dictLabel":"\u6B63\u5E38","dictValue":"0","dictType":"sys_normal_disable","cssClass":"","listClass":"primary","isDefault":"Y","status":"0","default":true},{"createBy":"admin","createTime":"2024-06-06 02:06:39","updateBy":null,"updateTime":null,"remark":"\u505C\u7528\u72B6\u6001","dictCode":7,"dictSort":2,"dictLabel":"\u505C\u7528","dictValue":"1","dictType":"sys_normal_disable","cssClass":"","listClass":"danger","isDefault":"N","status":"0","default":false}];
 
 
     $(function() {
 
-
         var options = {
             url: prefix + "/sort_list",
             showSearch: false,
@@ -97,7 +97,8 @@
             showToggle: false,
             showColumns: false,
             detailView: true,
-
+            modalName: "轮挡批次入库记录",
+            exportUrl: prefix + "/export_sort",
             onExpandRow : function(index, row, $detail) {
                 initChildTable(index, row, $detail);
             },
@@ -107,8 +108,8 @@
                 },
                 {
                     field: 'createTime',
-                    title: '入库时间',
-                    formatter: function(value, row, index) {
+                    title: '入库时间',width :250
+                   /* formatter: function(value, row, index) {
                         // 假设value是一个标准的日期时间字符串
                         if (value) {
                             // 解析日期时间字符串并格式化为仅显示日期部分
@@ -118,11 +119,11 @@
                             return date.getFullYear() + '-' + (date.getMonth() + 1).toString().padStart(2, '0') + '-' + date.getDate().toString().padStart(2, '0');
                         }
                         return value; // 如果value为空或不是有效的日期时间字符串，则直接返回原始值
-                    }
+                    }*/
                 },
                 {
                     field : 'batchCode',
-                    title : '批次码'
+                    title : '批次码',width :250
                 },
                 {
                     field: 'recordCount',
@@ -140,16 +141,7 @@
                 //         return $.table.selectDictLabel(datas, value);
                 //     }
                 // },
-                {
-                    // title: '操作',
-                    // align: 'center',
-                    // formatter: function(value, row, index) {
-                    //     var actions = [];
-                    //     actions.push('<a class="btn btn-success btn-xs" href="javascript:;"><i class="fa fa-edit"></i>编辑</a> ');
-                    //     actions.push('<a class="btn btn-danger btn-xs" href="javascript:;"><i class="fa fa-remove"></i>删除</a>');
-                    //     return actions.join('');
-                    // }
-                }]
+            ]
         };
 
         $.table.init(options);
@@ -252,11 +244,11 @@
             objIds: objIds.join(',')
         };
 */
-        $.modal.confirm("确定导出数据吗？", function() {
+  /*      $.modal.confirm("确定导出数据吗？", function() {
             $.ajax({
                 url: prefix + "/export_sort", // 修改为您的导出接口URL
                 method: 'POST',
-                // data: dataParam,
+                data: dataParam,
                 success: function(result) {
                     if (result.code === web_status.SUCCESS) {
                         window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
@@ -268,7 +260,7 @@
                     $.modal.alertError("导出失败");
                 }
             });
-        });
+        });*/
     }
 
 
diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_out/record_out.html b/ruoyi-manage/src/main/resources/templates/manage/record_out/record_out.html
index 2d3e053..7bb3192 100644
--- a/ruoyi-manage/src/main/resources/templates/manage/record_out/record_out.html
+++ b/ruoyi-manage/src/main/resources/templates/manage/record_out/record_out.html
@@ -14,6 +14,11 @@
                                 <label>RFID：</label>
                                 <input type="text" name="epcCode"/>
                             </li>
+                               <li>
+                                <label>机位码：</label>
+                                <input type="text" name="locationCode"/>
+                            </li>
+
                             <li>
                                 <label>领用人：</label>
                                 <input type="text" name="useUser"/>
diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_out_sort/record_out_sort.html b/ruoyi-manage/src/main/resources/templates/manage/record_out_sort/record_out_sort.html
index f41eea6..67cfa39 100644
--- a/ruoyi-manage/src/main/resources/templates/manage/record_out_sort/record_out_sort.html
+++ b/ruoyi-manage/src/main/resources/templates/manage/record_out_sort/record_out_sort.html
@@ -50,8 +50,8 @@
             <table id="bootstrap-table"></table>
         </div>
         <div class="btn-group-sm" id="toolbar" role="group">
-            <i class="fa fa-info-circle" style="color: red;"></i>
-            勾选数据导出指定列，否则为全部
+          <!--  <i class="fa fa-info-circle" style="color: red;"></i>
+            勾选数据导出指定列，否则为全部-->
             <a class="btn btn-warning" onclick="exportSelected()">
                 <i class="fa fa-download"></i> 导出
             </a>
@@ -83,7 +83,7 @@
 </div>
 <script>
     var prefix = ctx + "manage/record_out";
-    var datas = [{"createBy":"admin","createTime":"2024-06-06 02:06:39","updateBy":null,"updateTime":null,"remark":"\u6B63\u5E38\u72B6\u6001","dictCode":6,"dictSort":1,"dictLabel":"\u6B63\u5E38","dictValue":"0","dictType":"sys_normal_disable","cssClass":"","listClass":"primary","isDefault":"Y","status":"0","default":true},{"createBy":"admin","createTime":"2024-06-06 02:06:39","updateBy":null,"updateTime":null,"remark":"\u505C\u7528\u72B6\u6001","dictCode":7,"dictSort":2,"dictLabel":"\u505C\u7528","dictValue":"1","dictType":"sys_normal_disable","cssClass":"","listClass":"danger","isDefault":"N","status":"0","default":false}];
+    // var datas = [{"createBy":"admin","createTime":"2024-06-06 02:06:39","updateBy":null,"updateTime":null,"remark":"\u6B63\u5E38\u72B6\u6001","dictCode":6,"dictSort":1,"dictLabel":"\u6B63\u5E38","dictValue":"0","dictType":"sys_normal_disable","cssClass":"","listClass":"primary","isDefault":"Y","status":"0","default":true},{"createBy":"admin","createTime":"2024-06-06 02:06:39","updateBy":null,"updateTime":null,"remark":"\u505C\u7528\u72B6\u6001","dictCode":7,"dictSort":2,"dictLabel":"\u505C\u7528","dictValue":"1","dictType":"sys_normal_disable","cssClass":"","listClass":"danger","isDefault":"N","status":"0","default":false}];
 
     $(function() {
         var options = {
@@ -233,13 +233,13 @@
     };
     // 导出数据
     function exportSelected() {
-        var userIds = $.table.selectColumns("objid");
+        // var userIds = $.table.selectColumns("objid");
         var dataParam = $("#export-form").serializeArray();
         var tipMsg = "确定导出所有数据吗？";
-        if($.common.isNotEmpty(userIds)){
-            tipMsg = "确定导出勾选" + userIds.length + "条数据吗？";
-            dataParam.push({ "name": "userIds", "value": userIds });
-        }
+        // if($.common.isNotEmpty(userIds)){
+        //     tipMsg = "确定导出勾选" + userIds.length + "条数据吗？";
+        //     dataParam.push({ "name": "userIds", "value": userIds });
+        // }
         $.modal.confirm(tipMsg, function() {
             $.post(prefix + "/exportData", dataParam, function(result) {
                 if (result.code == web_status.SUCCESS) {