From b6840d52e249463a41274ec8f900df831fd741b2 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 18 十一月 2025 13:44:03 +0800
Subject: [PATCH] 增加呼叫agv字段

---
 src/main/resources/mapper/WrkMastLogMapper.xml     |    1 +
 src/main/webapp/static/js/wrkMastLog/wrkMastLog.js |    2 +-
 src/main/java/com/zy/asrs/entity/WrkMast.java      |   17 +++++++++++++++++
 src/main/resources/mapper/WrkMastMapper.xml        |    3 ++-
 src/main/java/com/zy/asrs/entity/WrkMastLog.java   |   17 +++++++++++++++++
 src/main/webapp/static/js/wrkMast/wrkMast.js       |    1 +
 6 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 2f643bf..1767d50 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -327,6 +327,13 @@
     @TableField("take_none")
     private String takeNone;
 
+    /**
+     * 鍛煎彨agv 1.鍑嗗鍛煎彨锛�2.宸插懠鍙�
+     */
+    @ApiModelProperty(value = "鍛煎彨agv 1.鍑嗗鍛煎彨锛�2.宸插懠鍙�")
+    @TableField("call_agv")
+    private Integer callAgv;
+
     public WrkMast() {
     }
 
@@ -337,6 +344,16 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
     }
 
+    public String getCallAgv$() {
+        switch (this.callAgv) {
+            case 0: return "鏈懠鍙�";
+            case 1: return "鍑嗗鍛煎彨";
+            case 2: return "宸插懠鍙�";
+            default:
+        }
+        return "";
+    }
+
     public String getWrkSts$() {
         BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
         BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 27472d2..4e926ad 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -328,9 +328,26 @@
     @TableField("take_none")
     private String takeNone;
 
+    /**
+     * 鍛煎彨agv 1.鍑嗗鍛煎彨锛�2.宸插懠鍙�
+     */
+    @ApiModelProperty(value = "鍛煎彨agv 1.鍑嗗鍛煎彨锛�2.宸插懠鍙�")
+    @TableField("call_agv")
+    private Integer callAgv;
+
     public WrkMastLog() {
     }
 
+    public String getCallAgv$() {
+        switch (this.callAgv) {
+            case 0: return "鏈懠鍙�";
+            case 1: return "鍑嗗鍛煎彨";
+            case 2: return "宸插懠鍙�";
+            default:
+        }
+        return "";
+    }
+
     public String getWrkNo$() {
         WrkMastService service = SpringUtils.getBean(WrkMastService.class);
         WrkMast wrkMast = service.selectById(this.wrkNo);
diff --git a/src/main/resources/mapper/WrkMastLogMapper.xml b/src/main/resources/mapper/WrkMastLogMapper.xml
index dd1bdf7..ec1346e 100644
--- a/src/main/resources/mapper/WrkMastLogMapper.xml
+++ b/src/main/resources/mapper/WrkMastLogMapper.xml
@@ -62,6 +62,7 @@
         <result column="full_plt" property="fullPlt" />
         <result column="pre_have" property="preHave" />
         <result column="take_none" property="takeNone" />
+        <result column="call_agv" property="callAgv" />
     </resultMap>
     <sql id="queryWhere">
         <where>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index afa1793..bd61797 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -62,6 +62,7 @@
         <result column="full_plt" property="fullPlt" />
         <result column="pre_have" property="preHave" />
         <result column="take_none" property="takeNone" />
+        <result column="call_agv" property="callAgv" />
     </resultMap>
 
     <select id="selectToBeCompleteData" resultMap="BaseResultMap">
@@ -72,7 +73,7 @@
         select * from asr_wrk_mast
         where wrk_sts=5
         or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
-        or (wrk_sts=15 and dateadd(mi,3,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=15 and dateadd(mi,1,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
         order by io_time,wrk_no asc
     </select>
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index b367be3..8d2d027 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -36,6 +36,7 @@
             ,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
             ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
             ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
+            ,{field: 'callAgv$', align: 'center',title: '鍛煎彨agv', hide:true}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:300}
         ]],
         request: {
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index 9f7c461..750128a 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -66,7 +66,7 @@
             //         html += ">";
             //         return html;
             //     }}
-
+            ,{field: 'callAgv$', align: 'center',title: '鍛煎彨agv', hide:true}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
         ]],
         request: {

--
Gitblit v1.9.1