From 7fc23d00b91d52c4c0b84fc4a4c2211607ca634d Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 23 八月 2024 11:01:38 +0800
Subject: [PATCH] 修改系统问题
---
Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs | 8
Wms/Wms/Controllers/SysController.cs | 13
Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs | 10
Wms/WMS.BLL/SysServer/StorageAreaServer.cs | 11
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 17
Wms/WMS.IDAL/ISysInterface/IStorageLocatRepository.cs | 4
Wms/Model/ModelVm/SysVm/LocateVm.cs | 13
HTML/views/WareHouseSetting/Locate.html | 1194 +++++++++++++++++++-------------------
HTML/views/WareHouseSetting/LocateAddFrom.html | 536 +++++++---------
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 6
10 files changed, 901 insertions(+), 911 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 47e5016..e3fbe92 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -1,646 +1,648 @@
<!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">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script>
- // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
-
- //鑾峰彇table榛樿鏄剧ず鏁�
- pageCntFirst();
- });
- </script>
- </head>
- <body id="body">
- <div class="layui-fluid" style="padding-bottom: 0;">
- <div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
- <div class="layui-input-inline">
- <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
- <option value=""></option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鎵�灞炲尯鍩�</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-inline">
- <label class="layui-form-label" style="width: 60px;">鎵�灞炲贩閬�</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-inline">
- <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅鐘舵��</label>
- <div class="layui-input-inline">
- <select name="Status" id="Status" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">绌哄偍浣�</option>
- <option value="1">鏈夌墿鍝�</option>
- <option value="2">鍏ュ簱涓�</option>
- <option value="3">鍑哄簱涓�</option>
- <option value="4">绉诲叆涓�</option>
- <option value="5">绉诲嚭涓�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅鏍囧織</label>
- <div class="layui-input-inline">
- <select name="Flag" id="Flag" lay-search>
- <option value=""></option>
- <option value="0">姝ｅ父</option>
- <option value="1">灞忚斀</option>
- <option value="2">鎹熷潖</option>
- </select>
- </div>
- </div>
- <div class="layui-inline" >
- <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅缂栫爜</label>
- <div class="layui-input-inline">
- <input type="text" id="LocatNo" name="LocatNo" placeholder="鍌ㄤ綅缂栫爜路路路" autocomplete="off"
- class="layui-input">
- </div>
- </div>
-
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鍌ㄦ帓</label>
- <div class="layui-input-inline">
- <input type="number" id="Row" onkeyup="this.value=this.value.replace(/[, ]/g,'')" name="Row" placeholder="鎺捖仿仿�" autocomplete="off"
- class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鍌ㄥ垪</label>
- <div class="layui-input-inline">
- <input type="number" id="Column" onkeyup="this.value=this.value.replace(/[, ]/g,'')" name="Column" placeholder="鍒椔仿仿�"
- autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline" >
- <label class="layui-form-label" style="width: 60px;">鍌ㄥ眰</label>
- <div class="layui-input-inline">
- <input type="number" id="Layer" onkeyup="this.value=this.value.replace(/[, ]/g,'')" name="Layer" placeholder="灞偮仿仿�"
- autocomplete="off" class="layui-input">
- </div>
- </div>
+<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">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script>
+ // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+ document.addEventListener("DOMContentLoaded", function () {
- <div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
- lay-filter="LAY-app-contlist-search">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
- </button>
- </div>
- <div class="layui-inline">
- <button style="margin-right: 10px;" class="layui-btn layui-btn-normal layui-btn-sm layuiadmin-btn-list editClass"
- data-type="editList" id="approvalBtn">
- <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>
+ //鑾峰彇table榛樿鏄剧ず鏁�
+ pageCntFirst();
+ });
+ </script>
+</head>
+
+<body id="body">
+
+ <div class="layui-fluid" style="padding-bottom: 0;">
+ <div class="layui-card">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC"
+ id="top">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
+ <div class="layui-input-inline">
+ <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
+ <option value=""></option>
+ </select>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炲尯鍩�</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-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炲贩閬�</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-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅鐘舵��</label>
+ <div class="layui-input-inline">
+ <select name="Status" id="Status" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">绌哄偍浣�</option>
+ <option value="1">鏈夌墿鍝�</option>
+ <option value="2">鍏ュ簱涓�</option>
+ <option value="3">鍑哄簱涓�</option>
+ <option value="4">绉诲叆涓�</option>
+ <option value="5">绉诲嚭涓�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅鏍囧織</label>
+ <div class="layui-input-inline">
+ <select name="Flag" id="Flag" lay-search>
+ <option value=""></option>
+ <option value="0">姝ｅ父</option>
+ <option value="1">灞忚斀</option>
+ <option value="2">鎹熷潖</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅缂栫爜</label>
+ <div class="layui-input-inline">
+ <input type="text" id="LocatNo" name="LocatNo" placeholder="鍌ㄤ綅缂栫爜路路路" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄦ帓</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Row" onkeyup="this.value=this.value.replace(/[, ]/g,'')" name="Row"
+ placeholder="鎺捖仿仿�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄥ垪</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Column" onkeyup="this.value=this.value.replace(/[, ]/g,'')"
+ name="Column" placeholder="鍒椔仿仿�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄥ眰</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Layer" onkeyup="this.value=this.value.replace(/[, ]/g,'')"
+ name="Layer" placeholder="灞偮仿仿�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ lay-filter="LAY-app-contlist-search">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
+ </button>
+ </div>
+ <div class="layui-inline">
+ <button style="margin-right: 10px;"
+ class="layui-btn layui-btn-normal layui-btn-sm layuiadmin-btn-list editClass"
+ data-type="editList" id="approvalBtn">
+ <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 id="center"></div>
- <div class="layui-card-body">
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list" style="width: 100%;"></table>
- <script type="text/html" id="table-content-list">
+ </div>
+ <div id="center"></div>
+ <div class="layui-card-body">
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list" style="width: 100%;"></table>
+ <script type="text/html" id="table-content-list">
<a class="editBtn layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>缂栬緫</a>
</script>
- </div>
</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('token');
- if (uid == null) {
- alert('鐧诲綍澶辨晥,璇烽噸鏂扮櫥褰曞悗鎿嶄綔');
- window.parent.location.href = '../Login.html'
- }
- layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'layer'], function() {
- var table = layui.table,
- form = layui.form,
- laypage = layui.laypage,
- layer = layui.layer,
- $ = layui.$;
- var houseid = 0;
- var h1 = GetTableHeight();
- // 琛ㄥ崟闇�瑕佺殑鍙橀噺
- var doing = true;
- active = {
-
- editList: function () {
- var checkStatus = table.checkStatus('LAY-app-content-list'),
+ </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('token');
+ if (uid == null) {
+ alert('鐧诲綍澶辨晥,璇烽噸鏂扮櫥褰曞悗鎿嶄綔');
+ window.parent.location.href = '../Login.html'
+ }
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'table', 'laypage', 'layer'], function () {
+ var table = layui.table,
+ form = layui.form,
+ laypage = layui.laypage,
+ layer = layui.layer,
+ $ = layui.$;
+ var houseid = 0;
+ var h1 = GetTableHeight();
+ // 琛ㄥ崟闇�瑕佺殑鍙橀噺
+ var doing = true;
+ active = {
+
+ editList: function () {
+ var checkStatus = table.checkStatus('LAY-app-content-list'),
checkData = checkStatus.data; //寰楀埌閫変腑鐨勬暟鎹�
- if (checkData.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- else if(checkData.length > 1)
- {
- var li = 0;
- var ping = 0;
- var WareNo = "W01";
- checkData.forEach(item => {
- if (item.WareHouseName == "鍔涜绔嬩綋搴�")
- {
- li += 1;
- WareNo = "W01";
- if (ping > 0)
- {
- return;
- }
+ if (checkData.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ else if (checkData.length > 1) {
+ var li = 0;
+ var ping = 0;
+ var WareNo = "W01";
+ checkData.forEach(item => {
+ if (item.WareHouseName == "鍔涜绔嬩綋搴�") {
+ li += 1;
+ WareNo = "W01";
+ if (ping > 0) {
+ return;
}
- if (item.WareHouseName == "鍔涜骞冲簱")
- {
- ping += 1;
- WareNo = "W02";
- if (li > 0)
- {
- return;
- }
+ }
+ if (item.WareHouseName == "鍔涜骞冲簱") {
+ ping += 1;
+ WareNo = "W02";
+ if (li > 0) {
+ return;
}
- });
- if (li != 0 && ping != 0)
- {
- return layer.msg('璇峰嬁閫夋嫨澶氱浠撳簱锛�');
}
+ });
+ if (li != 0 && ping != 0) {
+ return layer.msg('璇峰嬁閫夋嫨澶氱浠撳簱锛�');
}
-
- layer.open({
- type: 2,
- title: '缂栬緫鍌ㄤ綅鐘舵�侀泦鍚�',
- content: 'LocateFrom.html?WareHouseNo='+WareNo,
- maxmin: true,
- area: ['560px', '510px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function (index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index],
- 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,
- Status:field.Status,
- Flag:field.Flag,
- Temperature:field.Temp
- };
- if (doing) {
- doing = false;
- sendData(IP + "/Sys/EditStorageLocatList", param, 'post', function (res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- tableIns.reload({
- page: {
- curr: 1
- }
- });
- layer.close(index); //鍏抽棴寮瑰眰
- 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');
- }
- });
- },
- 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) : '';
- });
- var where = {
- HouseNo: $("#WareHouseNo").val(),
- RoadwayNo: $("#RoadwayNo").val(),
- AreaNo: $("#AreaNo").val(),
- Status: $("#Status").val(),
- Flag: $("#Flag").val(),
- Locat: $("#LocatNo").val(),
- Row: parseInt($("#Row").val()),
- Col: parseInt($("#Column").val()),
- Layer: parseInt($("#Layer").val()),
- };
- console.log(where);
- var tableIns = table.render({
- elem: '#LAY-app-content-list',
- height: h1,
- id: 'LAY-app-content-list',
- url: IP + "/Sys/GetStorageLocatList",
- method: 'post',
- where: where,
- contentType: 'application/json',
- headers:{ToKen:$.cookie('token')},
- page: true,
- even: true,
- limit: pageCnt, //榛樿澶氬皯椤�
- limits: pageLimits, //榛樿鏁扮粍[10,20,30,40,50]
- cellMinWidth: 70,
- done: function() {
- $(function() {
- $(".editClass").hide();
- $(".addClass").hide();
- });
- sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
- for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "缂栬緫鍌ㄤ綅") {
- $(function() {
- $(".editClass").show();
- });
- }
- if (res.data[k].MenuName == "娣诲姞鍌ㄤ綅") {
- $(function() {
- $(".addClass").show();
- });
- }
+ layer.open({
+ type: 2,
+ title: '缂栬緫鍌ㄤ綅鐘舵�侀泦鍚�',
+ content: 'LocateFrom.html?WareHouseNo=' + WareNo,
+ maxmin: true,
+ area: ['560px', '510px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index],
+ 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)
}
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- });
- },
- cols: [
- [ {
- title: '搴忓彿',
- type: 'checkbox',
- width: 65,
- fixed: 'left'
- },{
- title: '搴忓彿',
- type: 'numbers',
- width: 65,
- fixed: 'left'
- }, {
- field: 'WareHouseName',
- title: '鎵�灞炰粨搴�',
- align: 'center',
- width: 140,
- fixed: 'left',
- templet: function(d) {
+ console.log(msg);
- return d.WareHouseNo + '-' + d.WareHouseName;
- }
- }, {
- field: 'RoadwayNo',
- title: '鎵�灞炲贩閬�',
- align: 'center',
- width: 130,
- templet: function(d) {
-
- return d.RoadwayNo + '-' + d.RoadwayName;
- }
- }, {
- field: 'AreaName',
- title: '鎵�灞炲尯鍩�',
- align: 'center',
- width: 130,
- templet: function(d) {
-
- return d.AreaNo + '-' + d.AreaName;
- }
- }, {
- field: 'LocatNo',
- title: '鍌ㄤ綅缂栫爜',
- align: 'center',
- }, {
- field: 'StatusName',
- title: '鍌ㄤ綅鐘舵��',
- align: 'center',
- width: 140,
- }, {
- field: 'FlagName',
- title: '鍌ㄤ綅鏍囪瘑',
- align: 'center',
- width: 90,
- }, {
- field: 'Row',
- title: '鎺�',
- align: 'center',
- width: 70,
- }, {
- field: 'Column',
- title: '鍒�',
- align: 'center',
- width: 70,
- }, {
- field: 'Layer',
- title: '灞�',
- align: 'center',
- width: 70,
- }, {
- field: 'Depth',
- title: '娣卞害',
- align: 'center',
- width: 70,
- }, {
- field: 'Height',
- title: '楂樺害',
- align: 'center',
- width: 90,
- }, {
- field: 'Weight',
- title: '閲嶉噺',
- align: 'center',
- width: 90,
- }, {
- field: 'TempName',
- title: '瀛樺偍鍧忓',
- align: 'center',
- width: 110,
- }, {
- title: '鎿嶄綔',
- fixed: 'right',
- width: 120,
- align: 'center',
- toolbar: '#table-content-list'
- }
- ]
- ],
- })
- //鐩戝惉鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- tableIns.reload({
- where: { //璁惧畾寮傛鏁版嵁鎺ュ彛鐨勯澶栧弬鏁帮紝浠绘剰璁�
- HouseNo: $("#WareHouseNo").val(),
- RoadwayNo: $("#RoadwayNo").val(),
- AreaNo: $("#AreaNo").val(),
- Status: $("#Status").val(),
- Flag: $("#Flag").val(),
- Locat: $("#LocatNo").val(),
- Row: parseInt($("#Row").val()),
- Col: parseInt($("#Column").val()),
- Layer: parseInt($("#Layer").val()),
- },
- page: {
- curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
- }
- });
- });
-
- table.on('tool(LAY-app-content-list)', function(obj) {
- var data = obj.data;
- var id = 0;
- if (obj.event === 'edit') {
- id = data.Id;
- layer.open({
- type: 2,
- title: '鍌ㄤ綅淇℃伅绠＄悊',
- content: 'LocateFrom.html?id=' + id,
- maxmin: true,
- area: ['560px', '510px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index],
- submitID = 'layuiadmin-app-form-edit',
- submit = layero.find('iframe').contents().find('#' + submitID);
- //鐩戝惉鎻愪氦
- iframeWindow.layui.form.on('submit(' + submitID + ')', function(data) {
-
- var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
- console.log(data)
- //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
- var param = {
- Id: id,
- Status:field.Status,
- Flag:field.Flag,
- Temperature:field.Temp
- };
- sendData(IP + "/Sys/EditStorageLocat", param, 'post', function(res) {
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ Id: msg,
+ Status: field.Status,
+ Flag: field.Flag,
+ Temperature: field.Temp,
+ AreaNo: field.AreaNo
+ };
+ if (doing) {
+ doing = false;
+ sendData(IP + "/Sys/EditStorageLocatList", param, 'post', function (res) {
console.log(res);
if (res.code == 0) { //鎴愬姛
- layer.msg("淇敼鎴愬姛", {
+ layer.msg(res.msg, {
icon: 1,
- time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
tableIns.reload({
page: {
curr: 1
}
});
layer.close(index); //鍏抽棴寮瑰眰
+ doing = true;
});
- } else if(res.code == 1){
+ } else if (res.code == 1) {
layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ }, function () { doing = true; });
} else { //涓嶆垚鍔�
layer.msg(res.statusText, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ }, function () { doing = true; });
}
- });
- });
- submit.trigger('click');
+ });
+ }
+
+ //$.ajax({});
+ });
+ 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) : '';
+ });
+ var where = {
+ HouseNo: $("#WareHouseNo").val(),
+ RoadwayNo: $("#RoadwayNo").val(),
+ AreaNo: $("#AreaNo").val(),
+ Status: $("#Status").val(),
+ Flag: $("#Flag").val(),
+ Locat: $("#LocatNo").val(),
+ Row: parseInt($("#Row").val()),
+ Col: parseInt($("#Column").val()),
+ Layer: parseInt($("#Layer").val()),
+ };
+ console.log(where);
+ var tableIns = table.render({
+ elem: '#LAY-app-content-list',
+ height: h1,
+ id: 'LAY-app-content-list',
+ url: IP + "/Sys/GetStorageLocatList",
+ method: 'post',
+ where: where,
+ contentType: 'application/json',
+ headers: { ToKen: $.cookie('token') },
+ page: true,
+ even: true,
+ limit: pageCnt, //榛樿澶氬皯椤�
+ limits: pageLimits, //榛樿鏁扮粍[10,20,30,40,50]
+ cellMinWidth: 70,
+ done: function () {
+ $(function () {
+ $(".editClass").hide();
+ $(".addClass").hide();
+ });
+ sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "缂栬緫鍌ㄤ綅") {
+ $(function () {
+ $(".editClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "娣诲姞鍌ㄤ綅") {
+ $(function () {
+ $(".addClass").show();
+ });
+ }
}
- });
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ },
+ cols: [
+ [{
+ title: '搴忓彿',
+ type: 'checkbox',
+ width: 65,
+ fixed: 'left'
+ }, {
+ title: '搴忓彿',
+ type: 'numbers',
+ width: 65,
+ fixed: 'left'
+ }, {
+ field: 'WareHouseName',
+ title: '鎵�灞炰粨搴�',
+ align: 'center',
+ width: 140,
+ fixed: 'left',
+ templet: function (d) {
+
+ return d.WareHouseNo + '-' + d.WareHouseName;
+ }
+ }, {
+ field: 'RoadwayNo',
+ title: '鎵�灞炲贩閬�',
+ align: 'center',
+ width: 130,
+ templet: function (d) {
+
+ return d.RoadwayNo + '-' + d.RoadwayName;
+ }
+ }, {
+ field: 'AreaName',
+ title: '鎵�灞炲尯鍩�',
+ align: 'center',
+ width: 130,
+ templet: function (d) {
+
+ return d.AreaNo + '-' + d.AreaName;
+ }
+ }, {
+ field: 'LocatNo',
+ title: '鍌ㄤ綅缂栫爜',
+ align: 'center',
+ }, {
+ field: 'StatusName',
+ title: '鍌ㄤ綅鐘舵��',
+ align: 'center',
+ width: 140,
+ }, {
+ field: 'FlagName',
+ title: '鍌ㄤ綅鏍囪瘑',
+ align: 'center',
+ width: 90,
+ }, {
+ field: 'Row',
+ title: '鎺�',
+ align: 'center',
+ width: 70,
+ }, {
+ field: 'Column',
+ title: '鍒�',
+ align: 'center',
+ width: 70,
+ }, {
+ field: 'Layer',
+ title: '灞�',
+ align: 'center',
+ width: 70,
+ }, {
+ field: 'Depth',
+ title: '娣卞害',
+ align: 'center',
+ width: 70,
+ }, {
+ field: 'Height',
+ title: '楂樺害',
+ align: 'center',
+ width: 90,
+ }, {
+ field: 'Weight',
+ title: '閲嶉噺',
+ align: 'center',
+ width: 90,
+ }, {
+ field: 'TempName',
+ title: '瀛樺偍鍧忓',
+ align: 'center',
+ width: 110,
+ }, {
+ title: '鎿嶄綔',
+ fixed: 'right',
+ width: 120,
+ align: 'center',
+ toolbar: '#table-content-list'
}
- });
-
- //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
- sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ ]
+ ],
+ })
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ tableIns.reload({
+ where: { //璁惧畾寮傛鏁版嵁鎺ュ彛鐨勯澶栧弬鏁帮紝浠绘剰璁�
+ HouseNo: $("#WareHouseNo").val(),
+ RoadwayNo: $("#RoadwayNo").val(),
+ AreaNo: $("#AreaNo").val(),
+ Status: $("#Status").val(),
+ Flag: $("#Flag").val(),
+ Locat: $("#LocatNo").val(),
+ Row: parseInt($("#Row").val()),
+ Col: parseInt($("#Column").val()),
+ Layer: parseInt($("#Layer").val()),
+ },
+ page: {
+ curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
+ }
+ });
+ });
+
+ table.on('tool(LAY-app-content-list)', function (obj) {
+ var data = obj.data;
+ var id = 0;
+ if (obj.event === 'edit') {
+ id = data.Id;
+ layer.open({
+ type: 2,
+ title: '鍌ㄤ綅淇℃伅绠＄悊',
+ content: 'LocateFrom.html?id=' + id,
+ maxmin: true,
+ area: ['560px', '510px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index],
+ submitID = 'layuiadmin-app-form-edit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ console.log(data)
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ Id: id,
+ Status: field.Status,
+ Flag: field.Flag,
+ Temperature: field.Temp,
+ AreaNo: field.AreaNo
+ };
+ sendData(IP + "/Sys/EditStorageLocat", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg("淇敼鎴愬姛", {
+ icon: 1,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ tableIns.reload({
+ page: {
+ curr: 1
+ }
+ });
+ layer.close(index); //鍏抽棴寮瑰眰
+ });
+ } else if (res.code == 1) {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.statusText, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ });
+ submit.trigger('click');
+ }
+ });
+ }
+ });
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
$("#WareHouseNo").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 () { });
+ }
+ });
+
+ getAR("");
+ form.on('select(getWareHouseNo)', function (data) {
+ console.log(data);
+ getAR(data.value);
+ });
+ function getAR(val) {
+ //鑾峰彇 宸烽亾涓嬫媺妗�
+ sendData(IP + "/Sys/GetStorageRoadwayByHouseNo?wareHouseNo=" + val, {}, '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(res.msg, {
+ layer.msg('鑾峰彇宸烽亾淇℃伅澶辫触', {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ }, function () {
+ //鍥炶皟
+ form.render('select');
+ });
}
});
-
- getAR("");
- form.on('select(getWareHouseNo)', function(data) {
- console.log(data);
- getAR(data.value);
+ //鑾峰彇 鍖哄煙涓嬫媺妗�
+ sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo=" + val, {}, '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 getAR(val) {
- //鑾峰彇 宸烽亾涓嬫媺妗�
- sendData(IP + "/Sys/GetStorageRoadwayByHouseNo?wareHouseNo="+val, {}, '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');
- });
- }
- });
- //鑾峰彇 鍖哄煙涓嬫媺妗�
- sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo="+val, {}, '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');
- });
- }
- });
-
- };
-
- });
-
-
- </script>
- </body>
-</html>
+
+ };
+
+ });
+
+
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/HTML/views/WareHouseSetting/LocateAddFrom.html b/HTML/views/WareHouseSetting/LocateAddFrom.html
index 4c4b6ac..8318e9f 100644
--- a/HTML/views/WareHouseSetting/LocateAddFrom.html
+++ b/HTML/views/WareHouseSetting/LocateAddFrom.html
@@ -1,308 +1,254 @@
<!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>
+<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>
- <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>
+<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">
- <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 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>
- <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)
+ <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;
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ 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)
// {
- // 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) {
+ // a = wareHouse;
+ // }
+ sendData(IP + "/Sys/GetStorageAreaByHouseNo?HouseNo=" + a, {}, 'get', function (res) {
+ console.log(res)
+ if (res.code == 0) { //鎴愬姛
$("#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');
- });
+ 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>');
}
- });
-
- // }
- //鑾峰彇鍖哄煙
- 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);
+ // $("select[name='AreaNo']").val(val);
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ Layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ //鍥炶皟
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;
- }
+ });
+ }
+ });
+ }
+ //鑾峰彇宸烽亾
+ function GetRoadway(val) {
+ sendData(IP + "/Sys/GetStorageRoadwayByHouseNo", {}, 'get', function (res) {
- })
- </script>
- </body>
-</html>
+ 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>
\ No newline at end of file
diff --git a/Wms/Model/ModelVm/SysVm/LocateVm.cs b/Wms/Model/ModelVm/SysVm/LocateVm.cs
index 82cfbc0..1a6296d 100644
--- a/Wms/Model/ModelVm/SysVm/LocateVm.cs
+++ b/Wms/Model/ModelVm/SysVm/LocateVm.cs
@@ -44,6 +44,11 @@
/// </summary>
[MaxLength(3)]
public string Temperature { get; set; }
+
+ /// <summary>
+ /// 鍖哄煙缂栧彿
+ /// </summary>
+ public string AreaNo { get; set; }
}
/// <summary>
/// 淇敼鍌ㄤ綅model
@@ -69,7 +74,13 @@
/// </summary>
[MaxLength(3)]
public string Temperature { get; set; }
-
+
+ /// <summary>
+ /// 鍖哄煙缂栧彿
+ /// </summary>
+ public string AreaNo { get; set; }
+
+
}
/// <summary>
/// 鏌ヨ鍌ㄤ綅model
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 4c0e2f0..4978a4e 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1720,18 +1720,18 @@
var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
if (sku == null)
{
- throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒板叆搴撳崟鏄庣粏鍖呭惈鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
+ throw new Exception("鐗╂枡缂栫爜涓嶅瓨鍦紝涓嶅彲鍏ュ簱");
}
//鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
if (string.IsNullOrWhiteSpace(sku.CategoryNo))
{
- throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈煡璇㈠埌绫诲埆淇℃伅");
+ throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈缃被鍒�,涓嶅彲鍏ュ簱");
}
var skuCategory = skuCategoryList.FirstOrDefault(m => m.CategoryNo == sku.CategoryNo);
if (skuCategory == null)
{
- throw new Exception($"鏈湪绫诲埆淇℃伅涓煡璇㈠埌鐗╂枡锛歿sku.SkuNo}鍖呭惈鐨勭被鍒�");
+ throw new Exception($"{sku.SkuNo}鐗╂枡绫诲埆涓嶅瓨鍦紝涓嶅彲鍏ュ簱");
}
var areaStr = skuCategory.AreaNo.Split(",");
diff --git a/Wms/WMS.BLL/SysServer/StorageAreaServer.cs b/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
index d81dd61..aafcdac 100644
--- a/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
@@ -148,16 +148,15 @@
try
{
string str = "";
- //鍒ゆ柇鎵�灞炰粨搴撴槸鍚︿负绔嬩綋搴�
- if (model.WareHouseNo != "W01")
+ //鍒ゆ柇鎵�灞炰粨搴撴槸鍚︿负null
+ if (string.IsNullOrWhiteSpace(model.WareHouseNo))
{
- str = "-1:鎵�灞炰粨搴撲笉涓虹珛浣撳簱锛岃閲嶆柊閫夋嫨锛�";
+ str = "-1:鎵�灞炰粨搴撲笉鍙负绌猴紒";
return str;
}
//鑾峰彇绔嬩綋搴撴渶澶х紪鐮�
- //var area = Db.Queryable<SysStorageArea>().Max(a => a.Id)(a => a.IsDel == "0" && a.WareHouseNo == "W01");
- var area = Db.Queryable<SysStorageArea>().Where(a => a.IsDel == "0" && a.WareHouseNo == "W01").OrderByDescending(a=>a.CreateTime).First();
- //楠岃瘉鏄惁瀛樺湪绔嬩綋搴撶涓�鏉″尯鍩熶俊鎭�
+ var area = Db.Queryable<SysStorageArea>().Where(a => a.IsDel == "0").OrderByDescending(a=>a.CreateTime).First();
+ //楠岃瘉鏄惁瀛樺湪鍖哄煙淇℃伅
if (area == null)
{
model.AreaNo = "A01";
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index a6ea852..d886a35 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -119,12 +119,25 @@
}
}
+ public List<SysStorageLocat> GetStorageLocat()
+ {
+ try
+ {
+ var data = LocatRst.GetAll().ToList();
+ return data;
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine(e);
+ throw;
+ }
+ }
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.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
return bl;
}
@@ -272,7 +285,7 @@
{
try
{
- var bl = LocatRst.EditStorageLocatList(model.Id, model.Status, model.Flag, model.Temperature, url, userId);
+ var bl = LocatRst.EditStorageLocatList(model.Id, model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
return bl;
}
diff --git a/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs b/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
index 92fb59a..643771e 100644
--- a/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
+++ b/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
@@ -27,12 +27,13 @@
/// 缂栬緫鍌ㄤ綅淇℃伅
/// </summary>
/// <param name="id"></param>
+ /// <param name="areaNo">鎵�灞炲尯鍩�</param>
/// <param name="status">鐘舵��</param>
/// <param name="flag">鏍囪瘑</param>
/// <param name="temperature">瀛樺偍鐜</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- public bool EditStorageLocat(int id, string status, string flag, string temperature,string url, int userId)
+ public bool EditStorageLocat(int id, string areaNo,string status, string flag, string temperature,string url, int userId)
{
try
{
@@ -54,6 +55,7 @@
locate2.Flag = "1";
locate2.UpdateUser = userId;
locate2.UpdateTime = DateTime.Now;
+ locate2.AreaNo = areaNo;
var m = Edit(locate2);
WcsLocat locatEntry = new WcsLocat();
@@ -79,6 +81,7 @@
locate.Status = status;
locate.Flag = flag;
locate.Temperature = temperature;
+ locate.AreaNo = areaNo;
locate.UpdateUser = userId;
locate.UpdateTime = DateTime.Now;
var i = Edit(locate);
@@ -125,11 +128,12 @@
/// 缂栬緫鍌ㄤ綅淇℃伅
/// </summary>
/// <param name="id"></param>
+ /// <param name="areaNo">鎵�灞炲尯鍩�</param>
/// <param name="status">鐘舵��</param>
/// <param name="flag">鏍囪瘑</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- public bool EditStorageLocatList(List<int> id, string status, string flag,string temperature,string url ,int userId)
+ public bool EditStorageLocatList(List<int> id,string areaNo, string status, string flag,string temperature,string url ,int userId)
{
try
{
@@ -154,6 +158,7 @@
locate2.Flag = "1";
locate2.UpdateUser = userId;
locate2.UpdateTime = DateTime.Now;
+ locate2.AreaNo = areaNo;
var m = Edit(locate2);
WcsLocat locatEntry = new WcsLocat();
@@ -183,6 +188,7 @@
}
locate.UpdateUser = userId;
locate.UpdateTime = DateTime.Now;
+ locate.AreaNo = areaNo;
i = Edit(locate);
WcsLocat locatEntry2 = new WcsLocat();
diff --git a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
index 3d2bde2..1def813 100644
--- a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
@@ -34,6 +34,14 @@
/// <param name="id"></param>
/// <returns></returns>
SysStorageLocat GetStorageLocat(int id);
+
+
+ /// <summary>
+ /// 鏌ヨ澶氭潯鍌ㄤ綅淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ List<SysStorageLocat> GetStorageLocat();
+
/// <summary>
/// 缂栬緫鍌ㄤ綅淇℃伅
/// </summary>
diff --git a/Wms/WMS.IDAL/ISysInterface/IStorageLocatRepository.cs b/Wms/WMS.IDAL/ISysInterface/IStorageLocatRepository.cs
index 56319b0..1df3c43 100644
--- a/Wms/WMS.IDAL/ISysInterface/IStorageLocatRepository.cs
+++ b/Wms/WMS.IDAL/ISysInterface/IStorageLocatRepository.cs
@@ -19,7 +19,7 @@
/// <param name="temperature">瀛樺偍鐜</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool EditStorageLocat(int id, string status, string flag, string temperature,string url, int userId);
+ bool EditStorageLocat(int id,string areaNo, string status, string flag, string temperature,string url, int userId);
/// <summary>
/// 缂栬緫鍌ㄤ綅淇℃伅闆嗗悎
/// </summary>
@@ -28,7 +28,7 @@
/// <param name="flag">鏍囪瘑</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool EditStorageLocatList(List<int> id, string status, string flag, string temperature, string url,int userId);
+ bool EditStorageLocatList(List<int> id, string areaNo, string status, string flag, string temperature, string url,int userId);
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index d177afc..1a53042 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -1234,18 +1234,23 @@
var bolls = _locatSvc.EditStorageLocatList(model, _config.WcsHost + _config.EditLocateUrl, 1);//int.Parse(userId)
if (bolls)
{
- SysStorageLocat storage = _locatSvc.GetStorageLocat(model.Id[0]);
- string msg = "鍌ㄤ綅鐘舵�� 鍌ㄤ綅鍙凤細" + storage.RoadwayNo;
+ SysStorageLocat storage;
+ //string msg = "鍌ㄤ綅鐘舵�� 鍌ㄤ綅鍙凤細" + storage.RoadwayNo;
if (model.Id.Count > 1)
{
+ var list = _locatSvc.GetStorageLocat();
foreach (var item in model.Id)
{
- storage = _locatSvc.GetStorageLocat(item);
- _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", storage.LocatNo, "鎵归噺缂栬緫", "鎵归噺淇敼鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + storage.LocatNo, Convert.ToInt32(userId));
+ storage = list.FirstOrDefault(m=>m.Id == item);
+ if (storage != null)
+ {
+ _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", storage.LocatNo, "鎵归噺缂栬緫", "鎵归噺淇敼鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + storage.LocatNo, Convert.ToInt32(userId));
+ }
}
}
else
{
+ storage = _locatSvc.GetStorageLocat(model.Id[0]);
_operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", storage.LocatNo, "淇敼", "淇敼鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + storage.LocatNo, Convert.ToInt32(userId));
}
--
Gitblit v1.8.0