From b930175d06df0f9898e6992ef86230cbe7659802 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 六月 2020 12:47:16 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/rowLastno/rowLastno.js            |    5 +++--
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    9 +++++++++
 src/main/java/com/zy/asrs/entity/RowLastno.java             |    8 ++++----
 src/main/java/com/zy/common/service/DoubleDeepService.java  |   10 +++++++++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 24896aa..292294b 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -154,19 +154,19 @@
         this.currentRow = currentRow;
     }
 
-    public Integer getSRow() {
+    public Integer getsRow() {
         return sRow;
     }
 
-    public void setSRow(Integer sRow) {
+    public void setsRow(Integer sRow) {
         this.sRow = sRow;
     }
 
-    public Integer getERow() {
+    public Integer geteRow() {
         return eRow;
     }
 
-    public void setERow(Integer eRow) {
+    public void seteRow(Integer eRow) {
         this.eRow = eRow;
     }
 
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 38ceece..624ddb0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -36,6 +36,15 @@
         basDevpService.checkSiteStatus(param.getDevpNo());
         // 鐢熸垚宸ヤ綔鍙�
         int workNo = doubleDeepService.getWorkNo(0);
+        if (workNo == 0) {
+            throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
+        } else {
+            if (wrkMastService.selectById(workNo)!=null) {
+                throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
+            }
+        }
+        // 搴撲綅妫�绱�
+        String locNo = doubleDeepService.getLocNo();
 
 
 //        if (staNo == null || staNo.get)
diff --git a/src/main/java/com/zy/common/service/DoubleDeepService.java b/src/main/java/com/zy/common/service/DoubleDeepService.java
index 36785d8..04db044 100644
--- a/src/main/java/com/zy/common/service/DoubleDeepService.java
+++ b/src/main/java/com/zy/common/service/DoubleDeepService.java
@@ -23,7 +23,7 @@
     /**
      * 鐢熸垚宸ヤ綔鍙�
      * @param wrkMk 0:鍏ュ嚭搴� ; 1:鍏朵粬
-     * @return
+     * @return workNo(宸ヤ綔鍙�)
      */
     public int getWorkNo(Integer wrkMk) {
         WrkLastno wrkLastno = wrkLastnoService.selectById(wrkMk);
@@ -57,5 +57,13 @@
         return workNo;
     }
 
+    /**
+     * 妫�绱㈠簱浣嶅彿
+     * @param
+     * @return
+     */
+    public String getLocNo() {
+        return null;
+    }
 
 }
diff --git a/src/main/webapp/static/js/rowLastno/rowLastno.js b/src/main/webapp/static/js/rowLastno/rowLastno.js
index d7e695c..678f470 100644
--- a/src/main/webapp/static/js/rowLastno/rowLastno.js
+++ b/src/main/webapp/static/js/rowLastno/rowLastno.js
@@ -26,8 +26,8 @@
             ,{field: 'eRow', align: 'center',title: '缁堟鎺掑彿'}
             ,{field: 'crnQty', align: 'center',title: '鍫嗗灈鏈烘暟閲�'}
             ,{field: 'memo', align: 'center',title: '澶囨敞'}
-            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
-            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width:200}
+            // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+            // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width:200}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
         ]],
@@ -47,6 +47,7 @@
             statusCode: 200
         },
         done: function(res, curr, count) {
+            console.log(res);
             if (res.code === 403) {
                 top.location.href = baseUrl+"/";
             }

--
Gitblit v1.9.1