From 9d13343087fad70aebae38f04d533dd3832ef40c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 三月 2021 13:20:42 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locDetl/locDetl.html | 4
src/main/webapp/static/js/ioWorks/stockOut.js | 37 +++++---
src/main/webapp/views/ioWorks/locDetlQuery.html | 56 +++++--------
src/main/resources/mapper/LocDetlMapper.xml | 40 +++++++--
src/main/webapp/views/ioWorks/stockOut.html | 10 +-
src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java | 6 +
src/main/java/zy/cloud/wms/manager/service/LocDetlService.java | 2
src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java | 34 ++-----
src/main/webapp/static/js/common.js | 9 +-
src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java | 6 +
10 files changed, 108 insertions(+), 96 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
index b9ddade..2ff8b0b 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
@@ -43,31 +43,19 @@
Object nodeId = param.get("node_id");
if (Cools.isEmpty(nodeId)) {
nodeId = getOriginNode().getId();
+ param.put("node_id", String.valueOf(nodeId));
}
- return R.ok(locDetlService.getPage(new Page<>(curr, limit)
- , String.valueOf(nodeId)
- , param.get("loc_no")
- , param.get("matnr")
- , param.get("maktx"))
- );
+ if (!Cools.isEmpty(param.get("update_time"))){
+ String val = String.valueOf(param.get("update_time"));
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ param.put("startTime", DateUtils.convert(dates[0]));
+ param.put("endTime", DateUtils.convert(dates[1]));
+ param.remove("update_time");
+ }
+ }
+ return R.ok(locDetlService.getPage(toPage(curr, limit, param, LocDetl.class)));
}
-
-// @RequestMapping(value = "/stock/out/list/auth")
-// @ManagerAuth
-// public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
-// @RequestParam(defaultValue = "10")Integer limit,
-// @RequestParam Map<String, Object> param){
-// if (!Cools.isEmpty(param.get("update_time"))){
-// String val = String.valueOf(param.get("update_time"));
-// if (val.contains(RANGE_TIME_LINK)) {
-// String[] dates = val.split(RANGE_TIME_LINK);
-// param.put("startTime", DateUtils.convert(dates[0]));
-// param.put("endTime", DateUtils.convert(dates[1]));
-// param.remove("modi_time");
-// }
-// }
-// return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
-// }
private void convert(Map<String, Object> map, EntityWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java
index 8571c54..3446b58 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java
@@ -1,19 +1,21 @@
package zy.cloud.wms.manager.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.plugins.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import zy.cloud.wms.manager.entity.LocDetl;
import java.util.List;
+import java.util.Map;
@Mapper
@Repository
public interface LocDetlMapper extends BaseMapper<LocDetl> {
- List<LocDetl> listByPage(Page page, @Param("nodeId") String nodeId, @Param("locNo") Object locNo, @Param("matnr") Object matnr, @Param("maktx") Object maktx);
+ List<LocDetl> listByPage(Map<String, Object> map);
+
+ Integer listByPageCount(Map<String, Object> map);
LocDetl selectByLocNoAndMatnr(@Param("nodeId")Long nodeId, @Param("matnr")String martnr);
diff --git a/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java b/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java
index 63fe39d..b5af7d5 100644
--- a/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java
@@ -8,7 +8,7 @@
public interface LocDetlService extends IService<LocDetl> {
- Page<LocDetl> getPage(Page page, String nodeId, Object locNo, Object matnr, Object maktx);
+ Page<LocDetl> getPage(Page<LocDetl> page);
LocDetl getLocDetl(Long nodeId, String matnr);
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
index 0578a6e..a5141f7 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
@@ -28,8 +28,10 @@
private MatService matService;
@Override
- public Page<LocDetl> getPage(Page page, String nodeId, Object locNo, Object matnr, Object maktx) {
- return page.setRecords(baseMapper.listByPage(page, nodeId, locNo, matnr, maktx));
+ public Page<LocDetl> getPage(Page<LocDetl> page) {
+ page.setRecords(baseMapper.listByPage(page.getCondition()));
+ page.setTotal(baseMapper.listByPageCount(page.getCondition()));
+ return page;
}
@Override
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 2589254..f30d2d9 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -31,15 +31,9 @@
</resultMap>
- <select id="listByPage" resultMap="BaseResultMap">
- SELECT
- mld.*
- FROM man_loc_detl mld
- LEFT JOIN man_node mn ON mld.node_id = mn.id
- WHERE 1=1
- AND (CHARINDEX(#{nodeId}, ','+mn.path+',') > 0 OR mn.id = #{nodeId})
- <if test="locNo != null and locNo != ''">
- and mld.loc_no like concat('%',#{locNo},'%')
+ <sql id="locDetlCondition">
+ <if test="loc_no != null and loc_no != ''">
+ and mld.loc_no like concat('%',#{loc_no},'%')
</if>
<if test="matnr != null and matnr != ''">
and mld.matnr like concat('%',#{matnr},'%')
@@ -47,7 +41,33 @@
<if test="maktx != null and maktx != ''">
and mld.maktx like concat('%',#{maktx},'%')
</if>
- ORDER BY mld.create_time DESC
+ <if test="startTime!=null and endTime!=null">
+ and mld.update_time between #{startTime} and #{endTime}
+ </if>
+ </sql>
+
+ <select id="listByPage" resultMap="BaseResultMap">
+ select * from
+ (
+ SELECT
+ ROW_NUMBER() over (order by mld.create_time desc) as row,
+ mld.*
+ FROM man_loc_detl mld
+ LEFT JOIN man_node mn ON mld.node_id = mn.id
+ WHERE 1=1
+ AND (CHARINDEX(#{node_id}, ','+mn.path+',') > 0 OR mn.id = #{node_id})
+ <include refid="locDetlCondition"></include>
+ ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+
+ <select id="listByPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+ select
+ count(1)
+ FROM man_loc_detl mld
+ LEFT JOIN man_node mn ON mld.node_id = mn.id
+ WHERE 1=1
+ AND (CHARINDEX(#{node_id}, ','+mn.path+',') > 0 OR mn.id = #{node_id})
+ <include refid="locDetlCondition"></include>
</select>
<select id="selectByLocNoAndMatnr" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 3cefd3b..0aa7cb0 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -200,8 +200,9 @@
var detlCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
- ,{field: 'name', align: 'center',title: '鍚嶇О'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺'}
+ ,{field: 'name', align: 'center',title: '鍚嶇О', hide: true}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
,{field: 'model', align: 'center',title: '鍨嬪彿', hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
@@ -210,7 +211,7 @@
,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
- ,{field: 'count', align: 'center',title: '鏁伴噺'}
+ ,{field: 'count', align: 'center',title: '鏁伴噺', hide: true}
,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
]
diff --git a/src/main/webapp/static/js/ioWorks/stockOut.js b/src/main/webapp/static/js/ioWorks/stockOut.js
index 5946e13..d391e22 100644
--- a/src/main/webapp/static/js/ioWorks/stockOut.js
+++ b/src/main/webapp/static/js/ioWorks/stockOut.js
@@ -2,13 +2,13 @@
var locDetlData = [];
function getCol() {
var cols = [
- // {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
- {field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
+ ,{field: 'anfme', align: 'center',title: '鍘熸暟閲�'}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
];
arrRemove(detlCols, 'field', 'anfme');
cols.push.apply(cols, detlCols);
- // cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
}
@@ -28,7 +28,7 @@
cols: [getCol()],
done: function(res, curr, count) {
limit();
- getOutBound();
+ // getOutBound();
}
});
@@ -45,11 +45,11 @@
if (data.length === 0){
layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
} else {
- var staNo = $("#staNoSelect").val();
- if (staNo === "" || staNo === null){
- layer.msg("璇烽�夋嫨鍑哄簱鍙�");
- return;
- }
+ // var staNo = $("#staNoSelect").val();
+ // if (staNo === "" || staNo === null){
+ // layer.msg("璇烽�夋嫨鍑哄簱鍙�");
+ // return;
+ // }
var locDetls = [];
data.forEach(function(elem) {
locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count});
@@ -67,7 +67,10 @@
success: function (res) {
if (res.code === 200){
locDetlData = [];
- tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
+ tableIns.reload({data: locDetlData,done:function (res) {
+ limit();
+ // getOutBound();
+ }});
layer.msg(res.msg);
} else if (res.code === 403){
top.location.href = baseUrl+"/";
@@ -91,7 +94,10 @@
locDetlData.splice(i, 1);
}
}
- tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
+ tableIns.reload({data: locDetlData,done:function (res) {
+ limit();
+ // getOutBound();
+ }});
break;
}
});
@@ -115,7 +121,10 @@
layer.msg("鏁伴噺蹇呴』澶т簬闆�");
}
}
- tableIns.reload({data: locDetlData,done:function (res) {limit(); getOutBound();}});
+ tableIns.reload({data: locDetlData,done:function (res) {
+ limit();
+ // getOutBound();
+ }});
}
// 鑾峰彇鍑哄簱鍙�
@@ -162,7 +171,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<locDetlData.length;j++){
- if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
+ if (data[i].matnr === locDetlData[j].matnr && data[i].locNo === locDetlData[j].locNo) {
pass = true;
break;
}
diff --git a/src/main/webapp/views/ioWorks/locDetlQuery.html b/src/main/webapp/views/ioWorks/locDetlQuery.html
index 44fe0ca..8aa66a9 100644
--- a/src/main/webapp/views/ioWorks/locDetlQuery.html
+++ b/src/main/webapp/views/ioWorks/locDetlQuery.html
@@ -46,33 +46,23 @@
<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="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="loc_no" placeholder="璐т綅" autocomplete="off">
</div>
</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="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <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="type" placeholder="鐗╂枡绫诲埆" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="lgnum" placeholder="瑙勬牸" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input layui-laydate-range" name="update_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
<!-- 寰呮坊鍔� -->
@@ -106,11 +96,11 @@
function getCol() {
var cols = [
{type: 'checkbox'}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'locNo', align: 'center',title: '璐т綅'}
];
cols.push.apply(cols, detlCols);
- cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
+ cols.push({field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'})
return cols;
}
@@ -124,7 +114,7 @@
locDetlTableIns = table.render({
elem: '#stockOut',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/stock/out/list/auth',
+ url: baseUrl+'/locDetl/list/auth',
page: true,
limit: 10,
even: true,
@@ -151,8 +141,8 @@
top.location.href = baseUrl+"/";
}
pageCurr=curr;
- $('.layui-form-checkbox').css("pointer-events", "none");
- $('td[data-field="0').css("cursor", "pointer")
+ // $('.layui-form-checkbox').css("pointer-events", "none");
+ // $('td[data-field="0').css("cursor", "pointer")
}
});
@@ -211,19 +201,19 @@
});
})
- var b = true;
- $(function(){
- $(document.body).on('click','td[data-field="0"]',function(){
- var locNo = $(this).next().children("div").html();
- if (b) {
- b = false;
- $("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click();
- setTimeout(function () {
- b = true;
- }, 200)
- }
- });
- })
+ // var b = true;
+ // $(function(){
+ // $(document.body).on('click','td[data-field="0"]',function(){
+ // var locNo = $(this).next().children("div").html();
+ // if (b) {
+ // b = false;
+ // $("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click();
+ // setTimeout(function () {
+ // b = true;
+ // }, 200)
+ // }
+ // });
+ // })
function tableReload(child) {
var searchData = {};
diff --git a/src/main/webapp/views/ioWorks/stockOut.html b/src/main/webapp/views/ioWorks/stockOut.html
index 3b052d7..65c06b6 100644
--- a/src/main/webapp/views/ioWorks/stockOut.html
+++ b/src/main/webapp/views/ioWorks/stockOut.html
@@ -45,7 +45,7 @@
}
#btn-outbound {
- margin-left: 60px;
+ margin-left: 20px;
display: none;
}
@@ -94,10 +94,10 @@
<div class="layui-form">
<div class="layui-btn-container">
<!-- 1.閫夋嫨鍑哄簱鍙� -->
- <span id="staNoSpan">鍑哄簱鍙ｏ細</span>
- <select id="staNoSelect" lay-verify="required">
- <option value="">璇烽�夋嫨绔欑偣</option>
- </select>
+<!-- <span id="staNoSpan">鍑哄簱鍙ｏ細</span>-->
+<!-- <select id="staNoSelect" lay-verify="required">-->
+<!-- <option value="">璇烽�夋嫨绔欑偣</option>-->
+<!-- </select>-->
<!-- 2.鍚姩鍑哄簱 -->
<button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
</div>
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 9a77282..27604a7 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -69,9 +69,9 @@
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
<div id="search-box" class="layui-form toolbar" style="padding-top: 5px">
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">璐т綅缂栧彿:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">璐т綅:</label>
<div class="layui-input-inline">
- <input name="loc_no" class="layui-input" placeholder="杈撳叆璐т綅缂栧彿"/>
+ <input name="loc_no" class="layui-input" placeholder="杈撳叆璐т綅"/>
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1