From 329120ef8dec5526adbdf1450c4916a9203cf62b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 11 七月 2020 16:51:55 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/WrkDetlLogController.java |    2 +-
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java    |    8 ++++----
 src/main/java/com/zy/asrs/controller/WrkMastLogController.java |    2 +-
 src/main/java/com/zy/asrs/controller/WorkController.java       |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 5ac9cfc..ef1e032 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -111,7 +111,7 @@
             return R.ok("宸ヤ綔妗e凡鍙栨秷");
         } else if (type == 3) {
             workService.pickWrkMast(workNo, getUserId());
-            return R.ok("宸ヤ綔妗e凡鎷f枡鍏ュ簱");
+            return R.ok();
         }
         return R.ok();
     }
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 6965127..831135c 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -45,7 +45,7 @@
         convert(param, wrapper);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
         else {
-            wrapper.orderBy("appe_time", false);
+            wrapper.orderBy("modi_time", false);
         }
         return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
     }
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 669978a..d635718 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -51,7 +51,7 @@
             }
             wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
         }else {
-            wrapper.orderBy("modi_time", false).orderBy("wrk_no", false);
+            wrapper.orderBy("modi_time", false);
         }
         return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
     }
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 e0c6167..c3e32e1 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -659,8 +659,8 @@
         if (Cools.isEmpty(wrkMast)){
             throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪");
         }
-        // 鎷f枡浣滀笟鍒ゆ柇
-        if (wrkMast.getIoType() != 103 || wrkMast.getIoType() != 104 || wrkMast.getIoType() != 107) {
+        // 鍏ュ嚭搴撶被鍨嬪垽鏂�
+        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
             throw new CoolException("褰撳墠鍏ュ嚭搴撶被鍨嬫棤娉曡繘琛屾搷浣�");
         }
         // 宸ヤ綔鐘舵�佸垽鏂�
@@ -677,7 +677,7 @@
         }
         // 鑾峰彇鐩爣绔�
         Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
-                .eq("type_no", 53)  // type_no: 53.鎷f枡鍐嶅叆搴�
+                .eq("type_no", wrkMast.getIoType() - 50)
                 .eq("stn_no", wrkMast.getStaNo()) // 浣滀笟绔欑偣 = 鎷f枡鍑哄簱鐨勭洰鏍囩珯
                 .eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
         StaDesc staDesc = staDescService.selectOne(wrapper);
@@ -687,7 +687,7 @@
         // 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
         Integer staNo = staDesc.getCrnStn();
         // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
-        wrkMast.setIoType(wrkMast.getIoType() + 50); // 鍏ュ嚭搴撶被鍨�: 53->103,54->104,57->107
+        wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
         wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
         wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
         wrkMast.setStaNo(staNo); // 鐩爣绔�

--
Gitblit v1.9.1