From 2ccbcb42a7f1b214a87549629ab7bc42d5bc8fce Mon Sep 17 00:00:00 2001
From: Limy <1353020654@qq.com>
Date: Mon, 1 Feb 2021 09:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=98=E7=9B=98=E5=AE=9E=E6=97=B6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=EF=BC=88=E5=AE=8C=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SelectWorktrayrealtimeinfoController.java |  6 ++-
 .../SelectWorkTrayRealTimeInfo.html           | 12 ++++--
 .../domain/TRpWorktrayrealtimeinfo.java       | 43 +++++++++++++++++--
 .../nanjing/TRpWorktrayrealtimeinfoMapper.xml |  7 ++-
 4 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java
index 983081f1..dd5ed1aa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java
@@ -64,8 +64,12 @@ public class SelectWorktrayrealtimeinfoController extends BaseController {
     @ResponseBody
     public AjaxResult export(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) {
         List<TRpWorktrayrealtimeinfo> list = tRpWorktrayrealtimeinfoService.selectrealtimeinfoList(tRpWorktrayrealtimeinfo);
+        for (TRpWorktrayrealtimeinfo tw:list)
+        {
+            tw.setProductCode(tw.getBarcoderelationship().getProductBarcode());
+        }
         ExcelUtil<TRpWorktrayrealtimeinfo> util = new ExcelUtil<TRpWorktrayrealtimeinfo>(TRpWorktrayrealtimeinfo.class);
-        return util.exportExcel(list, "WorkTrayRealTimeInfo");
+        return util.exportExcel(list, "托盘实时信息");
     }
 }
 
diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html
index 1b7057be..7040d217 100644
--- a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html
+++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html
@@ -14,11 +14,11 @@
                             <label>	工位名称：</label>
                             <select name="StationCode" required>
                                 <option value="">全部</option>
-                                <option th:each="ls : ${list}" th:text="${ls.StationCode}" th:value="${ls.StationCode}"></option>
+                                <option th:each="ls : ${list}" th:text="${ls.StationCode}" th:value="${ls.StationID}"></option>
                             </select>
                         </li>
                         <li>
-                            <label>托盘RFID码：</label>
+                            托盘RFID码：
                             <input type="text" name="rfidNum"/>
                         </li>
                         <li>
@@ -38,6 +38,7 @@
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
     var prefix = ctx + "nanjing/selectWorkTrayRealTimeInfo";
+    var datas = [[${@dict.getType('proState')}]];
     $(function() {
         var options = {
             url: prefix + "/list",
@@ -49,7 +50,7 @@
                     title: '托盘条码'
                 },
                 {
-                    field: 'barcode',
+                    field: 'barCode',
                     title: '系统条码'
                 },
                 {
@@ -58,7 +59,10 @@
                 },
                 {
                     field: 'state',
-                    title: '状态'
+                    title: '状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(datas, value);
+                    }
                 },
                 {
                     field: 'updateTime',
diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java
index 06f82fa1..acbf7af0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java
@@ -25,27 +25,62 @@ public class TRpWorktrayrealtimeinfo extends BaseEntity
     private String barCode;
 
     /** 产线条码 */
-    @Excel(name = "产线条码")
+//    @Excel(name = "产线条码")
     private String semiBarcode;
 
     /** 当前工位 */
     private String currentStation;
 
     /** 质量品级 */
+    @Excel(name = "质量品级(1合格，2不合格)")
     private Long state;
 
     /** 使用状态 */
-    @Excel(name = "使用状态")
+//    @Excel(name = "使用状态")
     private Long usedFlag;
 
+    /** 更新时间 */
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updateTime;
+
+    @Override
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    @Override
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     /** 添加时间 */
-    @Excel(name = "添加时间", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "添加时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date insertTime;
 
     /** 停用时间 */
-    @Excel(name = "停用时间", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "停用时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date deleteTime;
 
+    private String StationCode;
+
+    public String getStationCode() {
+        return StationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        StationCode = stationCode;
+    }
+
+    @Excel(name = "部件码")
+    private String productCode;
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
 
     private TRpBarcoderelationship barcoderelationship;
 
diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml
index 31ff1f85..cc917e14 100644
--- a/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml
@@ -38,7 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectrealtimeinfoList" resultMap="TRpWorktrayrealtimeinfoResult">
-        select t1.RFIDnum,t1.barcode,t3.ProductBarcode ,t1.state,t1.UpdateTime  from  dbo.T_RP_WorkTrayRealTimeInfo  t1  left join T_BD_SubStation t2 on t1.currentStation=t2.StationID   left join dbo.T_RP_BarcodeRelationShip t3 on t1.SemiBarcode=t3.SemiBarcode_Line where UsedFlag='1'
+        select t1.RFIDnum,t1.barcode,t3.ProductBarcode ,t1.state,t1.UpdateTime  from  dbo.T_RP_WorkTrayRealTimeInfo  t1  left join T_BD_SubStation t2 on t1.currentStation=t2.StationID   left join dbo.T_RP_BarcodeRelationShip t3 on t1.SemiBarcode=t3.SemiBarcode_Line
+        <where>
+            <if test="StationCode != '' "> and t2.StationID = #{StationCode}</if>
+            <if test="rfidNum != '' "> and t1.RFIDnum = #{rfidNum}</if>
+            and  UsedFlag='1'
+        </where>
     </select>
 
     <insert id="insertTRpWorktrayrealtimeinfo" parameterType="TRpWorktrayrealtimeinfo">