From 081aa3943dda47df98035aadd60f0e668a6f36aa Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 19 八月 2024 15:05:27 +0800
Subject: [PATCH] #库存管理的库存调整：增加搜托盘码
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 13 ++++++++++++-
zy-asrs-wms/src/main/webapp/static/js/pakStore/stockAdjust.js | 31 +++++++++++++++++++++++++++----
zy-asrs-wms/src/main/webapp/views/pakStore/stockAdjust.html | 5 +++++
3 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index 3d6f303..24d9fe8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -137,6 +137,12 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
+ Object barcode = null;
+ if (!Cools.isEmpty(param.get("barcode"))) {
+ barcode = param.get("barcode");
+ }
+ param.remove("zpallet");
+ param.remove("barcode");
if (!Cools.isEmpty(param.get("decrees"))) {
ArrayList<String> mats = new ArrayList<>();
@@ -167,13 +173,18 @@
wrapper.eq("loc_no", param.get("locNo"));
}
+ if (!Cools.isEmpty(barcode)) {
+ wrapper.eq("zpallet", barcode);
+ }
+
if (!Cools.isEmpty(orderByField)){
wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
}
+
+
param.remove("locNo");
param.remove("owner");
- param.remove("zpallet");
param.remove("matnr");
allLike(LocDetl.class, param.keySet(), wrapper, condition);
return R.ok(locDetlService.page(new Page<>(curr, limit), wrapper));
diff --git a/zy-asrs-wms/src/main/webapp/static/js/pakStore/stockAdjust.js b/zy-asrs-wms/src/main/webapp/static/js/pakStore/stockAdjust.js
index c45e71f..deafbee 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -2,6 +2,7 @@
var initAnfmeVal = "-";
var matCodeData = [];
var currLocNo;
+var currBarcode;
var matCodeLayerIdx;
function getCol() {
var cols = [
@@ -66,7 +67,7 @@
table.on('toolbar(chooseData)', function (obj) {
switch(obj.event) {
case 'adjust':
- if (isEmpty(currLocNo)) {
+ if (isEmpty(currLocNo) && isEmpty(currBarcode)) {
layer.msg("璇峰厛妫�绱㈠簱浣�", {icon: 2})
inputTip($("#searchLocNo"));
return;
@@ -127,12 +128,17 @@
// 妫�绱簨浠�
form.on('submit(search)', function (data) {
let locNo = data.field.loc_no;
- if (locNo === "") {
+ let barcode = data.field.barcode;
+ if (locNo === "" && barcode === "") {
inputTip($("#searchLocNo"));
- layer.msg("璇疯緭鍏ュ簱浣嶅彿");
+ layer.msg("璇疯緭鍏ュ簱浣嶅彿鎴栬�呮墭鐩樼爜锛侊紒锛�");
return;
}
- init(locNo);
+ if (locNo === ""){
+ initB(barcode);
+ } else {
+ init(locNo);
+ }
});
// 閲嶇疆浜嬩欢
@@ -152,6 +158,23 @@
})
}
+ function initB(barcode) {
+ http.post(baseUrl + "/locDetl/page/auth", {barcode: barcode,limit: 1000}, function (res) {
+ matCodeData = [];
+ matCodeData = res.data.records;
+ console.log("matCodeData2222")
+ console.log(matCodeData)
+ console.log(matCodeData[0])
+ for (var i = 0; i<matCodeData.length; i++) {
+ matCodeData[i]["count"] = matCodeData[i]["anfme"];
+ console.log(matCodeData)
+ console.log(matCodeData[i])
+ }
+ locTips(true, matCodeData[0]["locNo"]);
+ tableReload();
+ })
+ }
+
function reset() {
clearFormVal($('#search-box'));
matCodeData = [];
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/stockAdjust.html b/zy-asrs-wms/src/main/webapp/views/pakStore/stockAdjust.html
index bd758e9..2229345 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/stockAdjust.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/stockAdjust.html
@@ -84,6 +84,11 @@
<input id="searchLocNo" class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off" style="height: 45px;border-color: #b8b8b8">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input id="searchBarcode" class="layui-input" type="text" name="barcode" placeholder="鎵樼洏鐮�" autocomplete="off" style="height: 45px;border-color: #b8b8b8">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">妫�绱�</button>
--
Gitblit v1.9.1