From fc464a48c95cc0710d89501d9df99312c3efa603 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 13 八月 2024 18:35:12 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java | 1
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java | 11 +++++
zy-asrs-wms/src/main/webapp/static/js/common.js | 17 ++++++--
zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html | 26 +++++++++----
zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js | 18 ++++++---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 17 ++++++++
6 files changed, 71 insertions(+), 19 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
index 5ec4d48..808b950 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
@@ -4,9 +4,11 @@
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.utils.Synchro;
import com.zy.asrs.common.wms.service.DocTypeService;
import com.zy.asrs.common.wms.service.LocMastService;
+import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.common.wms.service.OrderService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -301,6 +303,15 @@
// null // 鎺堟潈鍟嗘埛
// );
+ public Mat getMat$(){
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat mat = service.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
+ if (!Cools.isEmpty(mat)){
+ return mat;
+ }
+ return null;
+ }
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.getById(this.locNo);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index d401e69..bb73fb2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -132,6 +132,22 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
+
+ if (!Cools.isEmpty(param.get("decrees"))) {
+ ArrayList<String> mats = new ArrayList<>();
+ List<Mat> decrees = matService.list(new LambdaQueryWrapper<Mat>().like(Mat::getDecrees, param.get("decrees")));
+ if (decrees.isEmpty()) {
+ mats.add("-1");
+ }else {
+ for (Mat mat : decrees) {
+ mats.add(mat.getMatnr());
+ }
+ }
+
+ wrapper.in("matnr", mats);
+ param.remove("decrees");
+ }
+
convert(param,wrapper);
wrapper.eq("host_id", getHostId());
// if (!Cools.isEmpty(condition)) {
@@ -145,6 +161,7 @@
if (!Cools.isEmpty(param.get("locNo"))) {
wrapper.eq("loc_no", param.get("locNo"));
}
+
param.remove("locNo");
param.remove("owner");
param.remove("zpallet");
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
index 24df00e..b9c50c2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
@@ -142,6 +142,7 @@
param.remove("order_no");
allLike(Order.class, param.keySet(), wrapper, condition);
+ wrapper.orderByDesc("create_time");
return R.ok(orderService.page(new Page<>(curr, limit), wrapper));
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/common.js b/zy-asrs-wms/src/main/webapp/static/js/common.js
index ea219fc..e396701 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -239,7 +239,14 @@
,{field: 'owner', align: 'center',title: '璐т富'}
,{field: 'fullPlt$', align: 'center',title: '鏄惁婊℃澘'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
+ ,{field: 'templet', align: 'center',title: '鏈哄瀷',templet:function(row){
+ return row.mat$.model
+ }}
+ ,{field: 'templet', align: 'center',title: '鍒朵护',templet:function(row){
+ return row.mat$.decrees
+ }}
+
+
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
@@ -252,10 +259,10 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: false}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: false}
+ ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js b/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
index 795dbad..c3fc15b 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
@@ -2,17 +2,23 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ {field: 'matnr', align: 'center',title: '鍝佸彿', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'orderType', align: 'center',title: '鍗曟嵁绫诲瀷', hide: false}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', width: 100}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'memo', align: 'center',title: '缈诲寘'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
+ ,{field: 'templet', align: 'center',title: '鏈哄瀷',templet:function(row){
+ return row.mat$.model
+ }}
+ ,{field: 'templet', align: 'center',title: '鍒朵护',templet:function(row){
+ return row.mat$.decrees
+ }}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
// ,{field: 'owner$', align: 'center',title: '鎷ユ湁鑰�'}
- ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
diff --git a/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html b/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
index 9f310ef..4467d8a 100644
--- a/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
@@ -16,12 +16,22 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="locNo" placeholder="搴撲綅鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="owner" placeholder="鎷ユ湁鑰�" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="decrees" placeholder="鍒朵护" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -31,14 +41,14 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="locNo" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
</div>
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="row" placeholder="鎺掓暟" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="owner" placeholder="鎷ユ湁鑰�" autocomplete="off">
+ </div>
+ </div>
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
--
Gitblit v1.9.1