From 1c2113e154faacedebfb1f00a29bb26127ed1b73 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期三, 21 二月 2024 16:39:51 +0800
Subject: [PATCH] 增加平库图例页面，后台代码编写，修改bug
---
Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs | 18
/dev/null | 1485 ---------------------------------
Wms/Wms/Controllers/SysController.cs | 38
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 107 +
HTML/views/WareHouseSetting/FlatLibraryLegend.html | 971 ++++++++++++++++++++++
5 files changed, 1,107 insertions(+), 1,512 deletions(-)
diff --git a/HTML/views/WareHouseSetting/FlatLibraryLegend.html b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
new file mode 100644
index 0000000..f17304d
--- /dev/null
+++ b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
@@ -0,0 +1,971 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <title>鍌ㄤ綅鍥句緥</title>
+ <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">
+ <style type="text/css">
+ html,
+ body {
+ height: 100%;
+ width: 100%;
+ }
+ .layouts {
+ display: flex;
+ }
+
+ /* ******************************************** */
+
+ #tab {
+ border-collapse: separate;
+ border-spacing: 2;
+ padding: 3px;
+ }
+
+ table td {
+ border: 3px solid white;
+ }
+
+ .btncls {
+ width: 30px;
+ height: 40px;
+ line-height: 20px;
+ }
+
+ .divcls {
+ box-shadow: 2px 2px 1px #888888;
+ border-radius: 2px;
+ }
+
+ .textSty {
+ color: black;
+ text-align: center;
+ word-break: break-all;
+ word-wrap: break-word;
+ }
+
+ .zero {
+ background-color: #5470c6;
+ Opacity: .8;
+ }
+
+ .one {
+ background-color: #91cc75;
+ Opacity: .8;
+ }
+
+ .two {
+ background-color: #ffdc60;
+ }
+
+ .three {
+ background-color: #ee6666;
+ Opacity: .8;
+ }
+
+ .four {
+ background-color: #ffff7f;
+ Opacity: .8;
+ }
+
+ .five {
+ background-color: #ee23ee;
+ Opacity: .8;
+ }
+
+ .filg {
+ background-color: #808080;
+ Opacity: .8;
+ }
+
+
+ .divOneS {
+ width: 25%;
+ height: 100%;
+ }
+ .divThreeS {
+ width: 33.3%;
+ height: 100%;
+ }
+
+ .divOneX {
+ width: 33.3%;
+ height: 100%;
+ }
+ .divThreeX {
+ width: 50%;
+ height: 100%;
+ }
+
+ .btnShow {
+ width: auto;
+ height: auto;
+ cursor: pointer;
+ }
+ .btnShow1 {
+ width: 20px;
+ height: 15px;
+ }
+
+ .container {
+ position: relative; /* 鐩稿瀹氫綅 */
+ top: 50%; /* 鍚戜笂绉诲姩鑷韩楂樺害鐨勪竴鍗� */
+ left: 50%; /* 鍚戝乏绉诲姩鑷韩瀹藉害鐨勪竴鍗� */
+ transform: translate(-50%, -50%); /* 閫氳繃translate鍑芥暟杩涜寰皟锛屼娇鍏跺畬鍏ㄥ眳涓� */
+ }
+ </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-md" 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">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
+ <div class="layui-input-inline">
+ <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
+ <!-- <option value=""></option> -->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎺�</label>
+ <div class="layui-input-inline">
+ <select name="Row" id="Row" lay-filter="SelectRow">
+ <option value="1" selected>涓�妤�</option>
+ <option value="3">涓夋ゼ</option>
+ </select>
+ </div>
+ </div>
+ <!-- <div class="layui-inline">
+ <label class="layui-form-label">娣卞害</label>
+ <div class="layui-input-inline">
+ <select name="Depth" id="Depth" lay-filter="SelectDepth">
+ <option value="01" selected>娣卞害1</option>
+ <option value="02" id="shendu2">娣卞害2</option>
+ </select>
+ </div>
+ </div> -->
+ <div class="layui-inline">
+ <!-- 鍌ㄤ綅鍥句緥 -->
+ <table style="margin:0 auto;">
+ <tr>
+ <td><button class="btnShow1 three" disabled></button></td>
+ <td>鍑哄簱涓�</td>
+ <td><button class="btnShow1 two" disabled></button></td>
+ <td>鍏ュ簱涓�</td>
+ <td><button class="btnShow1 one" disabled></button></td>
+ <td>鏈夌墿鍝�</td>
+ <td><button class="btnShow1 zero" disabled></button></td>
+ <td>绌哄簱浣�</td>
+ <td><button class="btnShow1 filg" disabled></button></td>
+ <td>鎹熷潖\灞忚斀</td>
+ </tr>
+ </table>
+ </div>
+
+ <!-- //瀹氭椂鑷埛鏂板簱浣嶅浘渚� -->
+ <!-- <div class="layui-inline" style="float: right;">
+ <label class="layui-form-label" style="margin-top: 10px;">鑷姩鍒锋柊</label>
+ <div class="layui-input-inline" style="width: auto;">
+ <input type="checkbox" checked="" id="autoRefresh" lay-skin="switch" lay-filter="switchTest" lay-text="寮�|鍏�">
+ </div>
+ </div> -->
+
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <!-- 涓� -->
+ <div class="layui-col-md" style="width: auto;height: 44%;">
+ <div class="layui-row layui-col-space15" style="width: auto;height: 100%;">
+ <!-- 涓�銆佷笁妤间笂宸01銆丅11 -->
+ <div class="layui-col-md6 divOneS" id="divOne">
+ <div class="layui-card" style="height: 100%;">
+ <p id="a"></p>
+ <table class="container" id="tabOne" style="width: 100%;height: 90%;"></table>
+ </div>
+ </div>
+
+ <!-- 涓�妤间笂涓乏B02 涓夋ゼ涓婁腑B12 -->
+ <div class="layui-col-md6 divOneS" id="divTwo">
+ <div class="layui-card" style="height: 100%;">
+ <p id="b"></p>
+ <table class="container" id="tabTwe" style="width: 100%;height: 90%;"></table>
+ </div>
+ </div>
+
+ <!-- 涓�妤间笂涓彸B03 -->
+ <div class="layui-col-md6 divOneS" id="divThree">
+ <div class="layui-card" style="height: 100%;">
+ <p id="c"></p>
+ <table class="container" id="tabThree" style="width: 100%;height: 90%;"></table>
+ </div>
+ </div>
+
+ <!-- 涓�銆佷笁妤间笂鍙矪04銆丅13 -->
+ <div class="layui-col-md6 divOneS" id="divFour">
+ <div class="layui-card" style="height: 100%;">
+ <p id="d"></p>
+ <table class="container" id="tabfour" style="width: 100%;height: 90%;"></table>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ <!-- 涓� -->
+ <div class="layui-col-md" style="width: auto;height: 44%;">
+ <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="e"></p>
+ <table class="container" id="tabfive" style="width: 100%;height: 90%;"></table>
+ </div>
+ </div>
+
+ <!-- 涓�妤间笅涓瑽06 -->
+ <div class="layui-col-md6 divOneX" id="divSix">
+ <div class="layui-card" style="height: 100%;">
+ <p id="f"></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="j"></p>
+ <table class="container" id="tabSeven" style="width: 100%;height: 90%;"></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 src="../../js/echarts.min.js"></script>
+ <script>
+
+ var uid = $.cookie('userId');
+ if (uid == null) {
+ alert('璇风櫥褰曞悗鎿嶄綔');
+ window.parent.location.href = '../Login.html'
+ }
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'table', 'laypage', 'layer'], function () {
+ var table = layui.table,
+ form = layui.form,
+ 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 = 'layui-col-md6 divOneS';
+ var onex = 'layui-col-md6 divOneX';
+ var threes = 'layui-col-md6 divThreeS';
+ var threex = 'layui-col-md6 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;
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ 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());
+
+
+ // 浠撳簱鏌ヨ浜嬩欢
+ form.on('select(getWareHouseNo)', function (data) {
+ GetSlotVm($("#WareHouseNo").val(), $("#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();
+ }
+ else if($("#Row").val() == "3")
+ {
+ // 涓夋ゼ
+ $("#divThree").hide();
+ $("#divSix").hide();
+ divOne.className=threes;
+ divTwo.className=threes;
+ divFour.className=threes;
+ divFive.className=threex;
+ divSeven.className=threex;
+ }
+ GetSlotVm($("#WareHouseNo").val(), $("#Row").val());
+ });
+
+ // // 娣卞害鏌ヨ浜嬩欢
+ // form.on('select(SelectDepth)', function (data) {
+ // GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
+ // });
+
+
+ //鑾峰彇鏁版嵁娓叉煋搴撲綅鍥�
+ function GetSlotVm(houseNo, row,depth) {
+ var param = {
+ WareHouseNo: houseNo,
+ Row: row,
+ Depth: depth
+ }
+ sendData(IP + "/Sys/GetFlatLibraryLegend", param, 'get', function (res) {
+ console.log(res)
+ if (res.code == 0) {
+
+ $("#a").html("");
+ $("#b").html("");
+ $("#c").html("");
+ $("#d").html("");
+ $("#e").html("");
+ $("#f").html("");
+ $("#j").html("");
+
+ $("#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>';
+
+ // //鍒ゆ柇涓�妤兼垨涓夋ゼ
+ if($("#Row").val() == "1")
+ {
+ /*
+
+ B01 1妤兼敹璐ф帴椹冲尯
+ B02 1妤煎彂璐ф帴椹冲尯
+ B03 1妤奸��璐х紦瀛樺尯
+ B04 1妤兼娊鏍风紦瀛樺尯
+ B05 1妤兼崲鎵樿创鏍囧尯
+ B06 1妤煎寘鏉愭殏瀛橀棿
+ B07 1妤艰溅闂翠緵鏂欏尯
+
+ B11 3妤兼墭鐩樼粍缂撳瓨鍖�
+ B12 3妤煎師杈呮枡缂撳瓨鍖�
+ B13 3妤肩┖鎵樼洏鏀堕泦鍖�
+ B14 3妤肩О閲嶅楠屽尯
+ B15 3妤兼嫞璐ф嫾鎵樺尯
+ */
+ // 涓�妤�
+ $("#a").append("B01 1妤兼敹璐ф帴椹冲尯");
+ $("#b").append("B02 1妤煎彂璐ф帴椹冲尯");
+ $("#c").append("B03 1妤奸��璐х紦瀛樺尯");
+ $("#d").append("B04 1妤兼娊鏍风紦瀛樺尯");
+ $("#e").append("B05 1妤兼崲鎵樿创鏍囧尯");
+ $("#f").append("B06 1妤煎寘鏉愭殏瀛橀棿");
+ $("#j").append("B07 1妤艰溅闂翠緵鏂欏尯");
+ }
+ else if($("#Row").val() == "3")
+ {
+ $("#a").append("B14 3妤肩О閲嶅楠屽尯");
+ $("#b").append("B13 3妤肩┖鎵樼洏鏀堕泦鍖�");
+ $("#d").append("B15 3妤兼嫞璐ф嫾鎵樺尯");
+ $("#e").append("B11 3妤兼墭鐩樼粍缂撳瓨鍖�");
+ $("#j").append("B12 3妤煎師杈呮枡缂撳瓨鍖�");
+ }
+
+ var list = res.data;
+ var B06 = 0;
+ var B07 = 0;
+ var B11 = 0;
+ var B12 = 0;
+ //鎸夊尯鍩熻繘琛屽惊鐜�
+ list.forEach(item => {
+
+ //鍒ゆ柇涓�妤兼垨涓夋ゼ
+ if($("#Row").val() == "1")
+ {
+ // 涓�妤�
+ /*
+ B01 tabOne html1
+ B02 tabTwe html2
+ B03 tabThree html3
+ B04 tabfour html4
+ B05 tabfive html5
+ B06 tabSix html6
+ B07 tabSeven html7
+ */
+ //鍒ゆ柇鍚勪釜鍖哄煙
+ 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>'
+ }
+ } else {
+ // console.log(i, a);
+ 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>'
+ }
+ } else {
+ // console.log(i, a);
+ html2 += '<td></td>'
+ }
+ if (item.Depth == 4) {
+ html2 += '<tr></tr>'
+ }
+ }
+ else if(item.AreaNo == "B03")
+ {
+ //4鎺�4鍒�
+ if (item != undefined) {
+ //鍒ゆ柇鍌ㄤ綅鏍囪瘑鏄惁涓�0
+ if(item.Flag != '0')
+ {
+ html3 += '<td><button value=' + item.LocatNo + ' class="btnShow filg" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绌哄偍浣� 0
+ else if (item.Status == 0) {
+ html3 += '<td><button value=' + item.LocatNo + ' class="btnShow zero" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //鏈夌墿鍝� 1
+ else if (item.Status == 1) {
+ html3 += '<td><button value=' + item.LocatNo + ' class="btnShow one" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //鍏ュ簱涓� 2
+ else if (item.Status == 2) {
+ html3 += '<td><button value=' + item.LocatNo + ' class="btnShow two" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //鍑哄簱涓� 3
+ else if (item.Status == 3) {
+ html3 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></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>'
+ }
+ } 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>'
+ }
+ } 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>'
+ }
+ } 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>'
+ }
+ } 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>'
+ }
+ } 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>'
+ }
+ } 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>'
+ }
+ } else {
+ // console.log(i, a);
+ html2 += '<td></td>'
+ }
+
+ if (item.Row == 2) {
+ html4 += '<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>'
+ }
+ } 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>'
+ }
+ } 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);
+ $("#tabThree").append(html3);
+ $("#tabfour").append(html4);
+ $("#tabfive").append(html5);
+ $("#tabSix").append(html6);
+ $("#tabSeven").append(html7);
+
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000
+ }, function () { })
+ }
+ });
+ }
+
+
+ //#region 鐐瑰嚮鍌ㄤ綅btn鎸夐挳鏌ョ湅鍌ㄤ綅涓婁俊鎭�
+ var tipsVal;
+ // 1.鎵惧埌瑙﹀彂鐨勪簨浠跺璞★紙缁戝畾鍏ㄥ眬锛� 2.浜嬩欢澶勭悊绋嬪簭
+ $('body').on('click','.btnShow', function () {
+ var html;
+ var that=this;
+ var locatNo = $(that)[0].value;
+ var className=$(that)[0].className;
+ if(className=='btnShow zero'){
+ html = "<p style='word-wrap:break-word;width: 100%;height:100%;line-height:24px;font-size:18px'>鍌ㄤ綅缂栫爜锛�" + locatNo + "<br/>鍌ㄤ綅鐘舵�侊細绌哄偍浣�</p>";
+ tipsVal=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>"
+ }
+ tipsVal=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
+
+ // #region 瀹氭椂鍒锋柊搴撲綅鍥句緥
+ //鑾峰彇鏄惁鑷姩鍒锋柊
+ var autoRefresh=$('#autoRefresh').prop('checked');
+ //缁戝畾鑷姩鍒锋柊change浜嬩欢鐩戝惉鍣�
+ form.on('switch(switchTest)', function (data) {
+ autoRefresh=$('#autoRefresh').prop('checked');
+ });
+ //瀹氭椂鍣�
+ setInterval(function(){
+ if(autoRefresh){
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
+ //var currentDate = new Date();
+ //console.log('鑷姩鍒锋柊浜嗭紝'+currentDate)
+ }
+ },10000)//10绉掕嚜鍔ㄥ埛鏂颁竴娆�
+ // #endregion
+ });
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Pda/View/AsnSetting/productEnterQuantity .html b/Pda/View/AsnSetting/productEnterQuantity .html
deleted file mode 100644
index d21234b..0000000
--- a/Pda/View/AsnSetting/productEnterQuantity .html
+++ /dev/null
@@ -1,1485 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
- <meta name="viewport" content="user-scalable=0,width=device-width,initial-scale=1.0" />
- <meta charset="UTF-8" />
- <!-- <meta name="viewport" content="width=device-width, initial-scale=0.665, minimum-scale=0.5, maximum-scale=1, user-scalable=no" /> -->
- <!-- <meta name="viewport" content="width=device-width, initial-scale=0.665" /> -->
- <meta http-equiv="X-UA-Compatible" content="ie=edge" />
- <title>Boxline PDA</title>
-
- <link rel="stylesheet" href="/layui/css/layui.css" />
- <link rel="stylesheet" href="/css/style.css" />
- <script src="/js/adaptive.js"></script>
- <link rel="stylesheet" href="/css/my.css" />
- <style type="text/css">
- td {
- word-break: break-all;
- word-wrap: break-word;
- }
-
- .layui-form-switch {
- margin-top: 0;
- }
-
- /* 鏍囩鏍峰紡 */
- .tableyang-this a {
- margin: 10px 10px 0px 0px;
- line-height: 30px;
- width: 100px;
- color: #999;
- text-align: center;
- float: left;
- background: #f7f7f7;
- user-select: none;
- position: relative;
- z-index: 1;
- cursor: pointer;
- border-radius: 5px;
- border: 1px solid #ccc;
- transition: all 0.3s ease;
- }
-
- .tableyang-this a.hover {
- color: #5298ff;
- background-color: #eff2ff;
- border: 1px solid #5298ff;
- }
- /* 鍐呭灞呬腑 */
- .tableyang-tab {
- display: flex;
- /* justify-content: center; */
- /* align-items: center; */
- flex-direction: column;
- height: 90vh;
- }
- /* 蹇呯敤鏍峰紡 */
- .tableyang-2,.tableyang-3 {
- display: none;
- }
-
- ul {
- list-style-type: none;
- padding: 0;
- }
-
- li {
- cursor: pointer;
- background-color: lightgray;
- padding: 10px;
- margin-bottom: 5px;
- }
-
-
-
- </style>
- <link rel="stylesheet" href="/css/adapter.css" />
- <script src="../../js/jquery.js"></script>
- <script src="../../js/jquery-3.5.1.min.js"></script>
-</head>
-
-<body>
- <div id="" class="main-content">
-
- <div id="" class="layout-title">
- <table border="" cellspacing="" cellpadding="">
- <tr>
- <td class="img-back"><a href="../index.html"><img src="/assets/back.jpg"></a></td>
- <td class="title-text" lang>鎵樼洏缁戝畾</td>
- <td class="title-menu-icon"><img id="menuImg" src="/assets/menu.jpg"></td>
- </tr>
- </table>
- </div>
-
- <div id="" class="layout-sub-content">
- <div id="menuList" class="menu">
- <ul class="" style="text-align: center;">
- <li><a href="../index.html" lang>涓婚〉</a></li>
- <!-- <li><a href="productEnterConfirm.html">鍏ュ簱淇℃伅纭</a></li> -->
- <li><a href="../login.html" lang>閲嶆柊鐧诲綍</a></li>
- </ul>
- </div>
-
- <ul>
- <li id="option1">鏍囩</li>
- <li id="option2">鏁伴噺</li>
-
- </ul>
-
- <br />
- <!-- 鏈夌爜 -->
- <div id="content1">
- <div id="zongDiv" class="layout-bill-info" style="height: 285px;">
- <form class="layui-form" action="">
- <div id="" class="layui-form-item layout-dropdownlist">
- <label class="layui-form-label" lang>鍏ュ簱鍗曪細</label>
- <div class="layui-input-block" id="selectDiv">
- <select id="bar" lay-filter="getbar" lay-search>
- <option value=""></option>
- </select>
- <img src="/assets/down_arraw.png">
- </div>
- </div>
- <div class="layui-form-item layout-dropdownlist" style="margin-top: 10px;">
- <label class="layui-form-label">鐗╂枡-鎵规锛�</label>
- <div class="layui-input-block" id="goodDiv">
- <select id="goodSelect" lay-filter="goodSelect" lay-search>
- <option value=""></option>
- </select>
- <img src="/assets/down_arraw.png">
- </div>
- </div>
-
- <div id="" class="layui-form-item layout-input">
- <label class="layui-form-label" lang>鎵樼洏鏉＄爜锛�</label>
- <div class="layui-input-block">
- <input id="STOCKCODE" type="text" lay-verify="stock" lang langholder placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- autocomplete="off" class="layui-input">
- </div>
- </div>
- <div id="BOX" class="layui-form-item layout-input">
- <label class="layui-form-label" lang>澶栫鏉＄爜锛�</label>
- <div class="layui-input-block">
- <input id="BOXCODE" type="text" lay-verify="required" lang langholder placeholder="璇锋壂鎻忓绠辨潯鐮�"
- autocomplete="off" class="layui-input">
- </div>
- </div>
- <div id="" class="layui-form-item layout-input">
- <label class="layui-form-label" lang>鏄惁杩炵粍锛�</label>
- <div class="layui-input-block">
- <input type="checkbox" name="IsLianXu" id="IsLianXu" lay-skin="switch" lay-text="鏄瘄鍚�"
- lay-filter="IsLianXu">
- </div>
- </div>
- <div id="BOX2" class="layui-form-item layout-input" style="display: none;">
- <label class="layui-form-label" lang>灏剧鏉＄爜锛�</label>
- <div class="layui-input-block">
- <input id="BOXCODE2" type="text" lang langholder placeholder="璇锋壂鎻忓绠辨潯鐮�" autocomplete="off"
- class="layui-input">
- </div>
- </div>
-
- <table class="layout-tbl-input" border="" cellspacing="" cellpadding="">
- <tr>
- <td>
- <div id="" class="layui-form-item layout-boxinfo">
- <label class="layui-form-label" lang>瑙勬牸/鍨嬪彿锛�</label>
- <div class="layui-input-block">
- <input id="Standard" type="text" disabled placeholder="" autocomplete="off"
- class="layui-input">
- </div>
- </div>
- </td>
- <td>
- <div id="" class="layui-form-item layout-boxinfo">
- <label class="layui-form-label" lang>璁″垝鏁伴噺锛�</label>
- <div class="layui-input-block">
- <input id="ImportQuantity" type="text" disabled placeholder=""
- autocomplete="off" class="layui-input">
- </div>
- </div>
- </td>
-
- </tr>
- <tr>
- <td>
- <div id="" class="layui-form-item layout-boxinfo">
- <label class="layui-form-label" lang>宸茬粍鏁伴噺锛�</label>
- <div class="layui-input-block">
- <input id="ImportFactQuantity" type="text" disabled placeholder=""
- autocomplete="off" class="layui-input">
- </div>
- </div>
- </td>
- <td>
- <div id="" class="layui-form-item layout-boxinfo">
- <label class="layui-form-label" lang>绠卞唴鏁伴噺锛�</label>
- <div class="layui-input-block">
- <input id="BoxQty" type="text" disabled placeholder="" autocomplete="off"
- class="layui-input">
- </div>
- </div>
- </td>
- </tr>
-
- </table>
-
- <table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
- <tr>
- <td style="width: 23%;"></td>
- <td>
- <button class="layout-btn layout-btn-red" lang type="button" lay-submit
- lay-filter="formBind">缁戝畾鍒版墭鐩�</button>
- </td>
- <td style="width: 33%;"></td>
-
- </tr>
- </table>
- </form>
- </div>
-
- <br>
-
- <div id="" class="cut-line">
- <img src="/assets/fengexian.png">
- </div>
-
- <div class="layout-tbl-paging" id="">
- <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
- <tr>
- <th lang style="width: 15%;">缂栫爜</th>
- <th lang style="width: 35%;">鍚嶇О</th>
- <th lang style="width: 25%;">鎵规</th>
- <th lang style="width: 15%;">鏁伴噺</th>
- <th lang style="width: 10%;">鎿嶄綔</th>
- </tr>
- <tr id="boxCell" style="display: none;">
- <td name="code">AG000001</td>
- <td name="name">鐤嫍鍚嶇О鍚嶇О鍚嶇О</td>
- <td name="lotNo">鎵规鍙�</td>
- <td name="num">30</td>
- <td name="del">
- <div id="" class="tbl-btn-del" lang>
- 鍒犻櫎
- </div>
- </td>
- </tr>
- </table>
- <!-- 鍒嗛〉 -->
- <table id="tableBoxPages" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
- <tr style="display: ;">
- <td class="page-prev">涓婁竴椤�</td>
- <td class="page-num page-num-select">1</td>
- <td class="page-num">2</td>
- <td class="page-num">3</td>
- <td class="page-num">4</td>
- <td class="page-num">5</td>
- <td class="page-next">涓嬩竴椤�</td>
- </tr>
- </table>
- </div>
-
- </div>
- <!-- 鏃犵爜 -->
- <div id="content2">
- <div id="zongDiv" class="layout-bill-info" style="height: 255px;">
- <form class="layui-form" id="form2" action="">
- <div id="" class="layui-form-item layout-dropdownlist">
- <label class="layui-form-label" lang>鍏ュ簱鍗曪細</label>
- <div class="layui-input-block" id="selectDiv1">
- <select id="bar1" lay-filter="getbar1" lay-search>
- <option value=""></option>
- </select>
- <img src="/assets/down_arraw.png">
- </div>
- </div>
- <div class="layui-form-item layout-dropdownlist" style="margin-top: 10px;">
- <label class="layui-form-label">鐗╂枡-鎵规锛�</label>
- <div class="layui-input-block" id="goodDiv1">
- <select id="goodSelect1" lay-filter="goodSelect1" lay-search>
- <option value=""></option>
- </select>
- <img src="/assets/down_arraw.png">
- </div>
- </div>
-
- <div id="" class="layui-form-item layout-input">
- <label class="layui-form-label" lang>鎵樼洏鏉＄爜锛�</label>
- <div class="layui-input-block">
- <input id="STOCKCODE1" type="text" lay-verify="stock" lang langholder placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- autocomplete="off" class="layui-input">
- </div>
- </div>
-
- <div id="" class="layui-form-item layout-input">
- <label class="layui-form-label" lang>鐗╂枡鏁伴噺锛�</label>
- <div class="layui-input-block">
- <input id="SkuQty" type="text" lay-verify="stock" lang langholder placeholder="璇疯緭鍏ョ墿鏂欐暟閲�"
- autocomplete="off" class="layui-input">
- </div>
- </div>
-
- <table class="layout-tbl-input" border="" cellspacing="" cellpadding="">
- <tr>
- <td>
- <div id="" class="layui-form-item layout-boxinfo">
- <label class="layui-form-label" lang>瑙勬牸/鍨嬪彿锛�</label>
- <div class="layui-input-block">
- <input id="Standard1" type="text" disabled placeholder="" autocomplete="off"
- class="layui-input">
- </div>
- </div>
- </td>
- </tr>
- <tr>
- <td>
- <div id="" class="layui-form-item layout-boxinfo">
- <label class="layui-form-label" lang>璁″垝鏁伴噺锛�</label>
- <div class="layui-input-block">
- <input id="ImportQuantity1" type="text" disabled placeholder=""
- autocomplete="off" class="layui-input">
- </div>
- </div>
- </td>
-
- </tr>
- <tr>
- <td>
- <div id="" class="layui-form-item layout-boxinfo">
- <label class="layui-form-label" lang>宸茬粍鏁伴噺锛�</label>
- <div class="layui-input-block">
- <input id="ImportFactQuantity1" type="text" disabled placeholder=""
- autocomplete="off" class="layui-input">
- </div>
- </div>
- </td>
- </tr>
-
- </table>
-
- <table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
- <tr>
- <td style="width: 23%;"></td>
- <td>
- <button class="layout-btn layout-btn-red" lang type="button" lay-submit
- lay-filter="formBind">缁戝畾鍒版墭鐩�</button>
- </td>
- <td style="width: 33%;"></td>
-
- </tr>
- </table>
-
- </form>
- </div>
-
- <br>
-
- <div id="" class="cut-line">
- <img src="/assets/fengexian.png">
- </div>
-
- <div class="layout-tbl-paging" id="">
- <table id="tableBoxList1" class="tbl-box-list" border="" cellspacing="" cellpadding="">
- <tr>
- <th lang style="width: 15%;">鐗╂枡缂栫爜</th>
- <th lang style="width: 35%;">鐗╂枡鍚嶇О</th>
- <th lang style="width: 25%;">鎵规</th>
- <th lang style="width: 15%;">鐗╂枡鏁伴噺</th>
- <th lang style="width: 10%;">鎿嶄綔</th>
- </tr>
- <tr id="boxCell" style="display: none;">
- <td name="code">AG000001</td>
- <td name="name">鐤嫍鍚嶇О鍚嶇О鍚嶇О</td>
- <td name="lotNo">鎵规鍙�</td>
- <td name="num">30</td>
- <td name="del">
- <div id="" class="tbl-btn-del" lang>
- 鍒犻櫎
- </div>
- </td>
- </tr>
- </table>
- <!-- 鍒嗛〉 -->
- <table id="tableBoxPages1" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
- <tr style="display: ;">
- <td class="page-prev">涓婁竴椤�</td>
- <td class="page-num page-num-select">1</td>
- <td class="page-num">2</td>
- <td class="page-num">3</td>
- <td class="page-num">4</td>
- <td class="page-num">5</td>
- <td class="page-next">涓嬩竴椤�</td>
- </tr>
- </table>
- </div>
-
- </div>
-
- </div>
- </div>
- <script src="/js/jquery-3.5.1.min.js"></script>
- <script src="/layui/layui.js"></script>
- <script src="/js/public.js"></script>
- <script src="/js/language.js"></script>
- <script src="/js/jquery.cookie.js"></script>
- <script>
- layui.use(['form', 'jquery'], function () {
- var form = layui.form
-
- /* 鏍囩鍒囨崲浠ｇ爜 */
-
- var xianshiyemian = 0;
-
- $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
- $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
- $('#content2').hide();
- $(document).ready(function() {
- $('#option1').click(function() {
- // qingkong();
- xianshiyemian = 0;
- $('#content1').show();
- $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
-
- $('#content2').hide();
- $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
- });
-
- $('#option2').click(function() {
- // qingkong();
- xianshiyemian = 1;
- $('#content1').hide();
- $('#option1').attr("style", "background-color: #999;width: 45.77%;float: left;text-align: center;"); //榛樿棰滆壊
-
- $('#content2').show();
- $('#option2').attr("style", "background-color: aqua;width: 45.77%;float: right;text-align: center;"); //閫変腑鍚庨鑹�
-
- });
- });
-
- //娓呮鏂囨湰妗嗕腑鏁版嵁
- // function clear() {
- // if (xianshiyemian == "0")
- // {
- // $("#BOXCODE").val("");
- // $("#BOXCODE2").val("");
-
- // $("#ImportQuantity").val("");
- // $("#Standard").val("");
- // $("#ImportFactQuantity").val("");
- // $("#BoxQty").val("");
- // }
- // else if (xianshiyemian == "1")
- // {
- // $("#BOXCODE").val("");
- // $("#BOXCODE2").val("");
-
- // $("#ImportQuantity").val("");
- // $("#Standard").val("");
- // $("#ImportFactQuantity").val("");
- // $("#BoxQty").val("");
- // }
-
- // }
-
- /*鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��*/
-
- initLanguage()
- setLanguage()
-
- //褰撳墠鍒嗛〉
- var curPageIndex = 1;
- //鏄惁杩炵画缁勬墭
- isContinue = "0";
-
- // 鎵樼洏鐮佹枃鏈敼鍙樻椂瑙﹀彂
- $("#STOCKCODE").on('input', function () {
-
- if ($("#STOCKCODE").val() == "" || $("#STOCKCODE").val().length < 8) {
- return
- }
- if ($("#STOCKCODE").val().length >= 8) {
- $("#STOCKCODE").val($("#STOCKCODE").val().substr(-8))
- }
- checkPalletStat()
- })
- // 鎵樼洏鐮佹枃鏈敼鍙樻椂瑙﹀彂-鏁伴噺
- $("#STOCKCODE1").on('input', function () {
-
- if ($("#STOCKCODE1").val() == "" || $("#STOCKCODE1").val().length < 8) {
- return
- }
- if ($("#STOCKCODE1").val().length >= 8) {
- $("#STOCKCODE1").val($("#STOCKCODE1").val().substr(-8))
- }
- checkPalletStat()
- })
-
- //绠辩爜鍥炶溅浜嬩欢
- $("#BOXCODE").keydown(function (e) {
- if (e.keyCode === 13) {
- if ($("#BOXCODE").val() == "") {
- layer.msg('璇峰厛鎵弿绠辩爜', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return
- }
-
- // if ($("#STOCKCODE").val() == "") {
- // layer.msg('璇峰厛鎵弿鎵樼洏鐮�', {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // });
- // $("#BOXCODE").val("");
- // $("#STOCKCODE").focus();
- // return;
- // }
- checkBoxInfo()
- }
- });
-
- /* 鍏ュ簱鍗曟嵁涓嬫媺妗� */
- //鐐瑰嚮鍏ュ簱鍗曟嵁涓嬫媺妗嗕簨浠�
- $("#selectDiv").click(function () {
- if (xianshiyemian == 0)
- {
- var input = $('select[id="bar"]').next().find('.layui-select-title input')
- var val = input.val()
- //鍏堟洿鏂颁竴涓嬪叆搴撳崟
- updateBillList(function (data) {
- $('select[id="bar"]').next().addClass('layui-form-selected')
- $('select[id="bar"]').next().find('.layui-select-title input').val(val)
- })
- }
- })
- //鐐瑰嚮鍏ュ簱鍗曟嵁涓嬫媺妗嗕簨浠�
- $("#selectDiv1").click(function () {
- if (xianshiyemian == 1)
- {
- var input = $('select[id="bar1"]').next().find('.layui-select-title input')
- var val = input.val()
- //鍏堟洿鏂颁竴涓嬪叆搴撳崟
- updateBillList(function (data) {
- $('select[id="bar1"]').next().addClass('layui-form-selected')
- $('select[id="bar1"]').next().find('.layui-select-title input').val(val)
- })
- }
- })
-
- /*鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��*/
-
-
- /* 缁戝畾鍏ュ簱鍗曚俊鎭� */
-
- function updateBillList(callback) {
- if (xianshiyemian == 0)
- {
- var input = $('select[id="bar"]').next().find('.layui-select-title input')
- var val = input.val()
- $("#bar").empty()
- $("#bar").append('<option value =>' + '</option>');
- form.render('select');
-
- var param = {
- Type: "0,1,3"
- };
- sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- for (var i = 0; i < res.data.length; i++) {
- $("#bar").append('<option value =' + res.data[i].ASNNo + '>' + res.data[i]
- .ASNNo +
- '</option>');
- }
- form.render('select');
-
- if (!val) {
- $('#bar').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
- } else {
- var sel = 'dd[lay-value=' + val + ']';
- $('#bar').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
- }
-
- callback(res.data)
- } else { //涓嶆垚鍔�
- // layer.msg(res.msg, {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function() {});
- }
- });
- }
- else if (xianshiyemian == 1)
- {
- var input = $('select[id="bar1"]').next().find('.layui-select-title input')
- var val = input.val()
- $("#bar1").empty()
- $("#bar1").append('<option value =>' + '</option>');
- form.render('select');
-
- var param = {
- Type: "2,5,6,7"
- };
- sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- for (var i = 0; i < res.data.length; i++) {
- $("#bar1").append('<option value =' + res.data[i].ASNNo + '>' + res.data[i]
- .ASNNo +
- '</option>');
- }
- form.render('select');
-
- if (!val) {
- $('#bar1').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
- } else {
- var sel = 'dd[lay-value=' + val + ']';
- $('#bar1').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
- }
-
- callback(res.data)
- } else { //涓嶆垚鍔�
- // layer.msg(res.msg, {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function() {});
- }
- });
- }
-
- }
-
- /*鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��*/
-
- //鐐瑰嚮鐗╂枡涓嬫媺妗嗕簨浠�
- $("#goodDiv").click(function () {
- if ($("#bar").val() == null || $("#bar").val() == "" || $("#bar").val() == undefined) {
- layer.msg("璇峰厛閫夋嫨鍏ュ簱鍗�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- })
- //鐐瑰嚮鐗╂枡涓嬫媺妗嗕簨浠�-鏁伴噺
- $("#goodDiv1").click(function () {
- if ($("#bar1").val() == null || $("#bar1").val() == "" || $("#bar1").val() == undefined) {
- layer.msg("璇峰厛閫夋嫨鍏ュ簱鍗�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- })
- //閫変腑鍏ュ簱鍗曚簨浠�
- form.on('select(getbar)', function (data) {
- updateGoodList()
- setOrderGoods();
- });
- //閫変腑鍏ュ簱鍗曚簨浠�-鏁伴噺
- form.on('select(getbar1)', function (data) {
- updateGoodList()
- setOrderGoods();
- });
-
- //閫変腑鐗╂枡浜嬩欢
- form.on('select(goodSelect)', function (data) {
- setOrderGoods();
- });
- //閫変腑鐗╂枡浜嬩欢-鏁伴噺
- form.on('select(goodSelect1)', function (data) {
- setOrderGoods();
- });
-
- //缁戝畾鍒版墭鐩樹簨浠�
- form.on('submit(formBind)', function (data) {
- if(xianshiyemian == 0)
- {
- console.log($("#goodSelect").val());
- if ($("#bar").val() == "") {
- layer.msg('璇烽�夋嫨鍏ュ簱鍗�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- if ($("#goodSelect").val() == "") {
- layer.msg('璇烽�夋嫨鐗╂枡鍙婃槑缁�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- if ($("#STOCKCODE").val() == "") {
- layer.msg('璇锋壂鎻忔墭鐩樻潯鐮�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- if ($("#BOXCODE").val() == "") {
- layer.msg('璇锋壂鎻忓绠辨潯鐮�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- var param = {
- AsnNo: $("#bar").val(),
- PalletNo: $("#STOCKCODE").val(),
- AsnDetailId: parseInt($("#goodSelect").val()),
- BoxNo: $("#BOXCODE").val(),
- IsContinue: isContinue,
- TailBoxNo: $("#BOXCODE2").val(),
- Origin:"PDA"
- }
- //缁勭洏
- sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- setOrderGoods();
- refreshTable();
- $("#BOXCODE").val("");
- $("#BOXCODE2").val("");
- $("#QTY").val("");
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- //鍥炶皟
- });
- }
- });
- }
- else if(xianshiyemian == 1)
- {
- if ($("#bar1").val() == "") {
- layer.msg('璇烽�夋嫨鍏ュ簱鍗�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- if ($("#goodSelect1").val() == "") {
- layer.msg('璇烽�夋嫨鐗╂枡鍙婃槑缁�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- if ($("#STOCKCODE1").val() == "") {
- layer.msg('璇锋壂鎻忔墭鐩樻潯鐮�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- var param = {
- AsnNo: $("#bar1").val(), //鍑哄簱鍗曟嵁
- PalletNo: $("#STOCKCODE1").val(), //鎵樼洏鏉＄爜
- AsnDetailId: parseInt($("#goodSelect1").val()), //鐗╂枡鎵规
- SkuQty: parseInt($("#SkuQty").val()), //鐗╂枡鏁伴噺
- Origin:"PDA"
- }
-
- console.log(param)
- //缁勭洏
- sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- setOrderGoods();
- refreshTable();
- $("#STOCKCODE").val("");
- $("#SkuQty").val("");
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- //鍥炶皟
- });
- }
- });
- }
-
- return false; //闃绘琛ㄥ崟璺宠浆銆傚鏋滈渶瑕佽〃鍗曡烦杞紝鍘绘帀杩欐鍗冲彲銆�
- });
-
-
- // 鏍规嵁鍏ュ簱鏄庣粏ID 鑾峰彇璇︾粏淇℃伅
- function setOrderGoods() {
- if (xianshiyemian == 0)
- {
- $("#ImportQuantity").val("");
- $("#Standard").val("");
- $("#ImportFactQuantity").val("");
-
- var param = {
- Id: parseInt($("#goodSelect").val())
- };
-
- synData(IP + "/PdaAsn/GetArrivalNoticeDetail", param, 'post', function (res) {
- console.log(JSON.stringify(res))
- if (res.code == 0 && res.data != null) { //鎴愬姛
- $("#ImportQuantity").val(res.data.Qty);
- $("#Standard").val(res.data.Standard);
- $("#ImportFactQuantity").val(res.data.FactQty + "");
- }
- });
- }
- else if (xianshiyemian == 1)
- {
- $("#ImportQuantity1").val("");
- $("#Standard1").val("");
- $("#ImportFactQuantity1").val("");
-
- var param = {
- Id: parseInt($("#goodSelect1").val())
- };
-
- synData(IP + "/PdaAsn/GetArrivalNoticeDetail", param, 'post', function (res) {
- console.log(JSON.stringify(res))
- if (res.code == 0 && res.data != null) { //鎴愬姛
- $("#ImportQuantity1").val(res.data.Qty);
- $("#Standard1").val(res.data.Standard);
- $("#ImportFactQuantity1").val(res.data.FactQty + "");
- }
- });
- }
-
- }
-
- var asnDetails = "";
-
- /* 缁戝畾鍏ュ簱鍗曠墿鏂欏強鎵规 */
- function updateGoodList(skuNo) {
- if (xianshiyemian == 0)
- {
- console.log("aaaa");
- var input = $('select[id="goodSelect"]').next().find('.layui-select-title input')
- var val = input.val()
-
- $("#goodSelect").empty()
- $("#goodSelect").append('<option value =>' + '</option>');
-
- var param = {
- AsnNo: $("#bar").val(),
- };
- synData(IP + "/PdaAsn/GetArrivalNoticeDetails", param, 'post', function (res) {
- console.log("鍑哄簱鍙ｏ細" + JSON.stringify(res))
- if (res.code == 0) { //鎴愬姛
- asnDetails = res.data;
- for (var i = 0; i < res.data.length; i++) {
- if(skuNo!='' && skuNo==res.data[i].SkuNo){
- $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
- '</option>');
- }else{
- if (i == 0) {
- $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
- '</option>');
- } else {
- $("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
- '</option>');
- }
- }
- }
- form.render('select');
-
- if (!val) {
- $('#goodSelect').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
- } else {
- var sel = 'dd[lay-value=' + val + ']';
- $('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
- }
- } else {
- }
- });
- }
- else if (xianshiyemian == 1)
- {
- console.log("bbbb");
- var input = $('select[id="goodSelect1"]').next().find('.layui-select-title input')
- var val = input.val()
-
- $("#goodSelect1").empty()
- $("#goodSelect1").append('<option value =>' + '</option>');
-
- var param = {
- AsnNo: $("#bar1").val(),
- };
- synData(IP + "/PdaAsn/GetArrivalNoticeDetails", param, 'post', function (res) {
- console.log("鍑哄簱鍙ｏ細" + JSON.stringify(res))
- if (res.code == 0) { //鎴愬姛
- asnDetails = res.data;
- for (var i = 0; i < res.data.length; i++) {
- if (i == 0) {
- $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
- .SkuName);
- } else {
- $("#goodSelect1").append('<option value =' + res.data[i].Id + '>' + res.data[i]
- .SkuName);
- }
- if (res.data[i].LotNo != null)
- {
- $("#goodSelect1").append("-" + res.data[i].LotNo + '</option>');
- }
-
- }
- form.render('select');
-
- if (!val) {
- $('#goodSelect1').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
- } else {
- var sel = 'dd[lay-value=' + val + ']';
- $('#goodSelect1').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
- }
- } else {
- }
- });
- }
-
- }
-
- // 娓叉煋绠辩爜淇℃伅
- function refreshTable() {
- if (xianshiyemian == 0)
- {
- //鍏堟竻绌轰竴涓嬬瀛愬垪琛�
- let trs = $("#tableBoxList tr")
- let len = trs.length
-
- for (i = len - 1; i >= 2; i--) {
- trs[i].remove();
- }
-
- //璁剧疆鎵樼洏鍙�
- $("#palletCode").val($.cookie('stockCode'))
-
- var param = {
- PalletNo: $.cookie('stockCode')
- };
- // 鏍规嵁鎵樼洏鍙疯幏鍙栫鐮佷俊鎭�
- sendData(IP + "/PdaAsn/GetBoxInfos", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- var list = res
- var arrTrs = new Array()
- let idx = 0
- for (var i in res.data) {
- var tr = $("#boxCell").eq(0).clone();
- tr.appendTo("#tableBoxList");
- tr.attr('id', res.data[i].Id)
- tr.attr('boxno', res.data[i].BoxNo)
- tr.attr('BindNo', res.data[i].BindNo)
- idx++;
- tr.attr('index', idx)
- tr.find("td[name='code']").html(res.data[i].BoxNo);
- tr.find("td[name='name']").html(res.data[i].SkuName);
- tr.find("td[name='lotNo']").html(res.data[i].LotNo);
- tr.find("td[name='num']").html(res.data[i].Qty);
- tr.find("td[name='del']").click(function () {
- var elem = $(this).parent()
- var boxno = elem.attr('boxno')
- var BindNo = elem.attr('BindNo')
- var Id = elem.attr('id')
- layer.alert("纭畾瑕佷粠鎵樼洏涓婂垹闄よ繖涓鐗╂枡鍚楋紵<br>" + boxno, {
- icon: 2,
- time: 0, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- btn: ['鍒犻櫎', '鍙栨秷'],
- yes: function () {
-
- var param = {
- boxNo: res.data[i].BoxNo,
- };
- sendData(IP + "/BllAsn/DelBindBoxInfo", param, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- elem.remove()
- setOrderGoods();
- refreshTable();
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
- }
- })
- })
- tr.show();
- arrTrs[i] = tr
- }
-
-
- } else { //涓嶆垚鍔�
- layer.msg("鏃犳暟鎹�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- $("#boxNum").val(0)
- }
- });
- }
- else if (xianshiyemian == 1)
- {
- //鍏堟竻绌轰竴涓嬬瀛愬垪琛�
- let trs = $("#tableBoxList1 tr")
- let len = trs.length
-
- for (i = len - 1; i >= 2; i--) {
- trs[i].remove();
- }
-
- //璁剧疆鎵樼洏鍙�
- $("#palletCode").val($.cookie('stockCode1'))
-
- var param = {
- PalletNo: $.cookie('stockCode1')
- };
- // 鏍规嵁鎵樼洏鍙疯幏鍙栫鐮佷俊鎭�
- sendData(IP + "/PdaAsn/GetPalletBindInfo", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- var list = res
- var arrTrs = new Array()
- let idx = 0
- for (var i in res.data) {
- var tr = $("#boxCell").eq(0).clone();
- tr.appendTo("#tableBoxList1");
- tr.attr('id', res.data[i].Id)
- tr.attr('boxno', res.data[i].BoxNo)
- tr.attr('BindNo', res.data[i].BindNo)
- idx++;
- tr.attr('index', idx)
- tr.find("td[name='code']").html(res.data[i].SkuNo);
- tr.find("td[name='name']").html(res.data[i].SkuName);
- tr.find("td[name='lotNo']").html(res.data[i].LotNo);
- tr.find("td[name='num']").html(res.data[i].Qty);
- tr.find("td[name='del']").click(function () {
- var elem = $(this).parent()
- // var boxno = elem.attr('boxno')
- var BindNo = elem.attr('BindNo')
- console.log(res)
- var Id = elem.attr('id')
- layer.alert("纭畾瑕佷粠鎵樼洏涓婂垹闄よ繖鎵樼墿鏂欏悧锛�<br>" + res.data[0].PalletNo, {
- icon: 2,
- time: 0, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- btn: ['鍒犻櫎', '鍙栨秷'],
- yes: function () {
-
- var param = {
- PalletNo: res.data[0].PalletNo,
- };
- console.log(Id)
- console.log(param)
- // sendData(IP + "/PdaAsn/DelBoxInfo", param, 'post', function (res) {
- // if (res.code == 0) { //鎴愬姛
- // layer.msg(res.msg, {
- // icon: 1,
- // time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // });
- // elem.remove()
- // setOrderGoods();
- // refreshTable();
- // } else { //涓嶆垚鍔�
- // layer.msg(res.msg, {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function () { });
- // }
- // });
- }
- })
- })
- tr.show();
- arrTrs[i] = tr
- }
-
- //璁剧疆鍒嗛〉
- setPages(1, list.length)
-
- } else { //涓嶆垚鍔�
- layer.msg("鏃犳暟鎹�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- $("#boxNum").val(0)
- setPages(1, 0)
- }
- });
- }
-
- }
-
- // 鍒ゆ柇鎵樼洏鐮佹槸鍚﹀彲鐢�
- function checkPalletStat() {
- if (xianshiyemian == 0)
- {
- var param = {
- "PalletNo": $("#STOCKCODE").val()
- }
- sendData(IP + "/PdaAsn/IsEnablePalletNo", param, 'post', function (res) {
- if (res.code == 0) {
-
- $.cookie('stockCode', $("#STOCKCODE").val());
- refreshTable()
- $("#BOXCODE").focus();
-
- } else {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
- }
- else if (xianshiyemian == 1)
- {
- var param = {
- "PalletNo": $("#STOCKCODE1").val()
- }
- sendData(IP + "/PdaAsn/IsEnablePalletNo", param, 'post', function (res) {
- if (res.code == 0) {
-
- $.cookie('stockCode1', $("#STOCKCODE1").val());
- refreshTable()
- $("#SkuQty").focus();
-
- } else {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
- }
-
- }
-
-
- function checkBoxInfo() {
- var param = {
- "BoxNo": $("#BOXCODE").val(),
- }
- sendData(IP + "/PdaAsn/GetBindBoxInfos", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- var bl = false;
- if (res.data.length == 0) {
- layer.msg("鏈煡璇㈠埌姝ょ鐗╂枡淇℃伅锛岃鏍稿疄!", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- if(res.data[0].ASNNo!='' && res.data[0].ASNNo!=null){
- $("#bar").empty()
- $("#bar").append('<option value =>' + '</option>');
- form.render('select');
-
- $("#bar").append('<option value =' + res.data[0].ASNNo + ' selected>' + res.data[0].ASNNo +'</option>');
-
- updateGoodList(res.data[0].SkuNo)
- setOrderGoods();
- }else{
- if(asnDetails==''){
- layer.msg("璇峰厛閫夋嫨鍏ュ簱鍗曟嵁!", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- }
- asnDetails.forEach(element => {
- console.log(element);
-
- if (element.SkuNo == res.data[0].SkuNo && element.LotNo == res.data[0].LotNo) {
- var sel = 'dd[lay-value=' + element.id + ']';
- $('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this');
- bl = true;
- }
- });
- if (!bl) {
- layer.msg("姝ょ鐗╂枡涓嶇鍚堣鍏ュ簱鍗曪紝璇锋牳瀹�!", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- } else {
- $("#BoxQty").val(res.data[0].Qty);
- }
-
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- }
- });
-
- }
-
-
- /* 鍒嗛〉 */
- //璁剧疆鍒嗛〉
- function setPages(pageIndex, boxNum){
-
- if (xianshiyemian == 0)
- {
- if(boxNum <= 0){
- //鍒楄〃涓虹┖锛岄殣钘忓垎椤甸〉鐮�
- $("#tableBoxPages").hide()
- return
- }
-
- let pageNum = Math.floor(boxNum / 10);
- if(boxNum % 10 > 0){
- pageNum += 1;
- }
- //console.log("pageNum is " + pageNum)
-
- $("#tableBoxPages").find("tr").remove()
- let table = $("#tableBoxPages")
- $("<tr></tr>").appendTo("#tableBoxPages")
-
- // let newTr = table.append("<tr></tr>")
- // newTr.append("<td class='page-prev'>涓婁竴椤�</td>")
- $("<td id='prevPage' class='page-prev'>涓婁竴椤�</td>").appendTo("#tableBoxPages tr")
- $("#tableBoxPages tr").eq(0).find("td[id^='prevPage']").click(function(){
- onClickPrevPage()
- })
- for(i=1; i < pageNum + 1; i++){
- // newTr.append("<td class='page-num'>"+ i +"</td>")
- $("<td class='page-num'>"+ i +"</td>").appendTo("#tableBoxPages tr")
- }
- // newTr.append("<td class='page-next'>涓嬩竴椤�</td>")
- $("<td id='nextPage' class='page-next'>涓嬩竴椤�</td>").appendTo("#tableBoxPages tr")
- $("#tableBoxPages tr").eq(0).find("td[id^='nextPage']").click(function(){
- onClickNextPage()
- })
- // pages.show()
- $("#tableBoxPages").show()
-
- setCurPage(1)
- }
- else if (xianshiyemian == 1)
- {
- if(boxNum <= 0){
- //鍒楄〃涓虹┖锛岄殣钘忓垎椤甸〉鐮�
- $("#tableBoxPages1").hide()
- return
- }
-
- let pageNum = Math.floor(boxNum / 10);
- if(boxNum % 10 > 0){
- pageNum += 1;
- }
- //console.log("pageNum is " + pageNum)
-
- $("#tableBoxPages1").find("tr").remove()
- let table = $("#tableBoxPages1")
- $("<tr></tr>").appendTo("#tableBoxPages1")
-
- // let newTr = table.append("<tr></tr>")
- // newTr.append("<td class='page-prev'>涓婁竴椤�</td>")
- $("<td id='prevPage' class='page-prev'>涓婁竴椤�</td>").appendTo("#tableBoxPages1 tr")
- $("#tableBoxPages1 tr").eq(0).find("td[id^='prevPage']").click(function(){
- onClickPrevPage()
- })
- for(i=1; i < pageNum + 1; i++){
- // newTr.append("<td class='page-num'>"+ i +"</td>")
- $("<td class='page-num'>"+ i +"</td>").appendTo("#tableBoxPages1 tr")
- }
- // newTr.append("<td class='page-next'>涓嬩竴椤�</td>")
- $("<td id='nextPage' class='page-next'>涓嬩竴椤�</td>").appendTo("#tableBoxPages1 tr")
- $("#tableBoxPages1 tr").eq(0).find("td[id^='nextPage']").click(function(){
- onClickNextPage()
- })
- // pages.show()
- $("#tableBoxPages1").show()
-
- setCurPage(1)
- }
-
- }
-
- //璁剧疆褰撳墠鍒嗛〉
- function setCurPage(pageIndex){
- if (xianshiyemian == 0)
- {
- let totalTrNum = $("#tableBoxList tr").length
- if(totalTrNum <= 2 ){
- //console.log("tableBoxList 涓虹┖ totalTrNum: " + totalTrNum)
- //curPageIndex = 1
- return
- }
-
- let pageNum = getBoxPageNum()
- if(pageIndex > pageNum){
- //console.log("璁剧疆鐨勯〉鐮佽秴鍑洪〉鏁�, pageIndex : " + pageIndex)
- //curPageIndex = 1
- return
- }
-
- let startIndex = (pageIndex - 1) * 10 + 1
- let n = totalTrNum - startIndex
- let endIndex = 0
- if(n > 9){
- endIndex = startIndex + 9
- }else{
- endIndex = startIndex + n
- }
-
- let trs = $("#tableBoxList tr")
- //console.log("琛屾暟 "+trs.length)
- let d = 0
- for(let i = 2; i < trs.length; i++){
- //console.log("琛岀储寮� " + trs.eq(i).attr('index'))
- let t = trs.eq(i)
- d = t.attr('index')
- if(d >= startIndex && d <= endIndex){
- //console.log("闇�瑕佹樉绀�")
- //鏄剧ず琛�
- t.show()
- }else{
- //闅愯棌琛�
- t.hide()
- }
- }
-
- curPageIndex = pageIndex
-
- let ptr = $("#tableBoxPages tr")
- for(let i = 1; i < pageNum+1; i++){
- ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
- if(i == curPageIndex){
- ptr.eq(0).find("td").eq(i).addClass("page-num-select")
- }
- }
- }
- else if (xianshiyemian == 1)
- {
- let totalTrNum = $("#tableBoxList1 tr").length
- if(totalTrNum <= 2 ){
- return
- }
-
- let pageNum = getBoxPageNum()
- if(pageIndex > pageNum){
- //console.log("璁剧疆鐨勯〉鐮佽秴鍑洪〉鏁�, pageIndex : " + pageIndex)
- //curPageIndex = 1
- return
- }
-
- let startIndex = (pageIndex - 1) * 10 + 1
- let n = totalTrNum - startIndex
- let endIndex = 0
- if(n > 9){
- endIndex = startIndex + 9
- }else{
- endIndex = startIndex + n
- }
-
- let trs = $("#tableBoxList1 tr")
- //console.log("琛屾暟 "+trs.length)
- let d = 0
- for(let i = 2; i < trs.length; i++){
- //console.log("琛岀储寮� " + trs.eq(i).attr('index'))
- let t = trs.eq(i)
- d = t.attr('index')
- if(d >= startIndex && d <= endIndex){
- //console.log("闇�瑕佹樉绀�")
- //鏄剧ず琛�
- t.show()
- }else{
- //闅愯棌琛�
- t.hide()
- }
- }
-
- curPageIndex = pageIndex
-
- let ptr = $("#tableBoxPages1 tr")
- for(let i = 1; i < pageNum+1; i++){
- ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
- if(i == curPageIndex){
- ptr.eq(0).find("td").eq(i).addClass("page-num-select")
- }
- }
- }
-
- }
-
- function getBoxPageNum()
- {
- if (xianshiyemian == 0)
- {
- let num = $("#tableBoxList tr").length
- if(num <= 2 ){
- return 0
- }
-
- let pageNum = Math.floor(num / 10);
- if(num % 10 > 0){
- pageNum += 1;
- }
-
- return pageNum
- }
- else if (xianshiyemian == 1)
- {
- let num = $("#tableBoxList1 tr").length
- if(num <= 2 ){
- return 0
- }
-
- let pageNum = Math.floor(num / 10);
- if(num % 10 > 0){
- pageNum += 1;
- }
-
- return pageNum
- }
-
- }
-
- function onClickPrevPage(){
- //console.log("涓婁竴椤垫寜閽鐐瑰嚮")
- if(curPageIndex == 1){
- return
- }
- setCurPage(curPageIndex - 1)
- }
-
- function onClickNextPage(){
- //console.log("涓嬩竴椤垫寜閽鐐瑰嚮")
- let n = getBoxPageNum()
- if(curPageIndex == n){
- return
- }
- setCurPage(curPageIndex + 1)
- }
-
- /*鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��*/
-
- form.on('switch(IsLianXu)', function (obj) {
- if (obj.elem.checked) {
- $('#BOX2').attr("style", "display:block")
- $('#zongDiv').attr("style", "height: 285px;")
- isContinue = "1";
- } else {
- $('#BOX2').attr("style", "display:none")
- $('#zongDiv').attr("style", "height: 255px;")
- isContinue = "0";
- }
- $('#BOXCODE2').val("");
- });
-
- $("#menuImg").click(function (e) {
- //console.log("menuImg")
- e.stopPropagation()
-
- if ($("#menuList").is(":hidden")) {
- $("#menuList").show()
- } else {
- $("#menuList").hide()
- }
- })
- $('body').click(function () {
- // //console.log("body")
- $("#menuList").hide()
- })
- })
- </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index c139dd7..f722153 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -17,11 +17,11 @@
namespace WMS.BLL.SysServer
{
- public class StorageLocatServer:DbHelper<SysStorageLocat>,IStorageLocatServer
+ public class StorageLocatServer : DbHelper<SysStorageLocat>, IStorageLocatServer
{
private static readonly SqlSugarScope Db = DataContext.Db;
public IStorageLocatRepository LocatRst { get; set; }
- public StorageLocatServer(IStorageLocatRepository locatRst):base(Db)
+ public StorageLocatServer(IStorageLocatRepository locatRst) : base(Db)
{
LocatRst = locatRst;
}
@@ -42,7 +42,7 @@
/// <param name="limit"></param>
/// <param name="count"></param>
/// <returns></returns>
- public List<LocatDto> GetStorageLocatList(string houseNo, string roadwayNo, string areaNo, string status, string flag,string locat, int? row, int? col, int? layer, int page, int limit,out int count)
+ public List<LocatDto> GetStorageLocatList(string houseNo, string roadwayNo, string areaNo, string status, string flag, string locat, int? row, int? col, int? layer, int page, int limit, out int count)
{
try
{
@@ -58,8 +58,8 @@
.AndIF(layer != null, it => it.Layer == layer)
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
-
- var data = LocatRst.GetAllByOrderPageAsync(item, limit, page,out int counts)
+
+ var data = LocatRst.GetAllByOrderPageAsync(item, limit, page, out int counts)
.Includes(x => x.WareHouseInfo)
.Includes(x => x.AreaInfo)
.Includes(x => x.RoadwayInfo)
@@ -119,7 +119,7 @@
}
}
-
+
public bool EditStorageLocat(EditLocateVm model, int userId)
{
try
@@ -129,7 +129,7 @@
return bl;
}
catch (Exception e)
- {
+ {
throw new Exception(e.Message);
}
}
@@ -187,12 +187,12 @@
c1 = c.ToString();
}
var area = l <= 7 ? "A12" : "A11";//鍖哄煙
- for (int d = 1; d<= int.Parse(dept); d++) //娣卞害
+ for (int d = 1; d <= int.Parse(dept); d++) //娣卞害
{
var s = "0" + d;//娣卞害
q += await LocatRst.AddAsync(new SysStorageLocat()
{
- LocatNo = r1 + c1 + l1+s,
+ LocatNo = r1 + c1 + l1 + s,
WareHouseNo = houseNo,
RoadwayNo = roadwayNo,
AreaNo = area,
@@ -205,11 +205,11 @@
CreateUser = userId
});
}
-
-
-
+
+
+
}
}
}
@@ -234,10 +234,10 @@
{
var q = 0;
// 鎺�(缁�)寰幆
- for(int i=1;i<=model.Row;i++)
+ for (int i = 1; i <= model.Row; i++)
{
// 鍒楀惊鐜�
- for (int z = 1; z <= model.Col; z++)
+ for (int z = 1; z <= model.Col; z++)
{
q += await LocatRst.AddAsync(new SysStorageLocat()
{
@@ -271,7 +271,7 @@
{
try
{
- var bl = LocatRst.EditStorageLocatList(model.Id, model.Status, model.Flag,model.Temperature ,userId);
+ var bl = LocatRst.EditStorageLocatList(model.Id, model.Status, model.Flag, model.Temperature, userId);
return bl;
}
@@ -364,14 +364,14 @@
{
var list = Db.Queryable<SysStorageLocat>().Where(m =>
m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row) && m.Depth == depth).ToList();
-
+
return list;
}
catch (Exception e)
{
throw new Exception(e.Message);
}
-
+
}
/// <summary>
@@ -384,20 +384,20 @@
public int GetMaxLayer(string wareHouseNo, string roadway, string row)
{
try
- {
+ {
var road = roadway.Substring(1, roadway.Length - 1);
var num = int.Parse(road);
var rows = (num - 1) * 2 + int.Parse(row);//鎺�
var maxLayer = Db.Queryable<SysStorageLocat>().Where(m =>
- m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row)).Max(m=>m.Layer);
+ m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row)).Max(m => m.Layer);
return maxLayer;
}
catch (Exception e)
{
throw new Exception(e.Message);
- }
+ }
}
/// <summary>
@@ -448,7 +448,7 @@
return depthlist;
}
-
+
/// <summary>
/// 鑾峰彇搴撲綅鍗犳瘮(鍦�)
@@ -607,7 +607,7 @@
{
//鏍规嵁浠撳簱鍙蜂互鍙婂贩閬撳彿鑾峰彇鍌ㄤ綅鍚勭姸鎬佹暟鎹�
string str = "select Row,Status,COUNT(Status) StatusNum from SysStorageLocat where WareHouseNo = @warehouseno and RoadwayNo = @roadwayno group by Row,Status order by Row,Status";
-
+
List<GetLocateVm> getLocateVms = Db.Ado.SqlQuery<GetLocateVm>(str, new
{
warehouseno = wareHouseNo, //浠撳簱鍙�
@@ -636,7 +636,7 @@
try
{
string str = "select RoadwayNo,RoadwayName,WareHouseNo from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
-
+
List<RoadwayDto> roadway = Db.Ado.SqlQuery<RoadwayDto>(str, new
{
isdel = "0", //鏄惁鍒犻櫎
@@ -678,7 +678,7 @@
model.LocatNo = locatNo;
model.Status = storageLocat.Status;
model.PalletNo = stockDetailList[0].PalletNo;
-
+
List<LocateGoodsInfoVm> goodsList = new List<LocateGoodsInfoVm>();
foreach (var item in stockDetailList)
{
@@ -755,5 +755,64 @@
throw new Exception(e.Message);
}
}
+
+ #region 骞冲簱鍥句緥
+
+ /// <summary>
+ /// 鑾峰彇鍌ㄤ綅淇℃伅(骞冲簱鍥句緥)
+ /// </summary>
+ /// <param name="wareHouseNo">浠撳簱</param>
+ /// <param name="row">鎺�</param>
+ /// <returns></returns>
+ public List<SysStorageLocat> GetFlatLibraryLegend(string wareHouseNo, string row)
+ {
+ try
+ {
+ //涓�妤煎尯鍩�
+ //List<string> row1 = new List<string>()
+ //{
+ // "B01",
+ // "B02",
+ // "B03",
+ // "B04",
+ // "B05",
+ // "B06",
+ // "B07",
+ //};
+ ////浜屾ゼ鍖哄煙
+ //List<string> row3 = new List<string>()
+ //{
+ // "B11",
+ // "B12",
+ // "B13",
+ // "B14",
+ // "B15",
+ //};
+ string row1 = "'B01','B02','B03','B04','B05','B06','B07'";
+ string row3 = "'B11','B12','B13','B14','B15'";
+ string str = $"select * from SysStorageLocat where IsDel = '0' and WareHouseNo = '{wareHouseNo}' and ";
+ if (row == "1")
+ {
+ str += $" AreaNo in ({row1})";
+ }
+ else if (row == "3")
+ {
+ str += $" AreaNo in ({row3})";
+ }
+
+ var list = Db.Ado.SqlQuery<SysStorageLocat>(str);
+
+ //var list = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == wareHouseNo && row == "1" ? row1.Contains(m.AreaNo) : row3.Contains(m.AreaNo)).ToList();
+
+ return list;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+
+ }
+
+ #endregion
}
}
diff --git a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
index 4a04723..86169c8 100644
--- a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
@@ -88,7 +88,7 @@
/// <param name="depth">娣卞害</param>
/// <returns></returns>
- List<SysStorageLocat> GetStorageLocatLists(string wareHouseNo, string roadway,string row, string depth);
+ List<SysStorageLocat> GetStorageLocatLists(string wareHouseNo, string roadway, string row, string depth);
/// <summary>
/// 鑾峰彇鏈�澶у眰绾�
@@ -122,7 +122,7 @@
/// <returns></returns>
List<string> GetDepth(string wareHouseNo);
-
+
/// <summary>
/// 鑾峰彇搴撲綅鍗犳瘮(鍦�)
@@ -152,5 +152,19 @@
/// <param name="locatNo"></param>
/// <returns></returns>
LocateInfoVm GetLocateInfo(string locatNo);
+
+ #region 骞冲簱
+
+ /// <summary>
+ /// 鑾峰彇鍌ㄤ綅淇℃伅(骞冲簱鍥句緥)
+ /// </summary>
+ /// <param name="wareHouseNo">浠撳簱</param>
+ /// <param name="row">鎺�</param>
+ /// <returns></returns>
+
+ List<SysStorageLocat> GetFlatLibraryLegend(string wareHouseNo, string row);
+
+ #endregion
+
}
}
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index ac02a38..1ec3250 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -760,7 +760,7 @@
model.CreateUser = int.Parse(userId);
string bolls = _areaSvc.InsertStorageArea(model);
var arr = bolls.Split(":");
- if (arr[0] != "-1" )
+ if (arr[0] != "-1")
{
SysStorageArea area = _areaSvc.GetStorageMaxArea();
_operation.InsertOperation("浠撳簱璁剧疆", "鍖哄煙绠＄悊", area.AreaNo, "娣诲姞", "娣诲姞鍖哄煙淇℃伅 鍖哄煙鍙凤細" + area.AreaNo, Convert.ToInt32(userId));
@@ -1536,6 +1536,7 @@
#region 鍌ㄤ綅鍥句緥
+ #region 绔嬪簱
/// <summary>
/// 鏍规嵁浠撳簱 鎺�
/// </summary>
@@ -1652,6 +1653,41 @@
});
}
+
+
+ #endregion
+
+ #region 骞冲簱
+
+ /// <summary>
+ /// 鏍规嵁浠撳簱 鎺�
+ /// </summary>
+ /// <param name="wareHouseNo">浠撳簱</param>
+ /// <param name="row">鎺�</param>
+ /// <param name="depth">娣卞害</param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetFlatLibraryLegend(string wareHouseNo, string row)
+ {
+ //鑾峰彇鍌ㄤ綅淇℃伅
+ List<SysStorageLocat> storagelist = _locatSvc.GetFlatLibraryLegend(wareHouseNo, row);
+
+ //Dictionary<string, int> dic = new Dictionary<string, int>()
+ //{
+ // "B01"
+ //};
+
+ return Ok(new
+ {
+ data = storagelist,
+ //dic,
+ code = 0,
+ msg = ""
+ });
+ }
+
+ #endregion
+
/// <summary>
/// 鏍规嵁鍌ㄤ綅鍦板潃鑾峰彇鍌ㄤ綅涓婄殑鎵樼洏鍜岀墿鍝佷俊鎭�
/// </summary>
--
Gitblit v1.8.0