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/SOSetting/ExportNoticeAddFrom.html | 196 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 141 insertions(+), 55 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNoticeAddFrom.html b/HTML/views/SOSetting/ExportNoticeAddFrom.html
index d056de4..1a8cd3e 100644
--- a/HTML/views/SOSetting/ExportNoticeAddFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeAddFrom.html
@@ -32,12 +32,22 @@
<label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-verify="required" lay-search>
- <option value=""></option>
+ <!-- <option value=""></option> -->
+ <!-- 24 -->
+ <option value="0">鎴愬搧鍑哄簱</option>
+ <option value="1">棰嗘枡鍑哄簱</option>
+ <option value="2">鎶芥鍑哄簱</option>
+ <option value="3">鐗╂枡鍙栨牱鍑哄簱</option>
+ <option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
+ <option value="5">涓棿鍝佸嚭搴�</option>
+ <option value="6">浠ｅ偍鍑哄簱</option>
+ <option value="7">鍏朵粬鍑哄簱</option>
+ <option value="8">瀵勫瓨鍑哄簱</option>
<!-- 09 -->
- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
+ <!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
<option value="1">闈炴爣閿�鍞嚭搴�</option>
<option value="2">鏍囧噯璋冩嫧鍑哄簱</option>
- <option value="3">闈炴爣璋冩嫧鍑哄簱</option>
+ <option value="3">闈炴爣璋冩嫧鍑哄簱</option> -->
<!-- 08 -->
<!-- <option value="0">鎴愬搧鍑哄簱</option>
<option value="1">鍘熻緟鏂欏嚭搴�</option>
@@ -47,7 +57,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
+ <label class="layui-form-label" id="CustomerNamep">瀹㈡埛鍚嶇О</label>
<div class="layui-input-inline">
<select name="CustomerNo" id="CustomerNo" lay-search>
<option value=""></option>
@@ -116,6 +126,7 @@
};
var arr = [];
+ var TypeValue=$("#Type").val();
function refreshTable(data) {
//table.clear();
@@ -263,10 +274,21 @@
},function() {});
return;
}
+ if($("#Type").val()=='6'){
+ if($("#CustomerNo").val()==''){
+ layer.msg("浠ｅ偍鍗曟嵁璇烽�夋嫨璐т富锛�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+
+ });
+ return;
+ }
+ }
layer.open({
type: 2,
title: '閫夋嫨鐗╁搧淇℃伅',
- content: 'ExportSelectSkuFrom.html?Type='+$("#Type").val(),
+ content: 'ExportSelectSkuFrom.html?Type='+$("#Type").val()+'&OwnerNo='+$("#CustomerNo").val(),
maxmin: true,
area: ['950px', '90%'],
fixed: false,
@@ -325,8 +347,22 @@
isrun = 0;
return;
}
+ var type= $("#Type").val();
+ if(type=='6'){
+ var CustomerNo=$("#CustomerNo").val();
+ if(CustomerNo==''){
+ layer.msg("浠ｅ偍鍗曟嵁璇烽�夋嫨璐т富锛�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+
+ });
+ return;
+ }
+ }
var DataList = [];
console.log(infoOptions.data);
+ var reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,4})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
for (var i in infoOptions.data) {
console.log(infoOptions.data[i].ExQty);
if (infoOptions.data[i].ExQty == "") {
@@ -337,40 +373,47 @@
isrun = 0;
return;
}
+ if (!reg.test(infoOptions.data[i].ExQty)) {
+ layer.msg("鍑哄簱鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ isrun = 0;
+ return ;
+ }
+ // if(infoOptions.data[i].ExQty.indexOf('.')>=0){
+ // layer.msg("鍑哄簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {});
+ // isrun = 0;
+ // return;
+ // }
+ // if(infoOptions.data[i].ExQty.indexOf('-')>=0){
+ // layer.msg("鍑哄簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {});
+ // isrun = 0;
+ // return;
+ // }
+ // if(infoOptions.data[i].ExQty.charAt(0)=='0'){
+ // layer.msg("鍑哄簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {});
+ // isrun = 0;
+ // return;
+ // }
- if(infoOptions.data[i].ExQty.indexOf('.')>=0){
- layer.msg("鍑哄簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- isrun = 0;
- return;
- }
- if(infoOptions.data[i].ExQty.indexOf('-')>=0){
- layer.msg("鍑哄簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- isrun = 0;
- return;
- }
- if(infoOptions.data[i].ExQty.charAt(0)=='0'){
- layer.msg("鍑哄簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- isrun = 0;
- return;
- }
-
- if (infoOptions.data[i].ExQty <= 0) {
- layer.msg("鍑哄簱鏁伴噺蹇呴』澶т簬0锛�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- isrun = 0;
- return;
- }
+ // if (infoOptions.data[i].ExQty <= 0) {
+ // layer.msg("鍑哄簱鏁伴噺蹇呴』澶т簬0锛�", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {});
+ // isrun = 0;
+ // return;
+ // }
if (infoOptions.data[i].ExQty > infoOptions.data[i].Qty) {
layer.msg("鍑哄簱鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺锛�", {
icon: 2,
@@ -382,7 +425,7 @@
var item = {
SkuNo: infoOptions.data[i].SkuNo,
LotNo: infoOptions.data[i].LotNo,
- Qty: parseInt(infoOptions.data[i].ExQty),
+ Qty: parseFloat(infoOptions.data[i].ExQty),
IsBale:infoOptions.data[i].IsBale,
IsBelt:infoOptions.data[i].IsBelt,
};
@@ -420,19 +463,16 @@
//涓嬫媺鍗曟嵁绫诲瀷閫変腑鍚庝簨浠�
- // form.on('select(Type)', function(data) {
- // // console.log(data.value);
- // if (data.value == "0" || data.value == "1") { //閿�鍞嚭搴�
- // $("#chengyunshang").removeClass("isNoShow");
- // $("#chengyunshang").addClass("isShow");
- // form.render('select');
- // }else if(data.value == "2" ||data.value == "3"){//涓嶅悎鏍煎嚭搴�
-
- // $("#chengyunshang").removeClass("isShow");
- // $("#chengyunshang").addClass("isNoShow");
- // form.render('select');
- // }
- // });
+ form.on('select(Type)', function(data) {
+ var value = data.value;
+ if(value!=TypeValue){
+ getCustomerList();
+ arr = [];
+ // 娓叉煋Table
+ refreshTable(null);
+ TypeValue=value;
+ }
+ });
//鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
// function getWareHouseList(){
// sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
@@ -461,9 +501,55 @@
$("#CustomerNo").empty();
$("#CustomerNo").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
- $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
- res.data[i].CustomerName + '</option>');
- }
+ var TypeNum = 0;
+
+ switch($("#Type").val())
+ {
+ case "0": //鎴愬搧鍑哄簱
+ TypeNum = 0;
+ console.log(TypeNum)
+ break;
+ case "1": //棰嗘枡鍑哄簱
+ case "2": //鎶芥鍑哄簱
+ case "3": //鐗╂枡鍙栨牱鍑哄簱
+ case "4": //涓嶅悎鏍煎搧鍑哄簱
+ case "5": //涓棿鍝佸嚭搴�
+ case "6": //浠ｅ偍鍑哄簱
+ case "7": //鍏朵粬鍑哄簱
+ case "8": //瀵勫瓨鍑哄簱
+ TypeNum = 2;
+ console.log(TypeNum)
+ break;
+ }
+ //鍒ゆ柇鍗曟嵁绫诲瀷
+ if (TypeNum == 0)
+ {
+ if (res.data[i].Type == 0)
+ {
+ $("#CustomerNamep").html("瀹㈡埛");
+ $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
+ res.data[i].CustomerName + '</option>');
+ }
+ }
+ else if (TypeNum == 1)
+ {
+ if (res.data[i].Type == 1)
+ {
+ $("#CustomerNamep").html("渚涘簲鍟�");
+ $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
+ res.data[i].CustomerName + '</option>');
+ }
+ }
+ else if (TypeNum == 2)
+ {
+ if (res.data[i].Type == 2)
+ {
+ $("#CustomerNamep").html("璐т富");
+ $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
+ res.data[i].CustomerName + '</option>');
+ }
+ }
+ }
form.render('select');
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
--
Gitblit v1.8.0