wudingsheng преди 1 година
родител
ревизия
9907f203c1

+ 5 - 1
src/main/java/com/imcs/admin/entity/WInventoryTransactionTask.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Builder;
 import lombok.Data;
 /**
@@ -61,6 +62,7 @@ public class WInventoryTransactionTask extends PageSize implements Serializable
 /**
      * 开始时间
      */
+@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
     private Date startTime;
 /**
      * 结束日期
@@ -88,7 +90,7 @@ public class WInventoryTransactionTask extends PageSize implements Serializable
     private Long updatedBy;
     private Long wPInventoryCountTaskId;
     /**
-     * 任务运行的出入库口
+     * 任务运行的设备
      */
     private Long deviceId;
 
@@ -103,6 +105,8 @@ public class WInventoryTransactionTask extends PageSize implements Serializable
     private String orderName;
     @TableField(exist = false)
     private String inOutCode;
+    @TableField(exist = false)
+    private String deviceName;
 
 }
 

+ 3 - 1
src/main/resources/mapper/WInventoryTransactionTaskDao.xml

@@ -22,6 +22,7 @@
         <result property="orderCode" column="order_code" jdbcType="INTEGER"/>
         <result property="orderName" column="order_name" jdbcType="INTEGER"/>
         <result property="inOutCode" column="in_out_code" jdbcType="INTEGER"/>
+        <result property="deviceName" column="device_name" jdbcType="INTEGER"/>
     </resultMap>
 
     <!--查询单个-->
@@ -35,9 +36,10 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="WInventoryTransactionTaskMap">
         select
-        task.*,orders.order_code,orders.order_name,orders.in_out_code
+        task.*,orders.order_code,orders.order_name,orders.in_out_code,wd.device_name
         from w_inventory_transaction_task task
         left join w_inventory_transaction_orders orders on task.w_inventory_transaction_orders_id=orders.id
+        left join w_device wd on wd.id=task.device_id
         <where>
             <if test="id != null">
                 and task.id = #{id}

+ 1 - 0
src/main/resources/static/wms/task/index.html

@@ -58,6 +58,7 @@
                 <el-table-column prop="startPosition" label="开始位置" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="endPosition" label="结束位置" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="vectorCode" label="托盘" :show-overflow-tooltip="true"></el-table-column>
+                <el-table-column prop="deviceName" label="设备" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="errorInfo" label="异常原因" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="startTime" label="开始时间" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="endTime" label="结束时间" :show-overflow-tooltip="true"></el-table-column>