From 9c02db09b3b4d648b562aee65b81f965251a21d7 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 01 四月 2025 20:51:14 +0800
Subject: [PATCH] 1
---
src/main/webapp/static/js/report/stayTime.js | 4 ++--
src/main/java/com/zy/asrs/service/AgvLocDetlService.java | 2 +-
src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java | 3 +++
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 8 ++++++--
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 4 ++--
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 2 +-
src/main/webapp/views/report/viewStayTime.html | 2 +-
7 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 48b4713..80b3fe2 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -255,7 +255,7 @@
if (agvWrkMast.getIoType() == 108 || agvWrkMast.getIoType() == 114) {
//鏇存柊搴撳瓨鏄庣粏
- agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
+ agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo(), agvWrkMast.getAppeUser());
//淇敼婧愬簱浣嶇姸鎬佷负O
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
} else if (agvWrkMast.getIoType() == 109 && !agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
diff --git a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
index 71f70c0..c6f41fe 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
@@ -16,6 +16,9 @@
@Repository
public interface AgvLocDetlMapper extends BaseMapper<AgvLocDetl> {
+ @Update("update agv_loc_detl set loc_no = '${targetLoc}' ,appe_user = '${userId}' where loc_no = '${sourceLoc}' ")
+ void updateStock2(@Param("sourceLoc")String sourceLoc, @Param("targetLoc")String targetLoc, @Param("userId")Long userId);
+
@Update("update agv_loc_detl set loc_no = '${targetLoc}' where loc_no = '${sourceLoc}' ")
void updateStock(@Param("sourceLoc")String sourceLoc, @Param("targetLoc")String targetLoc);
diff --git a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
index dc4c699..bb41400 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
@@ -21,7 +21,7 @@
public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq, String type);
- public void updateStock(String sourceLoc, String targetLoc);
+ public void updateStock(String sourceLoc, String targetLoc,Long userId);
Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index a150f56..a01cb80 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -199,8 +199,12 @@
/*
鏇存柊搴撳瓨鏄庣粏
*/
- public void updateStock(String sourceLoc, String targetLoc) {
- this.baseMapper.updateStock(sourceLoc, targetLoc);
+ public void updateStock(String sourceLoc, String targetLoc,Long userId) {
+ if (Cools.isEmpty(userId)){
+ this.baseMapper.updateStock(sourceLoc, targetLoc);
+ }else {
+ this.baseMapper.updateStock2(sourceLoc, targetLoc, userId);
+ }
}
public Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page) {
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index be5f5dd..114c56d 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -207,7 +207,7 @@
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
}
//鏇存柊搴撳瓨鏄庣粏
- agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
+ agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo(),null);
//淇敼婧愬簱浣嶇姸鎬佷负O
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null, "");
break;
@@ -367,7 +367,7 @@
case 121:
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
//鏇存柊搴撳瓨鏄庣粏
- agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
+ agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo(),agvWrkMast.getAppeUser());
//淇敼婧愬簱浣嶇姸鎬佷负O
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
break;
diff --git a/src/main/webapp/static/js/report/stayTime.js b/src/main/webapp/static/js/report/stayTime.js
index 35d396a..cfee297 100644
--- a/src/main/webapp/static/js/report/stayTime.js
+++ b/src/main/webapp/static/js/report/stayTime.js
@@ -8,7 +8,7 @@
// ,{field: 'suppCode', align: 'center',title: '璐ф灦鐮�', hide: false}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'batch', align: 'center',title: '鎵规鑷敱椤�'}
+ ,{field: 'batch', align: 'center',title: '鎵规鑷敱椤�', hide: true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'order_no', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'three_code', align: 'center',title: '閿�鍞鍗曞彿'}
@@ -23,7 +23,7 @@
,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
,{field: 'dsDate', align: 'center',title: '鍚敤鏃ユ湡', hide: true}
- ,{field: 'supp', align: 'center',title: '寤烘。浜�', hide: true}
+ ,{field: 'appeUser$', align: 'center',title: '鐢ㄦ埛'}
,{field: 'dInvCreateDatetime', align: 'center',title: '寤烘。鏃ユ湡', hide: true}
];
//cols.push.apply(cols, detlCols);
diff --git a/src/main/webapp/views/report/viewStayTime.html b/src/main/webapp/views/report/viewStayTime.html
index cc288a2..f076686 100644
--- a/src/main/webapp/views/report/viewStayTime.html
+++ b/src/main/webapp/views/report/viewStayTime.html
@@ -80,7 +80,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/report/stayTime.js?v=2" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/report/stayTime.js?v=3" charset="utf-8"></script>
</body>
</html>
--
Gitblit v1.9.1