From de53d1ae8eb785eb4e3f22c7b2ffe452c3393ceb Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 24 七月 2024 11:58:59 +0800
Subject: [PATCH] # 订单修改分页第二页面数据改动不更新

---
 src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index e5b8b03..0207985 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -93,6 +93,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("doAutoMove");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
@@ -192,12 +193,17 @@
         if (Cools.isEmpty(locMast)) {
             throw new CoolException("鏆傛棤搴撲綅");
         }
+        AgvWrkMast workingMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locMast.getLocNo()));
+        if (!Cools.isEmpty(workingMast)) {
+            throw new CoolException("褰撳墠搴撲綅姝ｅ湪杩涜鍏ュ簱锛岃繘琛屼笅涓�娆¤疆璇�");
+        }
         agvWrkMast.setWrkSts(201L);
         agvWrkMast.setLocNo(locMast.getLocNo());
         agvWrkMastService.updateById(agvWrkMast);
         //鏇存柊鐩爣搴撲綅鐘舵��
         updateAgvLocMast(locMast,"S");
-        log.info("鑷姩鍥炴祦浠诲姟 ==> 婧愬簱浣嶏細{}锛岀洰鏍囧簱浣嶏細{}",agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
+        AgvLocMast locMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locMast.getLocNo()));
+        log.info("鑷姩璋冩嫧浠诲姟 ==> 婧愬簱浣嶏細{}锛岀洰鏍囧簱浣嶏細{},搴撲綅鐘舵�亄}",agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo(),locMast1.getLocSts());
 
         return SUCCESS;
     }
@@ -211,6 +217,7 @@
         }
         agvWrkMast.setWrkSts(201L);
         agvWrkMast.setLocNo(locMast.getLocNo());
+        agvWrkMast.setLogErrMemo("start2-doAutoMove2");
         agvWrkMastService.updateById(agvWrkMast);
         //鏇存柊鐩爣搴撲綅鐘舵��
         updateAgvLocMast(locMast,"S");
@@ -233,6 +240,7 @@
         }
         agvWrkMast.setWrkSts(201L);
         agvWrkMast.setLocNo(devpNo.getDevNo());
+        agvWrkMast.setLogErrMemo("start3-doHandMove2");
         agvWrkMastService.updateById(agvWrkMast);
         updateAgvBasDevp(devpNo,"S",null,agvWrkMast.getBarcode());
         return SUCCESS;
@@ -292,6 +300,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
@@ -314,6 +323,7 @@
         agvWrkMast.setLocNo(locMast.getLocNo());
         agvWrkMast.setModiUser(9527L);
         agvWrkMast.setModiTime(now);
+        agvWrkMast.setLogErrMemo("autoEmptyBack3");
         if (!agvWrkMastService.updateById(agvWrkMast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
@@ -353,6 +363,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack2");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
@@ -420,6 +431,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack4");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
@@ -458,6 +470,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack5");
         // 鍒ゆ柇 鎺ラ┏鐐规槸鍚﹁嚜鍔�
         if ("Y".equals(agvBasDevp.getAutoing())) {
             //宸ヤ綔鐘舵��
@@ -514,6 +527,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack6");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }

--
Gitblit v1.9.1