From cc3b8857e340360e08aedbe81de7d82df7c1b644 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 05 七月 2023 15:33:33 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/locNormalIn.html | 51 +++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 11 ++++-
2 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index a68185b..21d5f1c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -136,8 +136,15 @@
*/
@RequestMapping("/bill/query/auth")
@ManagerAuth(memo = "鏍规嵁閫氱煡鍗曟煡璇㈡槑缁�")
- public R billQuery(@RequestParam String billNo){
- List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("supplier", billNo).and().gt("anfme", 0).isNull("zpallet"));
+ public R billQuery(@RequestParam String billNo,
+ @RequestParam String mnemonic){
+ EntityWrapper<WaitPakin> wrapper = new EntityWrapper<>();
+ if(mnemonic == "") {
+ wrapper.eq("supplier", billNo).and().gt("anfme", 0).isNull("zpallet");
+ } else {
+ wrapper.eq("supplier", billNo).and().gt("anfme", 0).isNull("zpallet").and().like("mnemonic",mnemonic);
+ }
+ List<WaitPakin> waitPakins = waitPakinService.selectList(wrapper);
List<CombBillQueryVo> vos = new ArrayList<>();
if (!Cools.isEmpty(waitPakins)) {
for (WaitPakin waitPakin : waitPakins) {
diff --git a/src/main/webapp/views/pda/locNormalIn.html b/src/main/webapp/views/pda/locNormalIn.html
index ae9a929..b93bdb2 100644
--- a/src/main/webapp/views/pda/locNormalIn.html
+++ b/src/main/webapp/views/pda/locNormalIn.html
@@ -105,6 +105,10 @@
<!-- 涓讳綋 -->
<main>
<div class="layui-btn-group demoTable">
+ <div class="layui-inline">
+ <input class="layui-input" name="id" id="demoReload" autocomplete="off" placeholder="鐢熶骇鍗曞彿">
+ </div>
+ <button class="layui-btn" data-type="reload">鎼滅储</button>
<button class="layui-btn" data-type="getCheckData">鎻愬彇</button>
</div>
<table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
@@ -192,6 +196,9 @@
,data = checkStatus.data;
matData = data
tableIns.reload({data: matData});
+ },
+ reload: function () {
+ findMata();
}
};
$$('.demoTable .layui-btn').on('click', function(){
@@ -475,7 +482,49 @@
url: baseUrl + "/mobile/bill/query/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- billNo: billNo
+ billNo: billNo,
+ mnemonic: '',
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ if (res.data != null) {
+ console.log('鍗曞彿鏁版嵁', res.data);
+ var data = res.data;
+ if (data.length > 0) {
+ for (var i = 0; i < data.length; i++) {
+ addTableData(data[i]);
+ }
+ }
+ }
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ }
+ });
+ }
+ function findMata() {
+ var billNo = $('#billNo').val()
+ if (isEmpty(billNo)) {
+ return;
+ }
+ if (billNo.indexOf('=') > -1) {
+ billNo = billNo.split(",")[0].split("=")[1];
+ }
+ var mnemonic = $('#demoReload').val();
+ // 璧嬪�煎墠娓呯┖琛ㄦ牸
+ matData = [];
+ tableIns.reload({data: matData});
+ console.log(billNo)
+ console.log(mnemonic)
+ $.ajax({
+ url: baseUrl + "/mobile/bill/query/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ billNo: billNo,
+ mnemonic: mnemonic,
},
method: 'POST',
success: function (res) {
--
Gitblit v1.9.1