From 4dca5d65e2518f019ce25c805827211e0509598f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 25 二月 2025 14:06:33 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/wrkMastDetlLog/wrkMastDetlLog.html | 8 +++
src/main/java/com/zy/asrs/service/AgvLocDetlService.java | 3 +
src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java | 4 ++
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 5 ++
src/main/webapp/views/user/user.html | 8 +++
src/main/webapp/static/js/user/user.js | 1
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 34 +++++++++++++++++
src/main/resources/application.yml | 2
8 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 8f7f771..968877f 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -299,6 +299,40 @@
return R.ok(page);
}
+
+ @RequestMapping(value = "/orderDetl/pakout/list/authV8")
+ @ManagerAuth
+ public R pakoutList8(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convertLike(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
+ }
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() == 34) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+
+ wrapper.in("source", docIds);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed2(record.getMatnr(), record.getThreeCode());
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ }
+
+ return R.ok(page);
+ }
+
@RequestMapping(value = "/orderDetl/pakout/list/authV6")
@ManagerAuth
public R pakoutList6(@RequestParam(defaultValue = "1") Integer curr,
diff --git a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
index 71d1aa4..05241a0 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
@@ -35,6 +35,10 @@
@Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where b.loc_sts = 'F' and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1 AND b.floor != 1")
Double selectSumAnfmeByMatnrProcessed(@Param("matnr") String matnr,@Param("threeCode") String threeCode);
+ @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where b.loc_sts = 'F' and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1 AND b.floor = 1")
+ Double selectSumAnfmeByMatnrProcessed2(@Param("matnr") String matnr,@Param("threeCode") String threeCode);
+
+
@Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where (b.loc_sts = 'F' or b.loc_sts = 'R') and b.floor = #{floor} and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1")
Double selectSumAnfmeByMatnr2(@Param("matnr") String matnr,@Param("threeCode") String threeCode,@Param("floor") Integer floor);
diff --git a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
index 759d93d..704a2b2 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
@@ -29,6 +29,9 @@
Double getSumAnfmeProcessed(String matnr, String threeCode);
+ Double getSumAnfmeProcessed2(String matnr, String threeCode);
+
+
Double getSumAnfmeDb(String matnr, String threeCode, Integer floor);
Double getSumAnfmeback(String matnr, String threeCode, Integer floor);
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 f7791fb..c3d2871 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -224,6 +224,11 @@
}
@Override
+ public Double getSumAnfmeProcessed2(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnrProcessed2(matnr, threeCode);
+ }
+
+ @Override
public Double getSumAnfmeDb(String matnr, String threeCode, Integer floor) {
return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode, floor);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f4d5610..5211fd6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
#dev loc prod
- active: prod
+ active: loc
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index 0e06c7e..4b5fed1 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -25,6 +25,7 @@
{type: 'checkbox'}
// ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛', templet: '#hostTpl', width: 140}
// ,{field: 'nickname', align: 'center',title: '鐢ㄦ埛鍚�'}
+ ,{field: 'id', align: 'center',title: '缂栧彿'}
,{field: 'username', align: 'center',title: '鐧诲綍璐︽埛'}
,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'}
// ,{field: 'deptName', align: 'center',title: '鎵�灞為儴闂�'}
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index d2611c8..422a0b1 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -32,6 +32,12 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">缂栧彿:</label>
+ <div class="layui-input-inline">
+ <input name="id" class="layui-input" placeholder="杈撳叆缂栧彿"/>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鐢ㄦ埛鍚�:</label>
<div class="layui-input-inline">
<input name="username" class="layui-input" placeholder="杈撳叆鐢ㄦ埛鍚�"/>
@@ -153,7 +159,7 @@
<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/tools/md5.js"></script>
-<script type="text/javascript" src="../../static/js/user/user.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/user/user.js?v=1" charset="utf-8"></script>
<!-- 椤圭洰缂栬緫绐楀彛 -->
<script type="text/html" id="hostEditDialog">
diff --git a/src/main/webapp/views/wrkMastDetlLog/wrkMastDetlLog.html b/src/main/webapp/views/wrkMastDetlLog/wrkMastDetlLog.html
index 30ac09e..c614d4d 100644
--- a/src/main/webapp/views/wrkMastDetlLog/wrkMastDetlLog.html
+++ b/src/main/webapp/views/wrkMastDetlLog/wrkMastDetlLog.html
@@ -74,7 +74,13 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="order_no" placeholder="鍗曟嵁缂栧彿"
+ <input class="layui-input" type="text" name="order_no" placeholder="涓昏鍗曞彿"
+ autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="three_code" placeholder="閿�鍞崟鍙�"
autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1