From 0d19e32011fd2003c3b5c74c07d1c701427e823a Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 16 三月 2021 10:32:34 +0800
Subject: [PATCH] 1.0.3 1.出库作业-提取出货内容新增根据生成单号查询物料
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 4 ++++
src/main/resources/mapper/LocDetlMapper.xml | 3 +++
src/main/webapp/views/pakStore/locDetlQuery.html | 14 ++++++++++----
src/main/webapp/static/js/common.js | 4 ++--
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 10d09bf..de77a91 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -72,6 +72,10 @@
if (Cools.isEmpty(param.get("supplier"))) {
param.remove("supplier");
}
+ /* 鐢熸垚鍗曞彿涓虹┖锛屽垹闄ょ敓鎴愬崟鍙穡arehouse */
+ if (Cools.isEmpty(param.get("warehouse"))) {
+ param.remove("warehouse");
+ }
return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 81360a4..8b9de7e 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -53,6 +53,9 @@
<if test="supplier!=null and supplier!=null">
and a.supplier like '%' + #{supplier} + '%'
</if>
+ <if test="warehouse!=null and warehouse!=null">
+ and a.warehouse like '%' + #{warehouse} + '%'
+ </if>
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 6254421..498c33e 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -208,8 +208,8 @@
,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
,{field: 'type', align: 'center',title: '鐗╂枡绫诲埆'}
,{field: 'mnemonic', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'supplier', align: 'center',title: '閫氱煡鍗曞彿'}
- // ,{field: 'warehouse', align: 'center',title: '浠撳簱'}
+ ,{field: 'supplier', align: 'center',title: '閫氱煡鍗曞彿', hide: true}
+ ,{field: 'warehouse', align: 'center',title: '鐢熸垚鍗曞彿'}
// ,{field: 'brand', align: 'center',title: '鍝佺墝'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'altme', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 2c632b4..8f90d4f 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -69,15 +69,21 @@
<input class="layui-input" type="text" name="lgnum" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
+ <!-- 鏃ユ湡鑼冨洿 -->
+ <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">
+ </div>
+ </div>
+ <br />
+ <div class="layui-inline" style="margin-left: 30px">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="supplier" placeholder="閫氱煡鍗曞彿" autocomplete="off">
</div>
</div>
- <!-- 鏃ユ湡鑼冨洿 -->
- <div class="layui-inline" style="width: 300px;margin-left: 30px">
+ <div class="layui-inline">
<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" type="text" name="warehouse" placeholder="鐢熸垚鍗曞彿" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
--
Gitblit v1.9.1