From bdd84cc48ba7b2527584c44d174da8e7d20c5375 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 18 九月 2024 16:37:13 +0800
Subject: [PATCH] 增加对申请入库时对平库库位的校验
---
HTML/views/ASNSetting/PalletUpShelf.html | 166 ++++++++-----------------------------------------------
1 files changed, 24 insertions(+), 142 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletUpShelf.html b/HTML/views/ASNSetting/PalletUpShelf.html
index 0355c9d..517a855 100644
--- a/HTML/views/ASNSetting/PalletUpShelf.html
+++ b/HTML/views/ASNSetting/PalletUpShelf.html
@@ -67,12 +67,12 @@
class="layui-input">
</div>
</div>
- <div class="layui-inline" style="margin-right: 0;">
+ <div class="layui-inline" style="margin-right: 0;">
<label class="layui-form-label" style="width: 60px;">鎵樼洏鍙�</label>
<div class="layui-input-inline" style="margin-right: 0;">
<div class="layui-input-inline" style="margin-right: 0;">
- <input type="text" id="PalletNo" name="PalletNo" placeholder="鎵樼洏鍙�"
- autocomplete="off" class="layui-input">
+ <input type="text" id="PalletNo" name="PalletNo" placeholder="鎵樼洏鍙�" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
@@ -83,7 +83,7 @@
class="layui-input">
</div>
</div>
- <div class="layui-inline" style="margin-right: 0;">
+ <div class="layui-inline" style="margin-right: 0;">
<label class="layui-form-label" style="width: 60px;">鐗╁搧鍚嶇О</label>
<div class="layui-input-inline" style="margin-right: 0;">
<input type="text" id="SkuName" name="SkuName" placeholder="鐗╂枡鍚嶇О" autocomplete="off"
@@ -99,7 +99,7 @@
</div>
</div>
</div>
-
+
<div class="layui-inline" style="margin-right: 0;">
<label class="layui-form-label">鐘舵��</label>
@@ -122,35 +122,12 @@
lay-filter="LAY-app-contlist-search">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
</button>
- <!-- <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-normal buDaLabelClass" style="margin-left: 5px;" lay-event="BuDaLabel" id="BuDaLabel">
- <i class="layui-icon layui-icon-print layuiadmin-button-btn"></i>琛ユ墦鏍囩
- </button>
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-danger delLabelClass" style="margin-left: 5px;" lay-event="delLabel" id="delLabel">
- <i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎鏍囩
- </button> -->
+
</div>
- <!-- 纭鍑哄簱鍙ｅ脊绐� -->
- <!-- <div class="layui-inline" id="divDelLotNo" style="display: none; padding-top: 10px;">
- <div class="layui-inline">
- <label class="layui-form-label">鍏ュ簱鍗曟嵁</label>
- <div class="layui-input-inline" style="width: 220px;">
- <input type="text" id="AsnNoSelect" name="AsnNoSelect" placeholder="鍏ュ簱鍗曟嵁" autocomplete="off" class="layui-input">
-
- </div>
- </div>
- <div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
- <label class="layui-form-label">鎵规鍙�</label>
- <div class="layui-input-inline" style="width: 220px;">
- <select name="LotNoSelect" id="LotNoSelect" lay-search>
- <option value=""></option>
- </select>
- </div>
- </div>
-
- </div> -->
+
</div>
</div>
- <div class="layui-card-body">
+ <div class="layui-card-body">
<div class="position-relative">
<table id="Box-list" lay-filter="Box-list"></table>
@@ -160,7 +137,7 @@
</button>
</div>
-
+
<script type="text/html" id="templetStatus">
{{# function GetBtn1(d){
@@ -175,7 +152,7 @@
}}
{{ GetBtn1(d) }}
</script>
-
+
<script type="text/html" id="templetCreateTime">
{{# function GetBtn2(d){
return formatDate(d.CreateTime);
@@ -183,7 +160,7 @@
}}
{{ GetBtn2(d) }}
</script>
- <script type="text/html" id="templetUpdateTime">
+ <script type="text/html" id="templetUpdateTime">
{{# function GetBtn3(d){
return formatDate(d.UpdateTime);
}
@@ -217,9 +194,6 @@
<script src="../../js/jquery-3.5.1.min.js"></script>
<script src="../../js/jquery.cookie.js"></script>
<script>
- // layui.extend({
- // excel: '../../layuiadmin/layui/layui_exts/excel' // {/}鐨勬剰鎬濆嵆浠ｈ〃閲囩敤鑷湁璺緞锛屽嵆涓嶈窡闅� base 璺緞
- // })
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -230,7 +204,7 @@
table = layui.table,
layer = layui.layer,
laydate = layui.laydate;
-
+
// 鎼滅储鏂规硶
form.on('submit(LAY-app-contlist-search)', function (data) {
bindTable();
@@ -240,116 +214,24 @@
// 椤甸潰鍔犺浇缁戝畾Table
bindTable();
- //鐢熸垚
- $('#BuDaLabel').on('click', function () {
- layer.open({
- type: 2,
- title: '鎵撳嵃',
- content: 'LabelBoxBuDa.html',
- maxmin: true,
- area: ['430px', '390px'],
- // btn: ['鍙栨秷']
- });
- });
- $("#AsnNoSelect").on('input', function () {
-
- if ($("#AsnNoSelect").val() == "" || $("#AsnNoSelect").val().length < 16) {
- return
- }
- if ($("#AsnNoSelect").val().length >= 16) {
- $("#AsnNoSelect").val($("#AsnNoSelect").val().substr(-16))
- }
- GetLotNoByAsnNo()
- })
- function GetLotNoByAsnNo() {
-
- $("#LotNoSelect").empty()
- $("#LotNoSelect").append('<option value =>' + '</option>');
- form.render('select');
- var param = {
- asnNo: $("#AsnNoSelect").val(),
- };
- sendData(IP + "/BllAsn/GetLotNoListByAsn", param, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
- for (var i = 0; i < res.data.length; i++) {
- $("#LotNoSelect").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
- }
- form.render('select');
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
-
- });
- }
- });
- }
-
- //鍒犻櫎鏍囩
- $('#delLabel').on('click', function () {
-
- layer.open({
- type: 1,
- title: '鍒犻櫎鏍囩',
- content: $('#divDelLotNo'),
- maxmin: false,
- area: ['350px','340px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
- var param = {
- AsnNo: $('#AsnNoSelect').val(),
- LotNo: $('#LotNoSelect').val(),
- };
- sendData(IP + "/BllAsn/DelLabelByAsnNo", param, 'post', function(res) {
- if (res.code == 0) { //鎴愬姛
- bindTable();
- layer.msg(res.msg, {
- icon: 1,
- time: 1500 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- $('#AsnNoSelect').val("");
- $("#LotNoSelect").empty()
- $("#LotNoSelect").append('<option value =>' + '</option>');
- form.render('select');
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- bindTable();
- $('#AsnNoSelect').val("");
- $("#LotNoSelect").empty()
- $("#LotNoSelect").append('<option value =>' + '</option>');
- form.render('select');
- });
- }
- layer.close(index);
- });
- }
- });
- });
-
-
//鑷畾涔夎〃澶�
var TotalColsArr = [[
- { field: 'TraceNo', title: '杩芥函鍙�', align: 'center',fixed: 'left', width: 180, "disabled": true },
+ { field: 'TraceNo', title: '杩芥函鍙�', align: 'center', fixed: 'left', width: 180, "disabled": true },
{ field: 'TaskNo', title: '浠诲姟鍙�', align: 'center', fixed: 'left', width: 220, "disabled": true },
- { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', fixed: 'left', width: 220, "disabled": true },
+ { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', fixed: 'left', width: 220, "disabled": true },
{ field: 'Status', title: '鐘舵��', align: 'center', templet: '#templetStatus', width: 90 },
- { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 140},
- { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
- { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 155},
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 140 },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 155 },
- { field: 'LocatName', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 90 },
+ { field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 90 },
{ field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center', width: 90 },
{ field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center', width: 90 },
{ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 100 },
{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#templetCreateTime' },
-
+
{ field: 'UpdateUserName', title: '鏇存柊浜�', align: 'center', width: 100 },
{ field: 'UpdateTime', title: '鏇存柊鏃堕棿', align: 'center', width: 160, templet: '#templetUpdateTime' },
//{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', toolbar: '#toolbarDemoList', "disabled": true }
@@ -374,12 +256,12 @@
colsJson = TotalColsArr
}
var param = {
- TraceNo:$("#ASNNo").val(),
+ TraceNo: $("#ASNNo").val(),
TaskNo: $("#BoxNo").val(),
- PalletNo: $("#PalletNo").val(),
+ PalletNo: $("#PalletNo").val(),
SkuNo: $("#SkuNo").val(),
SkuName: $("#SkuName").val(),
- LotNo: $("#LotNo").val(),
+ LotNo: $("#LotNo").val(),
Status: $("#Status").val(),
};
table.render({
@@ -389,7 +271,7 @@
height: 'full-96',
id: 'Box-list',
where: param,
- contentType: 'application/json',
+ contentType: 'application/json',
headers: { ToKen: $.cookie('token') },
page: true,
even: true,
@@ -397,7 +279,7 @@
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
done: function (res) {
-
+
//鑷畾涔夊垪瀹�
SetTableColW('Box-list', 'BllAsn/GetPalletUpShelfList', TotalColsSysArr);
},
--
Gitblit v1.8.0