From 727fed9fc28d7a430255af69efe9a6f108845f91 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:58:50 +0800
Subject: [PATCH] # AGV工作档维护日志
---
src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java | 3 ++-
src/main/java/com/zy/asrs/service/AgvWrkMastService.java | 2 ++
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 14 +++++++++++++-
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 12 ++++++++++++
src/main/java/com/zy/asrs/mapper/AgvWrkMastLogMapper.java | 3 ++-
5 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWrkMastLogMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWrkMastLogMapper.java
index 81ccf20..fb507f4 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWrkMastLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWrkMastLogMapper.java
@@ -21,11 +21,12 @@
"source_loc_no," +
"loc_no," +
"barcode," +
+ "manu_type," +
"appe_user," +
"appe_time," +
"modi_user," +
"modi_time) " +
- "VALUES(#{wrkNo},#{wrkSts},#{ioType},#{ioTime},#{ioPri},#{sourceLocNo},#{locNo},#{barcode},#{appeUser},#{appeTime},#{modiUser},#{modiTime})")
+ "VALUES(#{wrkNo},#{wrkSts},#{ioType},#{ioTime},#{ioPri},#{sourceLocNo},#{locNo},#{barcode},#{manuType},#{appeUser},#{appeTime},#{modiUser},#{modiTime})")
int saveByWrkMast(AgvWrkMast agvWrkMast);
}
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
index c0fd131..2b0f3f6 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
@@ -17,11 +17,12 @@
"crn_no," +
"barcode," +
"whs_type," +
+ "manu_type," +
"appe_user," +
"appe_time," +
"modi_user," +
"modi_time) " +
- "VALUES(#{wrkSts},#{ioType},#{ioTime},#{ioPri},#{sourceLocNo},#{locNo},#{crnNo},#{barcode},#{whsType},#{appeUser},#{appeTime},#{modiUser},#{modiTime})")
+ "VALUES(#{wrkSts},#{ioType},#{ioTime},#{ioPri},#{sourceLocNo},#{locNo},#{crnNo},#{barcode},#{whsType},#{manuType},#{appeUser},#{appeTime},#{modiUser},#{modiTime})")
public int insertByIncrease(AgvWrkMast agvWrkMast);
}
diff --git a/src/main/java/com/zy/asrs/service/AgvWrkMastService.java b/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
index 449a8e5..27fa643 100644
--- a/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
@@ -10,6 +10,8 @@
public void updateWrkStsByWrkNo(int wrkNo, long wrkSts);
+ public void updateWrkStsByWrkNo(int wrkNo, long wrkSts,String manuType,long userId);
+
public int startWrk(AgvWrkMast agvWrkMast) throws IOException;
public int containerMoveIn(List<AgvWrkMast> agvWrkMastList) throws IOException;
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index fa57596..64e403d 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -561,7 +561,9 @@
// throw new CoolException("鐩爣搴撲綅鎴栬�呮簮搴撲綅鏆傛湭鍒嗛厤锛屾棤娉曞彇娑�");
// }
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
- agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205);
+ //agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205);
+
+ agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"鎵嬪姩瀹屾垚",userId);
//鍑哄簱浠诲姟 101.鍑哄簱 || 103.鎷ｆ枡鍑哄簱 || 107.鐩樼偣鍑哄簱
if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 111){
@@ -674,11 +676,21 @@
}
});
}
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(new Date());
+ if (type == 2) {
+ wrkMast.setManuType("鎵嬪姩鍙栨秷锛坅gv锛�");
+ } else {
+ wrkMast.setManuType("鎵嬪姩鍙栨秷");
+ }
+
//淇濆瓨宸ヤ綔妗ｄ互鍙婃槑缁�
agvWrkMastLogService.save(wrkMast);
agvWrkDetlLogService.save(wrkMast.getWrkNo());
+
+
//鍒犻櫎宸ヤ綔妗ｄ互鍙婃槑缁�
if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index f10654e..1dd5f31 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -69,6 +69,18 @@
this.updateById(agvWrkMast);
}
+ public void updateWrkStsByWrkNo(int wrkNo, long wrkSts,String manuType,long userId) {
+ Date now = new Date();
+ AgvWrkMast agvWrkMast = this.selectById(wrkNo);
+ //鍒ゆ柇瑕佷慨鏀圭殑宸ヤ綔妗ｇ姸鎬佹槸鍚﹀悎鐞嗭紝濡傛灉涓嶅悎鐞嗗垯鎶涘嚭寮傚父
+ checkWrkSts(agvWrkMast,wrkSts);
+ agvWrkMast.setWrkSts(wrkSts);
+ agvWrkMast.setManuType(manuType);
+ agvWrkMast.setModiTime(now);
+ agvWrkMast.setModiUser(userId);
+ this.updateById(agvWrkMast);
+ }
+
// TODO 鍒ゆ柇瑙勫垯
private boolean checkWrkSts(AgvWrkMast agvWrkMast,long wrkSts){
--
Gitblit v1.9.1