From 603ec6242dd3a46bda3ea54082e06240b21c673e Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 19 十月 2024 19:07:37 +0800
Subject: [PATCH] 问题修改
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 42
HTML/views/ASNSetting/SelMaterials.html | 493 ++++++------
HTML/views/BaseSetting/Materials.html | 1080 ++++++++++++++--------------
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 40
Wms/Model/ModelDto/DataDto/StockDetailDto.cs | 4
Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs | 9
HTML/views/StatisticalReport/InventoryStatistics.html | 522 ++++++-------
Wms/Wms/Controllers/StatisticalController.cs | 9
Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs | 8
Wms/WMS.IBLL/IDataServer/IStockServer.cs | 3
Wms/WMS.BLL/DataServer/StockServer.cs | 47
11 files changed, 1,129 insertions(+), 1,128 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 0775cc6..1101799 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -175,13 +175,16 @@
{ field: 'Standard', title: '瑙勬牸', width: 160, align: 'center' },
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', edit: 'text', width: 160 },
{ field: 'PackagNo', title: '鍖呰鍚嶇О', width: 160, templet: "#table-content-Packlist" },
- { field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
- { field: 'Money', title: '閲戦', align: 'center', width: 100 },
- { field: 'UDF1', title: '鑷畾涔夊垪1', align: 'center', edit: 'text', width: 140 },
- { field: 'UDF2', title: '鑷畾涔夊垪2', align: 'center', edit: 'text', width: 140 },
- { field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', edit: 'text', width: 140 },
- { field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', edit: 'text', width: 140 },
- { field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
+ { field: 'Lot1', title: '鐢熶骇鏃ユ湡', align: 'center', edit: 'text', width: 140 },
+ { field: 'Lot2', title: '杩囨湡鏃ユ湡', align: 'center', edit: 'text', width: 140 },
+
+ // { field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
+ // { field: 'Money', title: '閲戦', align: 'center', width: 100 },
+ // { field: 'UDF1', title: '鑷畾涔夊垪1', align: 'center', edit: 'text', width: 140 },
+ // { field: 'UDF2', title: '鑷畾涔夊垪2', align: 'center', edit: 'text', width: 140 },
+ // { field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', edit: 'text', width: 140 },
+ // { field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', edit: 'text', width: 140 },
+ // { field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 170, align: 'center', templet: '#table-content-list', "disabled": true }
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -519,29 +522,6 @@
}
})
- // var IsBaleValue = "";
- // form.on('switch(IsBaleDemo)', function (obj) {
- // layer.tips(this.value + ' ' + this.name + '锛�' + obj.elem.checked, obj.othis);
- // if (obj.elem.checked) {
- // IsBaleValue = "1";
- // } else {
- // IsBaleValue = "0";
- // }
- // });
-
- // table.on('row(LAY-app-content-list)', function (obj) {
- // if (IsBaleValue != "") {
- // for (var j in arr) {
- // if (obj.data.SkuNo == arr[j].SkuNo) {
- // arr[j].IsBale = IsBaleValue;
- // IsBaleValue = ""
- // break;
- // }
- // }
- // }
-
- // })
-
// 鍒犻櫎鍏ュ簱鍗曟槑缁�
table.on('tool(LAY-app-content-list)', function (obj) {
if (obj.event == 'del') {
@@ -842,6 +822,8 @@
IsBale: arr[i].IsBale,
IsBelt: arr[i].IsBelt,
SupplierLot: arr[i].SupplierLot,
+ Lot1: arr[i].Lot1,
+ Lot2: arr[i].Lot2,
UDF1: arr[i].UDF1,
UDF2: arr[i].UDF2,
UDF3: arr[i].UDF3,
diff --git a/HTML/views/ASNSetting/SelMaterials.html b/HTML/views/ASNSetting/SelMaterials.html
index 8e0d04a..7b963c9 100644
--- a/HTML/views/ASNSetting/SelMaterials.html
+++ b/HTML/views/ASNSetting/SelMaterials.html
@@ -1,280 +1,265 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <title>閫夋嫨鐗╂枡淇℃伅</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- </head>
- <body>
- <div class="layui-fluid">
- <div class="layui-card">
- <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">鍏抽敭瀛�</label>
- <div class="layui-input-inline">
- <input type="text" id="Msg" name="Msg" placeholder="缂栫爜/鍚嶇О/瑙勬牸" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
- <div class="layui-input-inline">
- <select name="Type" id="Type" lay-filter="Type" disabled="disabled"
- lay-search>
- <option value="0">鎴愬搧鍏ュ簱</option>
- <option value="1">閲囪喘鍏ュ簱</option>
- <option value="2">涓棿鍝佸叆搴�</option>
- <option value="3">閫�璐у叆搴�</option>
- <option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
- <option value="5">鍏跺畠鍏ュ簱</option>
- <option value="6">浠ｅ偍鍏ュ簱</option>
- <option value="7">瀵勫瓨鍏ュ簱</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
- </button>
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" data-type="setParent">纭畾</button>
+<head>
+ <meta charset="utf-8">
+ <title>閫夋嫨鐗╂枡淇℃伅</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+</head>
+
+<body>
+
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <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">鍏抽敭瀛�</label>
+ <div class="layui-input-inline">
+ <input type="text" id="Msg" name="Msg" placeholder="缂栫爜/鍚嶇О/瑙勬牸" autocomplete="off"
+ class="layui-input">
</div>
</div>
- </div>
- <div class="layui-card-body">
- <table id="goods-list" lay-filter="goods-list"></table>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="Type" id="Type" lay-filter="Type" disabled="disabled" lay-search>
+ <option value="0">鎴愬搧鍏ュ簱</option>
+ <option value="1">閲囪喘鍏ュ簱</option>
+ <option value="2">涓棿鍝佸叆搴�</option>
+ <option value="3">閫�璐у叆搴�</option>
+ <option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
+ <option value="5">鍏跺畠鍏ュ簱</option>
+ <option value="6">浠ｅ偍鍏ュ簱</option>
+ <option value="7">瀵勫瓨鍏ュ簱</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ lay-filter="LAY-app-contlist-search">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
+ </button>
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list" data-type="setParent">纭畾</button>
+ </div>
</div>
</div>
+ <div class="layui-card-body">
+ <table id="goods-list" lay-filter="goods-list"></table>
+ </div>
</div>
+ </div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../js/jquery-3.5.1.min.js"></script>
- <script src="../../js/jquery.cookie.js"></script>
- <script src="../../js/public.js"></script>
-
- <script>
- layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'layer'], function() {
- var table = layui.table,
- form = layui.form,
- laypage = layui.laypage,
- index1 = parent.layer.getFrameIndex(window.name),
- layer = layui.layer;
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script src="../../js/public.js"></script>
+
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'table', 'laypage', 'layer'], function () {
+ var table = layui.table,
+ form = layui.form,
+ laypage = layui.laypage,
+ index1 = parent.layer.getFrameIndex(window.name),
+ layer = layui.layer;
- // 鑾峰彇涓婃父椤甸潰鐨勪紶鍊�
- getQueryString('type');
-
+ // 鑾峰彇涓婃父椤甸潰鐨勪紶鍊�
+ getQueryString('type');
- function getQueryString(name) {
- var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
- var r = window.location.search.substr(1).match(reg);
- if (r != null)
- {
- // $("#Type").empty();
- // if (unescape(r[2]) == 0)
- // {
- // $("#Type").append('<option value ="0" Selected >鏍囧噯鐗╂枡</option>');
- // $("#Type").append('<option value ="1">闈炴爣鐗╂枡</option>');
- // }
- // if (unescape(r[2]) == 1)
- // {
- // $("#Type").append('<option value ="0">鏍囧噯鐗╂枡</option>');
- // $("#Type").append('<option value ="1" Selected >闈炴爣鐗╂枡</option>');
- // }
+ function getQueryString(name) {
+ var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+ var r = window.location.search.substr(1).match(reg);
-
- $("#Type").val(unescape(r[2])); // "optionValue"涓洪渶瑕佽閫変腑鐨勯�夐」鐨剉alue灞炴�у��
- form.render('select');
- }
+ if (r != null) {
+ // $("#Type").empty();
+ // if (unescape(r[2]) == 0)
+ // {
+ // $("#Type").append('<option value ="0" Selected >鏍囧噯鐗╂枡</option>');
+ // $("#Type").append('<option value ="1">闈炴爣鐗╂枡</option>');
+ // }
+ // if (unescape(r[2]) == 1)
+ // {
+ // $("#Type").append('<option value ="0">鏍囧噯鐗╂枡</option>');
+ // $("#Type").append('<option value ="1" Selected >闈炴爣鐗╂枡</option>');
+ // }
- //return null;
+
+ $("#Type").val(unescape(r[2])); // "optionValue"涓洪渶瑕佽閫変腑鐨勯�夐」鐨剉alue灞炴�у��
+ form.render('select');
}
+ //return null;
+ }
- refreshTable();
- var active = {
- setParent: function(){
- var checkStatus = table.checkStatus('goods-list');
- var id = '#LAY-app-content-list',goods = $('#goods-list');
- if(checkStatus.data.length == 0)
- {
- parent.layer.msg('璇烽�夋嫨寰呭叆搴撶殑鐗╂枡锛�');
- return true;
+ refreshTable();
+
+ var active = {
+ setParent: function () {
+ var checkStatus = table.checkStatus('goods-list');
+ var id = '#LAY-app-content-list', goods = $('#goods-list');
+ if (checkStatus.data.length == 0) {
+ parent.layer.msg('璇烽�夋嫨寰呭叆搴撶殑鐗╂枡锛�');
+ return true;
}
window.parent.success(checkStatus.data);
- parent.layer.close(index1);
- }
- };
- $('.layui-inline .layui-btn').on('click', function(){
- var othis = $(this)
- ,type = othis.data('type');
- active[type] && active[type].call(this);
- });
-
-
- var tableIns;
- function refreshTable() {
- var param = {
- SkuNo: $("#Msg").val(),
- Type: $("#Type").val()
- };
-
- sendData(IP + "/BllAsn/GetMaterialsList", param, 'post', function(res) {
- if (res.code == 0) { //鎴愬姛
- var list = res.data;
- $.extend(infoOptions, {
- data: list
- });
- infoOptions.page = {
- curr: 1
- }
- tableIns = table.render(infoOptions);
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇鐗╂枡淇℃伅澶辫触锛�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- });
-
+ parent.layer.close(index1);
}
- // 琛ㄥ崟闇�瑕佺殑鍙橀噺
- var infoOptions = {
- elem: '#goods-list',
- height: 'full-100',
- id: 'goods-list',
- page: true,
- limit: pageCnt,
- limits: pageLimits,
- cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- cols: [
- [{
- field: 'SkuId',
- title: 'Id',
- type: 'checkbox',
- width: 100,
- sort: true,
- fixed: 'left'
- }, {
- field: 'SkuNo',
- title: '鐗╂枡缂栫爜',
- width: 100,
- fixed: 'left'
- }, {
- field: 'SkuName',
- title: '鐗╂枡鍚嶇О',
- width: 180,
- },{
- field: 'Standard',
- title: '瑙勬牸',
- align: 'center',
- width: 180
- }, {
- field: 'Type',
- title: '绫诲瀷',
- width: 100,
- templet: function (d) {
- switch (d.Type) {
- case "0" : return "鍘熸枡";
- case "1" : return "鍖呮潗";
- case "2" : return "鎴愬搧";
- case "3" : return "鑰楁潗";
- case "4" : return "鍗婃垚鍝�";
- default : return "";
- }
- }
- }, {
- field: 'IsControlled',
- title: '鏄惁鏍囧噯',
- // JC08 title: '鏄惁鍙楁帶',
- width: 100,
- // JC09
- templet: function (d) {
- switch (d.IsControlled) {
- case "0" : return "鏍囧噯";
- case "1" : return "闈炴爣";
- default : return "";
- }
- },
- // JC08
- // templet: function (d) {
- // switch (d.IsBale) {
- // case "0" : return "鍙楁帶";
- // case "1" : return "闈炲彈鎺�";
- // default : return "";
- // }
- // }
- },{
- field: 'IsInspect',
- title: '鏄惁鍏嶆',
- width: 100,
- templet: function (d) {
- switch (d.IsInspect) {
- case "0" : return "鍚�";
- case "1" : return "鏄�";
- default : return "";
- }
- },
- },{
- field: 'Origin',
- title: '鏉ユ簮',
- width: 120
- },{
- field: 'UnitName',
- title: '璁￠噺鍗曚綅',
- width: 100,
- }, {
- field: 'PackagName',
- title: '鍖呰鍚嶇О',
- width: 120
- }, {
- field: 'Environment',
- title: '瀛樺偍鐜',
- width: 120,
- templet: function (d) {
- switch (d.Environment) {
- case "0" : return "甯告俯";
- case "1" : return "浣庢俯";
- case "3" : return "骞茬嚗閫氶";
- default : return "";
- }
- },
- }, {
- field: 'Weight',
- title: '鐞嗚閲嶉噺',
- width: 100
- },{
- field: 'Price',
- title: '鐞嗚鍗曚环',
- width: 100
- }, {
- field: 'Warranty',
- title: '淇濊川鏈�(澶�)',
- width: 100
- },{
- field: 'GoodsRemark',
- title: '澶囨敞',
- width: 160
- }
- ]
- ],
-
+ };
+ $('.layui-inline .layui-btn').on('click', function () {
+ var othis = $(this)
+ , type = othis.data('type');
+ active[type] && active[type].call(this);
+ });
+
+
+ var tableIns;
+ function refreshTable() {
+ var param = {
+ SkuNo: $("#Msg").val(),
+ Type: $("#Type").val()
};
- //鐩戝惉鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- refreshTable();
+ sendData(IP + "/BllAsn/GetMaterialsList", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ var list = res.data;
+ $.extend(infoOptions, {
+ data: list
+ });
+ infoOptions.page = {
+ curr: 1
+ }
+ tableIns = table.render(infoOptions);
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鐗╂枡淇℃伅澶辫触锛�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
});
+
+ }
+ // 琛ㄥ崟闇�瑕佺殑鍙橀噺
+ var infoOptions = {
+ elem: '#goods-list',
+ height: 'full-100',
+ id: 'goods-list',
+ page: true,
+ limit: pageCnt,
+ limits: pageLimits,
+ cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ cols: [
+ [{
+ field: 'SkuId',
+ title: 'Id',
+ type: 'checkbox',
+ width: 100,
+ sort: true,
+ fixed: 'left'
+ }, {
+ field: 'SkuNo',
+ title: '鐗╂枡缂栫爜',
+ width: 100,
+ fixed: 'left'
+ }, {
+ field: 'SkuName',
+ title: '鐗╂枡鍚嶇О',
+ width: 180,
+ }, {
+ field: 'Standard',
+ title: '瑙勬牸',
+ align: 'center',
+ width: 180
+ }, {
+ field: 'Type',
+ title: '绫诲瀷',
+ width: 100,
+ templet: function (d) {
+ switch (d.Type) {
+ case "0": return "鍘熸枡";
+ case "1": return "鍖呮潗";
+ case "2": return "鎴愬搧";
+ case "3": return "鑰楁潗";
+ case "4": return "鍗婃垚鍝�";
+ default: return "";
+ }
+ }
+ },
+
+ {
+ field: 'IsControlled',
+ title: '鏄惁鏍囧噯',
+ // JC08 title: '鏄惁鍙楁帶',
+ width: 100,
+ // JC09
+ templet: function (d) {
+ switch (d.IsControlled) {
+ case "0": return "鏍囧噯";
+ case "1": return "闈炴爣";
+ default: return "";
+ }
+ },
+ }, {
+ field: 'IsInspect',
+ title: '鏄惁鍏嶆',
+ width: 100,
+ templet: function (d) {
+ switch (d.IsInspect) {
+ case "0": return "鍚�";
+ case "1": return "鏄�";
+ default: return "";
+ }
+ },
+ }, {
+ field: 'Origin',
+ title: '鏉ユ簮',
+ width: 120
+ }, {
+ field: 'UnitName',
+ title: '璁￠噺鍗曚綅',
+ width: 100,
+ }, {
+ field: 'PackagName',
+ title: '鍖呰鍚嶇О',
+ width: 120
+ }, {
+ field: 'Environment',
+ title: '瀛樺偍鐜',
+ width: 120,
+ templet: function (d) {
+ switch (d.Environment) {
+ case "0": return "甯告俯";
+ case "1": return "浣庢俯";
+ case "3": return "骞茬嚗閫氶";
+ default: return "";
+ }
+ },
+ }, {
+ field: 'GoodsRemark',
+ title: '澶囨敞',
+ width: 160
+ }
+ ]
+ ],
+
+ };
+
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ refreshTable();
});
- </script>
- </body>
-</html>
+ });
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 737e044..8f100aa 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -1,133 +1,141 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <title>鐗╂枡缂栫爜淇℃伅鍒楄〃</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script>
- // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
-
- //鑾峰彇table榛樿鏄剧ず鏁�
- pageCntFirst();
- });
- </script>
- </head>
- <body id="body">
- <div class="layui-fluid" style="padding-bottom: 0;">
- <div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
- <div class="layui-form-item">
- <!-- 鐗╂枡缂栫爜 -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
- <div class="layui-input-inline">
- <input type="text" id="SkuNo" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" autocomplete="off" class="layui-input">
- </div>
- </div>
- <!-- 鐗╂枡鍚嶇О -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" id="SkuName" name="SkuName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <!-- 瀹℃牳鐘舵�� -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">瀹℃牳鐘舵��</label>
- <div class="layui-input-inline">
- <select name="AuditStatusNo" id="AuditStatusNo" lay-verify="">
- <option value=""></option>
- <option value="0">寰呭鏍�</option>
- <option value="9">宸查�氳繃</option>
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline">
- <!-- 绫诲瀷 -->
- <label class="layui-form-label" style="width: 60px;">绫诲瀷</label>
- <div class="layui-input-inline">
- <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">鍘熸枡</option>
- <option value="1">鍖呮潗</option>
- <option value="2">鎴愬搧</option>
- <option value="3">鑰楁潗</option>
- <option value="4">涓棿鍝�</option>
- </select>
- </div>
- </div>
- <!-- 鏄惁鍙楁帶 -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鏄惁鍙楁帶</label>
- <div class="layui-input-inline">
- <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">鍙楁帶</option>
- <option value="1">闈炲彈鎺�</option>
- </select>
- </div>
- </div>
- <!-- 鏄惁鍏嶆 -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鏄惁鍏嶆</label>
- <div class="layui-input-inline">
- <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">鍚�</option>
- <option value="1">鏄�</option>
- </select>
- </div>
- </div>
- <!-- 瀛樺偍鐜 -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">瀛樺偍鐜</label>
- <div class="layui-input-inline">
- <select name="Environment" id="Environment" lay-verify="" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">甯告俯</option>
- <option value="1">浣庢俯</option>
- <!-- <option value="3">骞茬嚗閫氶</option> -->
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <!-- 鐗╂枡绫诲埆 -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鐗╂枡绫诲埆</label>
- <div class="layui-input-inline">
- <select name="CategoryNo" id="CategoryNo" lay-verify="">
- <option value=""></option>
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
- </button>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn" style="margin-right: 10px;" data-type="add" id="approvalBtn">
- <i class="layui-icon layuiadmin-button-btn"></i>娣诲姞
- </button>
+
+<head>
+ <meta charset="utf-8">
+ <title>鐗╂枡缂栫爜淇℃伅鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script>
+ // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+ document.addEventListener("DOMContentLoaded", function () {
+
+ //鑾峰彇table榛樿鏄剧ず鏁�
+ pageCntFirst();
+ });
+ </script>
+</head>
+
+<body id="body">
+ <div class="layui-fluid" style="padding-bottom: 0;">
+ <div class="layui-card">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC"
+ id="top">
+ <div class="layui-form-item">
+ <!-- 鐗╂枡缂栫爜 -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-inline">
+ <input type="text" id="SkuNo" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" autocomplete="off"
+ class="layui-input">
</div>
</div>
+ <!-- 鐗╂枡鍚嶇О -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" id="SkuName" name="SkuName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <!-- 瀹℃牳鐘舵�� -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">瀹℃牳鐘舵��</label>
+ <div class="layui-input-inline">
+ <select name="AuditStatusNo" id="AuditStatusNo" lay-verify="">
+ <option value=""></option>
+ <option value="0">寰呭鏍�</option>
+ <option value="9">宸查�氳繃</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <!-- 绫诲瀷 -->
+ <label class="layui-form-label" style="width: 60px;">绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">鍘熸枡</option>
+ <option value="1">鍖呮潗</option>
+ <option value="2">鎴愬搧</option>
+ <option value="3">鑰楁潗</option>
+ <option value="4">涓棿鍝�</option>
+ </select>
+ </div>
+ </div>
+ <!-- 鏄惁鍙楁帶 -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鏄惁鍙楁帶</label>
+ <div class="layui-input-inline">
+ <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">鍙楁帶</option>
+ <option value="1">闈炲彈鎺�</option>
+ </select>
+ </div>
+ </div>
+ <!-- 鏄惁鍏嶆 -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鏄惁鍏嶆</label>
+ <div class="layui-input-inline">
+ <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
+ <!-- 瀛樺偍鐜 -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">瀛樺偍鐜</label>
+ <div class="layui-input-inline">
+ <select name="Environment" id="Environment" lay-verify="" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">甯告俯</option>
+ <option value="1">浣庢俯</option>
+ <!-- <option value="3">骞茬嚗閫氶</option> -->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <!-- 鐗╂枡绫诲埆 -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍖哄煙绫诲埆</label>
+ <div class="layui-input-inline">
+ <select name="CategoryNo" id="CategoryNo" lay-verify="">
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ lay-filter="LAY-app-contlist-search">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
+ </button>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn"
+ style="margin-right: 10px;" data-type="add" id="approvalBtn">
+ <i class="layui-icon layuiadmin-button-btn"></i>娣诲姞
+ </button>
+ </div>
</div>
+ </div>
- <div id="center"></div>
+ <div id="center"></div>
- <div class="layui-card-body">
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
-
- <!-- 瀹℃牳鐘舵�� -->
- <script type="text/html" id="buttonAuditStatusNo">
+ <div class="layui-card-body">
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+
+ <!-- 瀹℃牳鐘舵�� -->
+ <script type="text/html" id="buttonAuditStatusNo">
{{# if(d.AuditStatusNo=='0'){ }}
<button class="layui-btn layui-btn-radius layui-btn-xs" style="background-color:RED;">寰呭鏍�</button>
{{# } else if(d.AuditStatusNo=='9') { }}
@@ -136,8 +144,8 @@
<button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs" style="background-color: blue;">鍏跺畠</button>
{{# } }}
</script>
- <!-- 绫诲瀷 -->
- <script type="text/html" id="buttonType">
+ <!-- 绫诲瀷 -->
+ <script type="text/html" id="buttonType">
{{# if(d.Type=='0'){ }}
<p>鍘熸枡</p>
{{# } else if(d.Type=='1') { }}
@@ -151,17 +159,17 @@
{{# } }}
</script>
- <!-- 鏄惁鍙楁帶 -->
- <script type="text/html" id="buttonIsControlled">
+ <!-- 鏄惁鍙楁帶 -->
+ <script type="text/html" id="buttonIsControlled">
{{# if(d.IsControlled=='0'){ }}
<p>鍙楁帶</p>
{{# } else if(d.IsControlled=='1') { }}
<p>闈炲彈鎺�</p>
{{# } }}
</script>
-
- <!-- 鏄惁鍏嶆 -->
- <script type="text/html" id="buttonIsInspect">
+
+ <!-- 鏄惁鍏嶆 -->
+ <script type="text/html" id="buttonIsInspect">
{{# if(d.IsInspect=='0'){ }}
<p>鍚�</p>
{{# } else if(d.IsInspect=='1') { }}
@@ -169,8 +177,8 @@
{{# } }}
</script>
- <!-- 瀛樺偍鐜 -->
- <script type="text/html" id="buttonEnvironment">
+ <!-- 瀛樺偍鐜 -->
+ <script type="text/html" id="buttonEnvironment">
{{# if(d.Environment=='0'){ }}
<p>甯告俯</p>
{{# } else if(d.Environment=='1') { }}
@@ -180,7 +188,7 @@
{{# } }}
</script>
- <script type="text/html" id="table-content-list">
+ <script type="text/html" id="table-content-list">
<a class="layui-btn layui-btn-normal layui-btn-xs approvalBtnupt" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>缂栬緫
</a>
@@ -188,463 +196,449 @@
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎
</a>
</script>
- </div>
</div>
</div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../js/public.js"></script>
- <script src="../../js/jquery-3.5.1.min.js"></script>
- <script src="../../js/jquery.cookie.js"></script>
- <script>
- 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;
+ </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>
+ 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 h1 = GetTableHeight();
- refreshTable("","","","","","","","");
- var tableIns;
- //鑾峰彇绫诲埆淇℃伅
- sendData(IP + "/sys/GetMaterialCategories1",{},'get',function(res){
- console.log(res)
- if (res.code == 1) //鎴愬姛
- {
- Categoryhtml = '<option value =""></option>';
- for (var i = 0; i < res.data.length; i++) {
- Categoryhtml = Categoryhtml + '<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>'
- }
- $("#CategoryNo").append(Categoryhtml);
- form.render('select');
+ var h1 = GetTableHeight();
+ refreshTable("", "", "", "", "", "", "", "");
+ var tableIns;
+ //鑾峰彇绫诲埆淇℃伅
+ sendData(IP + "/sys/GetMaterialCategories1", {}, 'get', function (res) {
+ console.log(res)
+ if (res.code == 1) //鎴愬姛
+ {
+ Categoryhtml = '<option value =""></option>';
+ for (var i = 0; i < res.data.length; i++) {
+ Categoryhtml = Categoryhtml + '<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>'
}
- })
-
- function refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment,CategoryNo) {
- var param = {
- SkuNo: SkuNo,
- SkuName: SkuName,
- AuditStatusNo: AuditStatusNo,
- Type: Type,
- IsControlled: IsControlled,
- IsInspect: IsInspect,
- Environment: Environment,
- CategoryNo:CategoryNo
- };
-
- var url = "/Basis/GetMateList?SkuNo="+SkuNo+"&&SkuName="+SkuName+"&&AuditStatusNo="+AuditStatusNo+"&&Type="+Type+"&&IsControlled="+IsControlled+"&&IsInspect="+IsInspect+"&&Environment="+Environment+"&CategoryNo="+CategoryNo;
- sendData(IP + url, {}, 'get', function(res) {
- if (res.code == 0) //鎴愬姛
- {
- var list = res.data;
- $.extend(infoOptions, {
- data: list
- });
- infoOptions.page = {
- curr: 1
- }
- tableIns = table.render(infoOptions);
- }
- else //涓嶆垚鍔�
- {
- layer.msg('鑾峰彇鐗╂枡鍒楄〃淇℃伅澶辫触锛�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- });
+ $("#CategoryNo").append(Categoryhtml);
+ form.render('select');
}
- sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
- $(function() {
- $("#approvalBtn").hide();
- });
- $(function() {
- $(".approvalBtndel").hide();
- });
- $(function() {
- $(".approvalBtnupt").hide();
- });
+ })
+
+ function refreshTable(SkuNo, SkuName, AuditStatusNo, Type, IsControlled, IsInspect, Environment, CategoryNo) {
+ var param = {
+ SkuNo: SkuNo,
+ SkuName: SkuName,
+ AuditStatusNo: AuditStatusNo,
+ Type: Type,
+ IsControlled: IsControlled,
+ IsInspect: IsInspect,
+ Environment: Environment,
+ CategoryNo: CategoryNo
+ };
+
+ var url = "/Basis/GetMateList?SkuNo=" + SkuNo + "&&SkuName=" + SkuName + "&&AuditStatusNo=" + AuditStatusNo + "&&Type=" + Type + "&&IsControlled=" + IsControlled + "&&IsInspect=" + IsInspect + "&&Environment=" + Environment + "&CategoryNo=" + CategoryNo;
+ sendData(IP + url, {}, 'get', function (res) {
if (res.code == 0) //鎴愬姛
{
- for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "娣诲姞鐗╂枡")
- {
- $(function() {
- $("#approvalBtn").show();
- });
- }
- if (res.data[k].MenuName == "鍒犻櫎鐗╂枡")
- {
- $(function() {
- $(".approvalBtndel").show();
- });
- }
- if (res.data[k].MenuName == "缂栬緫鐗╂枡")
- {
- $(function() {
- $(".approvalBtnupt").show();
- });
- }
+ var list = res.data;
+ $.extend(infoOptions, {
+ data: list
+ });
+ infoOptions.page = {
+ curr: 1
}
+ tableIns = table.render(infoOptions);
}
else //涓嶆垚鍔�
{
- layer.msg(
- "鑾峰彇淇℃伅澶辫触",
- {
- icon: 2,
- time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- },
- function () {
- //鍥炶皟
- }
- );
+ layer.msg('鑾峰彇鐗╂枡鍒楄〃淇℃伅澶辫触锛�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
}
});
-
- var infoOptions = {
- elem: "#LAY-app-content-list",
- height: h1,
- id: "LAY-app-content-list",
- page: true,
- limit: pageCnt,
- limits: pageLimits,
- even: true,
- cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- cols:
+ }
+ sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
+ $(function () {
+ $("#approvalBtn").hide();
+ });
+ $(function () {
+ $(".approvalBtndel").hide();
+ });
+ $(function () {
+ $(".approvalBtnupt").hide();
+ });
+ if (res.code == 0) //鎴愬姛
+ {
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "娣诲姞鐗╂枡") {
+ $(function () {
+ $("#approvalBtn").show();
+ });
+ }
+ if (res.data[k].MenuName == "鍒犻櫎鐗╂枡") {
+ $(function () {
+ $(".approvalBtndel").show();
+ });
+ }
+ if (res.data[k].MenuName == "缂栬緫鐗╂枡") {
+ $(function () {
+ $(".approvalBtnupt").show();
+ });
+ }
+ }
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(
+ "鑾峰彇淇℃伅澶辫触",
+ {
+ icon: 2,
+ time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ },
+ function () {
+ //鍥炶皟
+ }
+ );
+ }
+ });
+
+ var infoOptions = {
+ elem: "#LAY-app-content-list",
+ height: h1,
+ 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',width:65
+ title: '搴忓彿', type: 'numbers', fixed: 'left', width: 65
},
{
- field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',fixed: 'left',width: 100
- },
- {
- field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center',width: 150
- },
- {
- field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center',width: 130
- },
- {
- field: 'AuditStatusNo',title: '瀹℃牳鐘舵��',align: 'center',templet: '#buttonAuditStatusNo',width: 100
+ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', fixed: 'left', width: 100
},
{
- field: 'Type',title: '绫诲瀷',align: 'center',templet: '#buttonType',width: 100
+ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 150
},
{
- field: 'IsControlled',templet: '#buttonIsControlled',title: '鏄惁鍙楁帶',align: 'center',width: 100
- },
- {
- field: 'IsInspect',title: '鏄惁鍏嶆',align: 'center',templet: '#buttonIsInspect',width: 100
- },
- {
- field: 'Origin',title: '鏉ユ簮',align: 'center',width: 200
- },
- {
- field: 'UnitName',title: '鍗曚綅',align: 'center',width: 100
+ field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', width: 130
},
{
- field: 'PackagName',title: '鍖呰',align: 'center',width: 100
+ field: 'AuditStatusNo', title: '瀹℃牳鐘舵��', align: 'center', templet: '#buttonAuditStatusNo', width: 100
},
{
- field: 'Environment',title: '瀛樺偍鐜',align: 'center',templet: '#buttonEnvironment',width: 120
+ field: 'Type', title: '绫诲瀷', align: 'center', templet: '#buttonType', width: 100
},
{
- field: 'CategoryName',title: '鐗╂枡绫诲埆',align: 'center',width: 120
+ field: 'IsControlled', templet: '#buttonIsControlled', title: '鏄惁鍙楁帶', align: 'center', width: 100
},
{
- field: 'Weight',title: '鐞嗚閲嶉噺',align: 'center',width: 135
- },
- {
- field: 'Warranty',title: '淇濊川鏈�(澶�)',align: 'center',width: 140
+ field: 'IsInspect', title: '鏄惁鍏嶆', align: 'center', templet: '#buttonIsInspect', width: 100
},
{
- field: 'Price',title: '鐞嗚鍗曚环',align: 'center',width: 150
+ field: 'Origin', title: '鏉ユ簮', align: 'center', width: 200
},
{
- field: 'AdventTime',title: '涓存湡(澶�)',align: 'center',width: 140
+ field: 'UnitName', title: '鍗曚綅', align: 'center', width: 100
},
{
- field: 'LowInventory',title: '浣庡簱瀛�',align: 'center',width: 150
+ field: 'PackagName', title: '鍖呰', align: 'center', width: 100
},
{
- field: 'Demo',title: '澶囨敞',align: 'center',width: 200
+ field: 'Environment', title: '瀛樺偍鐜', align: 'center', templet: '#buttonEnvironment', width: 120
},
{
- field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center',width: 130
+ field: 'CategoryName', title: '鐗╂枡绫诲埆', align: 'center', width: 120
},
{
- field: 'CreateTime',title: '鍒涘缓鏃ユ湡',align: 'center',width: 170,
+ field: 'Weight', title: '鐞嗚閲嶉噺', align: 'center', width: 135
+ },
+ {
+ field: 'Warranty', title: '淇濊川鏈�(澶�)', align: 'center', width: 140
+ },
+ {
+ field: 'Price', title: '鐞嗚鍗曚环', align: 'center', width: 150
+ },
+ {
+ field: 'AdventTime', title: '涓存湡(澶�)', align: 'center', width: 140
+ },
+ {
+ field: 'LowInventory', title: '浣庡簱瀛�', align: 'center', width: 150
+ },
+ {
+ field: 'Demo', title: '澶囨敞', align: 'center', width: 200
+ },
+ {
+ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 130
+ },
+ {
+ field: 'CreateTime', title: '鍒涘缓鏃ユ湡', align: 'center', width: 170,
templet: function (d) {
return formatDate(d.CreateTime);
}
},
{
- title: '鎿嶄綔',fixed: 'right',align: 'center',toolbar: '#table-content-list',width: 170
+ title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list', width: 170
}
]],
+ };
+
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ var SkuNo = data.field.SkuNo;
+ var SkuName = data.field.SkuName;
+ var AuditStatusNo = data.field.AuditStatusNo;
+ var Type = data.field.Type;
+ var IsControlled = data.field.IsControlled;
+ var IsInspect = data.field.IsInspect;
+ var Environment = data.field.Environment;
+ var CategoryNo = data.field.CategoryNo;
+
+ refreshTable(SkuNo, SkuName, AuditStatusNo, Type, IsControlled, IsInspect, Environment, CategoryNo);
+ });
+ var doing = true;
+ var $ = layui.$,
+ active = {
+ //鏂板
+ add: function () {
+ layer.open({
+ type: 2,
+ title: '娣诲姞鐗╂枡淇℃伅',
+ content: 'MaterialsForm.html',
+ maxmin: true,
+ area: ['640px', '680px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index],
+ submitID = 'layuiadmin-app-form-submit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function (
+ data) {
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ SkuNo: field.SkuNo,
+ SkuName: field.SkuName,
+ Standard: field.Standard,
+ //AuditStatusNo: field.AuditStatusNo,
+ Type: field.Type,
+ IsControlled: field.IsControlled,
+ IsInspect: field.IsInspect,
+ Origin: field.Origin,
+ CategoryNo: field.CategoryNo,
+ UnitNo: field.UnitNo,
+ PackagNo: field.PackagNo,
+ Environment: field.Environment,
+ Weight: Number(field.Weight),
+ Warranty: Number(field.Warranty),
+ Price: Number(field.Price),
+ AdventTime: Number(field.AdventTime), //涓存湡
+ LowInventory: Number(field.LowInventory), //浣庡簱瀛�
+ Demo: field.Demo
+ };
+ if (doing) {
+ doing = false;
+ sendData(IP + "/Basis/AddMate", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ layer.close(index); //鍏抽棴寮瑰眰
+ refreshTable
+ (
+ $("#SkuNo").val(),
+ $("#SkuName").val(),
+ $("#AuditStatusNo").val(),
+ $("#Type").val(),
+ $("#IsControlled").val(),
+ $("#IsInspect").val(),
+ $("#Environment").val(),
+ $("#CategoryNo").val()
+ );
+ doing = true;
+ });
+ }
+ else if (res.code == 2) {
+ layer.msg("鐗╂枡缂栫爜鎴栧悕绉伴噸澶嶏紝娣诲姞澶辫触锛�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true; });
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true; });
+ }
+ });
+ }
+ else {
+ console.log(123);
+ }
+
+ });
+ submit.trigger('click');
+ }
+ });
+ }
};
-
- //鐩戝惉鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- var SkuNo = data.field.SkuNo;
- var SkuName = data.field.SkuName;
- var AuditStatusNo = data.field.AuditStatusNo;
- var Type = data.field.Type;
- var IsControlled = data.field.IsControlled;
- var IsInspect = data.field.IsInspect;
- var Environment = data.field.Environment;
- var CategoryNo = data.field.CategoryNo;
-
- refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment,CategoryNo);
- });
- var doing = true;
- var $ = layui.$,
- active = {
- //鏂板
- add: function() {
- layer.open({
- type: 2,
- title: '娣诲姞鐗╂枡淇℃伅',
- content: 'MaterialsForm.html',
- maxmin: true,
- area: ['640px', '680px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index],
- submitID = 'layuiadmin-app-form-submit',
- submit = layero.find('iframe').contents().find('#' + submitID);
- //鐩戝惉鎻愪氦
- iframeWindow.layui.form.on('submit(' + submitID + ')', function(
- data) {
- var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
- //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
- var param = {
- SkuNo: field.SkuNo,
- SkuName: field.SkuName,
- Standard: field.Standard,
- //AuditStatusNo: field.AuditStatusNo,
- Type: field.Type,
- IsControlled: field.IsControlled,
- IsInspect: field.IsInspect,
- Origin: field.Origin,
- CategoryNo: field.CategoryNo,
- UnitNo: field.UnitNo,
- PackagNo: field.PackagNo,
- Environment: field.Environment,
- Weight: Number(field.Weight),
- Warranty: Number(field.Warranty),
- Price: Number(field.Price),
- AdventTime: Number(field.AdventTime), //涓存湡
- LowInventory: Number(field.LowInventory), //浣庡簱瀛�
- Demo: field.Demo
- };
- if(doing)
- {
- doing = false;
- sendData(IP + "/Basis/AddMate", param, 'post',function(res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- layer.close(index); //鍏抽棴寮瑰眰
- refreshTable
- (
- $("#SkuNo").val(),
- $("#SkuName").val(),
- $("#AuditStatusNo").val(),
- $("#Type").val(),
- $("#IsControlled").val(),
- $("#IsInspect").val(),
- $("#Environment").val(),
- $("#CategoryNo").val()
- );
- doing = true;
- });
- }
- else if (res.code == 2) {
- layer.msg("鐗╂枡缂栫爜鎴栧悕绉伴噸澶嶏紝娣诲姞澶辫触锛�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {doing = true;});
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {doing = true;});
- }
- });
- }
- else{
- console.log(123);
- }
-
- });
- submit.trigger('click');
- }
- });
- }
- };
- $('.layui-btn.layuiadmin-btn-list').on('click', function() {
- var type = $(this).data('type');
- active[type] ? active[type].call(this) : '';
- });
+ $('.layui-btn.layuiadmin-btn-list').on('click', function () {
+ var type = $(this).data('type');
+ active[type] ? active[type].call(this) : '';
+ });
- var element = layui.element;
- var houseId = 0;
- var param = {
- Id: $.cookie('userId')
- }
- var xml = '';
- function getchiled(data, mainId) {
- if (data)
- {
- var list = data.filter(item => item.ParentId == mainId);
- if (list)
- {
- for (var i = 0; i < list.length; i++)
- {
- var id = list[i].Id;
- //鏌ヨ鏈夋棤瀛愯彍鍗�
- var count = data.filter(item => item.ParentId == id).length;
- if (count > 0)
- {
- xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
- getchiled(data, id);
- xml = xml + '</dl></dd>';
- }
- else
- {
- xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
- }
+ var element = layui.element;
+ var houseId = 0;
+ var param = {
+ Id: $.cookie('userId')
+ }
+ var xml = '';
+ function getchiled(data, mainId) {
+ if (data) {
+ var list = data.filter(item => item.ParentId == mainId);
+ if (list) {
+ for (var i = 0; i < list.length; i++) {
+ var id = list[i].Id;
+ //鏌ヨ鏈夋棤瀛愯彍鍗�
+ var count = data.filter(item => item.ParentId == id).length;
+ if (count > 0) {
+ xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
+ getchiled(data, id);
+ xml = xml + '</dl></dd>';
+ }
+ else {
+ xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
}
}
}
}
- var uid = $.cookie('userId');
- table.on('tool(LAY-app-content-list)', function(obj) {
- var data = obj.data;
- //鍒犻櫎
- if (obj.event === 'del')
- {
- layer.confirm('纭畾鍒犻櫎閫変腑鐨勭墿鏂欙紵', function(index) {
- cusid = data.Id;
- var arr = [];
- arr.push(cusid); //灞炴��
- var param = {
- Ids: arr
- };
- if(doing)
- {
- doing = false;
- sendData(IP + "/Basis/DelMate?Id="+data.Id+"", {} , 'get', function(res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- refreshTable
- (
- $("#SkuNo").val(),
- $("#SkuName").val(),
- $("#AuditStatusNo").val(),
- $("#Type").val(),
- $("#IsControlled").val(),
- $("#IsInspect").val(),
- $("#Environment").val(),
- $("#CategoryNo").val()
- );
- //table.reload('LAY-app-content-list'); //鏁版嵁鍒锋柊
- doing = true;
- });
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {doing = true;});
- }
- });
- }
- else
- {
- console.log(123);
- }
- });
- }
- //缂栬緫
- else if (obj.event === 'edit')
- {
- cusId = data.Id;
- layer.open({
- type: 2,
- title: '缂栬緫鐗╂枡淇℃伅',
- content: 'MaterialsForm.html?id=' + cusId,
- maxmin: true,
- area: ['630px', '670px'],
- 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 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
- var param = {
- Id: cusId,
- SkuNo: field.SkuNo,
- SkuName: field.SkuName,
- Standard: field.Standard,
- AuditStatusNo: field.AuditStatusNo,
- Type: field.Type,
- IsControlled: field.IsControlled,
- IsInspect: field.IsInspect,
- Origin: field.Origin,
- CategoryNo: field.CategoryNo,
- UnitNo: field.UnitNo,
- PackagNo: field.PackagNo,
- Environment: field.Environment,
- Weight: Number(field.Weight),
- Warranty: Number(field.Warranty),
- Price: Number(field.Price),
- AdventTime: Number(field.AdventTime), //涓存湡
- LowInventory: Number(field.LowInventory), //浣庡簱瀛�
- Demo: field.Demo
- };
- if(doing)
- {
- doing = false;
- sendData(IP + "/Basis/ExitMate", param, 'post',
- function(res) {
+ }
+ var uid = $.cookie('userId');
+ table.on('tool(LAY-app-content-list)', function (obj) {
+ var data = obj.data;
+ //鍒犻櫎
+ if (obj.event === 'del') {
+ layer.confirm('纭畾鍒犻櫎閫変腑鐨勭墿鏂欙紵', function (index) {
+ cusid = data.Id;
+ var arr = [];
+ arr.push(cusid); //灞炴��
+ var param = {
+ Ids: arr
+ };
+ if (doing) {
+ doing = false;
+ sendData(IP + "/Basis/DelMate?Id=" + data.Id + "", {}, 'get', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable
+ (
+ $("#SkuNo").val(),
+ $("#SkuName").val(),
+ $("#AuditStatusNo").val(),
+ $("#Type").val(),
+ $("#IsControlled").val(),
+ $("#IsInspect").val(),
+ $("#Environment").val(),
+ $("#CategoryNo").val()
+ );
+ //table.reload('LAY-app-content-list'); //鏁版嵁鍒锋柊
+ doing = true;
+ });
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true; });
+ }
+ });
+ }
+ else {
+ console.log(123);
+ }
+ });
+ }
+ //缂栬緫
+ else if (obj.event === 'edit') {
+ cusId = data.Id;
+ layer.open({
+ type: 2,
+ title: '缂栬緫鐗╂枡淇℃伅',
+ content: 'MaterialsForm.html?id=' + cusId,
+ maxmin: true,
+ area: ['630px', '670px'],
+ 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 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ Id: cusId,
+ SkuNo: field.SkuNo,
+ SkuName: field.SkuName,
+ Standard: field.Standard,
+ AuditStatusNo: field.AuditStatusNo,
+ Type: field.Type,
+ IsControlled: field.IsControlled,
+ IsInspect: field.IsInspect,
+ Origin: field.Origin,
+ CategoryNo: field.CategoryNo,
+ UnitNo: field.UnitNo,
+ PackagNo: field.PackagNo,
+ Environment: field.Environment,
+ Weight: Number(field.Weight),
+ Warranty: Number(field.Warranty),
+ Price: Number(field.Price),
+ AdventTime: Number(field.AdventTime), //涓存湡
+ LowInventory: Number(field.LowInventory), //浣庡簱瀛�
+ Demo: field.Demo
+ };
+ if (doing) {
+ doing = false;
+ sendData(IP + "/Basis/ExitMate", param, 'post',
+ function (res) {
if (res.code == 0) //鎴愬姛
{
layer.msg("淇敼鎴愬姛", {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
layer.close(index); //鍏抽棴寮瑰眰
refreshTable
- (
- $("#SkuNo").val(),
- $("#SkuName").val(),
- $("#AuditStatusNo").val(),
- $("#Type").val(),
- $("#IsControlled").val(),
- $("#IsInspect").val(),
- $("#Environment").val(),
- $("#CategoryNo").val(),
- );
+ (
+ $("#SkuNo").val(),
+ $("#SkuName").val(),
+ $("#AuditStatusNo").val(),
+ $("#Type").val(),
+ $("#IsControlled").val(),
+ $("#IsInspect").val(),
+ $("#Environment").val(),
+ $("#CategoryNo").val(),
+ );
doing = true;
});
}
@@ -653,21 +647,21 @@
layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {doing = true;});
+ }, function () { doing = true; });
}
});
- }
- else
- {
- console.log(123);
- }
- });
- submit.trigger('click');
- }
- });
- }
- });
+ }
+ else {
+ console.log(123);
+ }
+ });
+ submit.trigger('click');
+ }
+ });
+ }
});
- </script>
- </body>
-</html>
+ });
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 8ba163b..7643476 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -19,13 +19,13 @@
</style>
<script>
// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
+ document.addEventListener("DOMContentLoaded", function () {
//鑾峰彇table榛樿鏄剧ず鏁�
pageCntFirst();
//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
GetIsSetColW();
});
- </script>
+ </script>
</head>
@@ -51,6 +51,30 @@
</div>
</div>
<div class="layui-inline mingxi">
+ <label class="layui-form-label" style="width: 60px;">杩涘巶缂栧彿</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <input type="text" id="LotNo" name="LotNo" placeholder="杩涘巶缂栧彿" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+
+
+ <div class="layui-inline">
+ <!-- 绫诲瀷 -->
+ <label class="layui-form-label" style="width: 60px;">鐗╂枡绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">鍘熸枡</option>
+ <option value="1">鍖呮潗</option>
+ <option value="2">鎴愬搧</option>
+ <option value="3">鑰楁潗</option>
+ <option value="4">涓棿鍝�</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-inline mingxi">
<label class="layui-form-label" style="width: 60px;">璐т富缂栫爜</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<input type="text" id="OwnerNo" name="OwnerNo" placeholder="璐т富缂栫爜" autocomplete="off"
@@ -64,11 +88,20 @@
class="layui-input">
</div>
</div>
- <div class="layui-inline mingxi">
- <label class="layui-form-label" style="width: 60px;">杩涘巶缂栧彿</label>
- <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" id="LotNo" name="LotNo" placeholder="杩涘巶缂栧彿" autocomplete="off"
- class="layui-input">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
+ <div class="layui-input-inline">
+ <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炲尯鍩�</label>
+ <div class="layui-input-inline">
+ <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
+ <option value=""></option>
+ </select>
</div>
</div>
<div class="layui-inline mingxi">
@@ -85,7 +118,18 @@
class="layui-input">
</div>
</div>
-
+ <div class="layui-inline zhijian">
+ <label class="layui-form-label" style="width: 60px;">璐ㄦ鐘舵��</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <select name="InspectStatus" id="InspectStatus" lay-filter="InspectStatus" lay-search>
+ <option value=""></option>
+ <option value="0">寰呰川妫�</option><!-- 寰呮楠� -->
+ <option value="1">妫�楠屽悎鏍�</option><!-- 鍚堟牸鍝� -->
+ <option value="2">涓嶅悎鏍�</option><!-- 涓嶅悎鏍� -->
+ <option value="3">鏀剧疆鏈�</option><!-- 涓嶅悎鏍� -->
+ </select>
+ </div>
+ </div>
<div class="layui-inline ">
<label class="layui-form-label" style="width: 60px;">搴撳瓨鐘舵��</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
@@ -100,54 +144,16 @@
</select>
</div>
</div>
- <!-- <div class="layui-inline " style="display: none;">
- <label class="layui-form-label" style="width: 60px;">鎶芥鎵�</label>
- <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <select name="IsSamolingTray" id="IsSamolingTray" lay-filter="IsSamolingTray"
- lay-search>
- <option value=""></option>
- <option value="0">鍚�</option>
- <option value="1">鏄�</option>
- </select>
- </div>
- </div> -->
- <div class="layui-inline zhijian">
- <label class="layui-form-label" style="width: 60px;">璐ㄦ鐘舵��</label>
- <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <select name="InspectStatus" id="InspectStatus" lay-filter="InspectStatus" lay-search>
- <option value=""></option>
- <option value="0">寰呰川妫�</option><!-- 寰呮楠� -->
- <option value="1">妫�楠屽悎鏍�</option><!-- 鍚堟牸鍝� -->
- <option value="2">涓嶅悎鏍�</option><!-- 涓嶅悎鏍� -->
- <option value="3">鏀剧疆鏈�</option><!-- 涓嶅悎鏍� -->
- </select>
- </div>
- </div>
- <!-- <div class="layui-inline zhijian">
- <label class="layui-form-label" style="width: 60px;">寮�濮嬫椂闂�</label>
- <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" autocomplete="off" id="StartTime" class="layui-input"
- placeholder="寮�濮嬫椂闂�">
- </div>
- </div>
- <div class="layui-inline zhijian">
- <label class="layui-form-label" style="width: 60px;">缁撴潫鏃堕棿</label>
- <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" autocomplete="off" id="EndTime" class="layui-input"
- placeholder="缁撴潫鏃堕棿">
- </div>
- </div> -->
+
<div class="layui-inline sousuo">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
lay-filter="LAY-app-contlist-search">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
</button>
<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="daochu">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>瀵煎嚭
+ <i class="layui-icon layui-icon-edit layuiadmin-button-btn"></i>瀵煎嚭
</button>
</div>
-
-
</div>
</div>
@@ -180,13 +186,14 @@
<table id="LAY-app-content-list2" lay-filter="LAY-app-content-list2"></table>
<!-- #region 鑷畾涔夎〃澶� -->
<div class="headerSetIcon">
- <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols2">
+ <button class="layui-btn layui-btn-primary layui-btn-sm"
+ data-type="customCols2">
<i class="layui-icon"></i>
</button>
</div>
<!-- #endregion -->
- <!-- #region 鑷畾涔夎〃澶� -->
+ <!-- #region 鑷畾涔夎〃澶� -->
<script type="text/html" id="templetCompleteTime">
{{# function GetBtn(d){
return formatDate(d.CompleteTime);
@@ -235,6 +242,20 @@
{{# } else { }}
<button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">寮傚父</button>
{{# } }}
+ </script>
+
+ <script type="text/html" id="SkuType">
+ {{# if(d.Type=='0'){ }}
+ <p>鍘熸枡</p>
+ {{# } else if(d.Type=='1') { }}
+ <p>鍖呮潗</p>
+ {{# } else if(d.Type=='2') { }}
+ <p>鎴愬搧</p>
+ {{# } else if(d.Type=='3') { }}
+ <p>鑰楁潗</p>
+ {{# } else if(d.Type=='4') { }}
+ <p>涓棿鍝�</p>
+ {{# } }}
</script>
</div>
</div>
@@ -296,93 +317,43 @@
var $ = layui.$;
var yemianid = 0;
- refreshTable("", "","","","");
+ refreshTable("", "", "", "", "");
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions;
- //#region 鍘熷闈炶嚜瀹氫箟鍒�
- //infoOptions = {
- // elem: '#LAY-app-content-list',
- // height: 'full-206',
- // id: 'LAY-app-content-list',
- // totalRow: true
- // page: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // even: true,
- // cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // cols:
- // [[
- // {
- // title: '搴忓彿',
- // type: 'numbers',
- // fixed: 'left'
- // },
- // {
- // field: 'SkuNo',
- // title: '鐗╂枡缂栫爜',
- // align: 'center',
- // totalRowText: "鍚堣:",
- // }, {
- // field: 'SkuName',
- // title: '鐗╂枡鍚嶇О',
- // align: 'center',
- // }, {
- // field: 'Standard',
- // title: '鐗╂枡瑙勬牸',
- // align: 'center',
- // }, {
- // field: 'Qty',
- // title: '搴撳瓨鏁伴噺',
- // align: 'center',
- // totalRow: true,
- // }, {
- // field: 'LockQty',
- // title: '閿佸畾鏁伴噺',
- // align: 'center',
- // totalRow: true,
- // }, {
- // field: 'FrozenQty',
- // title: '鍐荤粨鏁伴噺',
- // align: 'center',
- // totalRow: true,
- // }
- // ]]
- //};
- //#endregion
//#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
- {field: '',title: '搴忓彿',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
- {field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',totalRowText: "鍚堣:", "disabled": true},
- {field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center', "disabled": true},
- {field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center', "disabled": true},
- {field: 'LotNo',title: '杩涘巶缂栧彿',align: 'center', "disabled": true},
- {field: 'LotText',title: '鎵规鎻忚堪',align: 'center'},
- {field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
- {field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
- {field: 'Qty',title: '搴撳瓨鏁伴噺',align: 'center',totalRow: true},
- {field: 'LockQty',title: '閿佸畾鏁伴噺',align: 'center',totalRow: true},
- {field: 'FrozenQty',title: '鍐荤粨鏁伴噺',align: 'center',totalRow: true}
- ]];
- var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ { field: '', title: '搴忓彿', type: 'numbers', align: 'center', fixed: 'left', "disabled": true },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', totalRowText: "鍚堣:", "disabled": true },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', "disabled": true },
+ { field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', "disabled": true },
+ { field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center', "disabled": true },
+ { field: 'LotText', title: '鎵规鎻忚堪', align: 'center' },
+ { field: 'OwnerNo', title: '璐т富缂栫爜', align: 'center' },
+ { field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center' },
+ { field: 'Qty', title: '搴撳瓨鏁伴噺', align: 'center', totalRow: true },
+ { field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center', totalRow: true },
+ { field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center', totalRow: true }
+ ]];
+ var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
//鑾峰彇鎬婚噺淇℃伅
- function refreshTable(SkuNo,SkuName,OwnerNo,OwnerName,LotNo) {
+ function refreshTable(SkuNo, SkuName, OwnerNo, OwnerName, LotNo) {
//#region 鑷畾涔夎〃澶�
var colsJson
- var param1={
- Href:'Statistical/GetInventoryList'
+ var param1 = {
+ Href: 'Statistical/GetInventoryList'
};
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- colsJson=TotalColsArr
- }else{
- colsJson= eval(res.data);
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ colsJson = TotalColsArr
+ } else {
+ colsJson = eval(res.data);
}
- }else{
- colsJson=TotalColsArr
+ } else {
+ colsJson = TotalColsArr
}
infoOptions = {
elem: '#LAY-app-content-list',
@@ -394,18 +365,18 @@
limits: pageLimits,
even: true,
cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function(){
+ done: function () {
//鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list','Statistical/GetInventoryList',TotalColsSysArr);
- },
- cols:colsJson
+ SetTableColW('LAY-app-content-list', 'Statistical/GetInventoryList', TotalColsSysArr);
+ },
+ cols: colsJson
};
var param = {
- SkuNo:SkuNo, //鐗╂枡鍙�
- SkuName:SkuName, //鐗╂枡鍚嶇О
- OwnerNo:OwnerNo, //璐т富缂栫爜
- OwnerName:OwnerName, //璐т富鍚嶇О
- LotNo:LotNo, //杩涘巶缂栧彿
+ SkuNo: SkuNo, //鐗╂枡鍙�
+ SkuName: SkuName, //鐗╂枡鍚嶇О
+ OwnerNo: OwnerNo, //璐т富缂栫爜
+ OwnerName: OwnerName, //璐т富鍚嶇О
+ LotNo: LotNo, //杩涘巶缂栧彿
};
sendData(IP + "/Statistical/GetInventoryList", param, 'get', function (res) {
console.log(res)
@@ -428,136 +399,51 @@
});
});
//#endregion
- }
+ }
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions2;
- //#region 鍘熷闈炶嚜瀹氫箟鍒�
- //infoOptions2 = {
- // elem: '#LAY-app-content-list2',
- // height: 'full-206',
- // id: 'LAY-app-content-list2',
- // page: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // even: true,
- // cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // cols:
- // [[
- // {
- // field: 'PalletNo',
- // title: '鎵樼洏鍙�',
- // align: 'center',
- // width: 110,
- // }, {
- // field: 'LocatNo',
- // title: '鍌ㄤ綅鍦板潃',
- // align: 'center',
- // width: 100,
- // }, {
- // field: 'RoadwayName',
- // title: '鎵�灞炲贩閬�',
- // width: 90,
- // align: 'center',
- // }, {
- // field: 'WareHouseName',
- // title: '鎵�灞炰粨搴�',
- // width: 90,
- // align: 'center',
- // }, {
- // field: 'SkuNo',
- // title: '鐗╂枡缂栫爜',
- // width: 100,
- // align: 'center',
- // }, {
- // field: 'SkuName',
- // title: '鐗╂枡鍚嶇О',
- // align: 'center',
- // }, {
- // field: 'Standard',
- // title: '鐗╂枡瑙勬牸',
- // width: 130,
- // align: 'center',
- // }, {
- // field: 'LotNo',
- // title: '杩涘巶缂栧彿',
- // align: 'center',
- // }, {
- // field: 'Qty',
- // title: '搴撳瓨鏁伴噺',
- // width: 110,
- // align: 'center',
- // }, {
- // field: 'LockQty',
- // title: '閿佸畾鏁伴噺',
- // width: 110,
- // align: 'center',
- // },
- // {
- // field: 'Status',
- // templet: '#buttonTpl',
- // title: '搴撳瓨鐘舵��',
- // width: 90,
- // align: 'center',
- // }, {
- // field: 'InspectStatus',
- // templet: '#buttonTp2',
- // title: '璐ㄦ鐘舵��',
- // width: 90,
- // align: 'center',
- // },
- // {
- // field: 'CompleteTime',
- // title: '鍏ュ簱鏃堕棿',
- // align: 'center',
- // width: 150,
- // templet: function (d) {
- // return formatDate(d.CompleteTime);
- // },
- // },
- // ]]
- //};
- //#endregion
//鑾峰彇鏄庣粏淇℃伅
//#region 鑷畾涔夎〃澶�
var DetailColsArr = [[
- {field: 'PalletNo',title: '鎵樼洏鍙�',align: 'center',width: 110,},
- {field: 'LocatNo',title: '鍌ㄤ綅鍦板潃',align: 'center',width: 100,},
- {field: 'WareHouseName',title: '鎵�灞炰粨搴�',width: 90,align: 'center'},
- {field: 'RoadwayName',title: '鎵�灞炲贩閬�',width: 90,align: 'center'},
- {field: 'AreaName',title: '鎵�灞炲尯鍩�',width: 90,align: 'center'},
- {field: 'SkuNo',title: '鐗╂枡缂栫爜',width: 100,align: 'center'},
- {field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'},
- {field: 'Standard',title: '鐗╂枡瑙勬牸',width: 130,align: 'center'},
- {field: 'LotNo',title: '杩涘巶缂栧彿',align: 'center'},
- {field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
- {field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
- {field: 'SupplierNo',title: '鐢熶骇鍟嗙紪鐮�',align: 'center'},
- {field: 'SupplierName',title: '鐢熶骇鍟嗗悕绉�',align: 'center'},
- {field: 'Qty',title: '搴撳瓨鏁伴噺',width: 110,align: 'center'},
- {field: 'LockQty',title: '閿佸畾鏁伴噺',width: 110,align: 'center'},
- {field: 'Status',templet: '#buttonTpl',title: '搴撳瓨鐘舵��',width: 90,align: 'center'},
- {field: 'InspectStatus',templet: '#buttonTp2',title: '璐ㄦ鐘舵��',width: 90,align: 'center'},
- {field: 'CompleteTime',title: '鍏ュ簱鏃堕棿',align: 'center',width: 150,templet: '#templetCompleteTime'},
- ]];
- var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110, },
+ { field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 100, },
+ { field: 'WareHouseName', title: '鎵�灞炰粨搴�', width: 90, align: 'center' },
+ { field: 'RoadwayName', title: '鎵�灞炲贩閬�', width: 90, align: 'center' },
+ { field: 'AreaName', title: '鎵�灞炲尯鍩�', width: 90, align: 'center' },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', width: 100, align: 'center' },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
+ { field: 'Standard', title: '鐗╂枡瑙勬牸', width: 130, align: 'center' },
+ { field: 'Type', title: '鐗╂枡绫诲瀷', width: 130, align: 'center', templet: '#SkuType' },
+ { field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center' },
+ { field: 'OwnerNo', title: '璐т富缂栫爜', align: 'center' },
+ { field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center' },
+ { field: 'SupplierNo', title: '鐢熶骇鍟嗙紪鐮�', align: 'center' },
+ { field: 'SupplierName', title: '鐢熶骇鍟嗗悕绉�', align: 'center' },
+ { field: 'Qty', title: '搴撳瓨鏁伴噺', width: 110, align: 'center' },
+ { field: 'LockQty', title: '閿佸畾鏁伴噺', width: 110, align: 'center' },
+ { field: 'Status', templet: '#buttonTpl', title: '搴撳瓨鐘舵��', width: 90, align: 'center' },
+ { field: 'InspectStatus', templet: '#buttonTp2', title: '璐ㄦ鐘舵��', width: 90, align: 'center' },
+ { field: 'CompleteTime', title: '鍏ュ簱鏃堕棿', align: 'center', width: 150, templet: '#templetCompleteTime' },
+ ]];
+ var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
- function refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus) {
+ function refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type) {
//#region 鑷畾涔夎〃澶�
var colsJson2
- var param1={
- Href:'Statistical/GetInventoryList1'
+ var param1 = {
+ Href: 'Statistical/GetInventoryList1'
};
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- colsJson2=DetailColsArr
- }else{
- colsJson2= eval(res.data);
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ colsJson2 = DetailColsArr
+ } else {
+ colsJson2 = eval(res.data);
}
- }else{
- colsJson2=DetailColsArr
+ } else {
+ colsJson2 = DetailColsArr
}
infoOptions2 = {
elem: '#LAY-app-content-list2',
@@ -568,22 +454,25 @@
limits: pageLimits,
even: true,
cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function(){
+ done: function () {
//鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list2','Statistical/GetInventoryList1',DetailColsSysArr);
- },
- cols:colsJson2
+ SetTableColW('LAY-app-content-list2', 'Statistical/GetInventoryList1', DetailColsSysArr);
+ },
+ cols: colsJson2
};
var param = {
- SkuNo:SkuNo, //鐗╂枡鍙�
- SkuName:SkuName, //鐗╂枡鍚嶇О
- OwnerNo:OwnerNo, //璐т富缂栫爜
- OwnerName:OwnerName, //璐т富鍚嶇О
- LotNo:LotNo, //杩涘巶缂栧彿
- LocatNo:LocatNo,//鍌ㄤ綅鍦板潃
- PalletNo:PalletNo, //鎵樼洏鍙�
- Status:Status,//搴撳瓨鐘舵��
- InspectStatus:InspectStatus //璐ㄦ鐘舵��
+ SkuNo: SkuNo, //鐗╂枡鍙�
+ SkuName: SkuName, //鐗╂枡鍚嶇О
+ OwnerNo: OwnerNo, //璐т富缂栫爜
+ OwnerName: OwnerName, //璐т富鍚嶇О
+ LotNo: LotNo, //杩涘巶缂栧彿
+ LocatNo: LocatNo,//鍌ㄤ綅鍦板潃
+ PalletNo: PalletNo, //鎵樼洏鍙�
+ Status: Status,//搴撳瓨鐘舵��
+ InspectStatus: InspectStatus, //璐ㄦ鐘舵��
+ HouseNo: HouseNo,
+ AreaNo: AreaNo, // 鎵�灞炲尯鍩�
+ Type: Type,
};
sendData(IP + "/Statistical/GetInventoryList1", param, 'get', function (res) {
if (res.code == 0) //鎴愬姛
@@ -608,12 +497,10 @@
});
//#endregion
}
-
- //var url = IP + "/Statistical/GetInventoryList1";
//鎺ュ彈鍏ㄥ眬鍙橀噺
let quanSkuNo = '';
- let quanLotNo='';
+ let quanLotNo = '';
//鐩戝惉鎼滅储
form.on('submit(LAY-app-contlist-search)', function (data) {
var SkuNo = $("#SkuNo").val();
@@ -625,14 +512,19 @@
var OwnerName = $("#OwnerName").val();
var Status = $("#Status").val();
var InspectStatus = $("#InspectStatus").val();
+ var HouseNo = $("#WareHouseNo").val(); // 鎵�灞炰粨搴�
+ var AreaNo = $("#AreaNo").val(); // 鎵�灞炲尯鍩�
+ var Type = $("#Type").val(); // 鐗╂枡绫诲瀷
+
if (yemianid == 0) {
console.log("鎬诲崟");
- refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
+ refreshTable(SkuNo, SkuName, OwnerNo, OwnerName, LotNo);
} else if (yemianid == 1) {
quanSkuNo = '';
- quanLotNo='';
+ quanLotNo = '';
console.log("鏄庣粏");
- refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus);
+ console.log(HouseNo);
+ refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type);
}
});
@@ -644,8 +536,8 @@
$('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
console.log(obj);
quanSkuNo = obj.data.SkuNo;
- quanLotNo=obj.data.lotNo;
- refreshTable2(obj.data.SkuNo,"","","",obj.data.LotNo);
+ quanLotNo = obj.data.lotNo;
+ refreshTable2(obj.data.SkuNo, "", "", "", obj.data.LotNo);
yemianid = 1;
});
@@ -660,14 +552,17 @@
var OwnerName = $("#OwnerName").val();
var Status = $("#Status").val();
var InspectStatus = $("#InspectStatus").val();
+ var HouseNo = $("#WareHouseNo").val(); // 鎵�灞炰粨搴�
+ var AreaNo = $("#AreaNo").val(); // 鎵�灞炲尯鍩�
+ var Type = $("#Type").val(); // 鐗╂枡绫诲瀷
console.log(data.index);
yemianid = data.index
if (yemianid == 0) {
console.log("鎬诲崟");
- refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
+ refreshTable(SkuNo, SkuName, OwnerNo, OwnerName, LotNo);
} else if (yemianid == 1) {
console.log("鏄庣粏");
- refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus);
+ refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type);
}
});
@@ -740,24 +635,23 @@
});
- //#region 鑷畾涔夎〃澶�
- //鑷畾涔夎〃澶�
+ //#region 鑷畾涔夎〃澶�
active = {
- customCols: function(){
+ customCols: function () {
layer.open({
type: 2,
title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetInventoryList&ColsSysArr='+TotalColsSysArr,
+ content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetInventoryList&ColsSysArr=' + TotalColsSysArr,
maxmin: false,
resize: false,
area: ['970px', '650px']
});
},
- customCols2: function(){
+ customCols2: function () {
layer.open({
type: 2,
title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetInventoryList1&ColsSysArr='+DetailColsSysArr,
+ content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetInventoryList1&ColsSysArr=' + DetailColsSysArr,
maxmin: false,
resize: false,
area: ['970px', '650px']
@@ -765,12 +659,76 @@
}
};
- $('.layui-btn').on('click', function() {
+ $('.layui-btn').on('click', function () {
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
});
//#endregion
+ // 鍒濆缁戝畾鎵�灞炰粨搴�
+ sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
+ res.data[i].WareHouseName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000
+ }, function () { });
+ }
+ });
+
+ getAR("");
+ form.on('select(getWareHouseNo)', function (data) {
+ console.log(data);
+ getAR(data.value);
+ });
+ function getAR(val) {
+ //鑾峰彇 宸烽亾涓嬫媺妗�
+ sendData(IP + "/Sys/GetStorageRoadwayByHouseNo?wareHouseNo=" + val, {}, 'get', function (res) {
+ $("#RoadwayNo").empty();
+ $("#RoadwayNo").append('<option value =""></option>');
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
+ res.data[i].RoadwayName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇宸烽亾淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000
+ }, function () {
+ form.render('select');
+ });
+ }
+ });
+ //鑾峰彇 鍖哄煙涓嬫媺妗�
+ sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo=" + val, {}, 'get', function (res) {
+ $("#AreaNo").empty();
+ $("#AreaNo").append('<option value =""></option>');
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
+ res.data[i].AreaName + '</option>');
+ }
+ form.render('select');
+ } else {
+ layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000
+ }, function () {
+
+ form.render('select');
+ });
+ }
+ });
+
+ };
+
});
</script>
</body>
diff --git a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
index 7707123..e8232fe 100644
--- a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
+++ b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
@@ -204,5 +204,9 @@
/// 鍌ㄤ綅娣卞害
/// </summary>
public int Dept { get; set; }
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
+ public string Type { get; set; }
}
}
diff --git a/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs b/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
index 13e8e08..10d15ac 100644
--- a/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
+++ b/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
@@ -122,6 +122,15 @@
public int? CreateUser { get; set; }
/// <summary>
+ /// 鎵规灞炴��1-鐢熶骇鏃ユ湡
+ /// </summary>
+ public string Lot1 { get; set; }
+ /// <summary>
+ /// 鎵规灞炴��2-杩囨湡鏃ユ湡
+ /// </summary>
+ public string Lot2 { get; set; }
+
+ /// <summary>
/// 鑷畾涔夊垪1
/// </summary>
public string UDF1 { get; set; }
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 355b71a..d1c0479 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -344,6 +344,19 @@
strMessage = "-1:鍘熷巶鎵瑰彿涓嶅彲涓虹┖;";
continue;
}
+ if (model.Type == "2") // 2锛氫腑闂村搧鍏ュ簱
+ {
+ if (string.IsNullOrWhiteSpace(detailModel.Lot1))
+ {
+ throw new Exception("鐢熶骇鏃ユ湡涓嶅彲涓虹┖!");
+ }
+ if (string.IsNullOrWhiteSpace(detailModel.Lot2))
+ {
+ throw new Exception("杩囨湡鏃ユ湡涓嶅彲涓虹┖!");
+ }
+ }
+
+
// 鍒ゆ柇鏄惁宸插瓨鍦ㄥ綋鍓嶆槑缁�
string sqlCount = $"SELECT COUNT(ID) FROM BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' ";
sqlCount += $"and SkuNo ='{detailModel.SkuNo}' and LotNo = '{detailModel.LotNo}' and id != '{detailModel.Id}' and isdel = '0';";
@@ -360,10 +373,11 @@
// 璁＄畻鍑烘�婚噾棰�
detailModel.Money = detailModel.Price * detailModel.Qty;
sqlDetailStr += "Insert into BllArrivalNoticeDetail (ASNNo,SkuNo,SkuName,Standard,";
- sqlDetailStr += "LotNo,LotText,Qty,PackagNo,Price,Money,IsBale,IsBelt,SupplierLot,Status,UDF1,UDF2,UDF3,UDF4,UDF5,CreateUser) values ( ";
+ sqlDetailStr += "LotNo,LotText,Qty,PackagNo,Price,Money,IsBale,IsBelt,SupplierLot,Status,Lot1,Lot2,UDF1,UDF2,UDF3,UDF4,UDF5,CreateUser) values ( ";
sqlDetailStr += $"'{model.ASNNo}','{detailModel.SkuNo}','{detailModel.SkuName}','{detailModel.Standard}', ";
sqlDetailStr += $"'{detailModel.LotNo}','{detailModel.LotText}','{detailModel.Qty}','{detailModel.PackagNo}','{detailModel.Price}', ";
- sqlDetailStr += $"{detailModel.Money},'{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.UDF1}','{detailModel.UDF2}','{detailModel.UDF3}','{detailModel.UDF4}','{detailModel.UDF5}','{model.CreateUser}');";
+ sqlDetailStr += $"'{detailModel.Money},'{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.Lot1}','{detailModel.Lot2}', ";
+ sqlDetailStr += $"'{detailModel.UDF1}','{detailModel.UDF2}','{detailModel.UDF3}','{detailModel.UDF4}','{detailModel.UDF5}','{model.CreateUser}');";
if (model.Type == "0")//鎴愬搧鍏ュ簱鍗曚笅鍙慦CS淇℃伅
{
@@ -518,6 +532,19 @@
strMessage = "-1:鎵规鍙蜂笉鍙负绌�;";
continue;
}
+
+ if (model.Type == "2") // 2锛氫腑闂村搧鍏ュ簱
+ {
+ if (string.IsNullOrWhiteSpace(detailModel.Lot1))
+ {
+ throw new Exception("鐢熶骇鏃ユ湡涓嶅彲涓虹┖!");
+ }
+ if (string.IsNullOrWhiteSpace(detailModel.Lot2))
+ {
+ throw new Exception("杩囨湡鏃ユ湡涓嶅彲涓虹┖!");
+ }
+ }
+
// 鍒ゆ柇鏄惁宸插瓨鍦ㄥ綋鍓嶆槑缁�
string sqlCount = $"SELECT COUNT(ID) FROM BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' ";
sqlCount += $"and SkuNo ='{detailModel.SkuNo}' and LotNo = '{detailModel.LotNo}' and id != '{detailModel.Id}' and isdel = '0';";
@@ -537,10 +564,12 @@
// 璁＄畻鍑烘�婚噾棰�
detailModel.Money = detailModel.Price * detailModel.Qty;
sqlDetailStr += "Insert into BllArrivalNoticeDetail (ASNNo,SkuNo,SkuName,Standard,";
- sqlDetailStr += "LotNo,LotText,Qty,PackagNo,Price,Money,IsBale,IsBelt,SupplierLot,Status,UDF1,UDF2,UDF3,UDF4,UDF5,CreateUser) values ( ";
+ sqlDetailStr += "LotNo,LotText,Qty,PackagNo,Price,Money,IsBale,IsBelt,SupplierLot,Status,Lot1,Lot2,UDF1,UDF2,UDF3,UDF4,UDF5,CreateUser) values ( ";
sqlDetailStr += $"'{model.ASNNo}','{detailModel.SkuNo}','{detailModel.SkuName}','{detailModel.Standard}', ";
sqlDetailStr += $"'{detailModel.LotNo}','{detailModel.LotText}','{detailModel.Qty}','{detailModel.PackagNo}','{detailModel.Price}', ";
- sqlDetailStr += $"{detailModel.Money},'{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.UDF1}','{detailModel.UDF2}','{detailModel.UDF3}','{detailModel.UDF4}','{detailModel.UDF5}','{model.CreateUser}');";
+ sqlDetailStr += $"'{detailModel.Money},'{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.Lot1}','{detailModel.Lot2}', ";
+ sqlDetailStr += $"'{detailModel.UDF1}','{detailModel.UDF2}','{detailModel.UDF3}','{detailModel.UDF4}','{detailModel.UDF5}','{model.CreateUser}');";
+
}
else
{
@@ -553,6 +582,8 @@
&& it.SupplierLot == detailModel.SupplierLot
&& it.IsBale == detailModel.IsBale
&& it.IsBelt == detailModel.IsBelt
+ && it.Lot1 == detailModel.Lot1 // 鐢熶骇鏃ユ湡
+ && it.Lot2 == detailModel.Lot2 // 杩囨湡鏃ユ湡
&& it.UDF1 == detailModel.UDF1
&& it.UDF2 == detailModel.UDF2
&& it.UDF3 == detailModel.UDF3
@@ -568,6 +599,7 @@
sqlDetailStr += $"Qty = '{detailModel.Qty}',LotNo = '{detailModel.LotNo}',Money='{detailModel.Money}', ";
sqlDetailStr += $"LotText = '{detailModel.LotText}',SupplierLot = '{detailModel.SupplierLot}', ";
sqlDetailStr += $"IsBale = '{detailModel.IsBale}',IsBelt = '{detailModel.IsBelt}', ";
+ sqlDetailStr += $" Lot1= '{detailModel.Lot1}',Lot2 = '{detailModel.Lot2}', ";
sqlDetailStr += $"UDF1 = '{detailModel.UDF1}',UDF2 = '{detailModel.UDF2}',UDF3 = '{detailModel.UDF3}',UDF4 = '{detailModel.UDF4}',UDF5 = '{detailModel.UDF5}',";
sqlDetailStr += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
sqlDetailStr += $"WHERE Id = {detailModel.Id};";
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 76b0595..a527d2c 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -7,6 +7,7 @@
using System.Text;
using Model.ModelDto;
using Model.ModelDto.DataDto;
+using Model.ModelDto.SysDto;
using Model.ModelVm.DataVm;
using SqlSugar;
using WMS.DAL;
@@ -129,16 +130,22 @@
/// <param name="palletNo">鎵樼洏鏉＄爜</param>
/// <param name="status">搴撳瓨鐘舵��</param>
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
+ /// <param name="houseNo">鎵�灞炰粨搴�</param>
+ /// <param name="areaNo">鎵�灞炲尯鍩�</param>
+ /// <param name="type">鐗╂枡绫诲瀷</param>
+ /// <param name="ownerNo">璐т富缂栧彿</param>
+ /// <param name="ownerName">璐т富鍚嶇О</param>
/// <returns></returns>
public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo,
- string status, string inspectStatus, string ownerNo, string ownerName)
+ string status, string inspectStatus, string ownerNo, string ownerName, string houseNo, string areaNo, string type)
{
- string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName," +
+ string str = "select detail.*,sku.Type,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName," +
"roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName " +
"from DataStockDetail detail " +
"left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo " +
"left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo " +
"left join SysStorageArea area on detail.AreaNo = area.AreaNo " +
+ "left join SysMaterials as sku on detail.skuNo = sku.skuNo " +
"Where detail.IsDel = @isdel";
//鍒ゆ柇鐗╂枡缂栫爜鏄惁涓虹┖
if (!string.IsNullOrEmpty(skuNo))
@@ -184,21 +191,37 @@
if (!string.IsNullOrEmpty(ownerName))
{
str += " and detail.OwnerName like @ownerName";
+ }
+ if (!string.IsNullOrEmpty(houseNo))
+ {
+ str += " and house.WareHouseNo = @wareHouseNo";
}
+ if (!string.IsNullOrEmpty(areaNo))
+ {
+ str += " and area.AreaNo = @areaNo";
+ }
+ if (!string.IsNullOrEmpty(type))
+ {
+ str += " and sku.Type = @type";
+ }
+
//鎺掑簭
str += " order by detail.SkuNo,detail.PalletNo,detail.LotNo";
List<StockDetailDto> stockDetailsList = Db.Ado.SqlQuery<StockDetailDto>(str, new
{
- isdel = "0", //鏄惁鍒犻櫎
- skuno = "%" + skuNo + "%", //鐗╂枡缂栫爜
- skuname = "%" + skuName + "%", //鐗╂枡鍚嶇О
- lotno = "%" + lotNo + "%", //鎵规
- locatno = "%" + locatNo + "%", //鍌ㄤ綅鍦板潃
- palletno = "%" + palletNo + "%", //鎵樼洏鏉＄爜
- status = status, //搴撳瓨鐘舵��
- inspectstatus = inspectStatus, //璐ㄦ鐘舵��
- ownerNo = "%" + ownerNo + "%", //璐т富缂栫爜
- ownerName = "%" + ownerName + "%" //璐т富鍚嶇О
+ isdel = "0", //鏄惁鍒犻櫎
+ skuno = "%" + skuNo + "%", //鐗╂枡缂栫爜
+ skuname = "%" + skuName + "%", //鐗╂枡鍚嶇О
+ lotno = "%" + lotNo + "%", //鎵规
+ locatno = "%" + locatNo + "%", //鍌ㄤ綅鍦板潃
+ palletno = "%" + palletNo + "%", //鎵樼洏鏉＄爜
+ status = status, //搴撳瓨鐘舵��
+ inspectstatus = inspectStatus, //璐ㄦ鐘舵��
+ ownerNo = "%" + ownerNo + "%", //璐т富缂栫爜
+ ownerName = "%" + ownerName + "%", //璐т富鍚嶇О
+ wareHouseNo = houseNo,
+ areaNo = areaNo, //鎵�灞炲尯鍩�
+ type = type
});
return stockDetailsList;
}
diff --git a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs
index 19c7495..b8d8d85 100644
--- a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs
+++ b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs
@@ -129,6 +129,14 @@
public DateTime? CompleteTime { get; set; }
public string OrderDetailCode { get; set; }
+ /// <summary>
+ /// 鎵规灞炴��1-鐢熶骇鏃ユ湡
+ /// </summary>
+ public string Lot1 { get; set; }
+ /// <summary>
+ /// 鎵规灞炴��2-杩囨湡鏃ユ湡
+ /// </summary>
+ public string Lot2 { get; set; }
/// <summary>
/// 鑷畾涔夊垪1
diff --git a/Wms/WMS.IBLL/IDataServer/IStockServer.cs b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
index b175bae..fd3e98c 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
@@ -30,7 +30,8 @@
/// <param name="status">搴撳瓨鐘舵��</param>
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
- List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName);
+ List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo,
+ string status, string inspectStatus, string ownerNo, string ownerName, string houseNo, string areaNo, string type);
#endregion
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 30131e0..4168244 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -65,11 +65,16 @@
/// <param name="palletNo">鎵樼洏鏉＄爜</param>
/// <param name="status">搴撳瓨鐘舵��</param>
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
+ /// <param name="HouseNo">鎵�灞炰粨搴�</param>
+ /// <param name="RoadwayNo">鎵�灞炲尯鍩�</param>
+ /// <param name="Type">鐗╂枡绫诲瀷</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName)
+ public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo,
+ string status, string inspectStatus, string ownerNo, string ownerName,string HouseNo,string AreaNo, string Type)
{
- List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus, ownerNo, ownerName);
+ List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo,
+ status, inspectStatus, ownerNo, ownerName, HouseNo, AreaNo, Type);
return Ok(new
{
data = stockDetailsList,
--
Gitblit v1.8.0