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/WareHouseSetting/StorageLegend.html | 343 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 339 insertions(+), 4 deletions(-)
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 8607efe..380f98c 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -85,7 +85,7 @@
.btnShow {
- width: 20px;
+ width: 17px;
height: 15px;
cursor: pointer;
}
@@ -197,7 +197,7 @@
</div>
</div>
</div>
-
+
</div>
</div>
</div>
@@ -266,7 +266,116 @@
});
//宸烽亾鍙樻洿
form.on('select(getRoadwayNo)', function (data) {
+ if (data.value == "R01")
+ {
+ xianga = "宸烽亾1鎺�";
+ xiangb = "宸烽亾2鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='1']").attr("selected", "selected")
+ $("#Row").append('<option value =1>绗�1鎺�</option>');
+ $("#Row").append('<option value =2>绗�2鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R02")
+ {
+ xianga = "宸烽亾3鎺�";
+ xiangb = "宸烽亾4鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='3']").attr("selected", "selected")
+ $("#Row").append('<option value =3>绗�3鎺�</option>');
+ $("#Row").append('<option value =4>绗�4鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R03")
+ {
+
+ xianga = "宸烽亾5鎺�";
+ xiangb = "宸烽亾6鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='5']").attr("selected", "selected")
+ $("#Row").append('<option value =5>绗�5鎺�</option>');
+ $("#Row").append('<option value =6>绗�6鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R04")
+ {
+
+ xianga = "宸烽亾7鎺�";
+ xiangb = "宸烽亾8鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='7']").attr("selected", "selected")
+ $("#Row").append('<option value =7>绗�7鎺�</option>');
+ $("#Row").append('<option value =8>绗�8鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R05")
+ {
+
+ xianga = "宸烽亾9鎺�";
+ xiangb = "宸烽亾10鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='9']").attr("selected", "selected")
+ $("#Row").append('<option value =9>绗�9鎺�</option>');
+ $("#Row").append('<option value =10>绗�10鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R06")
+ {
+
+ xianga = "宸烽亾11鎺�";
+ xiangb = "宸烽亾12鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='11']").attr("selected", "selected")
+ $("#Row").append('<option value =11>绗�11鎺�</option>');
+ $("#Row").append('<option value =12>绗�12鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R07")
+ {
+
+ xianga = "宸烽亾13鎺�";
+ xiangb = "宸烽亾14鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='13']").attr("selected", "selected")
+ $("#Row").append('<option value =13>绗�13鎺�</option>');
+ $("#Row").append('<option value =14>绗�14鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R08")
+ {
+
+ xianga = "宸烽亾15鎺�";
+ xiangb = "宸烽亾16鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='15']").attr("selected", "selected")
+ $("#Row").append('<option value =15>绗�15鎺�</option>');
+ $("#Row").append('<option value =16>绗�16鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R09")
+ {
+
+ xianga = "宸烽亾17鎺�";
+ xiangb = "宸烽亾18鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='17']").attr("selected", "selected")
+ $("#Row").append('<option value =17>绗�17鎺�</option>');
+ $("#Row").append('<option value =18>绗�18鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R10")
+ {
+
+ xianga = "宸烽亾19鎺�";
+ xiangb = "宸烽亾20鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='19']").attr("selected", "selected")
+ $("#Row").append('<option value =19>绗�19鎺�</option>');
+ $("#Row").append('<option value =20>绗�20鎺�</option>');
+ form.render('select');
+ }
getRow(); //鑾峰彇宸烽亾涓帓
+ GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()); //鑾峰彇鏌辩姸淇℃伅
})
//鎺掑彉鏇�
form.on('select(SelectRow)', function (data) {
@@ -327,6 +436,64 @@
$("#RoadwayNo option[value='" + res.data[0].RoadwayNo + "']").attr("selected", "selected")
$("#Depth option[value ='01']").attr("selected", "selected")
form.render('select');
+ if ($("#RoadwayNo").val() == "R01")
+ {
+ xianga = "宸烽亾1鎺�";
+ xiangb = "宸烽亾2鎺�";
+ $("#Row option[value ='1']").attr("selected", "selected")
+ $("#Row").append('<option value =1>绗�1鎺�</option>');
+ $("#Row").append('<option value =2>绗�2鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R02")
+ {
+ xianga = "宸烽亾3鎺�";
+ xiangb = "宸烽亾4鎺�";
+ $("#Row option[value ='3']").attr("selected", "selected")
+ $("#Row").append('<option value =3>绗�3鎺�</option>');
+ $("#Row").append('<option value =4>绗�4鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R03")
+ {
+
+ xianga = "宸烽亾5鎺�";
+ xiangb = "宸烽亾6鎺�";
+ $("#Row option[value ='5']").attr("selected", "selected")
+ $("#Row").append('<option value =5>绗�5鎺�</option>');
+ $("#Row").append('<option value =6>绗�6鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R04")
+ {
+
+ xianga = "宸烽亾7鎺�";
+ xiangb = "宸烽亾8鎺�";
+ $("#Row option[value ='7']").attr("selected", "selected")
+ $("#Row").append('<option value =7>绗�7鎺�</option>');
+ $("#Row").append('<option value =8>绗�8鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R05")
+ {
+
+ xianga = "宸烽亾9鎺�";
+ xiangb = "宸烽亾10鎺�";
+ $("#Row option[value ='9']").attr("selected", "selected")
+ $("#Row").append('<option value =9>绗�9鎺�</option>');
+ $("#Row").append('<option value =10>绗�10鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R06")
+ {
+
+ xianga = "宸烽亾11鎺�";
+ xiangb = "宸烽亾12鎺�";
+ $("#Row option[value ='11']").attr("selected", "selected")
+ $("#Row").append('<option value =11>绗�11鎺�</option>');
+ $("#Row").append('<option value =12>绗�12鎺�</option>');
+ form.render('select');
+ }
getRow(); //鑾峰彇鎺�
GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()); //鑾峰彇鏌辩姸淇℃伅
} else { //涓嶆垚鍔�
@@ -433,7 +600,7 @@
// 鍔犺浇浠撳簱鍥句緥
//鍦�
- function GetSlotChart(warehouseNo) {
+ function GetSlotChart1(warehouseNo) {
sendData(IP + "/Sys/GetStorageProportion?WareHouseNo=" + warehouseNo, {}, 'get', function (res) {
// console.log("鍥暟鎹�",res)
@@ -508,6 +675,174 @@
});
};
+ //鏂扮増鍦嗗舰鍥�
+ function GetSlotChart(warehouseNo) {
+ sendData(IP + "/Sys/GetStorageProportion?WareHouseNo=" + warehouseNo, {}, 'get', function (res) {
+ // console.log("鍦嗘暟鎹�",res)
+ if (res.code == 0) {
+ // console.log("鍦嗘暟鎹�",res.data)
+ var LayerName = res.data[0].warehouseNo;
+
+ var list = res.data;
+ //0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 6: 鎹熷潖\灞忚斀
+ var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�', '鎹熷潖/灞忚斀'];
+ var value = [0,0,0,0,0,0,0];
+ list.forEach(item => {
+ value[item.Status] = item.StatusNum;
+ });
+ // console.log(value)
+
+ this.chartLine2 = echarts.init(document.getElementById("yuan"));
+
+ var option2 = {
+ tooltip: { //寮瑰嚭淇℃伅
+ trigger: 'item',
+ formatter: '{a} <br/>{b}: {c} ({d}%)'
+ },
+ legend: { //宸︿晶淇℃伅
+ top:'5%',
+ orient: 'vertical',
+ left: 'left'
+ },
+ series: [
+ { //涓績鍥�
+ type: 'pie',
+ radius: [0, '30%'],
+ label: {
+ position: 'inner',
+ fontSize: 35,
+ },
+ title:'12',
+ },
+ { //渚ц竟鍥�
+ color: [ //棰滆壊
+ '#5470c6', //绌哄偍浣�
+ '#91cc75', //鏈夌墿鍝�
+ '#ffdc60', //鍏ュ簱涓�
+ '#ee6666', //鍑哄簱涓�
+ '#ffff7f', //绉诲叆涓�
+ '#ee23ee', //绉诲嚭涓�
+ '#808080', //鎹熷潖/灞忚斀
+ ],
+ name: '鍌ㄤ綅鐘舵��',
+ type: 'pie',
+ radius: ['40%', '70%'],
+ avoidLabelOverlap: false,
+ itemStyle: {
+ borderRadius: 10,
+ borderColor: '#fff',
+ borderWidth: 2
+ },
+ label: { //鏄惁鏄剧ず澶栭儴绾挎潯淇℃伅
+ show: false,
+ position: 'center'
+ },
+ emphasis: { //榧犳爣绉诲叆鏄惁涓棿鏄剧ず淇℃伅
+ label: {
+ show: true,
+ fontSize: 20,
+ fontWeight: 'bold'
+ }
+ },
+ labelLine: { //鏍囩绾挎潯
+ show: false
+ },
+ data: [
+ { value: value[0], name: key[0] }, //绌哄偍浣�
+ { value: value[1], name: key[1] }, //鏈夌墿鍝�
+ { value: value[2], name: key[2] }, //鍏ュ簱涓�
+ { value: value[3], name: key[3] }, //鍑哄簱涓�
+ { value: value[4], name: key[4] }, //绉诲叆涓�
+ { value: value[5], name: key[5] }, //绉诲嚭涓�
+ { value: value[6], name: key[6] }, //鎹熷潖\灞忚斀
+ // { value: 1048, name: '绌哄偍浣�' },
+ // { value: 735, name: '鏈夌墿鍝�' },
+ // { value: 580, name: '鍏ュ簱涓�' },
+ // { value: 484, name: '鍑哄簱涓�' },
+ // { value: 484, name: '绉诲叆涓�' },
+ // { value: 484, name: '绉诲嚭涓�' },
+ // { value: 300, name: '鎹熷潖/灞忚斀' }
+ ]
+ },
+ ],
+ };
+
+ this.chartLine2.setOption(option2);
+
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000
+ }, function () { })
+ }
+ });
+ };
+ // option = {
+ // tooltip: { //寮瑰嚭淇℃伅
+ // trigger: 'item',
+ // formatter: '{a} <br/>{b}: {c} ({d}%)'
+ // },
+ // legend: { //宸︿晶淇℃伅
+ // top:'5%',
+ // orient: 'vertical',
+ // left: 'left'
+ // },
+ // series: [
+ // //涓績鍥�
+ // {
+ // type: 'pie',
+ // radius: [0, '30%'],
+ // label: {
+ // position: 'inner',
+ // fontSize: 35,
+ // },
+ // title:'12',
+ // },
+ // {
+ // color: [
+ // '#5470c6', //绌哄偍浣�
+ // '#91cc75', //鏈夌墿鍝�
+ // '#ffdc60', //鍏ュ簱涓�
+ // '#ee6666', //鍑哄簱涓�
+ // '#ffff7f', //绉诲叆涓�
+ // '#ee23ee', //绉诲嚭涓�
+ // '#808080', //鎹熷潖/灞忚斀
+ // ],
+ // name: '鍌ㄤ綅鐘舵��',
+ // type: 'pie',
+ // radius: ['40%', '70%'],
+ // avoidLabelOverlap: false,
+ // itemStyle: {
+ // borderRadius: 10,
+ // borderColor: '#fff',
+ // borderWidth: 2
+ // },
+ // label: { //鏄惁鏄剧ず澶栭儴绾挎潯淇℃伅
+ // show: false,
+ // position: 'center'
+ // },
+ // emphasis: { //榧犳爣绉诲叆鏄惁涓棿鏄剧ず淇℃伅
+ // label: {
+ // show: true,
+ // fontSize: 40,
+ // fontWeight: 'bold'
+ // }
+ // },
+ // labelLine: { //鏍囩绾挎潯
+ // show: false
+ // },
+ // data: [
+ // { value: 1048, name: '绌哄偍浣�' },
+ // { value: 735, name: '鏈夌墿鍝�' },
+ // { value: 580, name: '鍏ュ簱涓�' },
+ // { value: 484, name: '鍑哄簱涓�' },
+ // { value: 484, name: '绉诲叆涓�' },
+ // { value: 484, name: '绉诲嚭涓�' },
+ // { value: 300, name: '鎹熷潖/灞忚斀' }
+ // ]
+ // }
+ // ]
+ // };
//鏌�
function GetSlotChartz(warehouseNo, roadwayNo) {
@@ -624,7 +959,7 @@
type: 'shadow'
}
},
- // legend: {
+ // legend: { //椤堕儴鍒楄〃
// data: ['绌哄偍浣�','鏈夌墿鍝�','鍏ュ簱涓�','鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�']
// },
xAxis: [
--
Gitblit v1.8.0