From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/webapp/static/js/locDetl/locDetl.js | 2
src/main/java/com/zy/asrs/controller/LocDetlController.java | 42 +++++++++++++++++----
src/main/java/com/zy/asrs/utils/Utils.java | 6 +-
src/main/webapp/views/locOwner/locOwner.html | 4 +-
src/main/resources/mapper/LocDetlMapper.xml | 4 +-
src/main/java/com/zy/asrs/entity/WrkMast.java | 10 +++-
6 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 3bed8e4..944a213 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -241,6 +241,31 @@
}
return R.ok(exportSupport(result, fields));
}
+ @RequestMapping(value = "/locDetl/export/auth/v2")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
+ public synchronized R exportV2(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
+ String row = "";
+ if (map.get("row") != null) {
+ String chooseRow = (String) map.get("row");
+ if (chooseRow.length() == 1) {
+ row = "0" + chooseRow;
+ map.remove("row");
+ } else {
+ row = chooseRow;
+ map.remove("row");
+ }
+ }
+ convert(map, wrapper);
+ if (!row.equals("")) {
+ wrapper.and()
+ .where("loc_no like '" + row + "%'");
+ }
+ List<LocDetl> list = locDetlService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
@RequestMapping(value = "/locDetlQuery/auth")
@ManagerAuth
@@ -419,14 +444,15 @@
if (!Cools.isEmpty(mat.getStoreMaxDate())) {
- if (Cools.isEmpty(locDetl.getBatch())) {
- continue;
- } else if (locDetl.getBatch().length() != 8) {
- continue;
- }
+// if (Cools.isEmpty(locDetl.getBatch())) {
+// continue;
+// } else if (locDetl.getBatch().length() != 8) {
+// continue;
+// }
try {
- SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
- Date maxDate = simple.parse(locDetl.getBatch());
+// SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
+// Date maxDate = simple.parse(locDetl.getBatch());
+ Date maxDate = locDetl.getModiTime();
Calendar calendar = new GregorianCalendar();
calendar.setTime(maxDate);
// 鎶婃棩鏈熷線鍚庡鍔犱竴澶�,鏁存暟 寰�鍚庢帹,璐熸暟寰�鍓嶇Щ鍔�
@@ -443,7 +469,7 @@
abnormalLocDetlParam.setSpecs(mat.getSpecs());
abnormalLocDetlParam.setBatch(locDetl.getBatch());
if (now.compareTo(maxDate) > 0) {
- long difference = (now.getTime() - maxDate.getTime()) / (24 * 60 * 60 * 1000);
+ long difference = (now.getTime() - locDetl.getModiTime().getTime()) / (24 * 60 * 60 * 1000);
abnormalLocDetlParam.setNowTime(Integer.parseInt(String.valueOf(difference)));
result.add(abnormalLocDetlParam);
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 5e0dd68..9baa9f5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -431,9 +431,13 @@
if (wrkDetls.get(0).getOrderNo() != null) {
for (WrkDetl wrkDetl : wrkDetls) {
String orderNo$ = "";
- JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
- resultRecords.add(detlDto.getOrderNo());
- });
+ if(!wrkDetl.getOrderNo().startsWith("[") || !wrkDetl.getOrderNo().endsWith("]")) {
+ return wrkDetl.getOrderNo();
+ } else {
+ JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
+ resultRecords.add(detlDto.getOrderNo());
+ });
+ }
}
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 1149736..1eeb648 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -488,8 +488,8 @@
add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
}};
case 3:
- return new ArrayList<>();
case 4:
+ return new ArrayList<>();
case 5:
return new ArrayList<String>() {{
add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
@@ -521,8 +521,8 @@
add(zerofill(String.valueOf(11), 2) + locNo.substring(2));
}};
case 11:
- return new ArrayList<>();
case 12:
+ return new ArrayList<>();
case 13:
return new ArrayList<String>() {{
add(zerofill(String.valueOf(12), 2) + locNo.substring(2));
@@ -548,8 +548,8 @@
add(zerofill(String.valueOf(18), 2) + locNo.substring(2));
}};
case 18:
- return new ArrayList<>();
case 19:
+ return new ArrayList<>();
case 20:
return new ArrayList<String>() {{
add(zerofill(String.valueOf(19), 2) + locNo.substring(2));
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 4418970..ad33ebc 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -201,11 +201,11 @@
, a.loc_no as locNo
, a.batch
, a.anfme
+ , a.modi_time as modiTime
from asr_loc_detl a
where 1=1
- and batch!='' and batch is not null
<include refid="stockOutCondition"></include>
- group by a.matnr,a.batch,a.anfme, a.loc_no
+ group by a.matnr,a.batch,a.anfme, a.loc_no, a.modi_time
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 42f0e3b..86b8f69 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -199,7 +199,7 @@
};
var loadIndex = layer.msg('姝ｅ湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
$.ajax({
- url: baseUrl+"/locDetl/export/auth",
+ url: baseUrl+"/locDetl/export/auth/v2",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
diff --git a/src/main/webapp/views/locOwner/locOwner.html b/src/main/webapp/views/locOwner/locOwner.html
index 4374cd1..57c3173 100644
--- a/src/main/webapp/views/locOwner/locOwner.html
+++ b/src/main/webapp/views/locOwner/locOwner.html
@@ -29,7 +29,7 @@
<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input" type="text" name="owner" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
<div class="layui-inline"> 
@@ -73,7 +73,7 @@
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">: </label>
+ <label class="layui-form-label layui-form-required">瀹㈡埛淇℃伅: </label>
<div class="layui-input-block">
<input class="layui-input" name="owner" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
</div>
--
Gitblit v1.9.1