From 4e710a595e0687ba0a976d1a8c6d76a39cc1a6bd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 04 三月 2021 13:14:38 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockOut.html | 33 +++++++++++++++++++--------------
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 2 +-
src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java | 2 +-
3 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index 412172f..941160f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -69,7 +69,7 @@
@RequestMapping("/pakout/get")
@ManagerAuth(memo = "鑾峰彇鍑哄簱鍗�")
public R getPakout(@RequestParam String docNumber) {
- List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("wrk_sts", 1));
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).in("wrk_sts", 1,2));
if (Cools.isEmpty(pakouts)) {
return R.parse(BaseRes.EMPTY);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java
index e12ed99..c864be2 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java
@@ -11,6 +11,6 @@
@Override
public Boolean stockOutComplete(String wrkNo, String docNum, Long userId) {
- return this.baseMapper.updateWrkSts(wrkNo, docNum, 2, userId)>0;
+ return this.baseMapper.updateWrkSts(wrkNo, docNum, 3, userId)>0;
}
}
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index f90c391..fbb2867 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -90,7 +90,7 @@
<div class="layui-btn-container">
<button id="reset" type="button" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
<button id="confirm" type="button" class="layui-btn layui-btn-normal" onclick="pakoutConfirm()" style="margin-left: 20px">鎷ｈ揣纭</button>
- <span id="tips"></span>
+ <button id="tips1" style="outline: none;color: white;border-color: white; position: absolute;right: 0;bottom: 0;"></button>
</div>
</footer>
</body>
@@ -115,6 +115,7 @@
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
+ $('#pakout-box').html("");
pakoutData = [];
pakoutData = res.data.pakouts;
if (pakoutData != null) {
@@ -128,7 +129,7 @@
var html = template(res.data);
$('#pakout-box').append(html);
}
- $('#confirm').focus();
+ $('#tips1').focus();
}
} else if (res.code === 201) {
} else if (res.code === 403) {
@@ -150,6 +151,10 @@
// 鎷ｈ揣纭
function pakoutConfirm() {
+ if (pakoutData == null || pakoutData.length === 0) {
+ tips("璇风‘璁ゅ崟鎹紪鍙凤紒", true);
+ return;
+ }
var docNum = pakoutData[0].docNum;
if (isEmpty(docNum)) {
tips("璇风‘璁ゅ崟鎹紪鍙凤紒", true);
@@ -197,18 +202,18 @@
layer.msg(msg, {icon: warn?2:1})
}
- document.onkeyup = function (e) {
- if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
- e = window.event;
- var key = e.charCode || e.keyCode;
- if (key === 115) {
- $("#confirm").focus();
- pakoutConfirm();
- } else if (key === 113) {
- $("#docNum").val("");
- $("#docNum").focus();
- }
- }
+ // document.onkeyup = function (e) {
+ // if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+ // e = window.event;
+ // var key = e.charCode || e.keyCode;
+ // if (key === 115) {
+ // $("#confirm").focus();
+ // pakoutConfirm();
+ // } else if (key === 113) {
+ // $("#docNum").val("");
+ // $("#docNum").focus();
+ // }
+ // }
</script>
<script type="text/template" id="pakoutDetlTpl">
{{#each pakouts}}
--
Gitblit v1.9.1