From ae5928177e910e882ba37a953bcd52ae503f8c30 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 07 四月 2022 08:05:28 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locDetl/locDetl.html | 7 ++
src/main/java/com/zy/asrs/controller/MatCodeController.java | 10 ++
src/main/webapp/views/matCode/matCode.html | 5 +
src/main/java/com/zy/asrs/controller/LocDetlController.java | 1
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 53 +++++++++++++++--
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4
src/main/resources/mapper/LocDetlMapper.xml | 27 ++++++++
src/main/webapp/static/js/matCode/matCode.js | 17 +++++
src/main/webapp/views/pakStore/locDetlQuery.html | 36 ++++++++---
9 files changed, 135 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index b1b0e1d..5be8bc0 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -63,6 +63,7 @@
@ManagerAuth
public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
+// @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
if (!Cools.isEmpty(param.get("modi_time"))){
String val = String.valueOf(param.get("modi_time"));
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index d6fb5f2..3fabcd7 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -23,7 +23,6 @@
import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import com.zy.common.web.BaseController;
-import com.zy.system.entity.Role;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -128,8 +127,15 @@
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "浜у搧浠ｅ彿鏁版嵁瀵煎嚭")
public void export(@RequestParam(required = false) String fileName,
@RequestParam(required = false) Integer rowCount,
+ @RequestParam(required = false) String ids,
HttpServletResponse response) throws Exception {
- List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
+ List<MatCode> list = null;
+ if(!Cools.isEmpty(ids)){
+ list = matCodeService.selectList(new EntityWrapper<MatCode>().last("where mat_no in (" + ids + ")"));
+ }else{
+ list = matCodeService.selectList(new EntityWrapper<>());
+ }
+// List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
List<MatCodeExcel> excels = new ArrayList<>();
for (MatCode matCode : list) {
MatCodeExcel excel = VersionUtils.getExcel(matCode);
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index b6b8d33..0a68b5b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -280,8 +280,8 @@
wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
wrkDetl.setQtyBox(matCode.getStr6());
wrkDetl.setWeight(matCode.getWeight());
- wrkDetl.setAllWeight(qty*matCode.getWeight()+30);
- wrkDetl.setAllQty(qty*matCode.getStr6());
+ wrkDetl.setAllWeight(matCode.getWeight()!=null ? qty*matCode.getWeight()+30 : 0);
+ wrkDetl.setAllQty(matCode.getStr6()!=null ? qty*matCode.getStr6() : 0);
wrkDetl.setVendor(detlDto.getLocDetl().getVendor());
wrkDetl.setSource(detlDto.getLocDetl().getSource());
wrkDetl.setSupplier(detlDto.getLocDetl().getSupplier());
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e72c016..ffaa2e5 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -55,6 +55,31 @@
<if test="startTime!=null and endTime!=null">
and a.modi_time between #{startTime} and #{endTime}
</if>
+ <if test="memo!=null and memo!='' ">
+ and (
+ a.loc_no like '%' + #{memo} + '%'
+ or a.mat_no like '%' + #{memo} + '%'
+ or a.mat_name like '%' + #{memo} + '%'
+ or a.qty like '%' + #{memo} + '%'
+ or a.str3 like '%' + #{memo} + '%'
+ or a.unit like '%' + #{memo} + '%'
+ or a.specs like '%' + #{memo} + '%'
+ or a.size like '%' + #{memo} + '%'
+ or a.color like '%' + #{memo} + '%'
+ or a.supplier like '%' + #{memo} + '%'
+ or a.zpallet like '%' + #{memo} + '%'
+ or a.source like '%' + #{memo} + '%'
+ or a.vendor like '%' + #{memo} + '%'
+ or a.qty_box like '%' + #{memo} + '%'
+ or a.str3 like '%' + #{memo} + '%'
+ or a.str4 like '%' + #{memo} + '%'
+ or a.str5 like '%' + #{memo} + '%'
+ or a.memo like '%' + #{memo} + '%'
+ )
+ </if>
+ <if test="crnNo!=null and crnNo!='' ">
+ and b.crn_no=#{crnNo}
+ </if>
</sql>
<sql id="stockOutCondition1">
@@ -81,7 +106,7 @@
and b.loc_sts = 'F'
<include refid="stockOutCondition"></include>
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
- order by supplier,modi_time,loc_no
+ order by supplier,appe_time,loc_no
</select>
<select id="getStockOutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 13c2806..66a7c98 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -85,9 +85,11 @@
});
});
+ var checkData;
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(matCode)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
+ checkData = table.checkStatus(obj.config.id);
switch(obj.event) {
case 'addData':
layer.open({
@@ -191,9 +193,22 @@
// 瀵煎嚭excel
form.on('submit(exportDo)', function(data) {
+ debugger
+ // if (checkData.data.length === 0) {
+ // layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
layer.closeAll();
layer.load(1, {shade: [0.1,'#fff']});
- location.href = baseUrl + "/matCode/export/auth?fileName="+$("#exportFileName").val()+"&rowCount="+$("#exportRowCount").val();
+
+ var ids = "";
+ if(checkData.data.length>0) {
+ for (var i = 0; i < checkData.data.length; i++) {
+ ids = ids + "'" + checkData.data[i].matNo + "',";
+ }
+ ids = ids.substring(0, ids.length - 1);
+ }
+ location.href = baseUrl + "/matCode/export/auth?fileName="+$("#exportFileName").val()+"&rowCount="+$("#exportRowCount").val()+"&ids=" + ids;
+ // location.href = baseUrl + "/matCode/export/auth?fileName="+$("#exportFileName").val()+"&rowCount="+$("#exportRowCount").val();
layer.closeAll('loading');
return false;
});
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 9679a61..0230608 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -26,7 +26,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧浠ｅ彿" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="mat_name" placeholder="浜у搧鍚嶇О" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 6cfe00c..faf4287 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -57,6 +57,11 @@
<input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="mat_name" placeholder="浜у搧鍚嶇О" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index f98139a..0d2410b 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -10,6 +10,9 @@
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
+ .layui-table-body.layui-table-main {
+ overflow: scroll;
+ }
body {
padding: 0 20px;
}
@@ -44,6 +47,13 @@
<legend>鎼滅储鏍�</legend>
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-input-inline" style="margin-top: -10px">
+ <select id="crnNo" name="crnNo">
+ <option value="" style="display: none">璇烽�夋嫨宸烽亾</option>
+ <option value="1">1鍙�</option>
+ <option value="2">2鍙�</option>
+ </select>
+ </div>
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
@@ -57,6 +67,11 @@
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="mat_name" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="memo" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
@@ -79,7 +94,7 @@
</div>
</script>
-<div class="layui-form">
+<div class="layui-form" style="width: 100%">
<table class="layui-hide" id="stockOut" lay-filter="stockOut"></table>
</div>
@@ -97,14 +112,35 @@
var cols = [
{type: 'checkbox'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ];
- cols.push.apply(cols, detlCols);
- cols.push(
- {field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О', width: 180}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'source', title: '鏉ユ簮', align: 'center'}
+ ,{field: 'vendor', title: '渚涘簲鍟�', align: 'center'}
+ ,{field: 'qtyBox', align: 'center', title: '姣忕鏁伴噺(PCS)', width: 130}
+ ,{field: 'allQty', title: '鎬绘暟閲�(PCS)', align: 'center', width: 120}
+ ,{field: 'weight', align: 'center', title: '姣忕閲嶉噺(KG)', width: 130}
+ ,{field: 'allWeight', title: '鎬婚噸閲�(KG)', align: 'center', width: 120}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
+ ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ // ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
+ ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
+ ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
,{field: 'str5$', align: 'center',title: '绫诲埆'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
+ // {type: 'checkbox'}
+ // ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ];
+ // cols.push.apply(cols, detlCols);
+ cols.push(
+ // {field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ // ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+ // ,{field: 'str5$', align: 'center',title: '绫诲埆'}
+ {field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180})
return cols;
}
@@ -121,9 +157,10 @@
url: baseUrl+'/stock/out/list/auth',
page: true,
limit: 10,
+ limits: [10, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
- cellMinWidth: 50,
+ cellMinWidth: 100,
cols: [getCol()],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 9c5d9f1..1d02c25 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -10,6 +10,9 @@
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
+ .layui-table-body.layui-table-main {
+ overflow: scroll;
+ }
body {
padding: 0 20px;
}
@@ -44,6 +47,13 @@
<legend>鎼滅储鏍�</legend>
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-input-inline" style="margin-top: -10px">
+ <select id="crnNo" name="crnNo">
+ <option value="" style="display: none">璇烽�夋嫨宸烽亾</option>
+ <option value="1">1鍙�</option>
+ <option value="2">2鍙�</option>
+ </select>
+ </div>
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
@@ -51,12 +61,17 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="鐗╂枡鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="鐗╂枡缂栫爜" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_name" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_name" placeholder="鐗╂枡鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="memo" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
@@ -79,7 +94,7 @@
</div>
</script>
-<div class="layui-form">
+<div class="layui-form" style="width: 100%">
<table class="layui-hide" id="stockOut" lay-filter="stockOut"></table>
</div>
@@ -98,15 +113,15 @@
{type: 'checkbox'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
- ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О', width: 180}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'qty', align: 'center',title: '鏁伴噺'}
,{field: 'source', title: '鏉ユ簮', align: 'center'}
,{field: 'vendor', title: '渚涘簲鍟�', align: 'center'}
- ,{field: 'qtyBox', align: 'center', title: '姣忕鏁伴噺(PCS)'}
- ,{field: 'allQty', title: '鎬绘暟閲�(PCS)', align: 'center'}
- ,{field: 'weight', align: 'center', title: '姣忕閲嶉噺(KG)'}
- ,{field: 'allWeight', title: '鎬婚噸閲�(KG)', align: 'center'}
+ ,{field: 'qtyBox', align: 'center', title: '姣忕鏁伴噺(PCS)', width: 130}
+ ,{field: 'allQty', title: '鎬绘暟閲�(PCS)', align: 'center', width: 120}
+ ,{field: 'weight', align: 'center', title: '姣忕閲嶉噺(KG)', width: 130}
+ ,{field: 'allWeight', title: '鎬婚噸閲�(KG)', align: 'center', width: 120}
,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
,{field: 'color', align: 'center',title: '棰滆壊'}
@@ -120,7 +135,7 @@
// cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180})
return cols;
}
@@ -137,9 +152,10 @@
url: baseUrl+'/stock/out/list/auth',
page: true,
limit: 10,
+ limits: [10, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
- cellMinWidth: 50,
+ cellMinWidth: 100,
cols: [getCol()],
request: {
pageName: 'curr',
--
Gitblit v1.9.1