From 622d2c76208cfeebc9d2b7b9bbba86802534f494 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 15 七月 2024 08:45:22 +0800
Subject: [PATCH] 合并
---
HTML/views/WareHouseSetting/StorageLegend.html | 171 ++++++++++++++++
Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs | 7
Wms/Wms/Controllers/SysController.cs | 14
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 11
Wms/Model/ModelVm/SysVm/LocateVm.cs | 1
HTML/views/WareHouseSetting/Locate.html | 88 ++++++++
HTML/views/WareHouseSetting/LocateAddFrom.html | 308 ++++++++++++++++++++++++++++++
7 files changed, 582 insertions(+), 18 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 9f52be6..47e5016 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -115,6 +115,11 @@
<i class="layui-icon layui-icon-edit layuiadmin-button-btn"> </i>鎵归噺缂栬緫
</button>
</div>
+ <div class="layui-inline">
+ <button style="margin-right: 5px;" class="layui-btn layui-btn-sm layuiadmin-btn-list addClass" data-type="addList" lay-event="add" >
+ <i class="layui-icon"></i>娣诲姞
+ </button>
+ </div>
</div>
</div>
<div id="center"></div>
@@ -255,8 +260,83 @@
submit.trigger('click');
}
});
- }
+ },
+ addList: function () {
+
+ layer.open({
+ type: 2,
+ title: '娣诲姞鍌ㄤ綅淇℃伅',
+ content: 'LocateAddFrom.html',
+ maxmin: true,
+ area: ['560px', '510px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index1, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index1],
+ submitID = 'layuiadmin-app-form-submit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ console.log(field);
+ // var msg = [];
+ // for (var i = 0; i < checkData.length; i++) {
+ // // msg.push(checkData[i].Id);
+ // msg.push(checkData[i].Id)
+ // }
+ // console.log(msg);
+
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ // Id: msg,
+ Index:Number(field.IndexRow),
+ HouseNo:field.HouseNo,
+ RoadwayNo:field.RoadwayNo,
+ AreaNo:field.AreaNo,
+ Row:Number(field.Row),
+ Col:Number(field.Col),
+ Layer:Number(field.Layer),
+ Depth:field.Depth,
+ };
+ console.log(param)
+ if (doing) {
+ doing = false;
+ sendData(IP + "/Sys/AddStorageLocat", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 200) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ tableIns.reload({
+ page: {
+ curr: 1
+ }
+ });
+ layer.close(index1); //鍏抽棴寮瑰眰
+ doing = true;
+ });
+ } else if(res.code == 1){
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {doing = true;});
+ } else { //涓嶆垚鍔�
+ layer.msg(res.statusText, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {doing = true;});
+ }
+ });
+ }
+
+ //$.ajax({});
+ });
+ submit.trigger('click');
+ }
+ });
+ },
};
+
$('.layui-btn.layuiadmin-btn-list').on('click', function () {
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
@@ -290,6 +370,7 @@
done: function() {
$(function() {
$(".editClass").hide();
+ $(".addClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -299,6 +380,11 @@
$(".editClass").show();
});
}
+ if (res.data[k].MenuName == "娣诲姞鍌ㄤ綅") {
+ $(function() {
+ $(".addClass").show();
+ });
+ }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
diff --git a/HTML/views/WareHouseSetting/LocateAddFrom.html b/HTML/views/WareHouseSetting/LocateAddFrom.html
new file mode 100644
index 0000000..4c4b6ac
--- /dev/null
+++ b/HTML/views/WareHouseSetting/LocateAddFrom.html
@@ -0,0 +1,308 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>鍌ㄤ綅鍒濆鍖�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ </head>
+ <body>
+ <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list"
+ style="padding: 20px 30px 0 0;">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">褰撳墠鎺�</label>
+ <div class="layui-input-inline">
+ <input type="number" id="IndexRow" name="IndexRow" placeholder="褰撳墠鎺捖仿仿�" autocomplete="off"
+ class="layui-input" >
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵�灞炰粨搴�</label>
+ <div class="layui-input-inline">
+ <select name="HouseNo" id="HouseNo" lay-verify="" lay-search >
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵�灞炲贩閬�</label>
+ <div class="layui-input-inline">
+ <select name="RoadwayNo" id="RoadwayNo" lay-filter="getRoadwayNo" lay-search >
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵�灞炲尯鍩�</label>
+ <div class="layui-input-inline">
+ <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎺掓�绘暟</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Row" name="Row" placeholder="鎺捖仿仿�" autocomplete="off"
+ class="layui-input" >
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍒楁�绘暟</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Col" name="Col" placeholder="鍒椔仿仿�" autocomplete="off"
+ class="layui-input" >
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">灞傛�绘暟</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Layer" name="Layer" placeholder="灞偮仿仿�" autocomplete="off"
+ class="layui-input" >
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣卞害</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Depth" name="Depth" placeholder="娣卞害路路路" autocomplete="off"
+ class="layui-input" >
+ </div>
+ </div>
+
+ <!-- -->
+ <div class="layui-form-item layui-hide">
+ <input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit"
+ value="纭娣诲姞">
+ <input type="button" lay-submit lay-filter="layuiadmin-app-form-edit" id="layuiadmin-app-form-edit"
+ value="纭缂栬緫">
+ </div>
+ </div>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/public.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script>
+ var uid = $.cookie('userId');
+ if(uid==null){
+ alert('璇风櫥褰曞悗鎿嶄綔');
+ window.parent.location.href='../Login.html'
+ }
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'layer'], function() {
+ var $ = layui.$,
+ form = layui.form,
+ layer = layui.layer;
+
+ // if(getQueryString('id') != null)
+ // {
+ // sendData(IP + "/Sys/GetStorageLocat", param, 'post', function(res) {
+ // if (res.code == 0) {
+ // // $("input[name=Id]").val(res.data.Id);
+ // GetHouse(res.data.HouseNo)
+ // GetArea(res.data.AreaNo,res.data.HouseNo)
+ // GetRoadway(res.data.RoadwayNo)
+ // GetTemp(res.data.Temperature);
+ // $("input[name=Row]").val(res.data.Row);
+ // $("input[name=Col]").val(res.data.Col);
+ // $("input[name=Layer]").val(res.data.Layer);
+ // $("input[name=Depth]").val(res.data.Depth);
+
+ // $("input[name=LocatNo]").val(res.data.LocatNo);
+ // $("input[name=Height]").val(res.data.Height);
+ // $("input[name=Weight]").val(res.data.Weight);
+ // $("select[name='Status']").val(res.data.Status);
+ // $("select[name='Flag']").val(res.data.Flag);
+ // form.render();
+ // } else {
+ // Layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000
+ // }, function() {});
+ // }
+ // });
+ // }else{
+ // }
+ // GetHouse()
+ // GetArea()
+ // GetRoadway()
+ // GetTemp();
+
+ //鑾峰彇浠撳簱
+ // function GetHouse(){
+ // sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
+ // if (res.code == 0) { //鎴愬姛
+ // $("#RoadwayNo").empty();
+ // for (var i = 0; i < res.data.length; i++) {
+ // $("#HouseNo").append('<option value =' + res.data[i].HouseNo + '>' + res.data[i].HouseNo + '-' +
+ // res.data[i].WareHouseName + '</option>');
+ // }
+ // // $("select[name='HouseNo']").val(val);
+ // form.render('select');
+ // } else { //涓嶆垚鍔�
+ // Layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {});
+ // }
+ // });
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
+ console.log(2)
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#HouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
+ res.data[i].WareHouseName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+
+
+ //鑾峰彇 宸烽亾涓嬫媺妗�
+ synData(IP + "/Sys/GetStorageRoadwayByHouseNo", {}, 'get', function(res) {
+ $("#RoadwayNo").empty();
+ $("#RoadwayNo").append('<option value =""></option>');
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
+ res.data[i].RoadwayName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇宸烽亾淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
+ });
+ //鑾峰彇 鍖哄煙涓嬫媺妗�
+ synData(IP + "/Sys/GetStorageAreaByHouseNo", {}, 'get', function(res) {
+ $("#AreaNo").empty();
+ $("#AreaNo").append('<option value =""></option>');
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
+ res.data[i].AreaName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
+ });
+
+ // }
+ //鑾峰彇鍖哄煙
+ function GetArea(){
+ var a = $("#HouseNo").val();
+ // if (wareHouse != null)
+ // {
+ // a = wareHouse;
+ // }
+ sendData(IP + "/Sys/GetStorageAreaByHouseNo?HouseNo="+a, {}, 'get', function(res) {
+ console.log(res)
+ if (res.code == 0) { //鎴愬姛
+ $("#AreaNo").empty();
+ for (var i = 0; i < res.data.length; i++) {
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
+ res.data[i].AreaName + '</option>');
+ }
+ // $("select[name='AreaNo']").val(val);
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ Layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
+ });
+ }
+ //鑾峰彇宸烽亾
+ function GetRoadway(val){
+ sendData(IP + "/Sys/GetStorageRoadwayByHouseNo", {}, 'get', function(res) {
+
+ if (res.code == 0) { //鎴愬姛
+ $("#RoadwayNo").empty();
+ for (var i = 0; i < res.data.length; i++) {
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
+ res.data[i].RoadwayName + '</option>');
+ }
+ $("select[name='RoadwayNo']").val(val);
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ Layer.msg('鑾峰彇宸烽亾淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
+ });
+ }
+ //鑾峰彇瀛樺偍鐜
+ function GetTemp(temp){
+
+ sendData(IP + "/Sys/GetDictionaryByParentNo?parentNo="+"Temperature", {}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#Temp").append('<option value =' + res.data[i].Id + '>' +
+ res.data[i].DictName + '</option>');
+ }
+
+ $("select[name='Temp']").val(temp);
+
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ Layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+
+ }
+
+
+ //鑾峰彇娴忚鍣ㄥ弬鏁�
+ function getQueryString(name) {
+ var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null) return unescape(r[2]);
+ return null;
+ }
+
+ })
+ </script>
+ </body>
+</html>
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 8607efe..0280638 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;
}
@@ -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 { //涓嶆垚鍔�
@@ -624,7 +791,7 @@
type: 'shadow'
}
},
- // legend: {
+ // legend: { //椤堕儴鍒楄〃
// data: ['绌哄偍浣�','鏈夌墿鍝�','鍏ュ簱涓�','鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�']
// },
xAxis: [
diff --git a/Wms/Model/ModelVm/SysVm/LocateVm.cs b/Wms/Model/ModelVm/SysVm/LocateVm.cs
index f50f8ab..82cfbc0 100644
--- a/Wms/Model/ModelVm/SysVm/LocateVm.cs
+++ b/Wms/Model/ModelVm/SysVm/LocateVm.cs
@@ -11,6 +11,7 @@
/// </summary>
public class AddLocateVm
{
+ public int Index { get; set; }
public string HouseNo { get; set; }
public string RoadwayNo { get; set; }
public string AreaNo { get; set; }
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index f3ffb62..a6ea852 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -120,11 +120,11 @@
}
- public bool EditStorageLocat(EditLocateVm model,string url ,int userId)
+ public bool EditStorageLocat(EditLocateVm model, string url, int userId)
{
try
{
- var bl = LocatRst.EditStorageLocat(model.Id, model.Status, model.Flag, model.Temperature,url, userId);
+ var bl = LocatRst.EditStorageLocat(model.Id, model.Status, model.Flag, model.Temperature, url, userId);
return bl;
}
@@ -137,6 +137,7 @@
/// <summary>
/// 娣诲姞鍌ㄤ綅淇℃伅锛堢珛浣撳簱锛夌敤浜庡紑鍙戜汉鍛樻坊鍔犲熀纭�淇℃伅
/// </summary>
+ /// <param name="index">褰撳墠鎺掓暟</param>
/// <param name="houseNo">浠撳簱鍙�</param>
/// <param name="roadwayNo">宸烽亾鍙�</param>
/// <param name="areaNo">鍖哄煙鍙�</param>
@@ -146,14 +147,14 @@
/// <param name="dept">娣卞害</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- public async Task<int> AddStorageLocat(string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId)
+ public async Task<int> AddStorageLocat(int index, string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId)
{
try
{
var q = 0;
//R01 -01 -01 -02
//宸烽亾鈥撴帓-鍒�-灞�
- for (int r = 12; r <= row; r++)//鎺�
+ for (int r = index; r <= row; r++)//鎺�
{
var r1 = "1";
if (r < 10)
@@ -267,7 +268,7 @@
}
}
- public bool EditStorageLocatList(EditLocateListVm model,string url, int userId)
+ public bool EditStorageLocatList(EditLocateListVm model, string url, int userId)
{
try
{
diff --git a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
index 2014c78..3d2bde2 100644
--- a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
@@ -40,12 +40,13 @@
/// <param name="model"></param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool EditStorageLocat(EditLocateVm model, string url,int userId);
+ bool EditStorageLocat(EditLocateVm model, string url, int userId);
/// <summary>
/// 娣诲姞鍌ㄤ綅淇℃伅锛堢珛浣撳簱锛夌敤浜庡紑鍙戜汉鍛樻坊鍔犲熀纭�淇℃伅
/// </summary>
/// <param name="locateNo">鍌ㄤ綅鍙�</param>
+ /// <param name="index">褰撳墠鎺�</param>
/// <param name="houseNo">浠撳簱鍙�</param>
/// <param name="roadwayNo">宸烽亾鍙�</param>
/// <param name="areaNo">鍖哄煙鍙�</param>
@@ -55,7 +56,7 @@
/// <param name="dept">娣卞害</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- Task<int> AddStorageLocat(string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId);
+ Task<int> AddStorageLocat(int index, string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId);
/// <summary>
/// 娣诲姞鍌ㄤ綅淇℃伅锛堝钩搴擄級鐢ㄤ簬寮�鍙戜汉鍛樻坊鍔犲熀纭�淇℃伅
@@ -77,7 +78,7 @@
/// <param name="model"></param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool EditStorageLocatList(EditLocateListVm model,string url, int userId);
+ bool EditStorageLocatList(EditLocateListVm model, string url, int userId);
/// <summary>
/// 鑾峰彇鍌ㄤ綅淇℃伅
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index d45cf4a..d177afc 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -955,7 +955,7 @@
{
return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _roadwaySvc.EditStorageRoadway(model.Id, model.RoadwayName, model.Priority, model.Type, model.Temp,model.Availa, int.Parse(userId));
+ var bolls = _roadwaySvc.EditStorageRoadway(model.Id, model.RoadwayName, model.Priority, model.Type, model.Temp, model.Availa, int.Parse(userId));
if (bolls)
{
SysStorageRoadway storage = _roadwaySvc.GetStorageRoadway(model.Id);
@@ -1091,7 +1091,7 @@
//{
// return Ok(new { code = 400, ErrorMsg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
//}
- var bolls = await _locatSvc.AddStorageLocat(model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
+ var bolls = await _locatSvc.AddStorageLocat(model.Index, model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
if (bolls > 0)
{
await _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", model.RoadwayNo, "娣诲姞", "娣诲姞鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + model.RoadwayNo, 1);
@@ -1184,7 +1184,7 @@
{
return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _locatSvc.EditStorageLocat(model, _config.WcsHost + _config.EditLocateUrl,int.Parse(userId));
+ var bolls = _locatSvc.EditStorageLocat(model, _config.WcsHost + _config.EditLocateUrl, int.Parse(userId));
if (bolls)
{
SysStorageLocat storage = _locatSvc.GetStorageLocat(model.Id);
@@ -2048,7 +2048,7 @@
/// <returns></returns>
[HttpGet]
public IActionResult GetAvailabilityRoadry()
- {
+ {
try
{
var list = _locatSvc.GetAvailabilityRoadry();
@@ -2164,11 +2164,11 @@
#region 鏁版嵁褰掓。
[HttpGet]
- public IActionResult GetArchivingLogList(int Page=1, int Limit=10)
+ public IActionResult GetArchivingLogList(int Page = 1, int Limit = 10)
{
try
{
- var list = _archiving.GetArchivingLogList(Page,Limit, out int count);
+ var list = _archiving.GetArchivingLogList(Page, Limit, out int count);
return Ok(new
{
data = list,
@@ -2210,7 +2210,7 @@
{
return Ok(new { data = "", code = 1, msg = $"鎿嶄綔澶辫触锛歿e.Message}" });
}
-
+
}
#endregion
--
Gitblit v1.8.0