From 4d300a00081d7b5916c41162075bdd79851a8fcc Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 24 七月 2024 15:05:19 +0800
Subject: [PATCH] 新增MES采购入库上报功能

---
 src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java |   13 ++++++++++++-
 1 files changed, 12 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 9c46105..dd0c861 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -87,6 +87,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("doAutoMove");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
@@ -188,6 +189,7 @@
         }
         agvWrkMast.setWrkSts(201L);
         agvWrkMast.setLocNo(locMast.getLocNo());
+        agvWrkMast.setLogErrMemo("start2-doAutoMove2");
         agvWrkMastService.updateById(agvWrkMast);
         //鏇存柊鐩爣搴撲綅鐘舵��
         updateAgvLocMast(locMast,"S");
@@ -196,12 +198,13 @@
     }
     private ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) {
         Date now = new Date();
-        AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1);
+        AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1, "Y", "Y");
         if (Cools.isEmpty(devpNo)) {
             throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�");
         }
         agvWrkMast.setWrkSts(201L);
         agvWrkMast.setLocNo(devpNo.getDevNo());
+        agvWrkMast.setLogErrMemo("start3-doHandMove2");
         agvWrkMastService.updateById(agvWrkMast);
         updateAgvBasDevp(devpNo,"S",null,agvWrkMast.getBarcode());
         return SUCCESS;
@@ -261,6 +264,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
@@ -270,6 +274,7 @@
         updateAgvBasDevp(devpNo,"S",agvLocMast.getLocType2(),agvLocMast.getBarcode());
         return SUCCESS;
     }
+
     public ReturnT<String> autoEmptyBack3(AgvWrkMast agvWrkMast) {
         Date now = new Date();
         AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
@@ -283,6 +288,7 @@
         agvWrkMast.setLocNo(locMast.getLocNo());
         agvWrkMast.setModiUser(9527L);
         agvWrkMast.setModiTime(now);
+        agvWrkMast.setLogErrMemo("autoEmptyBack3");
         if (!agvWrkMastService.updateById(agvWrkMast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
@@ -291,6 +297,7 @@
         updateAgvBasDevp(agvBasDevp,"R");
         return SUCCESS;
     }
+
     public ReturnT<String> autoEmptyBack2(AgvLocMast agvLocMast) {
         Date now = new Date();
         //鏌ヨ宸ヤ綔妗�
@@ -322,6 +329,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack2");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
@@ -389,6 +397,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack4");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
@@ -427,6 +436,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack5");
         // 鍒ゆ柇 鎺ラ┏鐐规槸鍚﹁嚜鍔�
         if ("Y".equals(agvBasDevp.getAutoing())) {
             //宸ヤ綔鐘舵��
@@ -483,6 +493,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack4");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }

--
Gitblit v1.9.1