From 3a3c50e8a4f1bca47daaadd03f4138a5d4a2227c Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期六, 12 四月 2025 16:13:48 +0800
Subject: [PATCH] 更改程序
---
Wms/WMS.Entity/SysEntity/SysPallets.cs | 8
Wms/WMS.IBLL/ISysServer/IRoleWareHouseServer.cs | 16
Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs | 436 ++++++
HTML/views/HouseWithinSetting/HopperTransport.html | 507 +++++++
Wms/Model/ModelDto/SysDto/LocatDto.cs | 6
Wms/Model/ModelDto/SysDto/PalletsDto.cs | 4
HTML/views/SystemSettings/RoleWareHouse.html | 240 +++
HTML/views/StatisticalReport/BoxInfor.html | 61
HTML/views/WareHouseSetting/FlatLibraryLegend.html | 2142 ++++++++++++++++++++-----------
Wms/WMS.Entity/SysEntity/SysRoleWareHouse.cs | 24
Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs | 3
HTML/views/SystemSettings/Role.html | 70 +
Wms/Wms/Controllers/SysController.cs | 10
Wms/WMS.IBLL/IBllTransServer/IHopperTransportServer.cs | 24
Wms/WMS.BLL/SysServer/RoleWareHouseServer.cs | 125 +
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 13
HTML/views/WareHouseSetting/Pallets.html | 4
Wms/WMS.BLL/SysServer/PalletsServer.cs | 1
Wms/Model/InterFaceModel/HopperTransportModel.cs | 27
Wms/Wms/Controllers/BasisController.cs | 97 +
Wms/Wms/Controllers/DownApiController.cs | 213 ++
Wms/WMS.Entity/SysEntity/SysStorageArea.cs | 2
22 files changed, 3,183 insertions(+), 850 deletions(-)
diff --git a/HTML/views/HouseWithinSetting/HopperTransport.html b/HTML/views/HouseWithinSetting/HopperTransport.html
new file mode 100644
index 0000000..1c2ad6b
--- /dev/null
+++ b/HTML/views/HouseWithinSetting/HopperTransport.html
@@ -0,0 +1,507 @@
+<!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">
+ <link rel="stylesheet" href="../../css/public.css" media="all">
+
+ <style type="text/css">
+ .layui-table-view .layui-table[lay-size=sm] .layui-table-cell {
+ height: auto;
+ line-height: 23px;
+ }
+
+ /* 琛ㄦ牸涓嬫媺灏忕澶撮殣钘� */
+ .layui-table-grid-down {
+ display: none;
+ }
+ .flesDiv{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+ .solidDiv{
+ border: 1px solid black;
+ }
+ .showDiv{
+ display: block;
+ }
+ .hideDiv{
+ display: none;
+ }
+ </style>
+
+</head>
+
+<body id="body">
+
+ <div class="layui-fluid" style="padding-bottom: 0;height: 99%;">
+ <div class="layui-card" style="height: 99%;">
+ <div class="layui-card-body" style="height: 100%;">
+
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title" id="tab">
+ <li class="layui-this">鍙枡</li>
+ <li>鍙溅</li>
+ </ul>
+
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show ">
+ <div class="flesDiv" >
+ <form class="layui-form" action="" style="width: 40%;">
+ <!-- <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 80px;">妤煎眰</label>
+ <div class="layui-input-block">
+ <select name="Layer" lay-filter="">
+ <option value=""></option>
+ <option value="3">3妤�</option>
+ <option value="4">4妤�</option>
+ </select>
+ </div>
+ </div> -->
+
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 80px;">鍖哄煙</label>
+ <div class="layui-input-block">
+ <select id="AreaSelect" name="AreaSelect" lay-filter="AreaSelect" lay-search>
+ <option value=""></option>
+ </select>
+
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 80px;">鐩爣浣嶇疆</label>
+ <div class="layui-input-block">
+ <select id="LocateSelect" name="LocateSelect" lay-filter="LocateSelect" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 80px;">妗剁被鍨�</label>
+ <div class="layui-input-block">
+ <select id="PalletStatus" name="PalletStatus" lay-filter="PalletStatus" lay-search>
+ <option value=""></option>
+ <option value="0">鍑�妗�</option>
+ <option value="2">婊℃《</option>
+ <!-- <option value="3">鑴忔《</option> -->
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item" id="StandardDiv">
+ <label class="layui-form-label" style="width: 80px;">瑙勬牸</label>
+ <div class="layui-input-block">
+ <select name="Standard" lay-filter="Standard" lay-search>
+ <option value="400">400L</option>
+ <option value="800">800L</option>
+ <option value="1000">1000L</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item" id="SkuSelectDiv">
+ <label class="layui-form-label" style="width: 80px;">鐗╂枡</label>
+ <div class="layui-input-block">
+ <select id="SkuSelect" name="SkuSelect" lay-filter="SkuSelect" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item" id="LotNoSelectDiv">
+ <label class="layui-form-label" style="width: 80px;">鎵规</label>
+ <div class="layui-input-block">
+ <select id="LotNoSelect" name="LotNoSelect" lay-filter="LotNoSelect" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item" >
+ <div class="layui-input-block">
+ <button type="submit" class="layui-btn" lay-submit
+ lay-filter="demo1">绔嬪嵆鎻愪氦</button>
+ <button type="reset" class="layui-btn layui-btn-primary">閲嶇疆</button>
+ </div>
+ </div>
+
+ </form>
+ </div>
+
+ </div>
+ <div class="layui-tab-item">
+ <div class="flesDiv" >
+ <form class="layui-form" action="" style="width: 40%;">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 80px;">鍖哄煙</label>
+ <div class="layui-input-block">
+ <select id="AreaSelect2" name="AreaSelect2" lay-filter="AreaSelect2" lay-search>
+ <option value=""></option>
+ </select>
+
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 80px;">璧峰浣嶇疆</label>
+ <div class="layui-input-block">
+ <select id="LocateSelect2" name="LocateSelect2" lay-filter="LocateSelect2" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 80px;">妗剁被鍨�</label>
+ <div class="layui-input-block">
+ <select id="PalletStatus2" name="PalletStatus2" lay-filter="PalletStatus2" lay-search>
+ <option value=""></option>
+ <!-- <option value="0">鍑�妗�</option> -->
+ <option value="2">婊℃《</option>
+ <option value="3">鑴忔《</option>
+ </select>
+ </div>
+ </div>
+ <!-- <div class="layui-form-item" id="StandardDiv2">
+ <label class="layui-form-label" style="width: 80px;">瑙勬牸</label>
+ <div class="layui-input-block">
+ <select name="Standard2" lay-filter="Standard2" lay-search>
+ <option value="400">400L</option>
+ <option value="800">800L</option>
+ <option value="1000">1000L</option>
+ </select>
+ </div>
+ </div> -->
+ <div class="layui-form-item" id="SkuSelectDiv2">
+ <label class="layui-form-label" style="width: 80px;">鐗╂枡</label>
+ <div class="layui-input-block">
+ <select id="SkuSelect2" name="SkuSelect2" lay-filter="SkuSelect2" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item" id="LotNoSelectDiv2">
+ <label class="layui-form-label" style="width: 80px;">鎵规</label>
+ <div class="layui-input-block">
+ <input type="text" id="LotNoInput" name="LotNoInput" placeholder="" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item" id="WeightSelectDiv2">
+ <label class="layui-form-label" style="width: 80px;">閲嶉噺</label>
+ <div class="layui-input-block">
+ <input type="text" id="WeightInput" name="WeightInput" placeholder="" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item" >
+ <div class="layui-input-block">
+ <button type="submit" class="layui-btn" lay-submit
+ lay-filter="demo1">绔嬪嵆鎻愪氦</button>
+ <button type="reset" class="layui-btn layui-btn-primary">閲嶇疆</button>
+ </div>
+ </div>
+
+ </form>
+ </div>
+
+
+ </div>
+ </div>
+ </div>
+ </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 type="text/javascript">
+
+ </script>
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'table', 'laypage', 'element', 'layer', 'laydate'], function () {
+ var table = layui.table;
+ var form = layui.form;
+ var element = layui.element;
+ var laypage = layui.laypage;
+ var layer = layui.layer;
+ var laydate = layui.laydate;
+
+ var bodyHeight = $("#body").outerHeight();
+
+ var hh = bodyHeight - 146 ;//6鏄痓ody涓婂唴杈硅窛
+ $(".layui-card-body").attr("style","height:"+hh+"px");
+ //tab鍒囨崲鍒ゆ柇鍊�
+ var yemianid = 0;
+ //鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
+ element.on('tab(docDemoTabBrief)', function (data) {
+ yemianid = data.index;
+ console.log(yemianid);
+
+ if (yemianid == 0) {
+
+ } else if (yemianid == 1) {
+ }
+ });
+
+ $("#StandardDiv").hide();
+ $("#SkuSelectDiv").hide();
+ $("#LotNoSelectDiv").hide();
+
+
+ var doing = true;
+ // 鎻愪氦浜嬩欢
+ form.on('submit(demo1)', function (data) {
+ var field = data.field; // 鑾峰彇琛ㄥ崟瀛楁鍊�
+ // 鏄剧ず濉啓缁撴灉锛屼粎浣滄紨绀虹敤
+ layer.alert(JSON.stringify(field), {
+ title: '褰撳墠濉啓鐨勫瓧娈靛��'
+ });
+ // 姝ゅ鍙墽琛� Ajax 绛夋搷浣�
+ // 鈥�
+ return false; // 闃绘榛樿 form 璺宠浆
+ });
+
+ GetArea();
+
+ form.on('select(AreaSelect)', function(data) {
+ GetLocate(data.value);
+ GetPlnStatus(data.value)
+ });
+
+ form.on('select(PalletStatus)', function(data) {
+
+ //0锛氬噣妗� 1锛氶娣� 2锛氬崐鎴愬搧 3锛氳剰妗�
+ if (data.value == "0") {
+ $("#StandardDiv").show();
+ $("#SkuSelectDiv").hide();
+ $("#LotNoSelectDiv").hide();
+ } else {
+ $("#StandardDiv").hide();
+ $("#SkuSelectDiv").show();
+ $("#LotNoSelectDiv").show();
+ GetSku(data.value)
+ }
+ });
+
+ form.on('select(SkuSelect)', function(data) {
+ GetLotNo(data.value);
+ });
+
+ // 鑾峰彇鍖哄煙
+ function GetArea() {
+ $("#AreaSelect").empty();
+ $("#AreaSelect").append('<option value =""></option>');
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/DownApi/GetAreaListByUser", {}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+
+ console.log(res.data);
+ for (var i = 0; i < res.data.length; i++) {
+ $("#AreaSelect").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaName +'</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+ }
+
+ // 鑾峰彇鍌ㄤ綅
+ function GetLocate(val) {
+ $("#LocateSelect").empty();
+ $("#LocateSelect").append('<option value =""></option>');
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/DownApi/GetLocatByArea", {"areaNo":val}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#LocateSelect").append('<option value =' + res.data[i].LocatNo + '>' + res.data[i].LocatNo +'</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+ }
+
+ // 鑾峰彇妗剁被鍨�
+ function GetPlnStatus(val) {
+ $("#PalletStatus").empty();
+ $("#PalletStatus").append('<option value =""></option>');
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/DownApi/GetPlnStatusByArea", {"areaNo":val}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#PalletStatus").append('<option value =' + res.data[i].dic1 + '>' + res.data[i].dic2 +'</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+ }
+
+ //鑾峰彇鐗╂枡
+ function GetSku(val) {
+ $("#SkuSelect").empty();
+ $("#SkuSelect").append('<option value =""></option>');
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/DownApi/GetSkuByStatus", {"palletStatus":val}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#SkuSelect").append('<option value =' + res.data[i] + '>' + res.data[i] +'</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+ }
+
+ //鑾峰彇鎵规
+ function GetLotNo(val) {
+ $("#LotNoSelect").empty();
+ $("#LotNoSelect").append('<option value =""></option>');
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/DownApi/GetLotNoBySku", {"skuNo":val}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#LotNoSelect").append('<option value =' + res.data[i] + '>' + res.data[i] +'</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+ }
+
+
+ //------------------------------------------------------------------------------------
+
+ $("#WeightSelectDiv2").hide();
+ $("#SkuSelectDiv2").hide();
+ $("#LotNoSelectDiv2").hide();
+ GetArea2();
+ GetSku2();
+ form.on('select(AreaSelect2)', function(data) {
+ GetLocate2(data.value);
+ });
+ form.on('select(PalletStatus2)', function(data) {
+
+ //0锛氬噣妗� 1锛氶娣� 2锛氬崐鎴愬搧 3锛氳剰妗�
+ if (data.value == "2") {
+ $("#WeightSelectDiv2").show();
+ $("#SkuSelectDiv2").show();
+ $("#LotNoSelectDiv2").show();
+ } else {
+ $("#WeightSelectDiv2").hide();
+ $("#SkuSelectDiv2").hide();
+ $("#LotNoSelectDiv2").show();
+ GetSku(data.value)
+ }
+ });
+
+ // 鑾峰彇鍖哄煙
+ function GetArea2() {
+ $("#AreaSelect2").empty();
+ $("#AreaSelect2").append('<option value =""></option>');
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/DownApi/GetAreaListByUser", {}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+
+ console.log(res.data);
+ for (var i = 0; i < res.data.length; i++) {
+ $("#AreaSelect2").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaName +'</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+ }
+
+ // 鑾峰彇鍌ㄤ綅
+ function GetLocate2(val) {
+ $("#LocateSelect2").empty();
+ $("#LocateSelect2").append('<option value =""></option>');
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/DownApi/GetLocatByArea", {"areaNo":val}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#LocateSelect2").append('<option value =' + res.data[i].LocatNo + '>' + res.data[i].LocatNo +'</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+ }
+
+ //鑾峰彇鐗╂枡
+ function GetSku2() {
+ $("#SkuSelect2").empty();
+ $("#SkuSelect2").append('<option value =""></option>');
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/DownApi/GetSku", {}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#SkuSelect2").append('<option value =' + res.data[i] + '>' + res.data[i] +'</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+ }
+
+
+
+
+ });
+ </script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index ee4df8b..08e4611 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -326,66 +326,7 @@
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions;
- //#region 鍘熷闈炶嚜瀹氫箟鍒�
- // infoOptions = {
- // elem: '#LAY-app-content-list',
- // height: 'full-206',
- // id: 'LAY-app-content-list',
- // page: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // even: true,
- // cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // cols:
- // [[
- // {
- // title: '搴忓彿', type: 'numbers', fixed: 'left'
- // },
- // {
- // field: 'AreaNo', title: '鎵�灞炲尯鍩�', align: 'center',
- // },
- // {
- // field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'
- // },
- // {
- // field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center',
- // },
- // {
- // field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'
- // },
- // {
- // field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',
- // },
- // {
- // field: 'LotNo', title: '鎵规鍙�', align: 'center',
- // },
- // {
- // field: 'LotText', title: '鎵规鎻忚堪', align: 'center'
- // },
- // {
- // field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center',
- // },
- // {
- // field: 'Qty', title: '鏁伴噺', align: 'center'
- // },
- // {
- // field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',
- // },
- // {
- // field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'
- // },
- // {
- // field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'
- // },
- // {
- // field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus'
- // },
- // //{
- // // field: 'Status', title: '鎵樼洏鐘舵��', align: 'center', templet: '#PalletStatus',
- // //},
- // ]]
- // };
- //#endregion
+
//#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
diff --git a/HTML/views/SystemSettings/Role.html b/HTML/views/SystemSettings/Role.html
index ff3dd2b..2ea9c39 100644
--- a/HTML/views/SystemSettings/Role.html
+++ b/HTML/views/SystemSettings/Role.html
@@ -63,6 +63,9 @@
<a class="layui-btn layui-btn-xs roleClass" id="roleClass" style="background-color: rgb(67, 90, 20);" lay-event="roleright" >
<i class="layui-icon layui-icon-util"></i>鍒嗛厤鏉冮檺
</a>
+ <a class="layui-btn layui-btn-xs roleClass" id="roleClass" style="background-color: rgb(67, 90, 20);" lay-event="roleright2" >
+ <i class="layui-icon layui-icon-util"></i>浠撳簱鏉冮檺
+ </a>
<a class="layui-btn layui-btn-danger layui-btn-xs approvalBtndel" id="approvalBtndel" lay-event="del" >
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎
</a>
@@ -225,7 +228,7 @@
}
},
{
- title: "鎿嶄綔", fixed: "right", align: "center", toolbar: "#table-content-list", width: 240
+ title: "鎿嶄綔", fixed: "right", align: "center", toolbar: "#table-content-list", width: 340
},
]]
};
@@ -401,6 +404,71 @@
},
});
}
+ else if (obj.event === "roleright2")
+ {
+ id = data.Id;
+ layer.open({
+ type: 2,
+ title: "鍒嗛厤浠撳簱鏉冮檺",
+ content: "RoleWareHouse.html?id=" + id,
+ maxmin: true,
+ area: ["720px", "90%"],
+ // 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; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ console.log(field);
+ var param = {
+ Id: id, //Id
+ RoleNo: field.SortCode, //瑙掕壊鍙�
+ RoleName: field.Name, //瑙掕壊鍚嶇О
+ Demo: field.Demo, //澶囨敞
+ };
+ sendData( IP + "/basis/UpdateRolesInfo", param, "post", function (res) {
+ if (res.code == 0)
+ {
+ //鎴愬姛
+ layer.msg(
+ "淇敼鎴愬姛",
+ {
+ icon: 1,
+ time: 1000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ },
+ function () {
+ refreshTable($("#RoleName").val(), $("#RoleNo").val());
+ layer.close(index); //鍏抽棴寮瑰眰
+ doing = true;
+ }
+ );
+ }
+ else
+ {
+ //涓嶆垚鍔�
+ layer.msg(
+ res.msg,
+ {
+ icon: 2,
+ time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ },
+ function () {
+ doing = true;
+ }
+ );
+ }
+ });
+ });
+ submit.trigger("click");
+ },
+ });
+ }
//鍒犻櫎
else if (obj.event === "del") {
layer.confirm("纭畾鍒犻櫎閫変腑鐨勮鑹诧紵", function (index) {
diff --git a/HTML/views/SystemSettings/RoleWareHouse.html b/HTML/views/SystemSettings/RoleWareHouse.html
new file mode 100644
index 0000000..1a6a9d5
--- /dev/null
+++ b/HTML/views/SystemSettings/RoleWareHouse.html
@@ -0,0 +1,240 @@
+<!DOCTYPE html>
+<html style="background-color: white;">
+ <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">
+ </head>
+ <body style="height: 98%;">
+ <div class="layui-tab">
+ <div class="layui-tab-content" >
+ <!-- 涓氬姟 -->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-card">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="padding: 0;">
+ <div class="layui-form-item" >
+ <div class="layui-inline">
+ <button class="layui-btn layui-btn-sm" lay-submit lay-filter="btn" style="width: 60px;">淇濆瓨</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-card-body" >
+ <div style="margin-bottom: 15px;">
+ <table id="Layappcontentlist" lay-filter="Layappcontentlist"></table>
+ </div>
+ </div>
+ </div>
+ </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('userId');
+ 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;
+ var ids = getQueryString("id");
+ var pno2="";//褰撳墠椤甸潰琛ㄦ牸鐐瑰嚮琛岀殑鍊�
+ var rightListStr="";//宸叉湁鏉冮檺鑿滃崟MenuNo闆嗗悎json
+
+ getHaveRight();
+ //鑾峰彇鍒濆鏉冮檺
+ function getHaveRight(){
+ sendData(IP + "/Basis/GetRoleWareHouseOneListById?id="+ids,{},'get',function(res){
+ for (var i=0;i<res.data.length;i++) {
+ rightListStr += res.data[i].WareHouseNo + ',';
+ }
+ //娓叉煋椤甸潰妯″潡table鏁版嵁
+ refreshTablePage();
+ console.log('rightListStr:'+rightListStr)
+ });
+ }
+ //鐩戝惉椤甸潰妯″潡琛ㄦ牸鍗曞嚮浜嬩欢
+ table.on('row(Layappcontentlist)', function(obj){
+ pno2=obj.data.WareHouseNo;
+ });
+ //鐩戝惉椤甸潰妯″潡琛ㄦ牸澶嶉�夋鍗曞嚮浜嬩欢
+ table.on('checkbox(Layappcontentlist)', function(obj){
+ console.log(pno2);
+
+ //鍏ㄩ��
+ if(String(obj.type) == "all")
+ {
+ //閫変腑
+ if(obj.checked == true)
+ {
+
+ //娣诲姞鐖剁骇閫変腑鐘舵��
+ var menu = layui.table.cache.Layappcontentlist;
+ for(var i =0;i<menu.length;i++)
+ {
+ if(rightListStr.indexOf(menu[i].WareHouseNo)<=-1)
+ {
+ rightListStr=rightListStr+','+menu[i].WareHouseNo
+ }
+ }
+ }
+ //鍙栨秷閫変腑
+ if(obj.checked == false){
+
+ //鍙栨秷鐖剁骇閫変腑鐘舵��
+ var menu = layui.table.cache.Layappcontentlist;
+ for(var i =0;i<menu.length;i++)
+ {
+ rightListStr=rightListStr.replace(menu[i].WareHouseNo,'');
+ }
+
+ }
+ }
+ else if(String(obj.type) == "one")//鍗曢��
+ {
+ //閫変腑
+ if(obj.checked == true)
+ {
+ //娣诲姞閫変腑鐘舵��
+ rightListStr=rightListStr+','+pno2
+ }
+ //鍙栨秷閫変腑
+ if(obj.checked == false)
+ {
+ //鍒ゆ柇鍙栨秷鍚庤繕鏈夋病鏈夐�変腑鐨�
+ var menuCheck=false;
+ var menu = layui.table.cache.Layappcontentlist;
+ for(var i=0;i<menu.length;i++)
+ {
+ if(menu[i].LAY_CHECKED == true)
+ {
+ menuCheck=true;
+ continue;
+ }
+ }
+ //鍙栨秷鐖剁骇閫変腑鐘舵��
+ rightListStr=rightListStr.replace(pno2,'');
+ }
+ }
+ console.log(rightListStr);
+
+ });
+
+ var infoOptions = {
+ elem: '#Layappcontentlist',
+ height: 550,
+ id: 'Layappcontentlist',
+ page: false,
+ limit: Number.MAX_VALUE,
+ cols:
+ [[
+ {
+ title: '澶嶉�夋', field: 'Lay_Checked', fixed: 'left', type: 'checkbox', width:65
+ },
+ {
+ field: 'WareHouseNo', title: '浠撳簱鍙�', align: 'center'
+ },
+ {
+ field: 'WareHouseName', title: '浠撳簱鍚嶇О', align: 'center'
+ }
+ ]]
+ };
+ //娓叉煋椤甸潰妯″潡table鏁版嵁
+ function refreshTablePage(){
+ sendData(IP + "/Basis/GetHouseList",{},'get',function(res){
+
+ //灏嗘潈闄愯繘琛屽嬀閫�
+ var arr = rightListStr.split(',');
+ for(var a=0;a<arr.length;a++)
+ {
+ for(var i=0;i<res.data.length;i++)
+ {
+ if(arr[a] == res.data[i].WareHouseNo)
+ {
+ res.data[i].LAY_CHECKED = true;
+ continue;
+ }
+ }
+ }
+ $.extend(infoOptions, {
+ data: res.data,
+ });
+ table.render(infoOptions);
+
+ })
+ }
+
+ //鐩戝惉淇濆瓨
+ form.on('submit(btn)', function(){
+ //鍘婚噸
+ var arr = rightListStr.split(',')
+ var formArr = arr.sort()
+ var newArr=[formArr[0]]
+ for (let i = 1; i < formArr.length; i++)
+ {
+ if (formArr[i]!=formArr[i-1])
+ {
+ newArr.push(formArr[i])
+ }
+ }
+ //鍘婚噸鍚庨噸鏂拌祴鍊�
+ rightListStr = "";
+ for(var c=0;c<newArr.length;c++)
+ {
+ if (rightListStr == "")
+ {
+ rightListStr = newArr[c];
+ }
+ else
+ {
+ rightListStr = rightListStr + ',' + newArr[c];
+ }
+ }
+ synData(IP +"/basis/InsertRoleWareHouse?WareHouseNo="+rightListStr+"&&Id="+ids+"",{},"post",function (res) {
+ if (res.code == 0)
+ {
+ //鎴愬姛
+ layer.msg(res.msg,{
+ icon: 1,
+ time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ },function () {
+ var index = parent.layer.getFrameIndex(window.name)
+ parent.layer.close(index); //鍏抽棴寮瑰眰
+ });
+ }
+ else
+ {
+ //涓嶆垚鍔�
+ layer.msg(res.msg,{
+ icon: 2,
+ time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ },function () {
+ this.doing = true;
+ }
+ );
+ }
+ });
+
+ });
+
+ //鑾峰彇娴忚鍣ㄥ弬鏁�
+ 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/HTML/views/WareHouseSetting/FlatLibraryLegend.html b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
index 8e3e6a1..7fde50e 100644
--- a/HTML/views/WareHouseSetting/FlatLibraryLegend.html
+++ b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
@@ -103,47 +103,68 @@
}
.btnShow {
- width: 20px;
- height: 15px;
+ width: 25px;
+ height: 20px;
}
.btnShow1 {
width: 20px;
height: 15px;
+ }
+ .btnShow2 {
+ width: 20px;
+ height: 15px;
}
-
.container {
position: relative; /* 鐩稿瀹氫綅 */
top: 50%; /* 鍚戜笂绉诲姩鑷韩楂樺害鐨勪竴鍗� */
left: 50%; /* 鍚戝乏绉诲姩鑷韩瀹藉害鐨勪竴鍗� */
transform: translate(-50%, -50%); /* 閫氳繃translate鍑芥暟杩涜寰皟锛屼娇鍏跺畬鍏ㄥ眳涓� */
}
+ .solidDiv{
+ border: 1px solid black;
+ }
+ .flesDiv{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+ .showDiv{
+ display: block;
+ }
+ .hideDiv{
+ display: none;
+ }
+ .zuoyouDiv{
+ display: flex;
+ justify-content: space-between;
+ }
</style>
</head>
<body>
<div class="layui-fluid" style="height: 96%;width: 99%;">
- <div class="layui-row layui-col-space15" style="width: auto;height: 100%;">
+ <div class=" layui-col-space15" style="width: auto;height: 100%;">
<!-- 椤�-->
- <div class="layui-col-md" style="width: auto;height: 10%;">
+ <div class="" style="width: auto;height: 10%;">
<div class="layui-card" style="width: auto;height: 100%;">
<div class="layui-card-body">
<div class="layui-form layui-card-header layuiadmin-card-header-auto">
<div class="layui-form-item">
- <div class="layui-inline">
+ <!-- <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> -->
+ <option value=""></option>
</select>
</div>
- </div>
+ </div> -->
<div class="layui-inline">
<label class="layui-form-label">妤煎眰</label>
<div class="layui-input-inline">
<select name="Row" id="Row" lay-filter="SelectRow">
- <option value="4" selected>鍥涙ゼ</option>
- <option value="3">涓夋ゼ</option>
+ <option value="4" >鍥涙ゼ</option>
+ <option value="3" selected>涓夋ゼ</option>
</select>
</div>
</div>
@@ -152,19 +173,19 @@
<!-- 鍌ㄤ綅鍥句緥 -->
<table style="margin:0 auto;">
<tr>
- <td><button class="btnShow1 five" disabled></button></td>
+ <td><button class="btnShow2 five" disabled></button></td>
<td>绉诲嚭涓�</td>
- <td><button class="btnShow1 four" disabled></button></td>
+ <td><button class="btnShow2 four" disabled></button></td>
<td>绉诲叆涓�</td>
- <td><button class="btnShow1 three" disabled></button></td>
+ <td><button class="btnShow2 three" disabled></button></td>
<td>鍑哄簱涓�</td>
- <td><button class="btnShow1 two" disabled></button></td>
+ <td><button class="btnShow2 two" disabled></button></td>
<td>鍏ュ簱涓�</td>
- <td><button class="btnShow1 one" disabled></button></td>
+ <td><button class="btnShow2 one" disabled></button></td>
<td>鏈夌墿鍝�</td>
- <td><button class="btnShow1 zero" disabled></button></td>
+ <td><button class="btnShow2 zero" disabled></button></td>
<td>绌哄簱浣�</td>
- <td><button class="btnShow1 filg" disabled></button></td>
+ <td><button class="btnShow2 filg" disabled></button></td>
<td>鎹熷潖\灞忚斀</td>
</tr>
</table>
@@ -184,144 +205,1226 @@
</div>
</div>
</div>
- <!-- 涓� -->
- <div class="layui-col-md" style="width: auto;height: 24%;">
- <div class="layui-row layui-col-space15" style="width: auto;height: 100%;">
- <!-- 绌� -->
- <div class="layui-col-md1" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p></p>
- <table class="container" style="width: 100%;height: 90%;"></table>
+ <!-- 鍥涙ゼ -->
+ <div id="4Lou" class="layui-card zuoyouDiv" style="height: 88%; " >
+ <!-- 宸� -->
+ <div class="" style=" width: 20%;height: 100%;">
+ <!-- 绮夌瓫闂�1 -->
+ <div class="solidDiv" style="height: 18%;margin-bottom: 1%">
+ <p>绮夌瓫闂�1</p>
+ <div id="C22" class="flesDiv" style="height:85%;">
+ <button id="C2200101" value="C2200101" class="btnShow " ></button>
</div>
</div>
- <!-- 绮夌瓫闂� -->
- <div class="layui-col-md1 " id="divOne" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p id="a4">B01 绮夌瓫闂村尯</p>
- <table class="container" id="tabOne" style="width: 100%;height: 90%;"></table>
+ <!-- 绮夌瓫闂�2 -->
+ <div class="solidDiv" style="height: 18%; margin-bottom: 15%;">
+ <p>绮夌瓫闂�2</p>
+ <div id="C23" class="flesDiv" style="height:85%;" >
+ <button id="C2300101" value="C2300101" class="btnShow " ></button>
</div>
</div>
-
- <!-- 涓�姝ュ埗绮�1-->
- <div class="layui-col-md2 " id="divTwo" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p id="b4">涓�姝ュ埗绮�1</p>
- <table class="container" id="tabTwe" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
-
- <!-- 涓�姝ュ埗绮�2 -->
- <div class="layui-col-md2 " id="divThree" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p id="c4">涓�姝ュ埗绮�2</p>
- <table class="" id="tabThree" style="width: 100%;height: 90%;"></table>
- </div>
+ <!-- 棰勬贩闂�1 -->
+ <div class="solidDiv" style="height: 18%;margin-bottom: 1%">
+ <p> 棰勬贩闂村尯1</p>
+ <div id="C05" class="flesDiv" style="height:85%;">
+ <button id="C0500101" value="C0500101" class="btnShow" ></button>
+ </div>
</div>
+ <!-- 棰勬贩闂�2 -->
+ <div class="solidDiv" style="height: 18%;margin-bottom: 1%">
+ <p> 棰勬贩闂村尯2</p>
+ <div id="C06" class="flesDiv" style="height:85%;">
+ <button id="C0600101" value="C0600101" class="btnShow " ></button>
+ </div>
+ </div>
+ <!-- 棰勬贩闂�3 -->
+ <div class="solidDiv" style="height: 18%;margin-bottom: 1%">
+ <p> 棰勬贩闂村尯3</p>
+ <div id="C07" class="flesDiv" style="height:85%;">
+ <button id="C0700101" value="C0700101" class="btnShow " ></button>
+ </div>
+ </div>
+ </div>
+ <!-- 鍙� -->
+ <div style="width: 78%;height: 100%;">
+ <!-- 涓�-->
+ <div style="margin-bottom: 1%; height: 29%; display: flex; justify-content: space-between;">
+ <!-- 涓�姝ュ埗绮�1-->
+ <div class="solidDiv" style="width: 33%; height: 100%;">
+ <p>涓�姝ュ埗绮�1</p>
+ <div id="C10" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <button id="C1000101" value="C1000101" class="btnShow " ></button>
+
+ <button id="C1000201" value="C1000201" class="btnShow " ></button>
+ </div>
+ </div>
- <!-- 涓�姝ュ埗绮�3 -->
- <div class="layui-col-md2 " id="divFour" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p id="d4">涓�姝ュ埗绮�3</p>
- <table class="container" id="tabfour" style="width: 100%;height: 90%;"></table>
+ <!-- 涓�姝ュ埗绮�2 -->
+ <div class="solidDiv" style="width: 33%; height: 100%;">
+ <p>涓�姝ュ埗绮�2</p>
+ <div id="C12" style="display: flex; height: 85%;" >
+ <div class="flesDiv" style="width: 50%;height: 100%;">
+ <table class="" >
+ <tr>
+ <td><button id="C1200401" value="C1200401" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C1200501" value="C1200501" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C1200601" value="C1200601" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C1200701" value="C1200701" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ <div class="flesDiv" style="width: 50%;height: 100%;">
+ <table class="">
+ <tr>
+ <td><button id="C1200101" value="C1200101" class="btnShow " ></button></td>
+ <td><button id="C1200102" value="C1200102" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C1200201" value="C1200201" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C1200301" value="C1200301" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ <!-- 涓�姝ュ埗绮�3 -->
+ <div class="solidDiv" style="width: 33%; height: 100%;">
+ <p >涓�姝ュ埗绮�3</p>
+ <div id="C14" style="display: flex; height: 85%;" >
+ <div class="flesDiv" style="width: 50%;height: 100%;">
+ <table class="">
+ <tr>
+ <td><button id="C1400101" value="C1400101" class="btnShow " ></button></td>
+
+ </tr>
+ <tr>
+ <td><button id="C1400201" value="C1400201" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C1400301" value="C1400301" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ <div class="flesDiv" style="width: 50%;height: 100%;">
+ <table class="" >
+ <tr>
+ <td><button id="C1400401" value="C1400401" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C1400501" value="C1400501" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C1400601" value="C1400601" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C1400701" value="C1400701" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 涓� -->
+ <div style="margin-bottom: 1%; height: 39%; display: flex; justify-content: space-between;">
+ <!-- 涓棿绔� -->
+ <div class="solidDiv" style="width: 59%; height: 100%;">
+ <p>涓棿绔�</p>
+ <div id="C01" style="display: flex; height: 85%;" >
+ <div class="flesDiv" style="width: 35%;height: 100%;">
+ <table class="">
+ <tr>
+ <td><button id="C0100101" value="C0100101" class="btnShow " ></button></td>
+ <td><button id="C0100102" value="C0100102" class="btnShow " ></button></td>
+ <td><button id="C0100103" value="C0100103" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0100201" value="C0100201" class="btnShow " ></button></td>
+ <td><button id="C0100202" value="C0100202" class="btnShow " ></button></td>
+ <td><button id="C0100203" value="C0100203" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0100301" value="C0100301" class="btnShow " ></button></td>
+ <td><button id="C0100302" value="C0100302" class="btnShow " ></button></td>
+ <td><button id="C0100303" value="C0100303" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td style="height: 20px;"></td>
+ </tr>
+ <tr>
+ <td><button id="C0100401" value="C0100401" class="btnShow " ></button></td>
+ <td><button id="C0100402" value="C0100402" class="btnShow " ></button></td>
+ <td><button id="C0100403" value="C0100403" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0100501" value="C0100501" class="btnShow " ></button></td>
+ <td><button id="C0100502" value="C0100502" class="btnShow " ></button></td>
+ <td><button id="C0100503" value="C0100503" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0100601" value="C0100601" class="btnShow " ></button></td>
+ <td><button id="C0100602" value="C0100602" class="btnShow " ></button></td>
+ <td><button id="C0100603" value="C0100603" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ <div class="flesDiv" style="width: 30%;height: 100%;">
+ <table class="" >
+ <tr>
+ <td><button id="C0100701" value="C0100701" class="btnShow " ></button></td>
+ <td><button id="C0100702" value="C0100702" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0100801" value="C0100801" class="btnShow " ></button></td>
+ <td><button id="C0100802" value="C0100802" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0100901" value="C0100901" class="btnShow " ></button></td>
+ <td><button id="C0100902" value="C0100902" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td style="height: 20px;"></td>
+ </tr>
+ <tr>
+ <td><button id="C0101001" value="C0101001" class="btnShow " ></button></td>
+ <td><button id="C0101002" value="C0101002" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0101101" value="C0101101" class="btnShow " ></button></td>
+ <td><button id="C0101102" value="C0101102" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0101201" value="C0101201" class="btnShow " ></button></td>
+ <td><button id="C0101202" value="C0101202" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ <div class="flesDiv" style="width: 35%;height: 100%;">
+ <table>
+ <tr>
+ <td><button id="C0101301" value="C0101301" class="btnShow " ></button></td>
+ <td><button id="C0101302" value="C0101302" class="btnShow " ></button></td>
+ <td><button id="C0101303" value="C0101303" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0101401" value="C0101401" class="btnShow " ></button></td>
+ <td><button id="C0101402" value="C0101402" class="btnShow " ></button></td>
+ <td><button id="C0101403" value="C0101403" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0101501" value="C0101501" class="btnShow " ></button></td>
+ <td><button id="C0101502" value="C0101502" class="btnShow " ></button></td>
+ <td><button id="C0101503" value="C0101503" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td style="height: 20px;"></td>
+ </tr>
+ <tr>
+ <td><button id="C0101601" value="C0101601" class="btnShow " ></button></td>
+ <td><button id="C0101602" value="C0101602" class="btnShow " ></button></td>
+ <td><button id="C0101603" value="C0101603" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0101701" value="C0101701" class="btnShow " ></button></td>
+ <td><button id="C0101702" value="C0101702" class="btnShow " ></button></td>
+ <td><button id="C0101703" value="C0101703" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C0101801" value="C0101801" class="btnShow " ></button></td>
+ <td><button id="C0101802" value="C0101802" class="btnShow " ></button></td>
+ <td><button id="C0101803" value="C0101803" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ <!-- 鎬绘贩闂�1 -->
+ <div class="solidDiv" style="width: 19%; height: 100%;">
+ <p>鎬绘贩闂�1</p>
+ <div id="C14" style="display: flex; height: 85%;" >
+ <div class="flesDiv" style="width: 50%;height: 100%;">
+ <table class="">
+ <tr>
+ <td><button id="C1800101" value="C1800101" class="btnShow " ></button></td>
+
+ </tr>
+ <tr>
+ <td><button id="C1800201" value="C1800201" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C1800301" value="C1800301" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ <div class="flesDiv" style="width: 50%;height: 100%;">
+ <table class="" >
+
+ <tr>
+ <td><button id="C1800501" value="C1800501" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C1800601" value="C1800601" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ <!-- 鎬绘贩闂�2 -->
+ <div class="solidDiv" style="width: 19%; height: 100%;">
+ <p>鎬绘贩闂�2</p>
+ <div id="C20" class="flesDiv" style="display: flex; height: 85%;" >
+ <table class="">
+ <tr>
+ <td><button id="C2000101" value="C2000101" class="btnShow " ></button></td>
+ <td><button id="C2000102" value="C2000102" class="btnShow " ></button></td>
+
+ </tr>
+ <tr>
+ <td><button id="C2000201" value="C2000201" class="btnShow " ></button></td>
+ <td><button id="C2000202" value="C2000202" class="btnShow " ></button></td>
+
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ </div>
+ <!-- 涓� -->
+ <div style=" height: 28%; display: flex; justify-content: space-between;">
+ <div style="width: 40%; height: 100%;">
+ <div style="display: flex; height: 50%;">
+ <div class="solidDiv" style="width: 50%;height: 100%;">
+ <p>棰勬贩闂�4</p>
+ <div id="C08" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <button id="C0800101" value="C0800101" class="btnShow " ></button>
+ </div>
+ </div>
+ <div class="solidDiv" style="width: 50%; height: 100%;">
+ <p>棰勬贩闂�5</p>
+ <div id="C09" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <button id="C0900101" value="C0900101" class="btnShow " ></button>
+ </div>
+ </div>
+ </div>
+ <!-- 骞叉硶鍒剁矑-->
+ <div class="solidDiv" style="height: 50%;">
+ <p>骞叉硶鍒剁矑</p>
+ <div id="C17" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <button id="C1700101" value="C1700101" class="btnShow " ></button>
+ </div>
+ </div>
+
+ </div>
+ <!-- 婀挎硶鍒剁矑3-->
+ <div class="solidDiv" style="width: 19%; height: 100%;">
+ <p>婀挎硶鍒剁矑3</p>
+ <div id="C16" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <button id="C1600101" value="C1700101" class="btnShow " ></button>
+ </div>
</div>
</div>
-
- <!-- 绌� -->
- <div class="layui-col-md4 " id="divFour" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p id="e4"></p>
- <table class="container" id="tabfive" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
- </div>
- </div>
- <!-- 涓� -->
- <div class="layui-col-md" style="width: auto;height: 39%;">
- <div class="layui-row layui-col-space15" style="width: auto;height: 100%;">
- <!-- 绌� -->
- <div class="layui-col-md1" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p></p>
- <table class="container" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
- <!-- 棰勬贩闂� -->
- <div class="layui-col-md1 " id="divOne" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p id="a4"> 棰勬贩闂村尯</p>
- <table class="container" id="tabOne" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
- <!-- 绌� -->
- <div class="layui-col-md1 " id="divOne" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p id="a4"> </p>
- <table class="container" id="tabOne" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
- <!-- 涓棿绔�-->
- <div class="layui-col-md4 " id="divTwo" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p id="b4">涓棿绔�</p>
- <table class="container" id="tabTwe" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
-
- <!-- 涓�姝ュ埗绮�2 -->
- <div class="layui-col-md2 " id="divThree" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p id="c4">鎬绘贩1</p>
- <table class="" id="tabThree" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
-
- <!-- 涓�姝ュ埗绮�3 -->
- <div class="layui-col-md2 " id="divFour" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p id="d4">鎬绘贩2</p>
- <table class="container" id="tabfour" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
-
- <!-- 绌� -->
- <div class="layui-col-md4 " id="divFour" style="height: 100%;">
- <div class="layui-card" style="height: 100%;">
- <p id="e4"></p>
- <table class="container" id="tabfive" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
- </div>
+
+ </div>
</div>
- <!-- 涓� -->
- <div class="layui-col-md" style="width: auto;height: 24%;">
- <div class="layui-row layui-col-space15" style="width: auto;height: 100%;">
- <!-- 涓�銆佷笁妤间笅宸05銆丅14 -->
- <div class="layui-col-md6 divOneX" id="divFive">
- <div class="layui-card" style="height: 100%;">
- <p id="f"></p>
- <table class="container" id="tabfive2" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
+ <!-- 涓夋ゼ -->
+ <div id="3Lou" class="layui-card zuoyouDiv" style="height: 88%; " >
+ <!-- 宸� -->
+ <div class="" style=" width: 20%;height: 100%;">
+ <!-- 鍖呰。闂� -->
+ <div class="solidDiv" style="height: 12%; margin-bottom: 2%;">
+ <p>鍖呰。闂�</p>
+ <div id="C23" class="flesDiv" style="height:75%;" >
+ <button id="C4200101" value="C4200101" class="btnShow " ></button>
+ </div>
+ </div>
+ <!-- 鍘嬬墖闂�1 -->
+ <div class="solidDiv" style="height: 12%;">
+ <p>鍘嬬墖闂�1</p>
+ <div id="C28" style="height:75%; display: flex; justify-content: space-around;">
+ <div class="flesDiv">
+ <button id="C2800301" value="C2800301" class="btnShow" ></button>
+ </div>
+ <div class="flesDiv">
+ <table class="">
+ <tr>
+ <td><button id="C2800101" value="C2800101" class="btnShow " ></button></td>
+
+ </tr>
+ <tr>
+ <td><button id="C2800201" value="C2800201" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ <!-- 鍘嬬墖闂�2 -->
+ <div class="solidDiv" style="height: 12%;">
+ <p> 鍘嬬墖闂�2</p>
+ <div id="C29" style="height:75%; display: flex; justify-content: space-around;">
+ <div class="flesDiv">
+ <button id="C2900301" value="C2900301" class="btnShow" ></button>
+ </div>
+ <div class="flesDiv">
+ <table class="">
+ <tr>
+ <td><button id="C2900101" value="C2900101" class="btnShow " ></button></td>
+
+ </tr>
+ <tr>
+ <td><button id="C2900201" value="C2900201" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ <!-- 鍘嬬墖闂�3 -->
+ <div class="solidDiv" style="height: 12%;">
+ <p> 鍘嬬墖闂�3</p>
+ <div id="C30" style="height:75%; display: flex; justify-content: space-around;">
+ <div class="flesDiv">
+ <button id="C3000301" value="C3000301" class="btnShow" ></button>
+ </div>
+ <div class="flesDiv">
+ <table class="">
+ <tr>
+ <td><button id="C3000101" value="C3000101" class="btnShow " ></button></td>
+
+ </tr>
+ <tr>
+ <td><button id="C3000201" value="C3000201" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ <!-- 濉厖闂�1 -->
+ <div class="solidDiv" style="height: 12%;">
+ <p> 濉厖闂�1</p>
+ <div id="C34" style="height:75%; display: flex; justify-content: space-around;">
+ <div class="flesDiv">
+ <button id="C3400301" value="C3400301" class="btnShow" ></button>
+ </div>
+ <div class="flesDiv">
+ <table class="">
+ <tr>
+ <td><button id="C3400101" value="C3400101" class="btnShow " ></button></td>
+
+ </tr>
+ <tr>
+ <td><button id="C3400201" value="C3400201" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ <!-- 濉厖闂�2-->
+ <div class="solidDiv" style="height: 12%;">
+ <p> 濉厖闂�2</p>
+ <div id="C35" style="height:75%; display: flex; justify-content: space-around;">
+ <div class="flesDiv">
+ <button id="C3500301" value="C3500301" class="btnShow" ></button>
+ </div>
+ <div class="flesDiv">
+ <table class="">
+ <tr>
+ <td><button id="C3500101" value="C3500101" class="btnShow " ></button></td>
+
+ </tr>
+ <tr>
+ <td><button id="C3500201" value="C3500201" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ <!-- 濉厖闂�3 -->
+ <div class="solidDiv" style="height: 12%;">
+ <p> 濉厖闂�3</p>
+ <div id="C36" style="height:75%; display: flex; justify-content: space-around;">
+ <div class="flesDiv">
+ <button id="C3600301" value="C3600301" class="btnShow" ></button>
+ </div>
+ <div class="flesDiv">
+ <table class="">
+ <tr>
+ <td><button id="C3600101" value="C3600101" class="btnShow " ></button></td>
+
+ </tr>
+ <tr>
+ <td><button id="C3600201" value="C3600201" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ <!-- 濉厖闂�4 -->
+ <div class="solidDiv" style="height: 12%;">
+ <p> 濉厖闂�4</p>
+ <div id="C37" style="height:75%; display: flex; justify-content: space-around;">
+ <div class="flesDiv">
+ <button id="C3700301" value="C3700301" class="btnShow" ></button>
+ </div>
+ <div class="flesDiv">
+ <table class="">
+ <tr>
+ <td><button id="C3700101" value="C3700101" class="btnShow " ></button></td>
+
+ </tr>
+ <tr>
+ <td><button id="C3700201" value="C3700201" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 鍙� -->
+ <div style="width: 78%;height: 100%;">
+ <!-- 涓� -->
+ <div style="margin-bottom: 2%; height: 19%; display: flex; justify-content: space-between;">
+ <!-- 鎶曟枡鍖�1-->
+ <div class="solidDiv" style="width: 9%; height: 100%;">
+ <p>鎶曟枡鍖�1</p>
+ <div id="C43" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <table class="">
+ <tr>
+ <td class="btnShow"></td>
+ <td><button id="C4300202" value="C4300202" class="btnShow " ></button></td>
+ <td><button id="C4300302" value="C4300302" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C4300101" value="C4300101" class="btnShow " ></button></td>
+ <td><button id="C4300201" value="C4300201" class="btnShow " ></button></td>
+ <td><button id="C4300301" value="C4300301" class="btnShow " ></button></td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ <!-- 鎶曟枡鍖�2 -->
+ <div class="solidDiv" style="width: 9%; height: 100%;">
+ <p>鎶曟枡鍖�2</p>
+ <div id="C44" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <table class="">
+ <tr>
+ <td><button id="C4400102" value="C4400102" class="btnShow " ></button></td>
+ <td><button id="C4400202" value="C4400202" class="btnShow " ></button></td>
+ <td><button id="C4400302" value="C4400302" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C4400101" value="C4400201" class="btnShow " ></button></td>
+ <td><button id="C4400201" value="C4400201" class="btnShow " ></button></td>
+ <td><button id="C4400301" value="C4400301" class="btnShow " ></button></td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ <!-- 鎶曟枡鍖�3 -->
+ <div class="solidDiv" style="width: 9%; height: 100%;">
+ <p>鎶曟枡鍖�3</p>
+ <div id="C45" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <table class="">
+ <tr>
+ <td><button id="C4500102" value="C4500102" class="btnShow " ></button></td>
+ <td><button id="C4500202" value="C4500202" class="btnShow " ></button></td>
+ <td><button id="C4500302" value="C4500302" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C4500101" value="C4500101" class="btnShow " ></button></td>
+ <td><button id="C4500201" value="C4500201" class="btnShow " ></button></td>
+ <td><button id="C4500301" value="C4500301" class="btnShow " ></button></td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ <!-- 鎶曟枡鍖�4 -->
+ <div class="solidDiv" style="width: 9%; height: 100%;">
+ <p>鎶曟枡鍖�4</p>
+ <div id="C46" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <table class="">
+ <tr>
+ <td><button id="C4600102" value="C4600102" class="btnShow " ></button></td>
+ <td><button id="C4600202" value="C4600202" class="btnShow " ></button></td>
+ <td><button id="C4600302" value="C4600302" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C4600101" value="C4600101" class="btnShow " ></button></td>
+ <td><button id="C4600201" value="C4600201" class="btnShow " ></button></td>
+ <td><button id="C4600301" value="C4600301" class="btnShow " ></button></td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ <!-- 鎶曟枡鍖�5 -->
+ <div class="solidDiv" style="width: 9%; height: 100%;">
+ <p>鎶曟枡鍖�5</p>
+ <div id="C47" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <table class="">
+ <tr>
+ <td><button id="C4700104" value="C4700104" class="btnShow " ></button></td>
+ <td><button id="C4700204" value="C4700204" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C4700103" value="C4700103" class="btnShow " ></button></td>
+ <td><button id="C4700203" value="C4700203" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C4700102" value="C4700102" class="btnShow " ></button></td>
+ <td><button id="C4700202" value="C4700202" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C4700101" value="C4700101" class="btnShow " ></button></td>
+ <td><button id="C4700201" value="C4700201" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <!-- 鎶曟枡鍖�6 -->
+ <div class="solidDiv" style="width: 9%; height: 100%;">
+ <p>鎶曟枡鍖�6</p>
+ <div id="C48" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <table class="">
+ <tr>
+ <td><button id="C4800102" value="C4800102" class="btnShow " ></button></td>
+ <td><button id="C4800202" value="C4800202" class="btnShow " ></button></td>
+ <td><button id="C4800302" value="C4800302" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C4800101" value="C4800101" class="btnShow " ></button></td>
+ <td><button id="C4800201" value="C4800201" class="btnShow " ></button></td>
+ <td><button id="C4800301" value="C4800301" class="btnShow " ></button></td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ <!-- 鎶曟枡鍖�7 -->
+ <div class="solidDiv" style="width: 9%; height: 100%;">
+ <p>鎶曟枡鍖�7</p>
+ <div id="C49" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <table class="">
+ <tr>
+ <td><button id="C4900102" value="C4900102" class="btnShow " ></button></td>
+ <td><button id="C4900202" value="C4900202" class="btnShow " ></button></td>
+ <td><button id="C4900302" value="C4900302" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C4900101" value="C4900101" class="btnShow " ></button></td>
+ <td><button id="C4900201" value="C4900201" class="btnShow " ></button></td>
+ <td><button id="C4900301" value="C4900301" class="btnShow " ></button></td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ <!-- 鎶曟枡鍖�8 -->
+ <div class="solidDiv" style="width: 9%; height: 100%;">
+ <p>鎶曟枡鍖�8</p>
+ <div id="C50" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <table class="">
+ <tr>
+ <td><button id="C5000102" value="C5000102" class="btnShow " ></button></td>
+ <td><button id="C5000202" value="C5000202" class="btnShow " ></button></td>
+ <td><button id="C5000302" value="C5000302" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5000101" value="C5000101" class="btnShow " ></button></td>
+ <td><button id="C5000201" value="C5000201" class="btnShow " ></button></td>
+ <td><button id="C5000301" value="C5000301" class="btnShow " ></button></td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ <!-- 鎶曟枡鍖�9 -->
+ <div class="solidDiv" style="width: 18%; height: 100%;">
+ <p>鎶曟枡鍖�9</p>
+ <div id="C51" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <table class="">
+ <tr>
+ <td><button id="C5100102" value="C5100102" class="btnShow " ></button></td>
+ <td><button id="C5100202" value="C5100202" class="btnShow " ></button></td>
+ <td><button id="C5100302" value="C5100302" class="btnShow " ></button></td>
+ <td><button id="C5100402" value="C5100402" class="btnShow " ></button></td>
+ <td><button id="C5100502" value="C5100502" class="btnShow " ></button></td>
+ <td><button id="C5100602" value="C5100602" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5100101" value="C5100101" class="btnShow " ></button></td>
+ <td><button id="C5100201" value="C5100201" class="btnShow " ></button></td>
+ <td><button id="C5100301" value="C5100301" class="btnShow " ></button></td>
+ <td><button id="C5100401" value="C5100401" class="btnShow " ></button></td>
+ <td><button id="C5100501" value="C5100501" class="btnShow " ></button></td>
+ <td><button id="C5100601" value="C5100601" class="btnShow " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <!-- 鎶曟枡鍖�10 -->
+ <div class="solidDiv" style="width: 9%; height: 100%;">
+ <p>鎶曟枡鍖�10</p>
+ <div id="C52" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <table class="">
+ <tr>
+ <td><button id="C5200102" value="C5200102" class="btnShow " ></button></td>
+ <td><button id="C5200202" value="C5200202" class="btnShow " ></button></td>
+ <td><button id="C5200302" value="C5200302" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5200101" value="C5200101" class="btnShow " ></button></td>
+ <td><button id="C5200201" value="C5200201" class="btnShow " ></button></td>
+ <td><button id="C5200301" value="C5200301" class="btnShow " ></button></td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ <!-- 鎶曟枡鍖�11 -->
+ <div class="solidDiv" style="width: 9%; height: 100%;">
+ <p>鎶曟枡鍖�11</p>
+ <div id="C53" class="flesDiv" style="height:85%; justify-content: space-around;">
+ <table class="">
+ <tr>
+ <td><button id="C5300102" value="C5300102" class="btnShow " ></button></td>
+ <td><button id="C5300202" value="C5300202" class="btnShow " ></button></td>
+ <td><button id="C5300302" value="C5300302" class="btnShow " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5300101" value="C5300101" class="btnShow " ></button></td>
+ <td><button id="C5300201" value="C5300201" class="btnShow " ></button></td>
+ <td><button id="C5300301" value="C5300301" class="btnShow " ></button></td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ </div>
+ <!-- 涓� -->
+ <div style="height: 77%; display: flex; justify-content: space-between;">
+ <!-- 宸� -->
+ <div class="solidDiv" style="width: 69%; height: 100%;">
+ <p>涓棿绔�</p>
+ <div id="C24" style="height: 96%; display: flex; justify-content: space-between;">
+ <div class="flesDiv" style="width: 20%; height: 100%;">
+ <table class="">
+ <tr>
+ <td><button id="C2407801" value="C2407801" class="btnShow1 " ></button></td>
+ <td class="btnShow"></td>
+ </tr>
+ <tr>
+ <td><button id="C2407901" value="C2407901" class="btnShow1 " ></button></td>
+ <td><button id="C2407902" value="C2407902" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2408001" value="C2408001" class="btnShow1 " ></button></td>
+ <td><button id="C2408002" value="C2408002" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2408101" value="C2408101" class="btnShow1 " ></button></td>
+ <td><button id="C2408102" value="C2408102" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2408201" value="C2408201" class="btnShow1 " ></button></td>
+ <td><button id="C2408202" value="C2408202" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2408301" value="C2408301" class="btnShow1 " ></button></td>
+ <td><button id="C2408302" value="C2408302" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2408501" value="C2408501" class="btnShow1 " ></button></td>
+ <td class="btnShow"></td>
+ </tr>
+ <tr>
+ <td><button id="C2408601" value="C2408601" class="btnShow1 " ></button></td>
+ <td><button id="C2408602" value="C2408602" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2408701" value="C2408701" class="btnShow1 " ></button></td>
+ <td><button id="C2408702" value="C2408702" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td class="btnShow"></td>
+ </tr>
+ <tr>
+ <td class="btnShow"></td>
+ </tr>
+ <tr>
+ <td><button id="C2408801" value="C2408801" class="btnShow1 " ></button></td>
+ <td><button id="C2408802" value="C2408802" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2408901" value="C2408901" class="btnShow1 " ></button></td>
+ <td class="btnShow"></td>
+ </tr>
+ <tr>
+ <td><button id="C2409001" value="C2409001" class="btnShow1 " ></button></td>
+ <td><button id="C2409002" value="C2409002" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2409101" value="C2409101" class="btnShow1 " ></button></td>
+ <td><button id="C2409102" value="C2409102" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2409201" value="C2409201" class="btnShow1 " ></button></td>
+ <td><button id="C2409202" value="C2409202" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2409301" value="C2409301" class="btnShow1 " ></button></td>
+ <td><button id="C2409302" value="C2409302" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2409401" value="C2409401" class="btnShow1 " ></button></td>
+ <td><button id="C2409402" value="C2409402" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2409501" value="C2409501" class="btnShow1 " ></button></td>
+ <td class="btnShow"></td>
+ </tr>
+ <tr>
+ <td><button id="C2409601" value="C2409601" class="btnShow1 " ></button></td>
+ <td class="btnShow"></td>
+ </tr>
+ <tr>
+ <td><button id="C2409701" value="C2409701" class="btnShow1 " ></button></td>
+ <td><button id="C2409702" value="C2409702" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2409801" value="C2409801" class="btnShow1 " ></button></td>
+ <td><button id="C2409802" value="C2409802" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2409901" value="C2409901" class="btnShow1 " ></button></td>
+ <td><button id="C2409902" value="C2409902" class="btnShow1 " ></button></td>
+ </tr>
- <!-- 涓�妤间笅涓瑽06 -->
- <div class="layui-col-md6 divOneX" id="divSix">
- <div class="layui-card" style="height: 100%;">
- <p id="g"></p>
- <table class="container" id="tabSix" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
-
- <!-- 涓�銆佷笁涓嬪彸B07銆丅15 -->
- <div class="layui-col-md6 divOneX" id="divSeven">
- <div class="layui-card" style="height: 100%;">
- <p id="h"></p>
- <table class="container" id="tabSeven" style="width: 100%;height: 90%;"></table>
- </div>
- </div>
- </div>
-
- </div>
+ </table>
+ </div>
+ <div style="width: 80%; height: 100%;">
+ <div class="flesDiv" style="width: 100%; height: 25%;">
+ <table>
+ <tr>
+ <td><button id="C2400104" value="C2400104" class="btnShow1 " ></button></td>
+ <td><button id="C2400204" value="C2400204" class="btnShow1 " ></button></td>
+ <td><button id="C2400304" value="C2400304" class="btnShow1 " ></button></td>
+ <td><button id="C2400404" value="C2400404" class="btnShow1 " ></button></td>
+ <td><button id="C2400504" value="C2400504" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2400704" value="C2400704" class="btnShow1 " ></button></td>
+ <td><button id="C2400804" value="C2400804" class="btnShow1 " ></button></td>
+ <td><button id="C2400904" value="C2400904" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2401104" value="C2401104" class="btnShow1 " ></button></td>
+ <td><button id="C2401204" value="C2401204" class="btnShow1 " ></button></td>
+ <td><button id="C2401304" value="C2401304" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2401504" value="C2401504" class="btnShow1 " ></button></td>
+ <td><button id="C2401604" value="C2401604" class="btnShow1 " ></button></td>
+ <td><button id="C2401704" value="C2401704" class="btnShow1 " ></button></td>
+ <td><button id="C2401804" value="C2401804" class="btnShow1 " ></button></td>
+ <td><button id="C2401904" value="C2401904" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2400103" value="C2400103" class="btnShow1 " ></button></td>
+ <td><button id="C2400203" value="C2400203" class="btnShow1 " ></button></td>
+ <td><button id="C2400303" value="C2400303" class="btnShow1 " ></button></td>
+ <td><button id="C2400403" value="C2400403" class="btnShow1 " ></button></td>
+ <td><button id="C2400503" value="C2400503" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2400703" value="C2400703" class="btnShow1 " ></button></td>
+ <td><button id="C2400803" value="C2400803" class="btnShow1 " ></button></td>
+ <td><button id="C2400903" value="C2400903" class="btnShow1 " ></button></td>
+ <td><button id="C2401002" value="C2401002" class="btnShow1 " ></button></td>
+ <td><button id="C2401103" value="C2401103" class="btnShow1 " ></button></td>
+ <td><button id="C2401203" value="C2401203" class="btnShow1 " ></button></td>
+ <td><button id="C2401303" value="C2401303" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2401503" value="C2401503" class="btnShow1 " ></button></td>
+ <td><button id="C2401603" value="C2401603" class="btnShow1 " ></button></td>
+ <td><button id="C2401703" value="C2401703" class="btnShow1 " ></button></td>
+ <td><button id="C2401803" value="C2401803" class="btnShow1 " ></button></td>
+ <td><button id="C2401903" value="C2401903" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2400102" value="C2400102" class="btnShow1 " ></button></td>
+ <td><button id="C2400202" value="C2400202" class="btnShow1 " ></button></td>
+ <td><button id="C2400302" value="C2400302" class="btnShow1 " ></button></td>
+ <td><button id="C2400402" value="C2400402" class="btnShow1 " ></button></td>
+ <td><button id="C2400502" value="C2400502" class="btnShow1 " ></button></td>
+ <td><button id="C2400602" value="C2400602" class="btnShow1 " ></button></td>
+ <td><button id="C2400702" value="C2400702" class="btnShow1 " ></button></td>
+ <td><button id="C2400802" value="C2400802" class="btnShow1 " ></button></td>
+ <td><button id="C2400902" value="C2400902" class="btnShow1 " ></button></td>
+ <td><button id="C2401001" value="C2401001" class="btnShow1 " ></button></td>
+ <td><button id="C2401102" value="C2401102" class="btnShow1 " ></button></td>
+ <td><button id="C2401202" value="C2401202" class="btnShow1 " ></button></td>
+ <td><button id="C2401302" value="C2401302" class="btnShow1 " ></button></td>
+ <td><button id="C2401402" value="C2401402" class="btnShow1 " ></button></td>
+ <td><button id="C2401502" value="C2401502" class="btnShow1 " ></button></td>
+ <td><button id="C2401602" value="C2401602" class="btnShow1 " ></button></td>
+ <td><button id="C2401702" value="C2401702" class="btnShow1 " ></button></td>
+ <td><button id="C2401802" value="C2401802" class="btnShow1 " ></button></td>
+ <td><button id="C2401902" value="C2401902" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2400101" value="C2400101" class="btnShow1 " ></button></td>
+ <td><button id="C2400201" value="C2400201" class="btnShow1 " ></button></td>
+ <td><button id="C2400301" value="C2400301" class="btnShow1 " ></button></td>
+ <td><button id="C2400401" value="C2400401" class="btnShow1 " ></button></td>
+ <td><button id="C2400501" value="C2400501" class="btnShow1 " ></button></td>
+ <td><button id="C2400601" value="C2400601" class="btnShow1 " ></button></td>
+ <td><button id="C2400701" value="C2400701" class="btnShow1 " ></button></td>
+ <td><button id="C2400801" value="C2400801" class="btnShow1 " ></button></td>
+ <td><button id="C2400901" value="C2400901" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2401101" value="C2401101" class="btnShow1 " ></button></td>
+ <td><button id="C2401201" value="C2401201" class="btnShow1 " ></button></td>
+ <td><button id="C2401301" value="C2401301" class="btnShow1 " ></button></td>
+ <td><button id="C2401401" value="C2401401" class="btnShow1 " ></button></td>
+ <td><button id="C2401501" value="C2401501" class="btnShow1 " ></button></td>
+ <td><button id="C2401601" value="C2401601" class="btnShow1 " ></button></td>
+ <td><button id="C2401701" value="C2401701" class="btnShow1 " ></button></td>
+ <td><button id="C2401801" value="C2401801" class="btnShow1 " ></button></td>
+ <td><button id="C2401901" value="C2401901" class="btnShow1 " ></button></td>
+ </tr>
+ </table>
+ </div>
+ <div class="flesDiv" style="width: 100%; height: 25%;">
+ <table>
+ <tr>
+ <td><button id="C2402003" value="C2402003" class="btnShow1 " ></button></td>
+ <td><button id="C2402103" value="C2402103" class="btnShow1 " ></button></td>
+ <td><button id="C2402203" value="C2402203" class="btnShow1 " ></button></td>
+ <td><button id="C2402303" value="C2402303" class="btnShow1 " ></button></td>
+ <td><button id="C2402403" value="C2402403" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2402603" value="C2402603" class="btnShow1 " ></button></td>
+ <td><button id="C2402703" value="C2402703" class="btnShow1 " ></button></td>
+ <td><button id="C2402803" value="C2402803" class="btnShow1 " ></button></td>
+ <td><button id="C2402903" value="C2402903" class="btnShow1 " ></button></td>
+ <td><button id="C2403003" value="C2403003" class="btnShow1 " ></button></td>
+ <td><button id="C2403103" value="C2403103" class="btnShow1 " ></button></td>
+ <td><button id="C2403202" value="C2403202" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2403403" value="C2403403" class="btnShow1 " ></button></td>
+ <td><button id="C2403503" value="C2403503" class="btnShow1 " ></button></td>
+ <td><button id="C2403603" value="C2403603" class="btnShow1 " ></button></td>
+ <td><button id="C2403703" value="C2403703" class="btnShow1 " ></button></td>
+ <td><button id="C2403803" value="C2403803" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2402002" value="C2402002" class="btnShow1 " ></button></td>
+ <td><button id="C2402102" value="C2402102" class="btnShow1 " ></button></td>
+ <td><button id="C2402202" value="C2402202" class="btnShow1 " ></button></td>
+ <td><button id="C2402302" value="C2402302" class="btnShow1 " ></button></td>
+ <td><button id="C2402402" value="C2402402" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2402602" value="C2402602" class="btnShow1 " ></button></td>
+ <td><button id="C2402702" value="C2402702" class="btnShow1 " ></button></td>
+ <td><button id="C2402802" value="C2402802" class="btnShow1 " ></button></td>
+ <td><button id="C2402902" value="C2402902" class="btnShow1 " ></button></td>
+ <td><button id="C2403002" value="C2403002" class="btnShow1 " ></button></td>
+ <td><button id="C2403102" value="C2403102" class="btnShow1 " ></button></td>
+ <td><button id="C2403201" value="C2403201" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2403402" value="C2403402" class="btnShow1 " ></button></td>
+ <td><button id="C2403502" value="C2403502" class="btnShow1 " ></button></td>
+ <td><button id="C2403602" value="C2403602" class="btnShow1 " ></button></td>
+ <td><button id="C2403702" value="C2403702" class="btnShow1 " ></button></td>
+ <td><button id="C2403802" value="C2403802" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2402001" value="C2402001" class="btnShow1 " ></button></td>
+ <td><button id="C2402101" value="C2402101" class="btnShow1 " ></button></td>
+ <td><button id="C2402201" value="C2402201" class="btnShow1 " ></button></td>
+ <td><button id="C2402301" value="C2402301" class="btnShow1 " ></button></td>
+ <td><button id="C2402401" value="C2402401" class="btnShow1 " ></button></td>
+ <td><button id="C2402501" value="C2402501" class="btnShow1 " ></button></td>
+ <td><button id="C2402601" value="C2402601" class="btnShow1 " ></button></td>
+ <td><button id="C2402701" value="C2402701" class="btnShow1 " ></button></td>
+ <td><button id="C2402801" value="C2402801" class="btnShow1 " ></button></td>
+ <td><button id="C2402901" value="C2402901" class="btnShow1 " ></button></td>
+ <td><button id="C2403001" value="C2403001" class="btnShow1 " ></button></td>
+ <td><button id="C2403101" value="C2403101" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2403301" value="C2403301" class="btnShow1 " ></button></td>
+ <td><button id="C2403401" value="C2403401" class="btnShow1 " ></button></td>
+ <td><button id="C2403501" value="C2403501" class="btnShow1 " ></button></td>
+ <td><button id="C2403601" value="C2403601" class="btnShow1 " ></button></td>
+ <td><button id="C2403701" value="C2403701" class="btnShow1 " ></button></td>
+ <td><button id="C2403801" value="C2403801" class="btnShow1 " ></button></td>
+ </tr>
+ </table>
+ </div>
+ <div class="flesDiv" style="width: 100%; height: 25%;">
+ <table>
+ <tr>
+ <td><button id="C2403904" value="C2403904" class="btnShow1 " ></button></td>
+ <td><button id="C2404004" value="C2404004" class="btnShow1 " ></button></td>
+ <td><button id="C2404104" value="C2404104" class="btnShow1 " ></button></td>
+ <td><button id="C2404204" value="C2404204" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2404401" value="C2404401" class="btnShow1 " ></button></td>
+ <td><button id="C2404604" value="C2404604" class="btnShow1 " ></button></td>
+ <td><button id="C2404704" value="C2404704" class="btnShow1 " ></button></td>
+ <td><button id="C2404804" value="C2404804" class="btnShow1 " ></button></td>
+ <td><button id="C2404904" value="C2404904" class="btnShow1 " ></button></td>
+ <td><button id="C2405004" value="C2405004" class="btnShow1 " ></button></td>
+ <td><button id="C2405104" value="C2405104" class="btnShow1 " ></button></td>
+ <td><button id="C2405203" value="C2405203" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2405404" value="C2405404" class="btnShow1 " ></button></td>
+ <td><button id="C2405504" value="C2405504" class="btnShow1 " ></button></td>
+ <td><button id="C2405604" value="C2405604" class="btnShow1 " ></button></td>
+ <td><button id="C2405704" value="C2405704" class="btnShow1 " ></button></td>
+ <td><button id="C2405804" value="C2405804" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2403903" value="C2403903" class="btnShow1 " ></button></td>
+ <td><button id="C2404003" value="C2404003" class="btnShow1 " ></button></td>
+ <td><button id="C2404103" value="C2404103" class="btnShow1 " ></button></td>
+ <td><button id="C2404203" value="C2404203" class="btnShow1 " ></button></td>
+ <td><button id="C2404303" value="C2404303" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2404603" value="C2404603" class="btnShow1 " ></button></td>
+ <td><button id="C2404703" value="C2404703" class="btnShow1 " ></button></td>
+ <td><button id="C2404803" value="C2404803" class="btnShow1 " ></button></td>
+ <td><button id="C2404903" value="C2404903" class="btnShow1 " ></button></td>
+ <td><button id="C2405003" value="C2405003" class="btnShow1 " ></button></td>
+ <td><button id="C2405103" value="C2405103" class="btnShow1 " ></button></td>
+ <td><button id="C2405202" value="C2405202" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2405403" value="C2405403" class="btnShow1 " ></button></td>
+ <td><button id="C2405503" value="C2405503" class="btnShow1 " ></button></td>
+ <td><button id="C2405603" value="C2405603" class="btnShow1 " ></button></td>
+ <td><button id="C2405703" value="C2405703" class="btnShow1 " ></button></td>
+ <td><button id="C2405803" value="C2405803" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2403902" value="C2403902" class="btnShow1 " ></button></td>
+ <td><button id="C2404002" value="C2404002" class="btnShow1 " ></button></td>
+ <td><button id="C2404102" value="C2404102" class="btnShow1 " ></button></td>
+ <td><button id="C2404202" value="C2404202" class="btnShow1 " ></button></td>
+ <td><button id="C2404302" value="C2404302" class="btnShow1 " ></button></td>
+
+ <td><button id="C2404502" value="C2404502" class="btnShow1 " ></button></td>
+ <td><button id="C2404602" value="C2404602" class="btnShow1 " ></button></td>
+ <td><button id="C2404702" value="C2404702" class="btnShow1 " ></button></td>
+ <td><button id="C2404802" value="C2404802" class="btnShow1 " ></button></td>
+ <td><button id="C2404902" value="C2404902" class="btnShow1 " ></button></td>
+ <td><button id="C2405002" value="C2405002" class="btnShow1 " ></button></td>
+ <td><button id="C2405102" value="C2405102" class="btnShow1 " ></button></td>
+ <td><button id="C2405201" value="C2405201" class="btnShow1 " ></button></td>
+ <td><button id="C2405302" value="C2405302" class="btnShow1 " ></button></td>
+ <td><button id="C2405402" value="C2405402" class="btnShow1 " ></button></td>
+ <td><button id="C2405502" value="C2405502" class="btnShow1 " ></button></td>
+ <td><button id="C2405602" value="C2405602" class="btnShow1 " ></button></td>
+ <td><button id="C2405702" value="C2405702" class="btnShow1 " ></button></td>
+ <td><button id="C2405802" value="C2405802" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2403901" value="C2403901" class="btnShow1 " ></button></td>
+ <td><button id="C2404001" value="C2404001" class="btnShow1 " ></button></td>
+ <td><button id="C2404101" value="C2404101" class="btnShow1 " ></button></td>
+ <td><button id="C2404201" value="C2404201" class="btnShow1 " ></button></td>
+ <td><button id="C2404301" value="C2404301" class="btnShow1 " ></button></td>
+
+ <td><button id="C2404501" value="C2404501" class="btnShow1 " ></button></td>
+ <td><button id="C2404601" value="C2404601" class="btnShow1 " ></button></td>
+ <td><button id="C2404701" value="C2404701" class="btnShow1 " ></button></td>
+ <td><button id="C2404801" value="C2404801" class="btnShow1 " ></button></td>
+ <td><button id="C2404901" value="C2404901" class="btnShow1 " ></button></td>
+ <td><button id="C2405001" value="C2405001" class="btnShow1 " ></button></td>
+ <td><button id="C2405101" value="C2405101" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2405301" value="C2405301" class="btnShow1 " ></button></td>
+ <td><button id="C2405401" value="C2405401" class="btnShow1 " ></button></td>
+ <td><button id="C2405501" value="C2405501" class="btnShow1 " ></button></td>
+ <td><button id="C2405601" value="C2405601" class="btnShow1 " ></button></td>
+ <td><button id="C2405701" value="C2405701" class="btnShow1 " ></button></td>
+ <td><button id="C2405801" value="C2405801" class="btnShow1 " ></button></td>
+ </tr>
+ </table>
+ </div>
+ <div class="flesDiv" style="width: 100%; height: 25%;">
+ <table>
+ <tr>
+ <td><button id="C2405903" value="C2405903" class="btnShow1 " ></button></td>
+ <td><button id="C2406003" value="C2406003" class="btnShow1 " ></button></td>
+ <td><button id="C2406103" value="C2406103" class="btnShow1 " ></button></td>
+ <td><button id="C2406203" value="C2406203" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2406503" value="C2406503" class="btnShow1 " ></button></td>
+ <td><button id="C2406603" value="C2406603" class="btnShow1 " ></button></td>
+ <td><button id="C2406703" value="C2406703" class="btnShow1 " ></button></td>
+ <td><button id="C2406803" value="C2406803" class="btnShow1 " ></button></td>
+ <td><button id="C2406903" value="C2406903" class="btnShow1 " ></button></td>
+ <td><button id="C2407003" value="C2407003" class="btnShow1 " ></button></td>
+ <td><button id="C2407103" value="C2407103" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2407303" value="C2407303" class="btnShow1 " ></button></td>
+ <td><button id="C2407403" value="C2407403" class="btnShow1 " ></button></td>
+ <td><button id="C2407503" value="C2407503" class="btnShow1 " ></button></td>
+ <td><button id="C2407603" value="C2407603" class="btnShow1 " ></button></td>
+ <td><button id="C2407703" value="C2407703" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2405902" value="C2405902" class="btnShow1 " ></button></td>
+ <td><button id="C2406002" value="C2406002" class="btnShow1 " ></button></td>
+ <td><button id="C2406102" value="C2406102" class="btnShow1 " ></button></td>
+ <td><button id="C2406202" value="C2406202" class="btnShow1 " ></button></td>
+ <td><button id="C2406302" value="C2406302" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2406502" value="C2406502" class="btnShow1 " ></button></td>
+ <td><button id="C2406602" value="C2406602" class="btnShow1 " ></button></td>
+ <td><button id="C2406702" value="C2406702" class="btnShow1 " ></button></td>
+ <td><button id="C2406802" value="C2406802" class="btnShow1 " ></button></td>
+ <td><button id="C2406902" value="C2406902" class="btnShow1 " ></button></td>
+ <td><button id="C2407002" value="C2407002" class="btnShow1 " ></button></td>
+ <td><button id="C2407102" value="C2407102" class="btnShow1 " ></button></td>
+ <td class="btnShow1"></td>
+ <td><button id="C2407302" value="C2407302" class="btnShow1 " ></button></td>
+ <td><button id="C2407402" value="C2407402" class="btnShow1 " ></button></td>
+ <td><button id="C2407502" value="C2407502" class="btnShow1 " ></button></td>
+ <td><button id="C2407602" value="C2407602" class="btnShow1 " ></button></td>
+ <td><button id="C2407702" value="C2407702" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C2405901" value="C2405901" class="btnShow1 " ></button></td>
+ <td><button id="C2406001" value="C2406001" class="btnShow1 " ></button></td>
+ <td><button id="C2406101" value="C2406101" class="btnShow1 " ></button></td>
+ <td><button id="C2406201" value="C2406201" class="btnShow1 " ></button></td>
+ <td><button id="C2406301" value="C2406301" class="btnShow1 " ></button></td>
+ <td><button id="C2406401" value="C2406401" class="btnShow1 " ></button></td>
+ <td><button id="C2406501" value="C2406501" class="btnShow1 " ></button></td>
+ <td><button id="C2406601" value="C2406601" class="btnShow1 " ></button></td>
+ <td><button id="C2406701" value="C2406701" class="btnShow1 " ></button></td>
+ <td><button id="C2406801" value="C2406801" class="btnShow1 " ></button></td>
+ <td><button id="C2406901" value="C2406901" class="btnShow1 " ></button></td>
+ <td><button id="C2407001" value="C2407001" class="btnShow1 " ></button></td>
+ <td><button id="C2407101" value="C2407101" class="btnShow1 " ></button></td>
+ <td><button id="C2407201" value="C2407201" class="btnShow1 " ></button></td>
+ <td><button id="C2407301" value="C2407301" class="btnShow1 " ></button></td>
+ <td><button id="C2407401" value="C2407401" class="btnShow1 " ></button></td>
+ <td><button id="C2407501" value="C2407501" class="btnShow1 " ></button></td>
+ <td><button id="C2407601" value="C2407601" class="btnShow1 " ></button></td>
+ <td><button id="C2407701" value="C2407701" class="btnShow1 " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ <!-- 鍙� -->
+ <div style="width: 29%; height: 100%;display: flex; justify-content: space-between;">
+ <div id="C54" class="solidDiv" style="width: 49%;height: 100%; ">
+ <p>娓呮礂闂�</p>
+ <div class="flesDiv" style="width: 100%;height: 96%; ">
+
+ <table>
+ <tr>
+ <td><button id="C5400102" value="C5400102" class="btnShow1 " ></button></td>
+ <td><button id="C5400101" value="C5400101" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5400202" value="C5400202" class="btnShow1 " ></button></td>
+ <td><button id="C5400201" value="C5400201" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5400302" value="C5400302" class="btnShow1 " ></button></td>
+ <td><button id="C5400301" value="C5400301" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5400402" value="C5400402" class="btnShow1 " ></button></td>
+ <td><button id="C5400401" value="C5400401" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5400502" value="C5400502" class="btnShow1 " ></button></td>
+ <td><button id="C5400501" value="C5400501" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5400602" value="C5400602" class="btnShow1 " ></button></td>
+ <td><button id="C5400601" value="C5400601" class="btnShow1 " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <div id="C55" class="solidDiv" style="width: 49%; height: 100%; ">
+ <p>鍑�鏂楁殏瀛樺尯</p>
+ <div class="flesDiv" style="width: 100%;height: 96%; ">
+ <table>
+ <tr>
+ <td><button id="C5500101" value="C5500101" class="btnShow1 " ></button></td>
+ <td><button id="C5500102" value="C5500102" class="btnShow1 " ></button></td>
+ <td><button id="C5500103" value="C5500103" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5500201" value="C5500201" class="btnShow1 " ></button></td>
+ <td><button id="C5500202" value="C5500202" class="btnShow1 " ></button></td>
+ <td><button id="C5500203" value="C5500203" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5500301" value="C5500301" class="btnShow1 " ></button></td>
+ <td><button id="C5500302" value="C5500302" class="btnShow1 " ></button></td>
+ <td><button id="C5500303" value="C5500303" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5500401" value="C5500401" class="btnShow1 " ></button></td>
+ <td><button id="C5500402" value="C5500402" class="btnShow1 " ></button></td>
+ <td><button id="C5500403" value="C5500403" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5500501" value="C5500501" class="btnShow1 " ></button></td>
+ <td><button id="C5500502" value="C5500502" class="btnShow1 " ></button></td>
+ <td><button id="C5500503" value="C5500503" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5500601" value="C5500601" class="btnShow1 " ></button></td>
+ <td><button id="C5500602" value="C5500602" class="btnShow1 " ></button></td>
+ <td><button id="C5500603" value="C5500603" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5500701" value="C5500701" class="btnShow1 " ></button></td>
+ <td><button id="C5500702" value="C5500702" class="btnShow1 " ></button></td>
+ <td><button id="C5500703" value="C5500703" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5500801" value="C5500801" class="btnShow1 " ></button></td>
+ <td><button id="C5500802" value="C5500802" class="btnShow1 " ></button></td>
+ <td><button id="C5500803" value="C5500803" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5500901" value="C5500901" class="btnShow1 " ></button></td>
+ <td><button id="C5500902" value="C5500902" class="btnShow1 " ></button></td>
+ <td><button id="C5500903" value="C5500903" class="btnShow1 " ></button></td>
+ </tr>
+ <tr>
+ <td><button id="C5501001" value="C5501001" class="btnShow1 " ></button></td>
+ <td><button id="C5501002" value="C5501002" class="btnShow1 " ></button></td>
+ <td><button id="C5501003" value="C5501003" class="btnShow1 " ></button></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
</div>
</div>
<script src="../../layuiadmin/layui/layui.js"></script>
@@ -346,652 +1449,115 @@
laypage = layui.laypage,
layer = layui.layer,
$ = layui.$;
-
- var cengShu = "1";
- var dom = $('#LAY_app_tabsheader', parent.document).children();//.find(s=>s.s.nodeType == 1 && className == "layui-this")
- var xianga = "";
- var xiangb = "";
-
- var ones = ' divOneS';
- var onex = ' divOneX';
- var threes = 'divThreeS';
- var threex = 'divThreeX';
- var divOne=document.getElementById('divOne');
- var divTwo=document.getElementById('divTwo');
- var divThree=document.getElementById('divThree');
- var divFour=document.getElementById('divFour');
- var divFive=document.getElementById('divFive');
- var divSix=document.getElementById('divSix');
- var divSeven=document.getElementById('divSeven');
- // divOne.className=ones;
- // divTwo.className=ones;
- // divThree.className=ones;
- // divFour.className=ones;
- // divFive.className=onex;
- // divSix.className=onex;
- // divSeven.className=onex;
-
+
+ $("#3Lou").addClass("zuoyouDiv");
+ $("#3Lou").removeClass("hideDiv");
+ $("#4Lou").removeClass("zuoyouDiv");
+ $("#4Lou").addClass("hideDiv");
//鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
- synData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
- for (var i = 0; i < res.data.length; i++) {
- // 鍙姞杞藉钩搴�
- // console.log(res.data);
- if (res.data[i].Type != "2") {
- continue;
- }
+ // synData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
+ // if (res.code == 0) { //鎴愬姛
+ // for (var i = 0; i < res.data.length; i++) {
+ // // 鍙姞杞藉钩搴�
+ // // console.log(res.data);
+ // if (res.data[i].Type != "2") {
+ // continue;
+ // }
- $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
- res.data[i].WareHouseName + '</option>');
- }
- $("#WareHouseNo option[value='" + res.data[0].WareHouseNo + "']").attr("selected", "selected")
- form.render('select');
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
- GetSlotVm($("#WareHouseNo").val(), $("#Row").val());
-
-
+ // $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
+ // res.data[i].WareHouseName + '</option>');
+ // }
+ // $("#WareHouseNo option[value='" + res.data[0].WareHouseNo + "']").attr("selected", "selected")
+ // form.render('select');
+ // } else { //涓嶆垚鍔�
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function () { });
+ // }
+ // });
+
+ GetSlotVm($("#Row").val());
// 浠撳簱鏌ヨ浜嬩欢
form.on('select(getWareHouseNo)', function (data) {
- GetSlotVm($("#WareHouseNo").val(), $("#Row").val());
+ GetSlotVm($("#Row").val());
});
// 妤煎眰鏌ヨ浜嬩欢
form.on('select(SelectRow)', function (data) {
//鍒ゆ柇涓�妤兼垨涓夋ゼ
- if($("#Row").val() == "1")
- {
- divOne.className=ones;
- divTwo.className=ones;
- divFour.className=ones;
- divFive.className=onex;
- divSeven.className=onex;
- $("#divThree").show();
- $("#divSix").show();
+ if($("#Row").val() == "4")
+ {
+ $("#4Lou").addClass("zuoyouDiv");
+ $("#4Lou").removeClass("hideDiv");
+ $("#3Lou").removeClass("zuoyouDiv");
+ $("#3Lou").addClass("hideDiv");
}
else if($("#Row").val() == "3")
{
- // 涓夋ゼ
- $("#divThree").hide();
- $("#divSix").hide();
- divOne.className=threes;
- divTwo.className=threes;
- divFour.className=threes;
- divFive.className=threex;
- divSeven.className=threex;
+ $("#3Lou").addClass("zuoyouDiv");
+ $("#3Lou").removeClass("hideDiv");
+ $("#4Lou").removeClass("zuoyouDiv");
+ $("#4Lou").addClass("hideDiv");
}
- GetSlotVm($("#WareHouseNo").val(), $("#Row").val());
+ GetSlotVm($("#Row").val());
});
+ //鑾峰彇鍌ㄤ綅鎸夐挳绫诲悕绉�
+ function GetClassName(status,flag) {
+ var clsName = "";
+ if(flag!="0"){
+ return "filg";
+ }
+ var clsName = "";
+ switch (status) {
+ case "0":
+ clsName = "zero";
+ break;
+ case "1":
+ clsName = "one";
+ break;
+ case "2":
+ clsName = "two";
+ break;
+ case "3":
+ clsName = "three";
+ break;
+ case "4":
+ clsName = "four";
+ break;
+ case "5":
+ clsName = "five";
+ break;
+ default:
+ break;
+ }
+ return clsName;
+ }
+
//鑾峰彇鏁版嵁娓叉煋搴撲綅鍥�
- function GetSlotVm(houseNo, row) {
+ function GetSlotVm(row) {
var param = {
- WareHouseNo: houseNo,
+ //WareHouseNo: houseNo,
Row: row
}
sendData(IP + "/Sys/GetFlatLibraryLegend", param, 'get', function (res) {
console.log(res)
if (res.code == 0) {
-
- $("#tabOne").html("");
- $("#tabTwe").html("");
- $("#tabThree").html("");
- $("#tabfour").html("");
- $("#tabfive").html("");
- // $("#tabSix").html("");
- // $("#tabSeven").html("");
-
-
- var html1 = '<tr>';
- var html2 = '<tr>';
- var html3 = '<tr>';
- var html4 = '<tr>';
- var html5 = '<tr>';
- var html6 = '<tr>';
- var html7 = '<tr>';
var list = res.data;
- var B06 = 0;
- var B07 = 0;
- var B11 = 0;
- var B12 = 0;
+
//鎸夊尯鍩熻繘琛屽惊鐜�
list.forEach(item => {
+ var statusName = GetClassName(item.Status,item.Flag);
+ if($("#Row").val() == "3"){
+ $("#"+item.LocatNo).attr('class',"btnShow1 "+statusName);
+ }else{
+ $("#"+item.LocatNo).attr('class',"btnShow "+statusName);
+ }
- //鍒ゆ柇涓�妤兼垨涓夋ゼ
- if($("#Row").val() == "4")
- {
-
- //鍒ゆ柇鍚勪釜鍖哄煙
- if(item.AreaNo == "B01")
- {
- //4鎺�4鍒�
-
- if (item != undefined) {
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
- }
- } else {
- html1 += '<td></td>'
- }
-
- if (item.Depth == 4) {
- html1 += '<tr></tr>'
- }
- }
- else if(item.AreaNo == "B02")
- {
- //4鎺�4鍒�
- if (item != undefined) {
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
- }
- } else {
- // console.log(i, a);
- html2 += '<td></td>'
- }
- if (item.Depth == 4) {
- html2 += '<tr></tr>'
- }
- }
- else if(item.AreaNo == "C12")
- {
- console.log(item);
- //4鎺�4鍒�
- if (item != undefined) {
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html3 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html3 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html3 += '<td><button value=' + item.LocatNo + ' class="btnShow one" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html3 += '<td><button value=' + item.LocatNo + ' class="btnShow two" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html3 += '<td><button value=' + item.LocatNo + ' class="btnShow three" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html3 += '<td><button value=' + item.LocatNo + ' class="btnShow four" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html3 += '<td><button value=' + item.LocatNo + ' class="btnShow five" ></button></td>'
- }
- } else {
- // console.log(i, a);
- html3 += '<td></td>'
- }
- if (item.Depth == 4) {
- html3 += '<tr></tr>'
- }
- }
- else if(item.AreaNo == "B04")
- {
-
- if (item != undefined) {
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
- }
- } else {
- // console.log(i, a);
- html4 += '<td></td>'
- }
- if (item.Depth == 2) {
- html4 += '<tr></tr>'
- }
- }
- else if(item.AreaNo == "B05")
- {
- if (item != undefined) {
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
- }
- } else {
- // console.log(i, a);
- html5 += '<td></td>'
- }
- console.log(item)
- if (item.Row == 2) {
- html5 += '<tr></tr>'
- }
- }
- else if(item.AreaNo == "B06")
- {
- if (item != undefined) {
- B06+=1;
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html6 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html6 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html6 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html6 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html6 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html6 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html6 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
- }
- } else {
- // console.log(i, a);
- html6 += '<td></td>'
- }
- if (B06 %10 == 0)
- {
- html6 += '<tr></tr>'
- }
-
- }
- else if(item.AreaNo == "B07")
- {
- if (item != undefined) {
- B07 += 1;
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
- }
- } else {
- // console.log(i, a);
- html7 += '<td></td>'
- }
- if (B07 %13 == 0)
- {
- html7 += '<tr></tr>'
- }
- }
-
- }
- else if($("#Row").val() == "3")
- {
- // 涓夋ゼ
- /*
- B11 tabOne html5
- B12 tabTwe html7
- B13 tabfour html2
- B14 tabfive html1
- B15 tabSeven html4
- */
- //鍒ゆ柇鍚勪釜鍖哄煙
- if(item.AreaNo == "B11")
- {
- if (item != undefined) {
- B11 += 1;
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html5 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
- }
- } else {
- // console.log(i, a);
- html5 += '<td></td>'
- }
-
- if (B11 % 10 == 0) {
- html5 += '<tr></tr>'
- }
- }
- else if(item.AreaNo == "B12")
- {
- if (item != undefined) {
- B12 += 1;
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html7 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
- }
- } else {
- // console.log(i, a);
- html7 += '<td></td>'
- }
-
- if (B12 % 10 == 0) {
- html7 += '<tr></tr>'
- }
- }
- else if(item.AreaNo == "B13")
- {
- if (item != undefined) {
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html2 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
- }
- } else {
- // console.log(i, a);
- html2 += '<td></td>'
- }
-
- if (item.Row == 2) {
- html2 += '<tr></tr>'
- }
- }
- else if(item.AreaNo == "B14")
- {
- if (item != undefined) {
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html1 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
- }
- } else {
- // console.log(i, a);
- html1 += '<td></td>'
- }
- if (item.Depth == 2) {
- html1 += '<tr></tr>'
- }
- }
- else if(item.AreaNo == "B15")
- {
- if (item != undefined) {
- //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
- if(item.Flag != '0')
- {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绌哄偍浣� 0
- else if (item.Status == 0) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鏈夌墿鍝� 1
- else if (item.Status == 1) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍏ュ簱涓� 2
- else if (item.Status == 2) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
- }
- //鍑哄簱涓� 3
- else if (item.Status == 3) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲叆涓� 4
- else if (item.Status == 4) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
- }
- //绉诲嚭涓� 5
- else if (item.Status == 5) {
- html4 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
- }
- } else {
- // console.log(i, a);
- html4 += '<td></td>'
- }
- }
- }
- });
- html1 += '</tr>';
- html2 += '</tr>';
- html3 += '</tr>';
- html4 += '</tr>';
- html5 += '</tr>';
- html6 += '</tr>';
- html7 += '</tr>';
- $("#tabOne").append(html1);
- $("#tabTwe").append(html2);
- console.log(html3)
- $("#tabThree").append(html3);
- $("#tabfour").append(html4);
- $("#tabfive").append(html5);
- $("#tabSix").append(html6);
- $("#tabSeven").append(html7);
+
+ });
} else {
layer.msg(res.msg, {
@@ -1005,6 +1571,7 @@
//#region 鐐瑰嚮鍌ㄤ綅btn鎸夐挳鏌ョ湅鍌ㄤ綅涓婁俊鎭�
var tipsVal;
+ var tipsVal1;
// 1.鎵惧埌瑙﹀彂鐨勪簨浠跺璞★紙缁戝畾鍏ㄥ眬锛� 2.浜嬩欢澶勭悊绋嬪簭
$('body').on('click','.btnShow', function () {
var html;
@@ -1046,11 +1613,56 @@
}
});
- //榧犳爣绉诲嚭
+
+ $('body').on('click','.btnShow1', function () {
+ var html;
+ var that=this;
+ var locatNo = $(that)[0].value;
+ var className=$(that)[0].className;
+ if(className=='btnShow1 zero'){
+ html = "<p style='word-wrap:break-word;width: 100%;height:100%;line-height:24px;font-size:18px'>鍌ㄤ綅缂栫爜锛�" + locatNo + "<br/>鍌ㄤ綅鐘舵�侊細绌哄偍浣�</p>";
+ tipsVal1=layer.tips(html,that,{tips:[1,"rgb(58, 61, 73)"],area: ['220px'],time: 0});
+ }else{
+ var param={
+ locatNo:locatNo
+ }
+ sendData(IP + "/Sys/GetLocateInfo", param, 'get', function (res) {
+ console.log(res)
+ if (res.code == 0) {
+ html = "<p style='word-wrap:break-word;width: 100%;height:100%;line-height:24px;font-size:18px;'>";
+ html += "鍌ㄤ綅缂栫爜锛�" + locatNo;
+ html += "<br/>鍌ㄤ綅鐘舵�侊細"+res.data.Status;
+ if (res.data.GoodsInfoList != null)
+ {
+ html += "<br/>鎵樼洏鍙凤細 "+res.data.PalletNo;
+ for(var i=0;i<res.data.GoodsInfoList.length;i++){
+ html += "<br/><br/>鐗╂枡缂栫爜锛�"+res.data.GoodsInfoList[i].SkuNo;
+ html += "<br/>鐗╂枡鍚嶇О锛�"+res.data.GoodsInfoList[i].SkuName;
+ html += "<br/>鎵规鍙凤細 "+res.data.GoodsInfoList[i].LotNo;
+ html += "<br/>鏁伴噺锛� "+res.data.GoodsInfoList[i].Qty;
+ }
+ html += "</p>"
+ }
+ tipsVal1=layer.tips(html,that,{tips:[1,"rgb(58, 61, 73)"],area: ['260px'],time: 0});
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000
+ }, function () { })
+ }
+ });
+ }
+
+ });
+
+ //榧犳爣绉诲嚭
$('body').on('mouseout','.btnShow', function () {
layer.close(tipsVal);
});
- //#endregion
+ //榧犳爣绉诲嚭
+ $('body').on('mouseout','.btnShow1', function () {
+ layer.close(tipsVal1);
+ });
// #region 瀹氭椂鍒锋柊搴撲綅鍥句緥
//鑾峰彇鏄惁鑷姩鍒锋柊
diff --git a/HTML/views/WareHouseSetting/Pallets.html b/HTML/views/WareHouseSetting/Pallets.html
index 0f767ef..e7d510e 100644
--- a/HTML/views/WareHouseSetting/Pallets.html
+++ b/HTML/views/WareHouseSetting/Pallets.html
@@ -148,6 +148,10 @@
title: '妗跺彿',
align: 'center',
}, {
+ field: 'Standard',
+ title: '瑙勬牸',
+ align: 'center',
+ }, {
field: 'Status',
title: '妗剁姸鎬�',
align: 'center',
diff --git a/Wms/Model/InterFaceModel/HopperTransportModel.cs b/Wms/Model/InterFaceModel/HopperTransportModel.cs
new file mode 100644
index 0000000..5b73558
--- /dev/null
+++ b/Wms/Model/InterFaceModel/HopperTransportModel.cs
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model.InterFaceModel
+{
+ public class DicModel
+ {
+ public string dic1 { get; set; }
+ public string dic2 { get; set; }
+ }
+
+ public class HopperModel
+ {
+ public string AreaNo { get; set; }
+ public string LocateNo { get; set; }
+ public string PlnStatus { get; set; }
+ public string Standard { get; set; }
+ public string SkuNo { get; set; }
+ public string LotNo { get; set; }
+ public string PlnNo { get; set; }
+ public decimal Weight { get; set; }
+
+ }
+
+
+}
diff --git a/Wms/Model/ModelDto/SysDto/LocatDto.cs b/Wms/Model/ModelDto/SysDto/LocatDto.cs
index ea6b465..eca636e 100644
--- a/Wms/Model/ModelDto/SysDto/LocatDto.cs
+++ b/Wms/Model/ModelDto/SysDto/LocatDto.cs
@@ -15,6 +15,12 @@
public string LocatNo { get; set; }
/// <summary>
+ /// 鍌ㄤ綅鍓嶇紑 骞冲簱鍒ゆ柇浣跨敤
+ /// Default:
+ /// Nullable:False
+ /// </summary>
+ public string AreaNo2 { get; set; }
+ /// <summary>
/// 鎵�灞炰粨搴�
/// Default:
/// Nullable:False
diff --git a/Wms/Model/ModelDto/SysDto/PalletsDto.cs b/Wms/Model/ModelDto/SysDto/PalletsDto.cs
index b2192b4..64331b7 100644
--- a/Wms/Model/ModelDto/SysDto/PalletsDto.cs
+++ b/Wms/Model/ModelDto/SysDto/PalletsDto.cs
@@ -13,6 +13,10 @@
public string PalletNo { get; set; }
/// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ public string Standard { get; set; }
+ /// <summary>
/// 绫昏 0锛氭墭鐩� 1锛氫腑杞锛堟墭鐩樹笂瀛樻斁鐨勫鍣�/浜岀骇鎵樼洏锛� 鍔熻兘鎺у埗鏄惁寮�鍚腑杞
/// </summary>
public string Type { get; set; }
diff --git a/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
new file mode 100644
index 0000000..f1f55f3
--- /dev/null
+++ b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
@@ -0,0 +1,436 @@
+锘縰sing Model.InterFaceModel;
+using Model.ModelDto.SysDto;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using WMS.DAL;
+using WMS.Entity.Context;
+using WMS.Entity.DataEntity;
+using WMS.Entity.LogEntity;
+using WMS.Entity.SysEntity;
+using WMS.IBLL.IBllTransServer;
+
+namespace WMS.BLL.BllTransServer
+{
+ public class HopperTransportServer: IHopperTransportServer
+ {
+ private static readonly SqlSugarScope Db = DataContext.Db;
+
+ private readonly object RcsLock = new object();
+
+
+ public List<SysStorageArea> GetAreaListByUser(int userId)
+ {
+ try
+ {
+ //鏍规嵁鐢ㄦ埛瑙掕壊鏉冮檺鑾峰彇褰撳墠瑙掕壊鐨勫尯鍩�
+ var user = Db.Queryable<SysUserInfor>().First(m=>m.IsDel == "0" && m.Id == userId);
+ if (user == null)
+ {
+ throw new Exception("娌℃湁鏌ヨ鍒扮敤鎴蜂俊鎭�");
+ }
+ var role = Db.Queryable<SysRoles>().First(m => m.IsDel == "0" && m.RoleNo == user.RoleNo);
+ if (role == null)
+ {
+ throw new Exception("娌℃湁鏌ヨ鍒拌鑹蹭俊鎭�");
+ }
+ var roleWareStr = Db.Queryable<SysRoleWareHouse>().Where(m => m.IsDel == "0" && m.RoleNo == role.RoleNo).Select(m=>m.WareHouseNo).ToList();
+
+ var area = Db.Queryable<SysStorageArea>().Where(m => m.IsDel == "0" && m.Status == "0" && roleWareStr.Contains(m.WareHouseNo)).ToList();
+ //var layer = "3";
+ //var areaList = new List<SysStorageArea>();
+ //if (layer == "3")
+ //{
+ // areaList = area.Where(m => m.AreaName.Contains("3妤�")).ToList();
+ //}
+ //else if (layer == "4")
+ //{
+ // areaList = area.Where(m => m.AreaName.Contains("4妤�")).ToList();
+ //}
+ return area;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ public List<SysStorageLocat> GetLocatByArea(string area)
+ {
+ try
+ {
+ var locate = Db.Queryable<SysStorageLocat>().Where(m => m.AreaNo == area && m.IsDel == "0" && m.Flag == "0").ToList();
+
+ return locate;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ public List<DicModel> GetPlnStatusByArea(string area)
+ {
+ try
+ {
+ var areaInfo = Db.Queryable<SysStorageArea>().First(m => m.AreaNo == area && m.IsDel == "0");
+ var strList = new List<DicModel>();
+
+ var dev = new string[] {};
+ if (areaInfo!=null && !string.IsNullOrWhiteSpace(areaInfo.DeviceCode))
+ {
+ dev = areaInfo.DeviceCode.Split(";");
+ }
+
+ foreach (var item in dev)
+ {
+ if (string.IsNullOrWhiteSpace(item))
+ {
+ continue;
+ }
+ if (strList.Count(m=>m.dic1 == item) == 0)
+ {
+ var v = "";
+ switch (item)
+ {
+ case "0":
+ v = "鍑�妗�";
+ break;
+ case "1":
+ v = "棰勬贩妗�";
+ break;
+ case "2":
+ v = "婊℃《";
+ break;
+ case "3":
+ v = "鑴忔《";
+ break;
+ }
+ strList.Add(new DicModel
+ {
+ dic1 = item,
+ dic2 = v
+ });
+ }
+ }
+ if (strList.Count == 0)
+ {
+ strList.Add(new DicModel { dic1 = "0", dic2 = "鍑�妗�" });
+ //strList.Add(new DicModel { dic1 = "1", dic2 = "棰勬贩妗�" });
+ strList.Add(new DicModel { dic1 = "2", dic2 = "婊℃《" });
+ strList.Add(new DicModel { dic1 = "3", dic2 = "鑴忔《" });
+ }
+ return strList;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ public List<string> GetSkuByStatus(string palletStatus)
+ {
+ try
+ {
+ //鑾峰彇鍌ㄤ綅涓婄殑搴撳瓨鐗╂枡
+ var detail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && !string.IsNullOrWhiteSpace(m.LocatNo) && m.PalletStatus == palletStatus).Select(m=>m.SkuNo).Distinct().ToList();
+ return detail;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ public List<string> GetLotNoBySku(string skuNo)
+ {
+ try
+ {
+ var lotNoStr = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.SkuNo == skuNo).Select(m => m.LotNo).Distinct().ToList();
+ return lotNoStr;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ public List<string> GetSku()
+ {
+ try
+ {
+ //鑾峰彇鍌ㄤ綅涓婄殑搴撳瓨鐗╂枡
+ var detail = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0" ).Select(m => m.SkuNo).Distinct().ToList();
+ return detail;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+
+ /// <summary>
+ /// 鍙枡 鍒嗛厤鐗╂枡
+ /// </summary>
+ /// <param name="areaNo">鍖哄煙</param>
+ /// <param name="endLocate">璧峰浣嶇疆</param>
+ /// <param name="plnStatus">妗剁被鍨� 0鍑�妗� 2婊℃《 3鑴忔《 </param>
+ /// <param name="standard">瑙勬牸</param>
+ /// <param name="skuNo">鐗╂枡鍙�</param>
+ /// <param name="lotNo">鎵规</param>
+ /// <param name="userId">鎿嶄綔浜�</param>
+ /// <exception cref="Exception"></exception>
+ public void jiaoLiaoHopper(string areaNo,string endLocate,string plnStatus,string standard,string skuNo,string lotNo,int userId)
+ {
+ try
+ {
+ #region 鍒ゆ柇
+
+ if (string.IsNullOrWhiteSpace(areaNo) || string.IsNullOrWhiteSpace(endLocate) || string.IsNullOrWhiteSpace(plnStatus) )
+ {
+ throw new Exception("鍖哄煙/鐩爣浣�/妗剁被鍨嬩笉鑳戒负绌�");
+ }
+
+ if (plnStatus == "0" && string.IsNullOrWhiteSpace(standard))
+ {
+ throw new Exception("鍑�妗惰閫夋嫨瑙勬牸");
+
+ }
+ else if(plnStatus == "2" && (string.IsNullOrWhiteSpace(skuNo) || string.IsNullOrWhiteSpace(lotNo)))
+ {
+ throw new Exception("婊℃《璇烽�夋嫨鐗╂枡涓庢壒娆�");
+ }
+ //鍒ゆ柇鐩爣鍙枡鍌ㄤ綅鐘舵��
+ var endLocateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == endLocate && m.AreaNo == areaNo);
+ if (endLocateInfo == null)
+ {
+ throw new Exception("娌℃湁鏌ヨ鍒扮洰鏍囧偍浣嶄俊鎭�");
+ }
+ if (endLocateInfo.Flag != "0")
+ {
+ throw new Exception("鐩爣鍌ㄤ綅鏍囪瘑涓嶆槸姝ｅ父鍙敤鐨�");
+ }
+ if (endLocateInfo.Status!="0")
+ {
+ throw new Exception("鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅");
+ }
+
+ #endregion
+
+ //鐩爣妤煎眰
+ var layer = endLocateInfo.Layer;
+ var houseStr = layer == 3 ? "3妤间腑闂寸珯" : layer == 4 ? "4妤间腑闂寸珯" : "";
+
+ var house = Db.Queryable<SysWareHouse>().First(m => m.IsDel == "0" && m.WareHouseName == houseStr);
+ if (house == null)
+ {
+ throw new Exception("娌℃湁鏌ヨ鍒颁粨搴撲俊鎭�");
+ }
+ //鏌ユ壘鐘舵�佹槸鏈垎閰嶄笖鍌ㄤ綅涓嶄负绌虹殑搴撳瓨淇℃伅
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.Status == "0" && m.WareHouseNo == house.WareHouseNo && !string.IsNullOrWhiteSpace(m.LocatNo)).ToList();
+
+ if (plnStatus == "0")
+ {
+ stockDetail = stockDetail.Where(m => m.PalletStatus == "0" && m.Standard == standard).OrderBy(m=>m.LocatNo).ToList();
+ }
+ else if (plnStatus == "2")
+ {
+ stockDetail = stockDetail.Where(m => m.PalletStatus == "2" && m.SkuNo == skuNo && m.LotNo == lotNo).OrderBy(m => m.LocatNo).ToList();
+ }
+ else
+ {
+ throw new Exception("妗剁被鍨嬮敊璇�");
+ }
+ if (stockDetail == null)
+ {
+ throw new Exception("娌℃湁鏌ヨ鍒板彨鏂欑殑搴撳瓨淇℃伅");
+ }
+ //鏌ユ壘鍚堥�傜殑 妗跺彿 鍌ㄤ綅
+ foreach (var item in stockDetail)
+ {
+
+ }
+
+
+ var taskNo = new Common().GetMaxNo("TK");
+ //娣诲姞浠诲姟
+ var task = new LogTask
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+
+ StartLocat = "",//璧峰浣嶇疆
+ EndLocat = endLocate,//鐩爣浣嶇疆
+ PalletNo = "",//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "2",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+
+ CreateTime = DateTime.Now
+ };
+ Db.Insertable(task).ExecuteCommand();
+ //璋冪敤AGV鎺ュ彛涓嬪彂浠诲姟
+
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鍙溅 鍒嗛厤鍌ㄤ綅
+ /// </summary>
+ /// <param name="areaNo">鍖哄煙</param>
+ /// <param name="StartLocate">璧峰浣嶇疆</param>
+ /// <param name="plnNo">妗跺彿</param>
+ /// <param name="plnStatus">妗剁被鍨� 0鍑�妗� 2婊℃《 3鑴忔《 </param>
+ /// <param name="weight">閲嶉噺</param>
+ /// <param name="skuNo">鐗╂枡鍙�</param>
+ /// <param name="lotNo">鎵规</param>
+ /// <param name="userId">鎿嶄綔浜�</param>
+ /// <exception cref="Exception"></exception>
+ public void jiaoCheHopper(string areaNo, string StartLocate, string plnNo, string plnStatus, decimal weight, string skuNo, string lotNo, int userId)
+ {
+ try
+ {
+ #region 鍒ゆ柇
+
+ if (string.IsNullOrWhiteSpace(areaNo) || string.IsNullOrWhiteSpace(StartLocate) || string.IsNullOrWhiteSpace(plnStatus))
+ {
+ throw new Exception("鍖哄煙/鐩爣浣�/妗剁被鍨嬩笉鑳戒负绌�");
+ }
+
+ //if (plnStatus == "0" && string.IsNullOrWhiteSpace(standard))
+ //{
+ // throw new Exception("鍑�妗惰閫夋嫨瑙勬牸");
+
+ //}else
+ if (plnStatus == "2" && (string.IsNullOrWhiteSpace(skuNo) || string.IsNullOrWhiteSpace(lotNo)))
+ {
+ throw new Exception("婊℃《璇烽�夋嫨鐗╂枡涓庢壒娆�");
+ }
+ //鍒ゆ柇鐩爣鍙枡鍌ㄤ綅鐘舵��
+ var endLocateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == StartLocate && m.AreaNo == areaNo);
+ if (endLocateInfo == null)
+ {
+ throw new Exception("娌℃湁鏌ヨ鍒扮洰鏍囧偍浣嶄俊鎭�");
+ }
+ if (endLocateInfo.Flag != "0")
+ {
+ throw new Exception("鐩爣鍌ㄤ綅鏍囪瘑涓嶆槸姝ｅ父鍙敤鐨�");
+ }
+ if (endLocateInfo.Status != "0")
+ {
+ throw new Exception("鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅");
+ }
+
+ #endregion
+
+ var pln = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == plnNo);
+ var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.AreaNo == areaNo && m.LocatNo == StartLocate);
+ var skuName = "";
+ var packagNo = "";
+ if (plnStatus == "2")
+ {
+ var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
+ if (sku == null)
+ {
+ throw new Exception("娌℃湁鏌ヨ鍒扮墿鏂欎俊鎭�");
+ }
+ skuName = sku.SkuName;
+ }
+ else if (plnStatus == "3")
+ {
+
+ }
+
+ var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.PalletNo == plnNo);
+ if (stockDetail == null)
+ {
+ var stockDetailNew = new DataStockDetail()
+ {
+ LotNo = lotNo,
+
+ SkuNo = skuNo,
+ SkuName = skuName,
+ Standard = pln.Standard,
+ Qty = weight,
+ LockQty = 0,
+ FrozenQty = 0,
+ InspectQty = 0,
+
+ WareHouseNo = locate.WareHouseNo,
+ AreaNo = areaNo,
+ LocatNo = StartLocate,
+ PalletNo = plnNo,
+
+ PackagNo = packagNo,
+ PalletTags = "0",
+ CompleteTime = DateTime.Now,
+
+ PalletStatus = plnStatus,
+ Status = "0",
+ InspectMark = "0",
+ BitPalletMark = "0",
+ InspectStatus = "1",
+ };
+ Db.Insertable(stockDetailNew).ExecuteCommand();
+ }
+ else
+ {
+ stockDetail.PalletStatus = plnStatus;
+ stockDetail.SkuNo = skuNo;
+ stockDetail.LotNo = lotNo;
+ stockDetail.Qty = weight;
+ Db.Updateable(stockDetail).ExecuteCommand();
+
+ }
+ //鑾峰彇鍌ㄤ綅鍦板潃
+
+ var taskNo = new Common().GetMaxNo("TK");
+ //娣诲姞浠诲姟
+ var task = new LogTask
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+
+ StartLocat = "",//璧峰浣嶇疆
+ EndLocat = StartLocate,//鐩爣浣嶇疆
+ PalletNo = "",//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "2",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+
+ CreateTime = DateTime.Now
+ };
+ Db.Insertable(task).ExecuteCommand();
+ //璋冪敤AGV鎺ュ彛涓嬪彂浠诲姟
+
+
+
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+
+
+
+ }
+}
diff --git a/Wms/WMS.BLL/SysServer/PalletsServer.cs b/Wms/WMS.BLL/SysServer/PalletsServer.cs
index d024fa9..d43f570 100644
--- a/Wms/WMS.BLL/SysServer/PalletsServer.cs
+++ b/Wms/WMS.BLL/SysServer/PalletsServer.cs
@@ -56,6 +56,7 @@
{
Id = m.Id,
PalletNo = m.PalletNo,
+ Standard = m.Standard,
Type = m.Type == "0" ? "鎵樼洏" : m.Type == "1" ? "涓浆绠�" : "",
Status = m.Status,
LastUse = m.LastUse,
diff --git a/Wms/WMS.BLL/SysServer/RoleWareHouseServer.cs b/Wms/WMS.BLL/SysServer/RoleWareHouseServer.cs
new file mode 100644
index 0000000..fe4abfe
--- /dev/null
+++ b/Wms/WMS.BLL/SysServer/RoleWareHouseServer.cs
@@ -0,0 +1,125 @@
+锘縰sing Model.ModelDto.SysDto;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WMS.Entity.Context;
+using WMS.Entity.SysEntity;
+using WMS.IBLL.ISysServer;
+
+namespace WMS.BLL.SysServer
+{
+ public class RoleWareHouseServer: IRoleWareHouseServer
+ {
+
+ private static readonly SqlSugarScope Db = DataContext.Db;
+
+ public List<SysRoleWareHouse> GetRoleWareHouseOneListById(int id)
+ {
+ try
+ {
+ var role = Db.Queryable<SysRoles>().First(m => m.IsDel == "0" && m.Id == id);
+ if (role == null)
+ {
+ throw new Exception("娌℃湁鎵惧埌瑙掕壊淇℃伅");
+ }
+ var roleWare = Db.Queryable<SysRoleWareHouse>().Where(m => m.RoleNo == role.RoleNo && m.IsDel == "0").ToList();
+ return roleWare;
+
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇浠撳簱淇℃伅鍒楄〃
+ /// </summary>
+ /// <param name="str">sql璇彞</param>
+ /// <returns></returns>
+ public List<SysWareHouse> GetHouseList(string UserId)
+ {
+ var userEntry = Db.Ado.SqlQuery<SysUserInfor>($"select * from SysUserInfor where Id ={UserId}").FirstOrDefault();
+ //鑾峰彇鍏ㄩ儴鑿滃崟淇℃伅
+ string strmenu = "select * from SysWareHouse where IsDel = '0'";
+
+ //鍒嗛厤鏉冮檺鍙兘鍒嗛厤褰撳墠鐧诲綍鐢ㄦ埛鏈夌殑鏉冮檺
+ if (userEntry != null && userEntry.UserName.ToUpper() != "ADMIN")
+ {
+ strmenu += $" and WareHouseNo in (select WareHouseNo from SysRoleWareHouse where RoleNo='{userEntry.RoleNo}')";
+ }
+ strmenu += " order by WareHouseNo asc";
+ List<SysWareHouse> houselist = Db.Ado.SqlQuery<SysWareHouse>(strmenu);
+ return houselist;
+ }
+
+ /// <summary>
+ /// 鏂板瑙掕壊鏉冮檺淇℃伅
+ /// </summary>
+ /// <param name="WareHouseNo">浠撳簱鍙�</param>
+ /// <param name="RoleNo">瑙掕壊鍙�</param>
+ /// <returns></returns>
+ /// <exception cref="Exception">鎹曡幏寮傚父</exception>
+ public async Task<int> InsertRoleWareHouse(string WareHouseNo, string RoleNo, string userId)
+ {
+ //鎹曡幏寮傚父
+ try
+ {
+ //灏嗚彍鍗曞彿杩涜鍒嗗壊 瀛樺偍鏁扮粍涓�
+ var arr = WareHouseNo.Split(',');
+ int i = 0;
+ //鏌ヨ璇ヨ鑹叉槸鍚︽嫢鏈夋潈闄�
+ List<SysRoleWareHouse> rolelist = await Db.Queryable<SysRoleWareHouse>().Where(m=>m.IsDel == "0" && m.RoleNo == RoleNo).ToListAsync();
+ //鏈�
+ if (rolelist.Count > 0)
+ {
+ //鍒犻櫎璇ヨ鑹叉墍鏈夎彍鍗曚俊鎭�
+ i = await Db.Deleteable(rolelist).ExecuteCommandAsync();
+ }
+ //鏃�
+ else if (rolelist.Count == 0)
+ {
+ i = 1;
+ }
+ //寮�濮嬫柊澧炴潈闄�
+ if (i > 0)
+ {
+
+ //寰幆灏嗚彍鍗曟暟缁勫垎鍒姞鍏ュ埌鏁版嵁妯″瀷涓�
+ for (int j = 0; j < arr.Count(); j++)
+ {
+ if (string.IsNullOrWhiteSpace(arr[j]) || arr[j] == ",")
+ {
+ continue;
+ }
+ SysRoleWareHouse roleright = new SysRoleWareHouse();
+ roleright.RoleNo = RoleNo;//瑙掕壊鍙�
+ roleright.WareHouseNo = arr[j];//浠撳簱鍙�
+ roleright.CreateUser = Convert.ToInt32(userId);//鍒涘缓浜�
+
+ //鎴愬姛 灏嗚彍鍗曞彿鍜岃鑹插彿鏂板涓烘柊鐨勬暟鎹�
+ i += await Db.Insertable(roleright).ExecuteCommandAsync();
+ }
+
+ //杩斿洖
+ return i;
+
+ }
+ else
+ {
+ return i;
+ }
+ }
+ catch (Exception ex)
+ {
+ //鎶涘嚭寮傚父
+ throw new Exception("鏂板瑙掕壊鏉冮檺淇℃伅寮傚父", ex);
+ }
+ }
+
+
+ }
+}
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index a7a101a..6891d49 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -847,11 +847,11 @@
/// <param name="wareHouseNo">浠撳簱</param>
/// <param name="row">鎺�</param>
/// <returns></returns>
- public List<SysStorageLocat> GetFlatLibraryLegend(string wareHouseNo, string row)
+ public List<LocatDto> GetFlatLibraryLegend(string row)
{
try
{
- var area = Db.Queryable<SysStorageArea>().Where(m => m.IsDel == "0" && m.Status == "0" && m.WareHouseNo == wareHouseNo).ToList();
+ var area = Db.Queryable<SysStorageArea>().Where(m => m.IsDel == "0" && m.Status == "0" ).ToList();
var areaStr = new List<string>();
if (row == "3")
@@ -862,8 +862,13 @@
{
areaStr = area.Where(m => m.AreaName.Contains("4妤�")).Select(m => m.AreaNo).ToList();
}
-
- var list = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == wareHouseNo && areaStr.Contains(m.AreaNo)).ToList();
+
+ var list = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && areaStr.Contains(m.AreaNo)).Select(m => new LocatDto()
+ {
+ AreaNo2 =m.LocatNo.Substring(0,3),
+ LocatNo = m.LocatNo
+
+ }, true).ToList();
return list;
}
diff --git a/Wms/WMS.Entity/SysEntity/SysPallets.cs b/Wms/WMS.Entity/SysEntity/SysPallets.cs
index 3d4e1e2..ed76bcc 100644
--- a/Wms/WMS.Entity/SysEntity/SysPallets.cs
+++ b/Wms/WMS.Entity/SysEntity/SysPallets.cs
@@ -25,6 +25,14 @@
/// </summary>
public string Type {get;set;}
+
+ /// <summary>
+ /// 瑙勬牸
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string Standard { get; set; }
+
/// <summary>
/// 鐘舵�� 0锛氭湭浣跨敤 1锛氫娇鐢ㄤ腑
/// Default:
diff --git a/Wms/WMS.Entity/SysEntity/SysRoleWareHouse.cs b/Wms/WMS.Entity/SysEntity/SysRoleWareHouse.cs
new file mode 100644
index 0000000..02ad3dc
--- /dev/null
+++ b/Wms/WMS.Entity/SysEntity/SysRoleWareHouse.cs
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Entity.SysEntity
+{
+ public class SysRoleWareHouse:BaseEntity
+ {
+ public SysRoleWareHouse()
+ {
+
+ }
+
+ /// <summary>
+ /// 瑙掕壊鍙�
+ /// </summary>
+ public string RoleNo { get; set; }
+
+ /// <summary>
+ /// 浠撳簱鍙�
+ /// </summary>
+ public string WareHouseNo { get; set; }
+ }
+}
diff --git a/Wms/WMS.Entity/SysEntity/SysStorageArea.cs b/Wms/WMS.Entity/SysEntity/SysStorageArea.cs
index 2ec5c05..4c68778 100644
--- a/Wms/WMS.Entity/SysEntity/SysStorageArea.cs
+++ b/Wms/WMS.Entity/SysEntity/SysStorageArea.cs
@@ -60,7 +60,7 @@
/// </summary>
public string Temperature { get; set; }
/// <summary>
- /// 璁惧缂栫爜
+ /// 璁惧缂栫爜 JC37浠ｈ〃鍙�夋《绫诲瀷 渚� 0锛�1锛�2锛�3
/// </summary>
public string DeviceCode { get; set; }
diff --git a/Wms/WMS.IBLL/IBllTransServer/IHopperTransportServer.cs b/Wms/WMS.IBLL/IBllTransServer/IHopperTransportServer.cs
new file mode 100644
index 0000000..8d71f5b
--- /dev/null
+++ b/Wms/WMS.IBLL/IBllTransServer/IHopperTransportServer.cs
@@ -0,0 +1,24 @@
+锘縰sing Model.InterFaceModel;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using WMS.Entity.SysEntity;
+
+namespace WMS.IBLL.IBllTransServer
+{
+ public interface IHopperTransportServer
+ {
+ List<SysStorageArea> GetAreaListByUser(int userId);
+
+ List<SysStorageLocat> GetLocatByArea(string area);
+ List<DicModel> GetPlnStatusByArea(string area);
+ List<string> GetSkuByStatus(string palletStatus);
+ List<string> GetLotNoBySku(string skuNo);
+ List<string> GetSku();
+
+ void jiaoLiaoHopper(string areaNo, string endLocate, string plnStatus, string standard, string skuNo, string lotNo, int userId);
+ void jiaoCheHopper(string areaNo, string StartLocate, string plnNo, string plnStatus, decimal weight, string skuNo, string lotNo, int userId);
+
+
+ }
+}
diff --git a/Wms/WMS.IBLL/ISysServer/IRoleWareHouseServer.cs b/Wms/WMS.IBLL/ISysServer/IRoleWareHouseServer.cs
new file mode 100644
index 0000000..60b196f
--- /dev/null
+++ b/Wms/WMS.IBLL/ISysServer/IRoleWareHouseServer.cs
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using WMS.Entity.SysEntity;
+
+namespace WMS.IBLL.ISysServer
+{
+ public interface IRoleWareHouseServer
+ {
+ List<SysRoleWareHouse> GetRoleWareHouseOneListById(int id);
+ List<SysWareHouse> GetHouseList(string UserId);
+ Task<int> InsertRoleWareHouse(string WareHouseNo, string RoleNo, string userId);
+
+ }
+}
diff --git a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
index 2014c78..0352d8e 100644
--- a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
@@ -176,11 +176,10 @@
/// <summary>
/// 鑾峰彇鍌ㄤ綅淇℃伅(骞冲簱鍥句緥)
/// </summary>
- /// <param name="wareHouseNo">浠撳簱</param>
/// <param name="row">鎺�</param>
/// <returns></returns>
- List<SysStorageLocat> GetFlatLibraryLegend(string wareHouseNo, string row);
+ List<LocatDto> GetFlatLibraryLegend(string row);
#endregion
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index eac6a92..f059a89 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -44,6 +44,7 @@
private readonly IFunSettingServer _setting; //鍔熻兘璁惧畾
private readonly IInterfaceServer _interface;//鎺ュ彛绠＄悊
private readonly IOperationSysServer _operation; //鎿嶄綔鏃ュ織
+ private readonly IRoleWareHouseServer _roleWareSvs; //鎿嶄綔鏃ュ織
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
@@ -58,7 +59,7 @@
/// <param name="department">閮ㄩ棬</param>
/// <param name="setting">鍔熻兘璁惧畾</param>
/// <param name="operation">鎿嶄綔鏃ュ織</param>
- public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer, IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc, IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting, IInterfaceServer interfaceS, IOperationSysServer operation)
+ public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer, IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc, IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting, IInterfaceServer interfaceS, IOperationSysServer operation, IRoleWareHouseServer roleWareSvs)
{
_customerSvc = customerSvc;//瀹㈡埛Svc
_logisticsSvc = logisticsSvc;//鐗╂祦Svc
@@ -73,6 +74,7 @@
_setting = setting; //鍔熻兘璁惧畾
_interface = interfaceS;//鎺ュ彛绠＄悊
_operation = operation; //鎿嶄綔鏃ュ織
+ _roleWareSvs = roleWareSvs;
}
//鍩烘湰淇℃伅绠＄悊
@@ -754,6 +756,99 @@
#endregion
+ #region 瑙掕壊浠撳簱鏉冮檺
+
+ /// <summary>
+ /// 鑾峰彇瑙掕壊鏉冮檺淇℃伅鍒楄〃(鍗曡〃)
+ /// </summary>
+ /// <param name="id">瑙掕壊鏉冮檺id</param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetRoleWareHouseOneListById(int id)
+ {
+ try
+ {
+ List<SysRoleWareHouse> roleRights = _roleWareSvs.GetRoleWareHouseOneListById(id);
+ return Ok(new { data = roleRights, msg = "鎴愬姛", core = 0 });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", msg = e.Message, core = 1 });
+ }
+ }
+ /// <summary>
+ /// 鏍规嵁瑙掕壊id鑾峰彇褰撳墠鎵�鎷ユ湁鏉冮檺
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetHouseList()
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(UserId))
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+
+ var housedto = _roleWareSvs.GetHouseList(UserId);
+ return Ok(new { data = housedto, code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", msg = e.Message, core = 1 });
+ }
+
+ }
+
+ /// <summary>
+ /// 鍒嗛厤瑙掕壊鏉冮檺淇℃伅
+ /// </summary>
+ /// <param name="WareHouseNo">鑿滃崟鍙�</param>
+ /// <param name="id">瑙掕壊id</param>
+ /// <returns></returns>
+ /// <exception cref="Exception">鎹曡幏寮傚父</exception>
+ [HttpPost]
+ public async Task<IActionResult> InsertRoleWareHouse(string WareHouseNo, int id)
+ {
+ //鎹曡幏寮傚父
+ try
+ {
+ //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+
+ //鏍规嵁Id鑾峰彇瑙掕壊鍙�
+ SysRoles roles = _rolesServer.GetRoleInfoById(id);
+
+ //淇濆瓨瑙掕壊鏉冮檺淇℃伅
+ int i = await _roleWareSvs.InsertRoleWareHouse(WareHouseNo, roles.RoleNo, userId);
+ //鍒ゆ柇鏄惁鏂板鎴愬姛
+ if (i == 0)
+ {
+ return Ok(new { data = i, msg = "鍒嗛厤澶辫触", code = 1 });
+ }
+ else
+ {
+ await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", roles.RoleNo, "淇敼", "鍒嗛厤浠撳簱鏉冮檺 瑙掕壊鍙凤細" + roles.RoleNo, Convert.ToInt32(userId));
+ return Ok(new { data = i, msg = "鍒嗛厤鎴愬姛", code = 0 });
+ }
+ }
+ catch (Exception ex)
+ {
+ return Ok(new { data = "", msg = "鏂板瑙掕壊鏉冮檺淇℃伅寮傚父"+ ex.Message, code = 1 });
+ }
+ }
+
+
+ #endregion
+
#region 閮ㄩ棬绠＄悊
/// <summary>
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index a4e3fb8..c027bdf 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -21,6 +21,7 @@
using Microsoft.Extensions.Logging;
using ZXing.QrCode.Internal;
using Model.ModelVm.BllCheckVm;
+using Model.ModelVm.SysVm;
namespace Wms.Controllers
{
@@ -40,7 +41,8 @@
private readonly IWaveMageServer _waveSvc;//浠诲姟鍚屾Svc
private readonly IRcsServer _rcsserver;//RCS鐩稿叧浠诲姟
private readonly INoticeServer _noticeSvc;//浜屾ゼ鍗曟嵁鐩稿叧
- public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IBllTaskSyncServer taskSyncSvc, IWaveMageServer waveSvc, IRcsServer rcsserver, INoticeServer noticeSvc)
+ private readonly IHopperTransportServer _hopper;//浜屾ゼ鍗曟嵁鐩稿叧
+ public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IBllTaskSyncServer taskSyncSvc, IWaveMageServer waveSvc, IRcsServer rcsserver, INoticeServer noticeSvc, IHopperTransportServer hopper)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
@@ -51,6 +53,7 @@
_waveSvc = waveSvc;
_rcsserver = rcsserver;
_noticeSvc = noticeSvc;
+ _hopper = hopper;
}
#region WMS鎺ュ彛 璋冪敤涓嬫父绯荤粺鎺ュ彛
@@ -642,15 +645,6 @@
}
#endregion
-
- #region PDA
-
- //绌烘墭鎸囦护涓嬪彂锛堝嚭搴擄級
-
-
- #endregion
-
-
#region 浜屾ゼ涓氬姟
/// <summary>
/// RCS鍙《
@@ -1122,5 +1116,204 @@
}
}
#endregion
+
+ #region JC37 鏂欐枟杞繍3銆�4妤间笟鍔�
+
+ /// <summary>
+ /// 鑾峰彇鍖哄煙鏍规嵁瑙掕壊
+ /// </summary>
+ /// <param name=""></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetAreaListByUser()
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var model = _hopper.GetAreaListByUser(int.Parse(userId));
+
+ return Ok(new { data = model, code = 0, msg = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍌ㄤ綅鏍规嵁鍖哄煙
+ /// </summary>
+ /// <param name="areaNo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetLocatByArea(string areaNo)
+ {
+ try
+ {
+ var model = _hopper.GetLocatByArea(areaNo);
+
+ return Ok(new { data = model, code = 0, msg = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇缃愮被鍨嬫牴鎹尯鍩�
+ /// </summary>
+ /// <param name="areaNo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetPlnStatusByArea(string areaNo)
+ {
+ try
+ {
+ var model = _hopper.GetPlnStatusByArea(areaNo);
+
+ return Ok(new { data = model, code = 0, msg = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡鏍规嵁缃愮被鍨�
+ /// </summary>
+ /// <param name="palletStatus"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetSkuByStatus(string palletStatus)
+ {
+ try
+ {
+ var model = _hopper.GetSkuByStatus(palletStatus);
+
+ return Ok(new { data = model, code = 0, msg = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵规鏍规嵁鐗╂枡
+ /// </summary>
+ /// <param name="skuNo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetLotNoBySku(string skuNo)
+ {
+ try
+ {
+ var model = _hopper.GetLotNoBySku(skuNo);
+
+ return Ok(new { data = model, code = 0, msg = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetSku()
+ {
+ try
+ {
+ var model = _hopper.GetSku();
+
+ return Ok(new { data = model, code = 0, msg = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = e.Message });
+ }
+ }
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name=""></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult jiaoLiaoHopper(HopperModel model)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ _hopper.jiaoLiaoHopper(model.AreaNo,model.LocateNo,model.PlnStatus,model.Standard,model.SkuNo,model.LotNo, int.Parse(userId));
+
+ return Ok(new { data = model, code = 0, msg = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name=""></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult jiaoCheHopper(HopperModel model)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ _hopper.jiaoCheHopper(model.AreaNo, model.LocateNo,model.PlnNo, model.PlnStatus, model.Weight , model.SkuNo, model.LotNo, int.Parse(userId));
+
+ return Ok(new { data = model, code = 0, msg = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = e.Message });
+ }
+ }
+
+
+ #endregion
+
}
}
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index bf3e615..cbf1f6a 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -1701,16 +1701,14 @@
/// <summary>
/// 鏍规嵁浠撳簱 鎺�
- /// </summary>
- /// <param name="wareHouseNo">浠撳簱</param>
- /// <param name="row">鎺�</param>
- /// <param name="depth">娣卞害</param>
+ /// </summary>
+ /// <param name="row">鎺�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetFlatLibraryLegend(string wareHouseNo, string row)
+ public IActionResult GetFlatLibraryLegend(string row)
{
//鑾峰彇鍌ㄤ綅淇℃伅
- List<SysStorageLocat> storagelist = _locatSvc.GetFlatLibraryLegend(wareHouseNo, row);
+ List<LocatDto> storagelist = _locatSvc.GetFlatLibraryLegend(row);
//Dictionary<string, int> dic = new Dictionary<string, int>()
//{
--
Gitblit v1.8.0