From 8941629b61157a606bd73ab04cd9fefd75ed6fc0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 31 七月 2024 15:46:39 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WrkMastSta.java            |    3 +--
 src/main/webapp/static/wms/js/wrkMastSta/wrkMastSta.js      |    8 +++++---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index ee95451..53afd3c 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -144,9 +144,8 @@
         this.staStart = staStart;
         this.staEnd = staEnd;
         this.createTime = now;
-        this.updateTime = now;
         this.wrkSts = 0;
-        this.bignTime = now;
+
     }
 
 //    WrkMastSta wrkMastSta = new WrkMastSta(
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 7194c24..f0f9ec6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -300,6 +300,7 @@
                 if (!Cools.isEmpty(wrkMastStas) || wrkMastStas.size()<=0){
                     WrkMastSta wrkMastSta = wrkMastStas.get(0);
                     wrkMastSta.setWrkSts(3);
+                    wrkMastSta.setBignTime(new Date());
                     wrkMastStaMapper.updateById(wrkMastSta);
                 }
             }
@@ -507,6 +508,7 @@
                     boolean sign = rgvTakeFullAll(1, wrkMastSta); //鍛戒护涓嬪彂
                     if (sign){
                         wrkMastSta.setWrkSts(1);
+                        wrkMastSta.setUpdateTime(new Date());
                         wrkMastStaMapper.updateById(wrkMastSta);
                     } else {
                         log.error("宸ヤ綔鍙穥}鎵�灞炰换鍔′笅鍙戝け璐�",wrkMastSta.getWrkNo());
diff --git a/src/main/webapp/static/wms/js/wrkMastSta/wrkMastSta.js b/src/main/webapp/static/wms/js/wrkMastSta/wrkMastSta.js
index 98ef027..6a72626 100644
--- a/src/main/webapp/static/wms/js/wrkMastSta/wrkMastSta.js
+++ b/src/main/webapp/static/wms/js/wrkMastSta/wrkMastSta.js
@@ -32,10 +32,12 @@
             ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
             // ,{field: 'lineNumber', align: 'center',title: '琛屽彿'}
             // ,{field: 'wrkType', align: 'center',title: '宸ヤ綔绫诲瀷  绫诲瀷  1:鍙栵紙鍙犵洏锛�  2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�'}
-            ,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿'}
+            ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+            ,{field: 'updateTime$', align: 'center',title: '寮�濮嬫椂闂�'}
+            ,{field: 'bignTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
             // ,{field: 'wrkCrn', align: 'center',title: ''}
-            ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
-            ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+
+
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
         ]],
         request: {

--
Gitblit v1.9.1