From d1ecbc098962cfdcb1cf58abc06d16592fb3ce22 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 17 一月 2025 15:36:46 +0800
Subject: [PATCH] 1楼空托盘垛出库禁止AGV拉货
---
HTML/views/ASNSetting/LabelBox.html | 237 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 187 insertions(+), 50 deletions(-)
diff --git a/HTML/views/ASNSetting/LabelBox.html b/HTML/views/ASNSetting/LabelBox.html
index 79afd1a..1ec9351 100644
--- a/HTML/views/ASNSetting/LabelBox.html
+++ b/HTML/views/ASNSetting/LabelBox.html
@@ -75,32 +75,33 @@
</div>
</div>
<div class="layui-inline" style="margin-right: 0;">
- <label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+ <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="LotNo" name="LotNo" placeholder="鎵规鍙�" autocomplete="off"
+ <input type="text" id="LotNo" name="LotNo" placeholder="杩涘巶缂栧彿" autocomplete="off"
class="layui-input">
</div>
</div>
</div>
<div class="layui-inline" style="margin-right: 0;">
- <label class="layui-form-label" style="width: 60px;">渚涜揣鎵规</label>
+ <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="SupplierLot" name="SupplierLot" placeholder="渚涜揣鎵规"
+ <input type="text" id="SupplierLot" name="SupplierLot" placeholder="鍘熷巶鎵瑰彿"
autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-inline" style="margin-right: 0;">
- <label class="layui-form-label">鏄惁浣跨敤</label>
+ <label class="layui-form-label">鏍囩鐘舵��</label>
<div class="layui-input-inline" style="margin-right: 0;">
<div class="layui-input-inline" style="margin-right: 0;">
<select name="Status" id="Status" lay-filter="Status" lay-search>
<option value=""></option>
- <option value="0">鍚�</option>
- <option value="1">鏄�</option>
+ <option value="0">鏈粍鎵�</option>
+ <option value="1">宸茬粍鎵�</option>
+ <option value="2">宸插叆搴�</option>
</select>
</div>
@@ -120,9 +121,41 @@
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 buDaLabelClass" style="margin-left: 5px;" lay-event="BuDaLabel" id="BuDaLabel">
+ <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 class="layui-inline" id="divEditQty" 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="LabelQty" name="LabelQty" placeholder="鏁伴噺" autocomplete="off" class="layui-input">
+
+ </div>
+ </div>
</div>
</div>
</div>
@@ -227,9 +260,9 @@
<script type="text/html" id="toolbarDemoList">
{{# function GetBtn2(d){
var html = '';
- if(d.Origin == "WMS鐢熸垚" || d.Status == "0"){
- html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
- <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
+ if(d.Origin == "WMS鐢熸垚" && d.Status == "0"){
+ html = `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
+ <i class="layui-icon layui-icon-delete"></i>缂栬緫</a>`;
}
return html;
@@ -288,47 +321,136 @@
// 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() {
- // // 鍒犻櫎绠辨敮淇℃伅
- // table.on('tool(Box-list)', function (obj) {
- // var data = obj.data;
- // switch (obj.event) {
- // case "del":
- // layer.confirm('纭畾鍒犻櫎绠辨敮鏄庣粏鍚楋紵', function (index) {
- // // 浠ｇ爜鍖哄煙
- // var param = {
- // Id: data.Id,
- // Status: "0",
- // };
- // console.log(param);
- // sendData(IP + "/BllAsn/DelBllBoxInfo", param, 'post', function (res) {
- // if (res.code == 0) { //鎴愬姛
- // layer.msg(res.msg, {
- // icon: 1,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function () {
- // bindTable();
- // doing = true
- // });
- // } else { //涓嶆垚鍔�
- // layer.msg(res.msg, {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function () { doing = true });
- // }
- // });
- // });
+ $("#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() {
+
+ });
+ }
+ });
+ }
- // break;
- // default: break;
- // }
- // });
+ //鍒犻櫎鏍囩
+ $('#delLabel').on('click', function () {
- //#region 浜嬩欢鏂规硶
+ 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);
+ });
+ }
+ });
+ });
+
+ //鏄庣粏琛ㄦ搷浣滄爮浜嬩欢
+ table.on('tool(Box-list)', function (obj) {
+ var data = obj.data;
+ var id = data.Id;
+ switch(obj.event)
+ {
+ case "edit" :
+ layer.open({
+ type: 1,
+ title: '缂栬緫鏍囩',
+ content: $('#divEditQty'),
+ maxmin: false,
+ area: ['350px','180px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function(index, layero) {
+ var param = {
+ Id: id,
+ Qty: $('#LabelQty').val(),
+ };
+
+ sendData(IP + "/BllAsn/EditLabelQty", param, 'post', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ bindTable();
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1500 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ $('#LabelQty').val("");
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ bindTable();
+ $('#LabelQty').val("");
+ });
+ }
+ layer.close(index);
+ });
+ }
+ });
+
+ break;
+ default:break;
+ }
+ });
+
+
// 鏌ヨ褰曞叆鐨勭鏀叧绯�
- //#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
{ field: 'ASNNo', title: '鍏ュ簱鍗曞彿', align: 'center',fixed: 'left', width: 180, "disabled": true },
@@ -338,10 +460,11 @@
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', fixed: 'left', width: 140, "disabled": true },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 240, },
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 100, },
+ { field: 'UnitName', title: '鍗曚綅', align: 'center', width: 100, },
{ field: 'FullQty', title: '鏁寸鏁伴噺', align: 'center', width: 100, },
- { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 155, },
+ { field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center', width: 155, },
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 165 },
- { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 155 },
+ { field: 'SupplierLot', title: '鍘熷巶鎵瑰彿', align: 'center', width: 155 },
{ field: 'Status', title: '鐘舵��', align: 'center', templet: '#templetStatus', width: 90 },
{ field: 'Standard', title: '瑙勬牸/鍨嬪彿', align: 'center', width: 165 },
@@ -358,7 +481,7 @@
{ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 100 },
{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#templetCreateTime' },
- //{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', toolbar: '#toolbarDemoList', "disabled": true }
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', toolbar: '#toolbarDemoList', "disabled": true }
]];
//url缂栫爜
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -406,6 +529,8 @@
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
done: function (res) {
+
+ console.log(res);
setRight();
//鑷畾涔夊垪瀹�
SetTableColW('Box-list', 'BllAsn/GetLabelBoxList', TotalColsSysArr);
@@ -420,6 +545,8 @@
function setRight() {
$(function () {
$(".buDaLabelClass").hide();
+ $(".delLabelClass").hide();
+ $(".editClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -429,6 +556,16 @@
$(".buDaLabelClass").show();
});
}
+ if (res.data[k].MenuName == "鍒犻櫎鏍囩") {
+ $(function () {
+ $(".delLabelClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "缂栬緫鏍囩") {
+ $(function () {
+ $(".editClass").show();
+ });
+ }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
--
Gitblit v1.8.0