From 260c6e54c4f100ca49376a6afd70f73843868171 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 28 八月 2024 08:49:35 +0800
Subject: [PATCH] 组托收货测试
---
Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs | 6
HTML/views/QualityControl/QualityInformationFrom.html | 149 +-
Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs | 56
HTML/views/ASNSetting/PalletBind.html | 6
HTML/views/StatisticalReport/BoxInfor.html | 1427 ++++++++++++--------------
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 56
Wms/WMS.BLL/DataServer/StockServer.cs | 5
Pda/View/SoSetting/SampleOut2.html | 148 +-
HTML/views/QualityControl/QualityChangeLog.html | 573 ++++-----
Wms/WMS.BLL/DataServer/StockDetailServer.cs | 17
HTML/views/QualityControl/QualityInformation.html | 753 ++++++-------
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 25
Wms/Wms/Controllers/StatisticalController.cs | 9
13 files changed, 1,532 insertions(+), 1,698 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index f7761ca..87964db 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -455,13 +455,13 @@
{ field: 'PalletNo3', title: '鎵樼洏鍙稬V3', align: 'center' },
{ field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 90 },
{ field: 'RoadwayNo', title: '鎵�灞炲贩閬�', align: 'center', width: 90, templet: '#RoadwayButton' },
- { field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center', width: 90},
+ { field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center', width: 90 },
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 110 },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
{ field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 120 },
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 90 },
{ field: 'FullQty', title: '鏁存墭鏁伴噺', align: 'center', width: 90 },
- { field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 90 },
+ //{ field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 90 }, // 鍙栨牱鏁伴噺鏀惧埌璇烽獙澶勬樉绀�
{ field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', width: 90, templet: '#templetInspectMark' },
//{ field: 'Status', title: '鎵ц鐘舵��', align: 'center', width: 90, templet: '#templetStatus' }, // 閮芥槸鍏ュ簱瀹屾垚
{ field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', width: 90, templet: '#templetBitPalletMark' },
@@ -544,7 +544,7 @@
{ field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 150, },
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 105, },
{ field: 'FullQty', title: '鏁寸鏁伴噺', align: 'center', width: 105, },
- { field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 105, },
+ //{ field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 105, }, // 鍙栨牱鏁伴噺鏀惧埌璇烽獙椤甸潰鏄剧ず銆�
{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', width: 160, templet: '#templetProductionTime' },
{ field: 'ExpirationTime', title: '杩囨湡鏃ユ湡', align: 'center', width: 180, templet: '#templetExpirationTime' },
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 150, },
diff --git a/HTML/views/QualityControl/QualityChangeLog.html b/HTML/views/QualityControl/QualityChangeLog.html
index 0a0e60c..a21afd4 100644
--- a/HTML/views/QualityControl/QualityChangeLog.html
+++ b/HTML/views/QualityControl/QualityChangeLog.html
@@ -1,342 +1,291 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <title>璐ㄦ淇℃伅褰曞叆</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <link rel="stylesheet" href="../../css/public.css" media="all">
- <script>
- // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
- //鑾峰彇table榛樿鏄剧ず鏁�
- pageCntFirst();
- //鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
- GetIsSetColW();
- });
- </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">
- <!-- 鍗曟嵁
+<head>
+ <meta charset="utf-8">
+ <title>璐ㄦ淇℃伅褰曞叆</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../css/public.css" media="all">
+
+ <script>
+ // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+ document.addEventListener("DOMContentLoaded", function () {
+ //鑾峰彇table榛樿鏄剧ず鏁�
+ pageCntFirst();
+ //鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
+ GetIsSetColW();
+ });
+ </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="ASNNo" name="ASNNo" 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="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">
- <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">
- <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 class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+ <div class="layui-input-inline">
+ <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">
+ <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">
+ <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>
- <div id="center"></div>
- <div class="layui-card-body">
-
- <!-- <div style="padding-bottom: 5px; display: flex; flex-direction: row-reverse;">
+ </div>
+ <div id="center"></div>
+ <div class="layui-card-body">
+
+ <!-- <div style="padding-bottom: 5px; display: flex; flex-direction: row-reverse;">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn" style="margin-right: 10px;" data-type="add" id="approvalBtn">
<i class="layui-icon"></i>娣诲姞
</button>
</div> -->
- <div class="position-relative">
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+ <div class="position-relative">
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
- <!--#region 鑷畾涔夎〃澶� -->
- <div class="headerSetIcon">
- <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
- <i class="layui-icon"></i>
- </button>
- </div>
- <!-- #endregion -->
- </div>
-
- <script type="text/html" id="CreateTimeButton">
+ <!--#region 鑷畾涔夎〃澶� -->
+ <div class="headerSetIcon">
+ <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
+ <i class="layui-icon"></i>
+ </button>
+ </div>
+ <!-- #endregion -->
+ </div>
+
+ <script type="text/html" id="CreateTimeButton">
{{# console.log(d.CreateTime);
return formatDate(d.CreateTime);
}}
</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();
-
- var TotalColsArr =
- [[
- {
- field: '',title: '搴忓彿',type: 'numbers',fixed: 'left', "disabled": true
- },
- {
- field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center'
- },
- {
- field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'
- },
- {
- field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center'
- },
- {
- field: 'LotNo',title: '鎵规鍙�',align: 'center'
- },
- {
- field: 'FailQty',title: '鏁伴噺',align: 'center'
- },
- {
- field: 'Demo',title: '鍙樻洿淇℃伅',align: 'center',width: 360
- },
- // {
- // field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center'
- // },
- {
- field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center', templet: '#CreateTimeButton',
- },
- ]];
- var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ var h1 = GetTableHeight();
- refreshTable("","","","","","");
- var tableIns;
- var colsJson;
- function refreshTable(LotNo,SkuNo,SkuName) {
-
- var param1={
- // Href:'QualityControl/QualityInformation'
- Href:'BllQuality/GetBllQualityList2'
- };
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- console.log(1)
- colsJson=TotalColsArr
- }else{
- console.log(2)
- colsJson= eval(res.data);
- }
- }else{
- colsJson=TotalColsArr
- }
-
- var param = {
- // ASNNo: ASNNo,
- LotNo: LotNo,
- SkuNo: SkuNo,
- SkuName: SkuName,
- Origin:'WMS'
- };
- // console.log(param)
- var url = "/BllQuality/GetBllQualityList";
- table.render({
- elem: '#LAY-app-content-list',
- url: IP + url,
- method: 'post',
- height: h1,
- id: 'LAY-app-content-list',
- where: param,
- contentType: 'application/json',
- // toolbar: '#toolbarDemo',
- defaultToolbar: [], //'filter','print', 'exports'
- headers: { ToKen: $.cookie('token') },
- page: true,
- even: true,
- limit: pageCnt,
- limits: pageLimits,
- cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function (res) {
- setRight();
- //鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list','BllQuality/GetBllQualityList2',TotalColsSysArr);
- },
- cols: colsJson
- });
- });
-
-
-
- // var url = "/BllQuality/GetBllQualityList";
- // sendData(IP + url, param, 'post', function(res) {
- // if (res.code == 0) //鎴愬姛
- // {
- // var list = res.data;
- // $.extend(infoOptions, {
- // data: list
- // });
- // infoOptions.page = {
- // curr: 1
- // }
- // console.log(res)
- // tableIns = table.render(infoOptions);
- // }
- // else //涓嶆垚鍔�
- // {
- // layer.msg('鑾峰彇璐ㄦ鍒楄〃淇℃伅澶辫触锛�', {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function() {});
- // }
- // });
- }
-
- // function tableclass(LotNo,SkuNo,SkuName)
- // {
- // var param = {
- // // ASNNo: ASNNo,
- // LotNo: LotNo,
- // SkuNo: SkuNo,
- // SkuName: SkuName
- // };
- // // console.log(param)
- // var url = "/BllQuality/GetBllQualityList";
- // table.render({
- // elem: '#LAY-app-content-list',
- // url: IP + url,
- // method: 'post',
- // height: 'full-136',
- // id: 'LAY-app-content-list',
- // where: param,
- // // contentType: 'application/json',
- // // toolbar: '#toolbarDemo',
- // // defaultToolbar: [], //'filter','print', 'exports'
- // // headers: { ToKen: $.cookie('token') },
- // page: true,
- // even: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // done: function (res) {
- // setRight();
- // },
- // cols: colsJson
- // });
- // }
-
- // 鏉冮檺璁剧疆
- function setRight() {
- $(function() {
- $("#approvalBtn").hide();
- });
- sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
- for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉")
- {
- $(function() {
- $("#approvalBtn").show();
- });
- }
- }
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
- }
-
- //鐩戝惉鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- // var ASNNo = data.field.ASNNo;
- var LotNo = data.field.LotNo;
- var SkuNo = data.field.SkuNo;
- var SkuName = data.field.SkuName;
-
- refreshTable(LotNo,SkuNo,SkuName);
- });
- var doing = true;
- var $ = layui.$,
- active = {
- customCols: function(){
- layer.open({
- type: 2,
- title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllQuality/GetBllQualityList2&ColsSysArr='+TotalColsSysArr,
- maxmin: false,
- resize: false,
- area: ['970px', '650px']
- });
- },
- };
- $('.layui-btn').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 TotalColsArr =
+ [[
{
- 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>';
- }
+ field: '', title: '搴忓彿', type: 'numbers', fixed: 'left', "disabled": true
+ },
+ {
+ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'
+ },
+ {
+ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'
+ },
+ {
+ field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center'
+ },
+ {
+ field: 'LotNo', title: '鎵规鍙�', align: 'center'
+ },
+ {
+ field: 'PassQty', title: '鍚堟牸鏁伴噺', align: 'center'
+ },
+ {
+ field: 'FailQty', title: '涓嶅悎鏍兼暟閲�', align: 'center'
+ },
+ {
+ field: 'Demo', title: '鍙樻洿淇℃伅', align: 'center', width: 360
+ },
+ // {
+ // field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center'
+ // },
+ {
+ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', templet: '#CreateTimeButton',
+ },
+ ]];
+ var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+
+ refreshTable("", "", "", "", "", "");
+ var tableIns;
+ var colsJson;
+ function refreshTable(LotNo, SkuNo, SkuName) {
+
+ var param1 = {
+ // Href:'QualityControl/QualityInformation'
+ Href: 'BllQuality/GetBllQualityList2'
+ };
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ console.log(1)
+ colsJson = TotalColsArr
+ } else {
+ console.log(2)
+ colsJson = eval(res.data);
+ }
+ } else {
+ colsJson = TotalColsArr
+ }
+
+ var param = {
+ // ASNNo: ASNNo,
+ LotNo: LotNo,
+ SkuNo: SkuNo,
+ SkuName: SkuName,
+ Origin: 'WMS'
+ };
+ // console.log(param)
+ var url = "/BllQuality/GetBllQualityList";
+ table.render({
+ elem: '#LAY-app-content-list',
+ url: IP + url,
+ method: 'post',
+ height: h1,
+ id: 'LAY-app-content-list',
+ where: param,
+ contentType: 'application/json',
+ // toolbar: '#toolbarDemo',
+ defaultToolbar: [], //'filter','print', 'exports'
+ headers: { ToKen: $.cookie('token') },
+ page: true,
+ even: true,
+ limit: pageCnt,
+ limits: pageLimits,
+ cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ done: function (res) {
+ setRight();
+ //鑷畾涔夊垪瀹�
+ SetTableColW('LAY-app-content-list', 'BllQuality/GetBllQualityList2', TotalColsSysArr);
+ },
+ cols: colsJson
+ });
+ });
+ }
+
+
+ // 鏉冮檺璁剧疆
+ function setRight() {
+ $(function () {
+ $("#approvalBtn").hide();
+ });
+ sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉") {
+ $(function () {
+ $("#approvalBtn").show();
+ });
+ }
+ }
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ // var ASNNo = data.field.ASNNo;
+ var LotNo = data.field.LotNo;
+ var SkuNo = data.field.SkuNo;
+ var SkuName = data.field.SkuName;
+
+ refreshTable(LotNo, SkuNo, SkuName);
+ });
+ var doing = true;
+ var $ = layui.$,
+ active = {
+ customCols: function () {
+ layer.open({
+ type: 2,
+ title: '鑷畾涔夊垪',
+ content: '../SystemSettings/HeaderSetting.html?Href=BllQuality/GetBllQualityList2&ColsSysArr=' + TotalColsSysArr,
+ maxmin: false,
+ resize: false,
+ area: ['970px', '650px']
+ });
+ },
+ };
+ $('.layui-btn').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>';
}
}
}
}
- });
- </script>
- </body>
-</html>
+ }
+ });
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/HTML/views/QualityControl/QualityInformation.html b/HTML/views/QualityControl/QualityInformation.html
index c8760be..84661ad 100644
--- a/HTML/views/QualityControl/QualityInformation.html
+++ b/HTML/views/QualityControl/QualityInformation.html
@@ -1,445 +1,390 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <title>璐ㄦ淇℃伅褰曞叆</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <link rel="stylesheet" href="../../css/public.css" media="all">
- <script>
- // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
- //鑾峰彇table榛樿鏄剧ず鏁�
- pageCntFirst();
- //鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
- GetIsSetColW();
- });
- </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="ASNNo" name="ASNNo" 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="LotNo" name="LotNo" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" autocomplete="off" class="layui-input">
- </div>
+<head>
+ <meta charset="utf-8">
+ <title>璐ㄦ淇℃伅褰曞叆</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../css/public.css" media="all">
+
+ <script>
+ // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+ document.addEventListener("DOMContentLoaded", function () {
+ //鑾峰彇table榛樿鏄剧ず鏁�
+ pageCntFirst();
+ //鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
+ GetIsSetColW();
+ });
+ </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="ASNNo" name="ASNNo" placeholder="璇疯緭鍏ュ叆搴撳崟鎹�" autocomplete="off"
+ class="layui-input">
</div>
- <!-- 鐗╂枡鍙� -->
- <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">
- <!-- 鏄惁鍚堟牸 -->
- <label class="layui-form-label" style="width: 60px;">鏄惁鍚堟牸</label>
- <div class="layui-input-inline">
- <select name="IsQualified" id="IsQualified" lay-verify="" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">涓嶅悎鏍�</option>
- <option value="1">鍚堟牸</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 approvalBtn" lay-submit lay-filter="LAY-app-contlist-tianjia" id="add">
- <i class="layui-icon layui-icon-add layuiadmin-button-btn"></i>娣诲姞
- </button>
+ </div> -->
+ <!-- 鎵规 -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+ <div class="layui-input-inline">
+ <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">
+ <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">
+ <!-- 鏄惁鍚堟牸 -->
+ <label class="layui-form-label" style="width: 60px;">鏄惁鍚堟牸</label>
+ <div class="layui-input-inline">
+ <select name="IsQualified" id="IsQualified" lay-verify="" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">涓嶅悎鏍�</option>
+ <option value="1">鍚堟牸</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 approvalBtn" lay-submit
+ lay-filter="LAY-app-contlist-tianjia" id="add">
+ <i class="layui-icon layui-icon-add layuiadmin-button-btn"></i>娣诲姞
+ </button>
+ </div>
</div>
- <div id="center"></div>
- <div class="layui-card-body">
-
- <!-- <div style="padding-bottom: 5px; display: flex; flex-direction: row-reverse;">
+ </div>
+ <div id="center"></div>
+ <div class="layui-card-body">
+
+ <!-- <div style="padding-bottom: 5px; display: flex; flex-direction: row-reverse;">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn" style="margin-right: 10px;" data-type="add" id="approvalBtn">
<i class="layui-icon"></i>娣诲姞
</button>
</div> -->
- <div class="position-relative">
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+ <div class="position-relative">
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
- <!--#region 鑷畾涔夎〃澶� -->
- <div class="headerSetIcon">
- <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
- <i class="layui-icon"></i>
- </button>
- </div>
- <!-- #endregion -->
- </div>
-
+ <!--#region 鑷畾涔夎〃澶� -->
+ <div class="headerSetIcon">
+ <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
+ <i class="layui-icon"></i>
+ </button>
+ </div>
+ <!-- #endregion -->
+ </div>
- <script type="text/html" id="IsQualifiedButton">
+
+ <script type="text/html" id="IsQualifiedButton">
{{# if(d.IsQualified=='0'){ }}
<p>涓嶅悎鏍�</p>
{{# } else if(d.IsQualified=='1'){ }}
<p>鍚堟牸</p>
{{# } }}
</script>
- <script type="text/html" id="CreateTimeButton">
+ <script type="text/html" id="CreateTimeButton">
{{# console.log(d.CreateTime);
return formatDate(d.CreateTime);
}}
</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();
-
- var TotalColsArr =
- [[
- {
- field: '',title: '搴忓彿',type: 'numbers',fixed: 'left', "disabled": true
- },
- {
- field: 'InspectNo',title: '妫�楠屽彿',align: 'center'
- },
- {
- field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center'
- },
- {
- field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'
- },
- {
- field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center'
- },
- {
- field: 'LotNo',title: '鎵规鍙�',align: 'center'
- },
- {
- field: 'IsQualified',title: '妫�楠岀粨鏋�',align: 'center',templet: '#IsQualifiedButton',
- },
- {
- field: 'Origin',title: '鏉ユ簮',align: 'center'
- },
- {
- field: 'PassQty',title: '鍚堟牸鏁伴噺',align: 'center'
- },
- {
- field: 'FailQty',title: '涓嶅悎鏍兼暟閲�',align: 'center'
- },
- {
- field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center'
- },
- {
- field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center', templet: '#CreateTimeButton',
- },
- ]];
- var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ var h1 = GetTableHeight();
- refreshTable("","","","","","");
- var tableIns;
- var colsJson;
- function refreshTable(LotNo,SkuNo,SkuName,IsQualified) {
-
- var param1={
- // Href:'QualityControl/QualityInformation'
- Href:'BllQuality/GetBllQualityList'
- };
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- console.log(1)
- colsJson=TotalColsArr
- }else{
- console.log(2)
- colsJson= eval(res.data);
- }
- }else{
- colsJson=TotalColsArr
+ var TotalColsArr =
+ [[
+ {
+ field: '', title: '搴忓彿', type: 'numbers', fixed: 'left', "disabled": true
+ },
+ {
+ field: 'InspectNo', title: '妫�楠屽彿', align: 'center'
+ },
+ {
+ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'
+ },
+ {
+ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'
+ },
+ {
+ field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center'
+ },
+ {
+ field: 'LotNo', title: '鎵规鍙�', align: 'center'
+ },
+ {
+ field: 'IsQualified', title: '妫�楠岀粨鏋�', align: 'center', templet: '#IsQualifiedButton',
+ },
+ {
+ field: 'Origin', title: '鏉ユ簮', align: 'center'
+ },
+ {
+ field: 'PassQty', title: '鍚堟牸鏁伴噺', align: 'center'
+ },
+ {
+ field: 'FailQty', title: '涓嶅悎鏍兼暟閲�', align: 'center'
+ },
+ {
+ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center'
+ },
+ {
+ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', templet: '#CreateTimeButton',
+ },
+ ]];
+ var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+
+ refreshTable("", "", "", "", "", "");
+ var tableIns;
+ var colsJson;
+ function refreshTable(LotNo, SkuNo, SkuName, IsQualified) {
+
+ var param1 = {
+ // Href:'QualityControl/QualityInformation'
+ Href: 'BllQuality/GetBllQualityList'
+ };
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ console.log(1)
+ colsJson = TotalColsArr
+ } else {
+ console.log(2)
+ colsJson = eval(res.data);
}
- // tableclass(LotNo,SkuNo,SkuName,IsQualified);
+ } else {
+ colsJson = TotalColsArr
+ }
+ // tableclass(LotNo,SkuNo,SkuName,IsQualified);
- var param = {
- // ASNNo: ASNNo,
- LotNo: LotNo,
- SkuNo: SkuNo,
- SkuName: SkuName,
- IsQualified: IsQualified,
- Origin:'WMS'
- };
- // console.log(param)
- var url = "/BllQuality/GetBllQualityList";
- table.render({
- elem: '#LAY-app-content-list',
- url: IP + url,
- method: 'post',
- height: h1,
- id: 'LAY-app-content-list',
- where: param,
- contentType: 'application/json',
- // toolbar: '#toolbarDemo',
- defaultToolbar: [], //'filter','print', 'exports'
- headers: { ToKen: $.cookie('token') },
- page: true,
- even: true,
- limit: pageCnt,
- limits: pageLimits,
- cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function (res) {
- setRight();
- //鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list','BllQuality/GetBllQualityList',TotalColsSysArr);
- },
- cols: colsJson
+ var param = {
+ // ASNNo: ASNNo,
+ LotNo: LotNo,
+ SkuNo: SkuNo,
+ SkuName: SkuName,
+ IsQualified: IsQualified,
+ Origin: 'WMS'
+ };
+ // console.log(param)
+ var url = "/BllQuality/GetBllQualityList";
+ table.render({
+ elem: '#LAY-app-content-list',
+ url: IP + url,
+ method: 'post',
+ height: h1,
+ id: 'LAY-app-content-list',
+ where: param,
+ contentType: 'application/json',
+ // toolbar: '#toolbarDemo',
+ defaultToolbar: [], //'filter','print', 'exports'
+ headers: { ToKen: $.cookie('token') },
+ page: true,
+ even: true,
+ limit: pageCnt,
+ limits: pageLimits,
+ cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ done: function (res) {
+ setRight();
+ //鑷畾涔夊垪瀹�
+ SetTableColW('LAY-app-content-list', 'BllQuality/GetBllQualityList', TotalColsSysArr);
+ },
+ cols: colsJson
+ });
+ });
+ }
+
+ // 鏉冮檺璁剧疆
+ function setRight() {
+
+ $(function () {
+ $(".approvalBtn").hide();
+ });
+ sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉") {
+ $(function () {
+ $(".approvalBtn").show();
+ });
+ }
+ }
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ // var ASNNo = data.field.ASNNo;
+ var LotNo = data.field.LotNo;
+ var SkuNo = data.field.SkuNo;
+ var SkuName = data.field.SkuName;
+ var IsQualified = data.field.IsQualified;
+
+ refreshTable(LotNo, SkuNo, SkuName, IsQualified);
+ });
+ var doing = true;
+ var $ = layui.$,
+ active = {
+ customCols: function () {
+ layer.open({
+ type: 2,
+ title: '鑷畾涔夊垪',
+ content: '../SystemSettings/HeaderSetting.html?Href=BllQuality/GetBllQualityList&ColsSysArr=' + TotalColsSysArr,
+ maxmin: false,
+ resize: false,
+ area: ['970px', '650px']
});
- });
-
+ },
+ };
+ $('.layui-btn').on('click', function () {
+ var type = $(this).data('type');
+ active[type] ? active[type].call(this) : '';
+ });
-
- // var url = "/BllQuality/GetBllQualityList";
- // sendData(IP + url, param, 'post', function(res) {
- // if (res.code == 0) //鎴愬姛
- // {
- // var list = res.data;
- // $.extend(infoOptions, {
- // data: list
- // });
- // infoOptions.page = {
- // curr: 1
- // }
- // console.log(res)
- // tableIns = table.render(infoOptions);
- // }
- // else //涓嶆垚鍔�
- // {
- // layer.msg('鑾峰彇璐ㄦ鍒楄〃淇℃伅澶辫触锛�', {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function() {});
- // }
- // });
- }
-
- // function tableclass(LotNo,SkuNo,SkuName,IsQualified)
- // {
- // var param = {
- // // ASNNo: ASNNo,
- // LotNo: LotNo,
- // SkuNo: SkuNo,
- // SkuName: SkuName,
- // IsQualified: IsQualified
- // };
- // // console.log(param)
- // var url = "/BllQuality/GetBllQualityList";
- // table.render({
- // elem: '#LAY-app-content-list',
- // url: IP + url,
- // method: 'post',
- // height: 'full-136',
- // id: 'LAY-app-content-list',
- // where: param,
- // // contentType: 'application/json',
- // // toolbar: '#toolbarDemo',
- // // defaultToolbar: [], //'filter','print', 'exports'
- // // headers: { ToKen: $.cookie('token') },
- // page: true,
- // even: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // done: function (res) {
- // setRight();
- // },
- // cols: colsJson
- // });
- // }
-
- // 鏉冮檺璁剧疆
- function setRight() {
-
- $(function() {
- $(".approvalBtn").hide();
- });
- sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
- for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉")
- {
- $(function() {
- $(".approvalBtn").show();
- });
- }
- }
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
- }
-
- //鐩戝惉鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- // var ASNNo = data.field.ASNNo;
- var LotNo = data.field.LotNo;
- var SkuNo = data.field.SkuNo;
- var SkuName = data.field.SkuName;
- var IsQualified = data.field.IsQualified;
-
- refreshTable(LotNo,SkuNo,SkuName,IsQualified);
- });
- var doing = true;
- var $ = layui.$,
- active = {
- customCols: function(){
- layer.open({
- type: 2,
- title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllQuality/GetBllQualityList&ColsSysArr='+TotalColsSysArr,
- maxmin: false,
- resize: false,
- area: ['970px', '650px']
- });
- },
- };
- $('.layui-btn').on('click', function() {
- var type = $(this).data('type');
- active[type] ? active[type].call(this) : '';
- });
-
- //鐩戝惉娣诲姞
- form.on('submit(LAY-app-contlist-tianjia)', function () {
- layer.open({
- type: 2,
- title: '娣诲姞璐ㄦ淇℃伅',
- content: 'QualityInformationFrom.html',
- maxmin: true,
- area: ['500px', '450px'],
- 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 = {
- InspectNo: field.InspectNo,
- //ASNNo: field.ASNNo,
- LotNo: field.LotNo,
- SkuNo: field.SkuNo,
- IsQualified: field.IsQualified,
- };
- if(doing)
- {
- doing = false;
- sendData(IP + "/BllQuality/InsertQuality", 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
+ //鐩戝惉娣诲姞
+ form.on('submit(LAY-app-contlist-tianjia)', function () {
+ layer.open({
+ type: 2,
+ title: '娣诲姞璐ㄦ淇℃伅',
+ content: 'QualityInformationFrom.html',
+ maxmin: true,
+ area: ['500px', '450px'],
+ 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 = {
+ InspectNo: field.InspectNo,
+ ASNNo: field.ASNNo,
+ LotNo: field.LotNo,
+ SkuNo: field.SkuNo,
+ IsQualified: field.IsQualified,
+ };
+ if (doing) {
+ doing = false;
+ sendData(IP + "/BllQuality/InsertQuality", 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
(
- // $("#ASNNo").val(),
+ $("#ASNNo").val(),
$("#LotNo").val(),
$("#SkuNo").val(),
$("#SkuName").val(),
$("#InsertQuality").val(),
);
- doing = true;
- });
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {doing = true;});
- }
- });
- }
- else{
- console.log(123);
- }
-
- });
- submit.trigger('click');
- }
- });
- })
-
- 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>';
- }
+ doing = true;
+ });
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true; });
+ }
+ });
+ }
+ else {
+ console.log(123);
+ }
+
+ });
+ submit.trigger('click');
+ }
+ });
+ })
+
+ 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>';
}
}
}
}
- });
- </script>
- </body>
-</html>
+ }
+ });
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/HTML/views/QualityControl/QualityInformationFrom.html b/HTML/views/QualityControl/QualityInformationFrom.html
index 9b55017..b16fd47 100644
--- a/HTML/views/QualityControl/QualityInformationFrom.html
+++ b/HTML/views/QualityControl/QualityInformationFrom.html
@@ -1,77 +1,86 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <title>璐ㄦ淇℃伅褰曞叆</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- </head>
- <body>
- <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 0px 0 0;">
- <div class="layui-form-item">
- <label class="layui-form-label">妫�楠屽彿</label>
- <div class="layui-input-block" style="width: 70%;">
- <input type="text" name="InspectNo" placeholder="璇疯緭鍏ユ楠屽彿" lay-verify="required" autocomplete="off" class="layui-input">
- </div>
- </div>
- <!-- <div class="layui-form-item">
- <label class="layui-form-label">鍏ュ簱鍗曞彿</label>
- <div class="layui-input-block" style="width: 70%;">
- <input type="text" name="ASNNo" placeholder="璇疯緭鍏ュ叆搴撳崟鍙�" autocomplete="off" class="layui-input">
- </div>
- </div> -->
- <div class="layui-form-item">
- <label class="layui-form-label">鎵规鍙�</label>
- <div class="layui-input-block" style="width: 70%;">
- <input type="text" name="LotNo" placeholder="璇疯緭鍏ユ壒娆″彿" lay-verify="required" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐗╂枡鍙�</label>
- <div class="layui-input-block" style="width: 70%;">
- <input type="text" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欏彿" lay-verify="required" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀹℃牳鐘舵��</label>
- <div class="layui-input-block" style="width: 70%;">
- <select name="IsQualified" id="IsQualified" lay-verify="">
- <!-- <option value=""></option> -->
- <option value="0">涓嶅悎鏍�</option>
- <option value="1" selected>鍚堟牸</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item layui-hide">
- <input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit" value="纭娣诲姞">
+
+<head>
+ <meta charset="utf-8">
+ <title>璐ㄦ淇℃伅褰曞叆</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+</head>
+
+<body>
+ <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list"
+ style="padding: 20px 0px 0 0;">
+ <div class="layui-form-item">
+ <label class="layui-form-label">妫�楠屽彿</label>
+ <div class="layui-input-block" style="width: 70%;">
+ <input type="text" name="InspectNo" placeholder="璇疯緭鍏ユ楠屽彿" lay-verify="required" autocomplete="off"
+ class="layui-input">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏ュ簱鍗曞彿</label>
+ <div class="layui-input-block" style="width: 70%;">
+ <input type="text" name="ASNNo" placeholder="璇疯緭鍏ュ叆搴撳崟鍙�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵规鍙�</label>
+ <div class="layui-input-block" style="width: 70%;">
+ <input type="text" name="LotNo" placeholder="璇疯緭鍏ユ壒娆″彿" lay-verify="required" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐗╂枡鍙�</label>
+ <div class="layui-input-block" style="width: 70%;">
+ <input type="text" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欏彿" lay-verify="required" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹℃牳鐘舵��</label>
+ <div class="layui-input-block" style="width: 70%;">
+ <select name="IsQualified" id="IsQualified" lay-verify="">
+ <!-- <option value=""></option> -->
+ <option value="0">涓嶅悎鏍�</option>
+ <option value="1" selected>鍚堟牸</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item layui-hide">
+ <input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit"
+ value="纭娣诲姞">
+ </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', 'form', 'layer'], function() {
- var $ = layui.$,
- form = layui.form,
- layer = layui.layer;
+ <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', 'form', 'layer'], function () {
+ var $ = layui.$,
+ form = layui.form,
+ layer = layui.layer;
- });
+ });
- //鑾峰彇娴忚鍣ㄥ弬鏁�
- function getQueryString(name) {
- var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
- var r = window.location.search.substr(1).match(reg);
- if (r != null) return unescape(r[2]);
- return null;
- }
- </script>
- </body>
-</html>
+ //鑾峰彇娴忚鍣ㄥ弬鏁�
+ function getQueryString(name) {
+ var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null) return unescape(r[2]);
+ return null;
+ }
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 35b4739..04858a6 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -1,85 +1,92 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <title>鎵樼洏鏄庣粏鍒楄〃</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <link rel="stylesheet" href="../../css/public.css" media="all">
- <style type="text/css">
- .layui-form-item .layui-inline {
- margin-bottom: 1px;
- margin-right: 1px;
- }
-
- </style>
- <script>
- // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
- //鑾峰彇table榛樿鏄剧ず鏁�
- pageCntFirst();
- //鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
- GetIsSetColW();
- });
- </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" id="top">
- <div class="layui-form-item" style="margin-bottom: 0px;">
- <div class="layui-inline zongdan" >
- <label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
- <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" id="SkuNo" name="SkuNo" placeholder="鐗╂枡缂栫爜" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline zongdan" >
- <label class="layui-form-label" style="width: 60px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" id="SkuName" name="SkuName" placeholder="鐗╂枡鍚嶇О" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline zongdan" >
- <label class="layui-form-label" style="width: 60px;">鎵樼洏鍙�</label>
- <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" id="PalletNo" name="PalletNo" placeholder="鎵樼洏鍙�" autocomplete="off" 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="OwnerNo" name="OwnerNo" placeholder="璐т富缂栫爜" autocomplete="off"
- 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="OwnerName" name="OwnerName" placeholder="璐т富鍚嶇О" autocomplete="off"
- 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>
- </div>
- <!-- 绠辩爜 绠辨敮鐘舵�� 妫�楠屾爣璁� 闆剁鏍囪 璐ㄩ噺鐘舵�� -->
+<head>
+ <meta charset="utf-8">
+ <title>鎵樼洏鏄庣粏鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../css/public.css" media="all">
+ <style type="text/css">
+ .layui-form-item .layui-inline {
+ margin-bottom: 1px;
+ margin-right: 1px;
+ }
+ </style>
+ <script>
+ // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+ document.addEventListener("DOMContentLoaded", function () {
+ //鑾峰彇table榛樿鏄剧ず鏁�
+ pageCntFirst();
+ //鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
+ GetIsSetColW();
+ });
+ </script>
- <div class="layui-inline zongdan" >
- <label class="layui-form-label" style="width: 60px;">绠辩爜</label>
- <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" id="BoxNo" name="BoxNo" placeholder="绠辩爜" autocomplete="off" class="layui-input">
- </div>
+</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" id="top">
+ <div class="layui-form-item" style="margin-bottom: 0px;">
+ <div class="layui-inline zongdan">
+ <label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <input type="text" id="SkuNo" name="SkuNo" placeholder="鐗╂枡缂栫爜" autocomplete="off"
+ class="layui-input">
</div>
- <!-- <div class="layui-inline zhijian">
+ </div>
+ <div class="layui-inline zongdan">
+ <label class="layui-form-label" style="width: 60px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <input type="text" id="SkuName" name="SkuName" placeholder="鐗╂枡鍚嶇О" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline zongdan">
+ <label class="layui-form-label" style="width: 60px;">鎵樼洏鍙�</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <input type="text" id="PalletNo" name="PalletNo" placeholder="鎵樼洏鍙�" autocomplete="off"
+ 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="OwnerNo" name="OwnerNo" placeholder="璐т富缂栫爜" autocomplete="off"
+ 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="OwnerName" name="OwnerName" placeholder="璐т富鍚嶇О" autocomplete="off"
+ 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>
+ </div>
+
+ <!-- 绠辩爜 绠辨敮鐘舵�� 妫�楠屾爣璁� 闆剁鏍囪 璐ㄩ噺鐘舵�� -->
+
+ <div class="layui-inline zongdan">
+ <label class="layui-form-label" style="width: 60px;">绠辩爜</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <input type="text" id="BoxNo" name="BoxNo" placeholder="绠辩爜" autocomplete="off"
+ 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="Status" id="Status" lay-search>
@@ -91,117 +98,112 @@
</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="InspectMark" id="InspectMark" lay-filter="InspectMark"
- 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="BitPalletMark" id="BitPalletMark" lay-filter="BitPalletMark"
- 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="BitBoxMark" id="BitBoxMark" lay-filter="BitBoxMark"
- 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>瀵煎嚭
- </button>
+ <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="InspectMark" id="InspectMark" lay-filter="InspectMark" 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="BitPalletMark" id="BitPalletMark" lay-filter="BitPalletMark" 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="BitBoxMark" id="BitBoxMark" lay-filter="BitBoxMark" 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>瀵煎嚭
+ </button>
+ </div>
</div>
+ </div>
- <div class="layui-card-body">
- <div style="position: relative;">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title" id="tab">
- <li class="layui-this">鎵樼洏鏄庣粏</li>
- <li >绠辩爜鏄庣粏</li>
- </ul>
+ <div class="layui-card-body">
+ <div style="position: relative;">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title" id="tab">
+ <li class="layui-this">鎵樼洏鏄庣粏</li>
+ <li>绠辩爜鏄庣粏</li>
+ </ul>
- <div id="center">
- </div>
+ <div id="center">
+ </div>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
- <!-- #region 鑷畾涔夎〃澶� -->
- <div class="headerSetIcon">
- <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
- <i class="layui-icon"></i>
- </button>
- </div>
- <!-- #endregion -->
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+ <!-- #region 鑷畾涔夎〃澶� -->
+ <div class="headerSetIcon">
+ <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
+ <i class="layui-icon"></i>
+ </button>
</div>
+ <!-- #endregion -->
</div>
- <div class="layui-tab-item">
- <div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
- <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">
- <i class="layui-icon"></i>
- </button>
- </div>
- <!-- #endregion -->
+ </div>
+ <div class="layui-tab-item">
+ <div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
+ <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">
+ <i class="layui-icon"></i>
+ </button>
+ </div>
+ <!-- #endregion -->
- <!-- #region 鑷畾涔夎〃澶� -->
- <script type="text/html" id="templetProductionTime">
+ <!-- #region 鑷畾涔夎〃澶� -->
+ <script type="text/html" id="templetProductionTime">
{{# function GetBtn(d){
return formatDate(d.ProductionTime);
}
@@ -209,22 +211,22 @@
{{ GetBtn(d) }}
</script>
- <script type="text/html" id="templetInspectTime">
+ <script type="text/html" id="templetInspectTime">
{{# function GetBtn1(d){
return formatDate(d.InspectTime);
}
}}
{{ GetBtn1(d) }}
</script>
- <!-- #endregion -->
- </div>
+ <!-- #endregion -->
</div>
</div>
</div>
-
</div>
-
- <script type="text/html" id="BoxStatus">
+
+ </div>
+
+ <script type="text/html" id="BoxStatus">
{{# if(d.Status=='0'){ }}
<p>鏈粍鎵�</p>
{{# } else if(d.Status == '1') { }}
@@ -240,14 +242,14 @@
{{# } }}
</script>
- <script type="text/html" id="InspectMarkStatus">
+ <script type="text/html" id="InspectMarkStatus">
{{# if(d.InspectMark=='0'){ }}
<p>鍚�</p>
{{# } else if(d.InspectMark == '1') { }}
<p>鏄�</p>
{{# } }}
</script>
- <script type="text/html" id="BitPalletMarkStatus">
+ <script type="text/html" id="BitPalletMarkStatus">
{{# if(d.BitPalletMark=='0'){ }}
<p>鍚�</p>
{{# } else if(d.BitPalletMark == '1') { }}
@@ -255,7 +257,7 @@
{{# } }}
</script>
- <script type="text/html" id="InspectStatus1">
+ <script type="text/html" id="InspectStatus1">
{{# if(d.InspectStatus == '0') { }}
<p>寰呮楠�</p>
{{# } else if(d.InspectStatus == '1'){ }}
@@ -266,630 +268,503 @@
<p>鏀剧疆鏈�</p>
{{# } }}
</script>
- <script type="text/html" id="BitPalletMarkStatus1">
+ <script type="text/html" id="BitPalletMarkStatus1">
{{# if(d.BitBoxMark=='0'){ }}
<p>鍚�</p>
{{# } else if(d.BitBoxMark == '1') { }}
<p>鏄�</p>
{{# } }}
</script>
- <script type="text/html" id="table-content-list">
+ <script type="text/html" id="table-content-list">
<button class="layui-btn layui-btn-normal layui-btn-xs approvalBtnupt" id="approvalBtnupt" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>璇︽儏
</button>
</script>
- </div>
</div>
</div>
+ </div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../js/public.js"></script>
- <script src="../../js/jquery-3.5.1.min.js"></script>
- <script src="../../js/jquery.cookie.js"></script>
- <script>
- var uid = $.cookie('userId');
- layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'layer','element','laydate'], function() {
- var table = layui.table,
- form = layui.form,
- laypage = layui.laypage,
- layer = layui.layer;
- element = layui.element;
- laydate = layui.laydate;
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/public.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script>
+ var uid = $.cookie('userId');
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'table', 'laypage', 'layer', 'element', 'laydate'], function () {
+ var table = layui.table,
+ form = layui.form,
+ laypage = layui.laypage,
+ layer = layui.layer;
+ element = layui.element;
+ laydate = layui.laydate;
- var h1 = GetTableTabHeight();
- // var h1 = GetTkableTopHeight();
- // console.log(h1)
+ var h1 = GetTableTabHeight();
+ // var h1 = GetTkableTopHeight();
+ // console.log(h1)
- laydate.render({
- elem: '#StartTime',
- format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
- });
- laydate.render({
- elem: '#EndTime',
- format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
- });
- //鑾峰彇褰撳墠鏃堕棿
- function getNowTime() {
- var date = new Date();
- //骞� getFullYear()锛氬洓浣嶆暟瀛楄繑鍥炲勾浠�
- var year = date.getFullYear(); //getFullYear()浠ｆ浛getYear()
- //鏈� getMonth()锛�0 ~ 11
- var month = date.getMonth() + 1;
- //鏃� getDate()锛�(1 ~ 31)
- var day = date.getDate();
- //鏃� getHours()锛�(0 ~ 23)
- var hour = date.getHours();
- //鍒� getMinutes()锛� (0 ~ 59)
- var minute = date.getMinutes();
- //绉� getSeconds()锛�(0 ~ 59)
- var second = date.getSeconds();
-
- var time = year + addZero(month) + addZero(day) + addZero(hour) + addZero(minute) + addZero(second);
- return time;
-
- //灏忎簬10鐨勬嫾鎺ヤ笂0瀛楃涓�
-
- };
- function addZero(s) {
- return s < 10 ? ('0' + s) : s;
- };
+ laydate.render({
+ elem: '#StartTime',
+ format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ laydate.render({
+ elem: '#EndTime',
+ format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ //鑾峰彇褰撳墠鏃堕棿
+ function getNowTime() {
+ var date = new Date();
+ //骞� getFullYear()锛氬洓浣嶆暟瀛楄繑鍥炲勾浠�
+ var year = date.getFullYear(); //getFullYear()浠ｆ浛getYear()
+ //鏈� getMonth()锛�0 ~ 11
+ var month = date.getMonth() + 1;
+ //鏃� getDate()锛�(1 ~ 31)
+ var day = date.getDate();
+ //鏃� getHours()锛�(0 ~ 23)
+ var hour = date.getHours();
+ //鍒� getMinutes()锛� (0 ~ 59)
+ var minute = date.getMinutes();
+ //绉� getSeconds()锛�(0 ~ 59)
+ var second = date.getSeconds();
- var $ = layui.$;
- var yemianid =0;
- refreshTable("","","","","","","","","","","","","","");
+ var time = year + addZero(month) + addZero(day) + addZero(hour) + addZero(minute) + addZero(second);
+ return time;
- // 琛ㄥ崟闇�瑕佺殑鍙橀噺
- var infoOptions;
- //#region 鍘熷闈炶嚜瀹氫箟鍒�
- // infoOptions = {
- // elem: '#LAY-app-content-list',
- // height: 'full-206',
- // id: 'LAY-app-content-list',
- // page: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // even: true,
- // cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // cols:
- // [[
- // {
- // title: '搴忓彿', type: 'numbers', fixed: 'left'
- // },
- // {
- // field: 'AreaNo', title: '鎵�灞炲尯鍩�', align: 'center',
- // },
- // {
- // field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'
- // },
- // {
- // field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center',
- // },
- // {
- // field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'
- // },
- // {
- // field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',
- // },
- // {
- // field: 'LotNo', title: '鎵规鍙�', align: 'center',
- // },
- // {
- // field: 'LotText', title: '鎵规鎻忚堪', align: 'center'
- // },
- // {
- // field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center',
- // },
- // {
- // field: 'Qty', title: '鏁伴噺', align: 'center'
- // },
- // {
- // field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',
- // },
- // {
- // field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'
- // },
- // {
- // field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'
- // },
- // {
- // field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus'
- // },
- // //{
- // // field: 'Status', title: '鎵樼洏鐘舵��', align: 'center', templet: '#PalletStatus',
- // //},
- // ]]
- // };
- //#endregion
+ //灏忎簬10鐨勬嫾鎺ヤ笂0瀛楃涓�
+ };
+ function addZero(s) {
+ return s < 10 ? ('0' + s) : s;
+ };
+
+ var $ = layui.$;
+ var yemianid = 0;
+ refreshTable("", "", "", "", "", "", "", "", "", "", "", "", "", "");
+
+ // 琛ㄥ崟闇�瑕佺殑鍙橀噺
+ var infoOptions;
+ //#region 鑷畾涔夎〃澶�
+ var TotalColsArr = [[
+ { field: '', title: '搴忓彿', type: 'numbers', align: 'center', fixed: 'left', "disabled": true },
+ { field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center' },
+ { field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center' },
+ { field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center' },
+ { field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center' },
+ { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center' },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center' },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
+ { field: 'OwnerNo', title: '璐т富缂栫爜', align: 'center' },
+ { field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center' },
+ { field: 'SupplierNo', title: '渚涘簲鍟嗙紪鐮�', align: 'center' },
+ { field: 'SupplierName', title: '渚涘簲鍟嗗悕绉�', align: 'center' },
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center' },
+ { field: 'LotText', title: '鎵规鎻忚堪', align: 'center' },
+ { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center' },
+ { field: 'Qty', title: '鏁伴噺', align: 'center' },
+ { field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center', },
+ { field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center' },
+ { field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus' },
+ { field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', templet: '#templetProductionTime' },
+ { field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center' },
+ { field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus' },
+ ]];
+ var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ //#endregion
+ //鑾峰彇鎵樼洏鏄庣粏
+ function refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark,
+ BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime) {
//#region 鑷畾涔夎〃澶�
- var TotalColsArr = [[
- {field: '',title: '搴忓彿',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
- {field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center'},
- {field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center'},
- {field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center'},
- {field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'},
- {field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center'},
- {field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
- {field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
- {field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
- {field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
- {field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
- {field: 'SupplierName',title: '渚涘簲鍟嗗悕绉�',align: 'center'},
- {field: 'LotNo', title: '鎵规鍙�', align: 'center'},
- {field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
- {field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center'},
- {field: 'Qty', title: '鏁伴噺', align: 'center'},
- {field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',},
- {field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'},
- {field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'},
- {field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus'},
- ]];
- var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
- //#endregion
- //鑾峰彇鎵樼洏鏄庣粏
- function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime) {
- //#region 鑷畾涔夎〃澶�
- var colsJson
- var param1={
- Href:'Statistical/GetBindList'
- };
- 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
+ var colsJson
+ var param1 = {
+ Href: 'Statistical/GetBindList'
+ };
+ 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);
}
- 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 鏂板
- done: function(){
- //鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list','Statistical/GetBindList',TotalColsSysArr);
- },
- cols:colsJson
+ } else {
+ colsJson = TotalColsArr
+ }
+ 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 鏂板
+ done: function () {
+ //鑷畾涔夊垪瀹�
+ SetTableColW('LAY-app-content-list', 'Statistical/GetBindList', TotalColsSysArr);
+ },
+ cols: colsJson
+ };
+
+ var param = {
+ SkuNo: SkuNo, //鐗╂枡鍙�
+ SkuName: SkuName, //鐗╂枡鍚嶇О
+ palletNo: PalletNo, //鎵樼洏鍙�
+ LotNo: LotNo, //鎵规鍙�
+ BoxNo: BoxNo, //绠辩爜
+ Status: Status, //绠辨敮鐘舵��
+ InspectMark: InspectMark, //妫�楠屾爣璁�
+ BitPalletMark: BitPalletMark, //闆舵墭鏍囪
+ BitBoxMark: BitBoxMark, //闆剁鏍囪
+ InspectStatus: InspectStatus, //璐ㄩ噺鐘舵��
+ OwnerNo: OwnerNo, //璐т富缂栫爜
+ OwnerName: OwnerName, //璐т富鍚嶇О
+ StartTime: StartTime, //寮�濮嬫椂闂�
+ EndTime: EndTime, //缁撴潫鏃堕棿
+ };
+ sendData(IP + "/Statistical/GetBindList", param, 'get', function (res) {
+ console.log(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 () { });
+ }
+ });
+ });
+ //#endregion
+ }
+
+ // 琛ㄥ崟闇�瑕佺殑鍙橀噺
+ var infoOptions2;
+
+ //鑾峰彇鏄庣粏淇℃伅
+ //#region 鑷畾涔夎〃澶�
+ var DetailColsArr = [[
+ { field: '', title: '搴忓彿', type: 'numbers', fixed: 'left', "disabled": true },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center' },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
+ { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110 },
+ { field: 'BoxNo', title: '绠辩爜', align: 'center', width: 100 },
+ { field: 'Status', title: '绠辨敮鐘舵��', align: 'center', templet: '#BoxStatus' },
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center' },
+ { field: 'LotText', title: '鎵规鎻忚堪', align: 'center' },
+ { field: 'Qty', title: '鏁伴噺', width: 90, align: 'center' },
+ { field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center' },
+ { field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', templet: '#templetProductionTime' },
+ { field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus' },
+ { field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '闆剁鏍囪', align: 'center' },
+ { field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center' },
+ { field: 'InspectTime', title: '澶嶆鏃堕棿', align: 'center', templet: '#templetInspectTime' },
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list', "disabled": true }
+ ]];
+ var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ //#endregion
+ function refreshTable2(Id, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime) {
+ //#region 鑷畾涔夎〃澶�
+ var colsJson2
+ var param1 = {
+ Href: 'Statistical/GetBoxInfo'
+ };
+ 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
+ }
+ infoOptions2 = {
+ elem: '#LAY-app-content-list2',
+ height: h1,
+ id: 'LAY-app-content-list2',
+ page: true,
+ limit: pageCnt,
+ limits: pageLimits,
+ even: true,
+ cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ done: function () {
+ //鑷畾涔夊垪瀹�
+ SetTableColW('LAY-app-content-list2', 'Statistical/GetBoxInfo', DetailColsSysArr);
+ },
+ cols: colsJson2
+ };
+
+ var param = {
+ Id: Id,
+ SkuNo: SkuNo,
+ SkuName: SkuName,
+ LotNo: LotNo,
+ PalletNo: PalletNo,
+ BoxNo: BoxNo,
+ Status: Status,
+ InspectMark: InspectMark,
+ BitBoxMark: BitBoxMark,
+ InspectStatu: InspectStatus,
+ StartTime: StartTime,
+ EndTime: EndTime,
+ }
+ sendData(IP + "/Statistical/GetBoxInfo", param, 'get', function (res) {
+ if (res.code == 0) //鎴愬姛
+ {
+ var list = res.data;
+ $.extend(infoOptions2, {
+ data: list
+ });
+ infoOptions2.page = {
+ curr: 1
+ }
+ tableIns2 = table.render(infoOptions2);
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg('鑾峰彇鏄庣粏鍒楄〃淇℃伅澶辫触锛�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ })
+ });
+ //#endregion
+ }
+
+ //var url = IP + "/Statistical/GetInventoryList1";
+
+
+
+ //鎺ュ彈鍏ㄥ眬鍙橀噺
+ let quanid = '';
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ var SkuNo = $("#SkuNo").val();
+ var SkuName = $("#SkuName").val();
+ var LotNo = $("#LotNo").val();
+ var PalletNo = $("#PalletNo").val();
+
+ var BoxNo = $("#BoxNo").val();
+ var Status = $("#Status").val();
+ var InspectMark = $("#InspectMark").val();
+ var BitPalletMark = $("#BitPalletMark").val();
+ var BitBoxMark = $("#BitBoxMark").val();
+ var InspectStatus = $("#InspectStatus").val();
+
+ var OwnerNo = $("#OwnerNo").val();
+ var OwnerName = $("#OwnerName").val();
+
+ var StartTime = $("#StartTime").val();
+ var EndTime = $("#EndTime").val();
+
+ if (yemianid == 0) {
+ console.log("鎬诲崟");
+ refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark, BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime);
+ } else if (yemianid == 1) {
+ quanid = '';
+ console.log("鏄庣粏");
+ refreshTable2(quanid, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime);
+ }
+
+ });
+ //瑙﹀彂琛屽弻鍑讳簨浠�
+ table.on('rowDouble(LAY-app-content-list)', function (obj) {
+ $(".layui-tab-title>li").attr("class", "");
+ $('.layui-tab-title>li').eq(1).attr('class', 'layui-this');
+ $('.layui-tab-content .layui-tab-item').attr('class', 'layui-tab-item')
+ $('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
+ console.log(obj.data.Id);
+ quanid = obj.data.Id;
+ refreshTable2(obj.data.Id);
+ yemianid = 1;
+ });
+
+ //鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
+ element.on('tab(docDemoTabBrief)', function (data) {
+ var SkuNo = $("#SkuNo").val();
+ var SkuName = $("#SkuName").val();
+ var LotNo = $("#LotNo").val();
+ var PalletNo = $("#PalletNo").val();
+
+ var BoxNo = $("#BoxNo").val();
+ var Status = $("#Status").val();
+ var InspectMark = $("#InspectMark").val();
+ var BitPalletMark = $("#BitPalletMark").val();
+ var BitBoxMark = $("#BitBoxMark").val();
+ var InspectStatus = $("#InspectStatus").val();
+
+ var OwnerNo = $("#OwnerNo").val();
+ var OwnerName = $("#OwnerName").val();
+
+ var StartTime = $("#StartTime").val();
+ var EndTime = $("#EndTime").val();
+
+ console.log(data.index);
+ yemianid = data.index
+ if (yemianid == 0) {
+ console.log("鎬诲崟");
+ refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark, BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime);
+ } else if (yemianid == 1) {
+ console.log("鏄庣粏");
+ refreshTable2(quanid, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime);
+ }
+ });
+ var doing = true;
+ // ------------------------------------璇︽儏---------------------------------------------------
+ table.on('tool(LAY-app-content-list2)', function (obj) {
+ console.log(obj)
+ var data = obj.data;
+ //璇︽儏
+ if (obj.event === 'edit') {
+ BoxNo = data.BoxNo;
+ console.log(data)
+ layer.open({
+ type: 2,
+ title: '绠辨敮璇︽儏淇℃伅',
+ content: 'BoxSupportInfor.html?BoxNo=' + BoxNo,
+ maxmin: true,
+ area: ['80%', '85%'],
+ btn: ['鍏抽棴'],
+ yes: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index],
+ submitID = 'layuiadmin-app-form-edit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ if (doing) {
+ doing = false;
+
+ layer.close(index); //鍏抽棴寮瑰眰
+ refreshTable();
+ doing = true;
+
+
+ }
+ }
+ });
+ }
+ });
+
+ form.on('submit(daochu)', function () {
+ layer.confirm('纭畾瀵煎嚭褰撳墠鏁版嵁鍚楋紵', function (index) {
+ if (yemianid == 0) {
+ console.log("鎵樼洏鏄庣粏");
+ var param = {
+ SkuNo: $("#SkuNo").val(),
+ SkuName: $("#SkuName").val(),
+ LotNo: $("#LotNo").val(),
+ PalletNo: $("#PalletNo").val(),
+
+ BoxNo: $("#BoxNo").val(),
+ Status: $("#Status").val(),
+ InspectMark: $("#InspectMark").val(),
+ BitPalletMark: $("#BitPalletMark").val(),
+ BitBoxMark: $("#BitBoxMark").val(),
+ InspectStatus: $("#InspectStatus").val(),
+
+ StartTime: $("#StartTime").val(),
+ EndTime: $("#EndTime").val(),
};
- var param = {
- SkuNo:SkuNo, //鐗╂枡鍙�
- SkuName:SkuName, //鐗╂枡鍚嶇О
- palletNo:PalletNo, //鎵樼洏鍙�
- LotNo:LotNo, //鎵规鍙�
- BoxNo:BoxNo, //绠辩爜
- Status:Status, //绠辨敮鐘舵��
- InspectMark:InspectMark, //妫�楠屾爣璁�
- BitPalletMark:BitPalletMark, //闆舵墭鏍囪
- BitBoxMark:BitBoxMark, //闆剁鏍囪
- InspectStatus:InspectStatus, //璐ㄩ噺鐘舵��
- OwnerNo:OwnerNo, //璐т富缂栫爜
- OwnerName:OwnerName, //璐т富鍚嶇О
- StartTime:StartTime, //寮�濮嬫椂闂�
- EndTime:EndTime, //缁撴潫鏃堕棿
- };
- sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {
- console.log(res)
+ sendData(IP + "/Statistical/GetBindListDaoChu", param, 'get', function (res) {
+ console.log(res);
if (res.code == 0) { //鎴愬姛
var list = res.data;
- $.extend(infoOptions, {
- data: list
+ table.exportFile(tableIns.config.id, list, 'xls', "鎵樼洏鏄庣粏淇℃伅" + getNowTime(),); //data 涓鸿瀹炰緥涓殑浠绘剰鏁伴噺鐨勬暟鎹�
+ layer.msg('瀵煎嚭鎴愬姛锛�', {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+
});
- infoOptions.page = {
- curr: 1
- }
- tableIns = table.render(infoOptions);
- }
- else { //涓嶆垚鍔�
- layer.msg('鑾峰彇鎬婚噺鍒楄〃淇℃伅澶辫触锛�', {
+
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇淇℃伅澶辫触锛�', {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ }, function () { });
}
});
- });
- //#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:
- // [[
- // {
- // title: '搴忓彿', type: 'numbers', fixed: 'left'
- // },
- // {
- // field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center',
- // },
- // {
- // field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',
- // },
- // {
- // field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110,
- // },
- // {
- // field: 'BoxNo', title: '绠辩爜', align: 'center', width: 100,
- // },
- // {
- // field: 'Status', title: '绠辨敮鐘舵��', align: 'center', templet: '#BoxStatus',
- // },
- // {
- // field: 'LotNo', title: '鎵规鍙�', align: 'center',
- // },
- // {
- // field: 'LotText', title: '鎵规鎻忚堪', align: 'center',
- // },
- // {
- // field: 'Qty', title: '鏁伴噺', width: 90, align: 'center',
- // },
- // {
- // field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center',
- // },
- // {
- // field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center',
- // templet: function(d) {
- // return formatDate(d.ProductionTime);
- // },
- // },
- // {
- // field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus',
- // },
- // {
- // field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '闆剁鏍囪', align: 'center',
- // },
- // {
- // field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center',
- // },
- // {
- // field: 'InspectTime', title: '澶嶆鏃堕棿', align: 'center',
- // templet: function(d) {
- // return formatDate(d.InspectTime);
- // },
- // },
- // {
- // title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list'
- // }
- // ]]
- // };
- //#endregion
-
- //鑾峰彇鏄庣粏淇℃伅
- //#region 鑷畾涔夎〃澶�
- var DetailColsArr = [[
- {field: '',title: '搴忓彿',type:'numbers',fixed: 'left', "disabled": true},
- {field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
- {field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
- {field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110},
- {field: 'BoxNo', title: '绠辩爜', align: 'center', width: 100},
- {field: 'Status', title: '绠辨敮鐘舵��', align: 'center', templet: '#BoxStatus'},
- {field: 'LotNo', title: '鎵规鍙�', align: 'center'},
- {field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
- {field: 'Qty', title: '鏁伴噺', width: 90, align: 'center'},
- {field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center'},
- {field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center',templet: '#templetProductionTime'},
- {field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'},
- {field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '闆剁鏍囪', align: 'center'},
- {field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center'},
- {field: 'InspectTime', title: '澶嶆鏃堕棿', align: 'center',templet: '#templetInspectTime'},
- {field: 'caozuo',title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list', "disabled": true}
- ]];
- var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
- //#endregion
- function refreshTable2(Id,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime) {
- //#region 鑷畾涔夎〃澶�
- var colsJson2
- var param1={
- Href:'Statistical/GetBoxInfo'
- };
- 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
- }
- infoOptions2 = {
- elem: '#LAY-app-content-list2',
- height: h1,
- id: 'LAY-app-content-list2',
- page: true,
- limit: pageCnt,
- limits: pageLimits,
- even: true,
- cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function(){
- //鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list2','Statistical/GetBoxInfo',DetailColsSysArr);
- },
- cols:colsJson2
- };
-
+ } else if (yemianid == 1) {
+ console.log("绠辩爜鏄庣粏");
var param = {
- Id:Id,
- SkuNo:SkuNo,
- SkuName:SkuName,
- LotNo:LotNo,
- PalletNo:PalletNo,
- BoxNo:BoxNo,
- Status:Status,
- InspectMark:InspectMark,
- BitBoxMark:BitBoxMark,
- InspectStatu:InspectStatus,
- StartTime:StartTime,
- EndTime:EndTime,
- }
- sendData(IP + "/Statistical/GetBoxInfo", param, 'get', function(res) {
- if (res.code == 0) //鎴愬姛
- {
+ Id: quanid,
+ SkuNo: $("#SkuNo").val(),
+ SkuName: $("#SkuName").val(),
+ LotNo: $("#LotNo").val(),
+ LocatNo: $("#LocatNo").val(),
+ PalletNo: $("#PalletNo").val(),
+ Status: $("#Status").val(),
+ InspectStatus: $("#InspectStatus").val(),
+ IsSamolingTray: $("#IsSamolingTray").val(),
+ StartTime: $("#StartTime").val(),
+ EndTime: $("#EndTime").val(),
+ };
+ sendData(IP + "/Statistical/GetBoxInfoDaoChu", param, 'get', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
var list = res.data;
- $.extend(infoOptions2, {
- data: list
+ table.exportFile(tableIns2.config.id, list, 'xls', "绠辩爜鏄庣粏淇℃伅" + getNowTime(),); //data 涓鸿瀹炰緥涓殑浠绘剰鏁伴噺鐨勬暟鎹�
+ layer.msg('瀵煎嚭鎴愬姛锛�', {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+
});
- infoOptions2.page = {
- curr: 1
- }
- tableIns2 = table.render(infoOptions2);
- }
- else //涓嶆垚鍔�
- {
- layer.msg('鑾峰彇鏄庣粏鍒楄〃淇℃伅澶辫触锛�', {
+
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇淇℃伅澶辫触锛�', {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- })
- });
- //#endregion
- }
-
- //var url = IP + "/Statistical/GetInventoryList1";
-
-
-
- //鎺ュ彈鍏ㄥ眬鍙橀噺
- let quanid = '';
- //鐩戝惉鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- var SkuNo = $("#SkuNo").val();
- var SkuName = $("#SkuName").val();
- var LotNo = $("#LotNo").val();
- var PalletNo = $("#PalletNo").val();
-
- var BoxNo = $("#BoxNo").val();
- var Status = $("#Status").val();
- var InspectMark = $("#InspectMark").val();
- var BitPalletMark = $("#BitPalletMark").val();
- var BitBoxMark = $("#BitBoxMark").val();
- var InspectStatus = $("#InspectStatus").val();
-
- var OwnerNo = $("#OwnerNo").val();
- var OwnerName = $("#OwnerName").val();
-
- var StartTime = $("#StartTime").val();
- var EndTime = $("#EndTime").val();
-
- if(yemianid == 0){
- console.log("鎬诲崟");
- refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
- }else if(yemianid == 1){
- quanid = '';
- console.log("鏄庣粏");
- refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime);
- }
-
- });
- //瑙﹀彂琛屽弻鍑讳簨浠�
- table.on('rowDouble(LAY-app-content-list)', function(obj) {
- $(".layui-tab-title>li").attr("class", "");
- $('.layui-tab-title>li').eq(1).attr('class', 'layui-this');
- $('.layui-tab-content .layui-tab-item').attr('class', 'layui-tab-item')
- $('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
- console.log(obj.data.Id);
- quanid = obj.data.Id;
- refreshTable2(obj.data.Id);
- yemianid=1;
- });
-
- //鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
- element.on('tab(docDemoTabBrief)', function(data){
- var SkuNo = $("#SkuNo").val();
- var SkuName = $("#SkuName").val();
- var LotNo = $("#LotNo").val();
- var PalletNo = $("#PalletNo").val();
-
- var BoxNo = $("#BoxNo").val();
- var Status = $("#Status").val();
- var InspectMark = $("#InspectMark").val();
- var BitPalletMark = $("#BitPalletMark").val();
- var BitBoxMark = $("#BitBoxMark").val();
- var InspectStatus = $("#InspectStatus").val();
-
- var OwnerNo = $("#OwnerNo").val();
- var OwnerName = $("#OwnerName").val();
-
- var StartTime = $("#StartTime").val();
- var EndTime = $("#EndTime").val();
-
- console.log(data.index);
- yemianid = data.index
- if(yemianid == 0){
- console.log("鎬诲崟");
- refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
- }else if(yemianid == 1){
- console.log("鏄庣粏");
- refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime);
- }
- });
- var doing = true;
- // ------------------------------------璇︽儏---------------------------------------------------
- table.on('tool(LAY-app-content-list2)', function(obj) {
- console.log(obj)
- var data = obj.data;
- //璇︽儏
- if (obj.event === 'edit') {
- BoxNo = data.BoxNo;
- console.log(data)
- layer.open({
- type: 2,
- title: '绠辨敮璇︽儏淇℃伅',
- content: 'BoxSupportInfor.html?BoxNo=' + BoxNo,
- maxmin: true,
- area: ['80%', '85%'],
- btn: ['鍏抽棴'],
- yes: function(index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index],
- submitID = 'layuiadmin-app-form-edit',
- submit = layero.find('iframe').contents().find('#' + submitID);
- if(doing)
- {
- doing = false;
-
- layer.close(index); //鍏抽棴寮瑰眰
- refreshTable();
- doing = true;
-
-
- }
+ }, function () { });
}
});
- }
- });
-
- form.on('submit(daochu)', function () {
- layer.confirm('纭畾瀵煎嚭褰撳墠鏁版嵁鍚楋紵', function(index) {
- if(yemianid == 0){
- console.log("鎵樼洏鏄庣粏");
- var param = {
- SkuNo : $("#SkuNo").val(),
- SkuName : $("#SkuName").val(),
- LotNo : $("#LotNo").val(),
- PalletNo : $("#PalletNo").val(),
-
- BoxNo : $("#BoxNo").val(),
- Status : $("#Status").val(),
- InspectMark : $("#InspectMark").val(),
- BitPalletMark : $("#BitPalletMark").val(),
- BitBoxMark : $("#BitBoxMark").val(),
- InspectStatus : $("#InspectStatus").val(),
-
- StartTime: $("#StartTime").val(),
- EndTime: $("#EndTime").val(),
- };
-
- sendData(IP + "/Statistical/GetBindListDaoChu", param, 'get', function (res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- var list = res.data;
- table.exportFile(tableIns.config.id, list,'xls',"鎵樼洏鏄庣粏淇℃伅"+getNowTime(),); //data 涓鸿瀹炰緥涓殑浠绘剰鏁伴噺鐨勬暟鎹�
- layer.msg('瀵煎嚭鎴愬姛锛�', {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
-
- });
-
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇淇℃伅澶辫触锛�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
- }else if(yemianid == 1){
- console.log("绠辩爜鏄庣粏");
- var param = {
- Id:quanid,
- SkuNo: $("#SkuNo").val(),
- SkuName: $("#SkuName").val(),
- LotNo:$("#LotNo").val(),
- LocatNo:$("#LocatNo").val(),
- PalletNo:$("#PalletNo").val(),
- Status:$("#Status").val(),
- InspectStatus:$("#InspectStatus").val(),
- IsSamolingTray:$("#IsSamolingTray").val(),
- StartTime: $("#StartTime").val(),
- EndTime: $("#EndTime").val(),
- };
- sendData(IP + "/Statistical/GetBoxInfoDaoChu", param, 'get', function (res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- var list = res.data;
- table.exportFile(tableIns2.config.id, list,'xls',"绠辩爜鏄庣粏淇℃伅"+getNowTime(),); //data 涓鸿瀹炰緥涓殑浠绘剰鏁伴噺鐨勬暟鎹�
- layer.msg('瀵煎嚭鎴愬姛锛�', {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
-
- });
-
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇淇℃伅澶辫触锛�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
- }
- });
-
-
- });
-
- //#region 鑷畾涔夎〃澶�
- //鑷畾涔夎〃澶�
- active = {
- customCols: function(){
- layer.open({
- type: 2,
- title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBindList&ColsSysArr='+TotalColsSysArr,
- maxmin: false,
- resize: false,
- area: ['970px', '650px']
- });
- },
- customCols2: function(){
- layer.open({
- type: 2,
- title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBoxInfo&ColsSysArr='+DetailColsSysArr,
- maxmin: false,
- resize: false,
- area: ['970px', '650px']
- });
}
-
- };
- $('.layui-btn').on('click', function() {
- var type = $(this).data('type');
- active[type] ? active[type].call(this) : '';
});
- //#endregion
+
+
});
- </script>
- </body>
-</html>
+
+ //#region 鑷畾涔夎〃澶�
+ //鑷畾涔夎〃澶�
+ active = {
+ customCols: function () {
+ layer.open({
+ type: 2,
+ title: '鑷畾涔夊垪',
+ content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBindList&ColsSysArr=' + TotalColsSysArr,
+ maxmin: false,
+ resize: false,
+ area: ['970px', '650px']
+ });
+ },
+ customCols2: function () {
+ layer.open({
+ type: 2,
+ title: '鑷畾涔夊垪',
+ content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBoxInfo&ColsSysArr=' + DetailColsSysArr,
+ maxmin: false,
+ resize: false,
+ area: ['970px', '650px']
+ });
+ }
+
+ };
+ $('.layui-btn').on('click', function () {
+ var type = $(this).data('type');
+ active[type] ? active[type].call(this) : '';
+ });
+ //#endregion
+ });
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Pda/View/SoSetting/SampleOut2.html b/Pda/View/SoSetting/SampleOut2.html
index d6489db..07807e5 100644
--- a/Pda/View/SoSetting/SampleOut2.html
+++ b/Pda/View/SoSetting/SampleOut2.html
@@ -157,7 +157,7 @@
<table border="" cellspacing="" cellpadding="">
<tr>
<td class="img-back"><a href="../index.html"><img src="/assets/back.jpg"></a></td>
- <td class="title-text">鍙栨牱鍑哄簱</td>
+ <td class="title-text">鍙栨牱鎷ｈ揣</td>
<td class="title-menu-icon"><img id="menuImg" src="/assets/menu.jpg"></td>
</tr>
</table>
@@ -193,32 +193,32 @@
<img src="/assets/down_arraw.png">
</div>
</div>
-
+
<div id="" class="layout-tab-page">
<table class="tbl-box-sim-info" cellspacing="" cellpadding="">
<tr>
- <td colspan="3">
+ <td colspan="3">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 20%;">鐗╂枡锛�</label>
<div class="layui-input-block" style="width: 80%;margin-left:20%;">
- <input id="sku" type="text" lay-verify="" disabled
- placeholder="" class="layui-input">
+ <input id="sku" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
</div>
</div>
</td>
- </tr>
- <tr>
- <td colspan="3">
+ </tr>
+ <tr>
+ <td colspan="3">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 20%;">鎵规鍙�</label>
<div class="layui-input-block" style="width: 80%;margin-left:20%;">
- <input id="lotNo" type="text" lay-verify="" disabled
- placeholder="" class="layui-input">
+ <input id="lotNo" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
</div>
</div>
</td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td>
<div class="layui-form-item">
<label class="layui-form-label" style="width: 50%;">璁″垝鏁伴噺锛�</label>
@@ -239,11 +239,11 @@
</td>
</tr>
-
+
</table>
</div>
</div>
-
+
<div id="layout-pallet" class="layui-form-item layout-input">
<label class="layui-form-label lableWidth">鎵樼洏鏉＄爜锛�</label>
<div class="layui-input-block">
@@ -280,11 +280,11 @@
<td>
<div class="layui-form-item layout-input" style="margin-top: 6px;">
<label class="layui-form-label lableWidth">鎷ｈ揣鏁伴噺锛�</label>
- <div class="layui-input-block">
+ <div class="layui-input-block">
<input id="pickQty1" type="text" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"
autocomplete="off" class="layui-input"
oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
- onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
+ onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
</div>
</div>
</td>
@@ -313,7 +313,7 @@
</form>
</div>
-
+
</div>
<!-- 鏃犵爜 -->
<div id="content2">
@@ -330,31 +330,31 @@
<img src="/assets/down_arraw.png">
</div>
</div>
-
+
<div id="" class="layout-tab-page">
<table class="tbl-box-sim-info" cellspacing="" cellpadding="">
<tr>
- <td colspan="3">
+ <td colspan="3">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 20%;">鐗╂枡锛�</label>
<div class="layui-input-block" style="width: 80%;margin-left:20%;">
- <input id="sku2" type="text" lay-verify="" disabled
- placeholder="" class="layui-input">
+ <input id="sku2" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
</div>
</div>
</td>
- </tr>
- <tr>
- <td colspan="3">
+ </tr>
+ <tr>
+ <td colspan="3">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 20%;">鎵规鍙�</label>
<div class="layui-input-block" style="width: 80%;margin-left:20%;">
- <input id="lotNo2" type="text" lay-verify="" disabled
- placeholder="" class="layui-input">
+ <input id="lotNo2" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
</div>
</div>
</td>
- </tr>
+ </tr>
<tr>
<td>
<div class="layui-form-item">
@@ -376,11 +376,11 @@
</td>
</tr>
-
+
</table>
</div>
</div>
-
+
<div id="layout-pallet" class="layui-form-item layout-input">
<label class="layui-form-label lableWidth">鎵樼洏鏉＄爜锛�</label>
<div class="layui-input-block">
@@ -388,7 +388,7 @@
autocomplete="off" class="layui-input" style="height:24px">
</div>
</div>
-
+
<div id="" class="layout-tab-page">
<table class="layout-tab-content">
@@ -402,7 +402,7 @@
autocomplete="off" class="layui-input"
style="padding-left:0.1rem;"
oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
- onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
+ onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
</div>
</div>
<div id="" class="local-ok">
@@ -441,7 +441,7 @@
/* 鏍囩鍒囨崲浠ｇ爜 */
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();
@@ -469,14 +469,14 @@
});
});
-
+
var canPickBox = true
$("#palletNo").focus();//鍏夋爣榛樿閫変腑
-
+
function clear2() {
$("#sku").val("")//鐗╂枡
- $("#lotNo").val("") //鎵规
+ $("#lotNo").val("") //鎵规
}
function clear3() {
$("#planQty").val(""); //璁″垝鏁伴噺
@@ -497,8 +497,8 @@
}
checkPalletState()
})
- updateBillList();
-
+ updateBillList();
+
//妫�鏌ユ墭鐩樼姸鎬�
function checkPalletState() {
@@ -516,7 +516,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () { });
}
-
+
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -535,7 +535,7 @@
//涓嬫媺璇烽獙鍗曟嵁閫変腑鍚庝簨浠�
form.on('select(getbar)', function (data) {
-
+
if ($('#bar').val() == "") {
clear2();
clear3();
@@ -543,17 +543,17 @@
}
updateInspectionInfo();
});
-
+
//鍒濆鍖栨覆鏌� 璇烽獙鍗�
function updateBillList() {
- var bar = $("#bar").val();
+ var bar = $("#bar").val();
$("#bar").empty()
$("#bar").append('<option value =>' + '</option>');
form.render('select');
synData(IP + "/PdaSo/GetInspectionNo", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
-
+
for (var i = 0; i < res.data.length; i++) {
if (bar == res.data[i]) {
$("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
@@ -575,16 +575,16 @@
//鍒濆鍖栨覆鏌� 璇烽獙鍗曠殑淇℃伅 鐗╂枡-鎵规銆佹暟閲忕瓑
function updateInspectionInfo() {
clear2();
- clear3();
+ clear3();
var param = {
qcNo: $("#bar").val(),
};
synData(IP + "/PdaSo/GetInspectionRequestInfo", param, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
- console.log(res.data);
- $("#sku").val(res.data.Sku)
- $("#lotNo").val(res.data.LotNo)
- $("#planQty").val(res.data.Qty)
+ console.log(res.data);
+ $("#sku").val(res.data.Sku)
+ $("#lotNo").val(res.data.LotNo)
+ $("#planQty").val(res.data.Qty)
$("#finishQty").val(res.data.SamplingQty)
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -597,7 +597,7 @@
//鍗曟嫞璐э紙纭鎸夐挳锛�
form.on('submit(formPickScatter)', function (data) {
-
+
if (canPickBox == false) {
layer.msg("璇锋眰鏈畬鎴愶紝涓嶈閲嶅璇锋眰", {
@@ -606,7 +606,7 @@
});
return;
}
-
+
if ($('#bar').val() == "") {
layer.msg("璇烽�夋嫨璇烽獙鍗�", {
icon: 2,
@@ -619,14 +619,14 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
}
-
+
if ($('#boxNo').val() == "") {
layer.msg("璇疯緭鍏ョ鐮�", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
- }
-
+ }
+
reqPickScatter()
return false; //闃绘琛ㄥ崟璺宠浆銆傚鏋滈渶瑕佽〃鍗曡烦杞紝鍘绘帀杩欐鍗冲彲銆�
@@ -641,7 +641,7 @@
"BoxNo": $('#boxNo').val(),
"BoxNo3": $('#boxNo3').val(),
"PickQty": $('#pickQty1').val(),
-
+
}
sendData(IP + "/PdaSo/SampleSetPick", param, 'post', function (res) {
@@ -651,14 +651,14 @@
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
-
+
canPickBox = true//鍥炶皟
// $("#boxNo").val('');
$("#boxNo3").val('');
$("#pickQty1").val('');
updateInspectionInfo();
-
-
+
+
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -693,7 +693,7 @@
function clear22() {
//鐗╂枡鎵规
$("#sku2").val("")//鐗╂枡
- $("#lotNo2").val("") //鎵规
+ $("#lotNo2").val("") //鎵规
}
function clear23() {
$("#planQty2").val(""); //璁″垝鏁伴噺
@@ -710,7 +710,7 @@
}
checkPalletState2()
})
-
+
//妫�鏌ユ墭鐩樼姸鎬�
function checkPalletState2() {
var param = {
@@ -727,7 +727,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () { });
}
-
+
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -743,11 +743,11 @@
}
});
}
-
-
+
+
//涓嬫媺璇烽獙鍗曟嵁閫変腑鍚庝簨浠�
form.on('select(getbar2)', function (data) {
-
+
if ($('#bar2').val() == "") {
clear22();
clear23();
@@ -755,8 +755,8 @@
}
updateInspectionInfo2();
});
-
-
+
+
//鍒濆鍖栨覆鏌� 璇烽獙鍗�
function updateBillList2() {
$("#bar2").empty()
@@ -765,7 +765,7 @@
synData(IP + "/PdaSo/GetInspectionNo", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
-
+
for (var i = 0; i < res.data.length; i++) {
if (bar == res.data[i]) {
$("#bar2").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
@@ -787,16 +787,16 @@
//鍒濆鍖栨覆鏌� 鐗╂枡-鎵规
function updateInspectionInfo2() {
clear22();
- clear23();
+ clear23();
var param = {
qcNo: $("#bar2").val(),
};
synData(IP + "/PdaSo/GetInspectionRequestInfo", param, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
- console.log(res.data);
- $("#sku2").val(res.data.Sku)
- $("#lotNo2").val(res.data.LotNo)
- $("#planQty2").val(res.data.Qty)
+ console.log(res.data);
+ $("#sku2").val(res.data.Sku)
+ $("#lotNo2").val(res.data.LotNo)
+ $("#planQty2").val(res.data.Qty)
$("#finishQty2").val(res.data.SamplingQty)
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -823,7 +823,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
}
-
+
if ($('#palletNo2').val() == "") {
layer.msg("璇疯緭鍏ユ墭鐩樼爜", {
icon: 2,
@@ -838,8 +838,8 @@
});
return;
}
-
-
+
+
reqPickScatter2()
@@ -865,7 +865,7 @@
}, function () {
canPickBox = true//鍥炶皟
-
+
$("#pickQty2").val('');
updateInspectionInfo2();
});
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index bed4f60..118e2bc 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -892,7 +892,7 @@
#endregion
#region 鍦扮爜淇℃伅(鍌ㄤ綅淇℃伅)
- var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0" && w.WareHouseNo == "W02");
+ var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0");
if (storageLocat == null)
{
strMsg = "-1:鍌ㄤ綅淇℃伅涓嶅瓨鍦ㄦ垨闈炵┖闂茬姸鎬侊紝璇锋牳鏌�!";
@@ -4582,6 +4582,18 @@
var bindId = 0;
if (bind == null)
{
+ DateTime? pTime = null;
+ DateTime? eTime = null;
+ if (!string.IsNullOrWhiteSpace(detail.Lot1))
+ {
+ pTime = DateTime.Parse(detail.Lot1);
+ }
+ if (!string.IsNullOrWhiteSpace(detail.Lot2))
+ {
+ eTime = DateTime.Parse(detail.Lot2);
+ }
+
+
bind = new BllPalletBind
{
ASNNo = model.AsnNo,
@@ -4597,6 +4609,8 @@
SupplierLot = detail.SupplierLot,
//InspectMark = model.IsSample, //鏄惁鍙栨牱鎵樼洏 鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
//SamplingQty = 0, //鍙栨牱鏁伴噺 鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+ ProductionTime = pTime,
+ ExpirationTime = eTime,
BitPalletMark = "1",
IsBale = "0",
IsBelt = "0",
@@ -4652,6 +4666,12 @@
}
else
{
+ string inspectStatusStr = "0";
+ if (sku.IsInspect == "1")
+ {
+ inspectStatusStr = "1";
+ }
+
// 搴撳瓨涓嶅瓨鍦� 鎻掑叆鏁版嵁
sd1 = new DataStockDetail()
{
@@ -4680,7 +4700,7 @@
ExpirationTime = bind.ExpirationTime,
Status = "0",
InspectMark = bind.InspectMark,
- InspectStatus = sku.IsInspect,
+ InspectStatus = inspectStatusStr,
BitPalletMark = bind.BitPalletMark,
PackagNo = detail.PackagNo, //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�
IsBale = bind.IsBale,
@@ -4870,9 +4890,6 @@
sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','缁勭洏','0',getDate(),{userId},NULL,NULL);";
Db.Ado.ExecuteCommand(sqlStr);
new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鎵樼洏缁戝畾", model.AsnNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{model.PalletNo}鐨勭粍鐩樹俊鎭�", userId);
-
-
-
}
#endregion
@@ -4922,7 +4939,7 @@
#endregion
#region 鍦扮爜淇℃伅(鍌ㄤ綅淇℃伅)
- var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0" && w.WareHouseNo == "W02");
+ var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0");
if (storageLocat == null)
{
throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦ㄦ垨闈炵┖闂茬姸鎬侊紝璇锋牳鏌�!");
@@ -5262,11 +5279,13 @@
//淇敼搴撳瓨鏄庣粏淇℃伅
foreach (var item in stockDetail)
{
- item.Status = "0"; //鐘舵�佹洿鏀逛负寰呭垎閰�
- item.WareHouseNo = "W02"; //鎵�灞炰粨搴�
- item.LocatNo = model.LocatNo;//鍌ㄤ綅鍦板潃
- item.UpdateTime = serverTime; //淇敼鏃堕棿
- item.UpdateUser = model.CreateUser; //淇敼浜�
+ item.Status = "0"; // 鐘舵�佹洿鏀逛负寰呭垎閰�
+ item.WareHouseNo = storageLocat.WareHouseNo; // 鎵�灞炰粨搴�
+ item.RoadwayNo = storageLocat.RoadwayNo; // 鎵�灞炲贩閬�
+ item.AreaNo = storageLocat.AreaNo; // 鎵�灞炲尯鍩�
+ item.LocatNo = model.LocatNo; // 鍌ㄤ綅鍦板潃
+ item.UpdateTime = serverTime; // 淇敼鏃堕棿
+ item.UpdateUser = model.CreateUser; // 淇敼浜�
//淇敼搴撳瓨鏄庣粏淇℃伅
Db.Updateable(item).ExecuteCommand();
}
@@ -5304,15 +5323,17 @@
};
Db.Insertable(exTask).ExecuteCommand();
//鎵樼洏缁戝畾淇℃伅
- var bindInfo = Db.Queryable<BllPalletBind>().First(w => w.IsDel == "0" && w.PalletNo == model.PalletNo && w.Status == "2" && string.IsNullOrEmpty(w.LocatNo));
+ var bindInfo = Db.Queryable<BllPalletBind>().First(w => w.IsDel == "0" && w.PalletNo == model.PalletNo
+ && w.Status == "2" && string.IsNullOrEmpty(w.LocatNo));
if (bindInfo != null)
{
- bindInfo.WareHouseNo = "W02";//鎵�灞炰粨搴�
- bindInfo.LocatNo = model.LocatNo;//鍌ㄤ綅鍦板潃
+ bindInfo.WareHouseNo = storageLocat.WareHouseNo; // 鎵�灞炰粨搴�
+ bindInfo.RoadwayNo = storageLocat.RoadwayNo; // 鎵�灞炲贩閬�
+ bindInfo.LocatNo = model.LocatNo; // 鍌ㄤ綅鍦板潃
bindInfo.UpdateTime = serverTime;
bindInfo.UpdateUser = model.CreateUser;
- bindInfo.CompleteTime = serverTime; //瀹屾垚鏃堕棿
- bindInfo.TaskNo = taskNo; //浠诲姟鍙�
+ bindInfo.CompleteTime = serverTime; // 瀹屾垚鏃堕棿
+ bindInfo.TaskNo = taskNo; // 浠诲姟鍙�
Db.Updateable(bindInfo).ExecuteCommand();
}
#endregion
@@ -5344,7 +5365,8 @@
//淇敼鍌ㄤ綅淇℃伅
Db.Updateable(storageLocat).ExecuteCommand();
- new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "骞冲簱鍏ュ簱", model.PalletNo, "瀹屾垚", $"鍦≒DA涓婂畬鎴愬崟鎹彿涓猴細{model.ASNNo}鐨勬墭鐩樼爜涓猴細{model.PalletNo}鐨勫钩搴撳叆搴撴搷浣�", (int)model.CreateUser);
+ new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "骞冲簱鍏ュ簱", model.PalletNo, "瀹屾垚",
+ $"鍦≒DA涓婂畬鎴愬崟鎹彿涓猴細{model.ASNNo}鐨勬墭鐩樼爜涓猴細{model.PalletNo}鐨勫钩搴撳叆搴撴搷浣�", (int)model.CreateUser);
Db.CommitTran();
}
catch (Exception ex)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 3a75010..5bd3412 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -960,6 +960,7 @@
catch (Exception e)
{
Db.RollbackTran();
+ throw e;
}
}
@@ -1328,6 +1329,7 @@
catch (Exception e)
{
Db.RollbackTran();
+ throw e;
}
}
@@ -1385,7 +1387,8 @@
}
//鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
- public async Task SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1, string asnNo, int userId)
+ public async Task SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3,
+ string pickQty1, string asnNo, int userId)
{
Db.BeginTran();
try
@@ -2025,6 +2028,7 @@
catch (Exception e)
{
Db.RollbackTran();
+ throw e;
}
}
@@ -2497,6 +2501,7 @@
catch (Exception e)
{
Db.RollbackTran();
+ throw e;
}
}
@@ -3032,6 +3037,7 @@
catch (Exception e)
{
Db.RollbackTran();
+ throw e;
}
}
/// <summary>
@@ -3345,6 +3351,7 @@
catch (Exception e)
{
Db.RollbackTran();
+ throw e;
}
}
#endregion
@@ -3389,7 +3396,7 @@
var samplingQty = await Db.Queryable<BllSamplingDetails>().Where(m => m.IsDel == "0" && m.QcNo == qcNo).SumAsync(m => m.CompleteQty);
data.QcNo = qcNo;
- data.Sku = inspectionRequest.SkuNo;
+ data.Sku = inspectionRequest.SkuNo + "-" + inspectionRequest.SkuName;
data.LotNo = inspectionRequest.LotNo;
data.Qty = inspectionRequest.SamplingQty.ToString();
data.SamplingQty = samplingQty == null ? "0" : samplingQty.ToString();
@@ -3855,6 +3862,7 @@
catch (Exception e)
{
Db.RollbackTran();
+ throw e;
}
}
@@ -3899,14 +3907,20 @@
throw Oops.Bah("璇烽獙鍗曠姸鎬侀敊璇紝璇锋牳瀹�");
}
//搴撳瓨鏄庣粏淇℃伅
- var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == inspecd.SkuNo && m.LotNo == inspecd.LotNo);
+ var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo
+ && m.SkuNo == inspecd.SkuNo && m.LotNo == inspecd.LotNo);
if (stockDetail == null)
{
throw Oops.Bah("鏈湪搴撳瓨涓煡璇㈠嚭褰撳墠鎵樼洏淇℃伅");
}
+ // 鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱鍐�
if (!string.IsNullOrWhiteSpace(stockDetail.LocatNo))
{
- throw Oops.Bah("褰撳墠鎵樼洏涓嶆槸搴撳鎵樼洏锛岃鏍稿疄");
+ var wareHouseData = await Db.Queryable<SysWareHouse>().FirstAsync(m => m.IsDel == "0" && m.WareHouseNo == stockDetail.WareHouseNo);
+ if (wareHouseData.Type != "2")
+ {
+ throw Oops.Bah("褰撳墠鎵樼洏涓嶆槸搴撳鎵樼洏锛岃鏍稿疄");
+ }
}
//搴撳瓨鎬昏〃
var stock = await Db.Queryable<DataStock>().FirstAsync(m => m.IsDel == "0" && m.SkuNo == inspecd.SkuNo && m.LotNo == inspecd.LotNo);
@@ -4033,8 +4047,6 @@
await Db.Updateable(inspecd).ExecuteCommandAsync();
#endregion
-
-
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鍙栨牱鎷ｈ揣", qcNo, "鎷ｈ揣", $"鍦≒DA涓婂璇烽獙鍗曞彿涓猴細{qcNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
Db.CommitTran();
@@ -4042,6 +4054,7 @@
catch (Exception e)
{
Db.RollbackTran();
+ throw e;
}
}
diff --git a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
index c7bb748..f2de73b 100644
--- a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
+++ b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
@@ -31,7 +31,12 @@
/// <returns></returns>
public List<BllQualityInspectDto> GetBllQualityList(BllQualityInspect model)
{
- string str = "select q.Id Id,q.InspectNo InspectNo,q.ASNNo ASNNo,q.LotNo LotNo,q.SupplierLot SupplierLot,q.SkuNo SkuNo,q.SkuName SkuName,q.Standard Standard,q.PassQty PassQty,q.FailQty FailQty,q.Origin Origin,q.InspectTime InspectTime,q.IsOut IsOut,q.Demo Demo,q.IsQualified IsQualified,q.IsDel IsDel,q.CreateTime CreateTime,u.RealName CreateUserName,q.UpdateTime UpdateTime,q.UpdateUser UpdateUserName from BllQualityInspect q left join SysUserInfor u on q.CreateUser = u.id where q.IsDel = @isdel";
+ string str = "select q.Id Id,q.InspectNo InspectNo,q.ASNNo ASNNo,q.LotNo LotNo,q.SupplierLot SupplierLot," +
+ "q.SkuNo SkuNo,q.SkuName SkuName,q.Standard Standard,q.PassQty PassQty,q.FailQty FailQty,q.Origin Origin," +
+ "q.InspectTime InspectTime,q.IsOut IsOut,q.Demo Demo,q.IsQualified IsQualified,q.IsDel IsDel,q.CreateTime " +
+ "CreateTime,u.RealName CreateUserName,q.UpdateTime UpdateTime,q.UpdateUser UpdateUserName " +
+ "from BllQualityInspect q " +
+ "left join SysUserInfor u on q.CreateUser = u.id where q.IsDel = @isdel";
////鍒ゆ柇鍏ュ簱鍗曞彿鏄惁涓虹┖
//if (!string.IsNullOrEmpty(model.ASNNo))
@@ -111,23 +116,25 @@
{
throw new Exception("鎵规鍙蜂笉鍙负绌猴紝璇锋牳鏌ワ紒");
}
- //int isTui = 0;
//楠岃瘉鍏ュ簱鍗曞彿鏄惁涓虹┖
- if (!string.IsNullOrEmpty(model.ASNNo))
+ if (string.IsNullOrEmpty(model.ASNNo))
{
- //鏌ヨ鏄惁涓洪��璐у叆搴撳崟鎹�
- var Arrival = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.Type == "3");
- if (Arrival == null)
- {
- throw new Exception("鍙湁鍏ュ簱鍗曟嵁涓洪��璐у叆搴撳崟鍙緭鍏� 鍏ュ簱鍗曞彿锛岃鏍告煡锛�");
- }
+ throw new Exception("鍏ュ簱鍗曞彿涓嶅彲涓虹┖锛�");
- //鑾峰彇鍏ュ簱鍗曟槑缁�
- var ArrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.LotNo.Contains(model.LotNo) && a.SkuNo == model.SkuNo);
- if (ArrivalDetail == null)
- {
- throw new Exception("杈撳叆鐨勬壒娆℃垨鐗╂枡淇℃伅涓庡叆搴撳崟鎹笉绗︼紝璇锋牳鏌ワ紒");
- }
+
+ //鏌ヨ鏄惁涓洪��璐у叆搴撳崟鎹�
+ //var Arrival = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.Type == "3");
+ //if (Arrival == null)
+ //{
+ // throw new Exception("鍙湁鍏ュ簱鍗曟嵁涓洪��璐у叆搴撳崟鍙緭鍏� 鍏ュ簱鍗曞彿锛岃鏍告煡锛�");
+ //}
+
+ ////鑾峰彇鍏ュ簱鍗曟槑缁�
+ //var ArrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.LotNo.Contains(model.LotNo) && a.SkuNo == model.SkuNo);
+ //if (ArrivalDetail == null)
+ //{
+ // throw new Exception("杈撳叆鐨勬壒娆℃垨鐗╂枡淇℃伅涓庡叆搴撳崟鎹笉绗︼紝璇锋牳鏌ワ紒");
+ //}
//isTui = 1;
}
@@ -148,7 +155,13 @@
//}
////鏌ユ壘鍚屾壒娆� 鍚屽崟鎹� 鍏ュ簱鍗曚俊鎭��
- //BllArrivalNoticeDetail arrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.ASNNo == model.ASNNo && m.LotNo == model.LotNo);
+ BllArrivalNoticeDetail arrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0"
+ && m.ASNNo == model.ASNNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
+ if (arrivalDetail == null)
+ {
+ throw new Exception("鏈壘鍒板叆搴撳崟淇℃伅锛�");
+ }
+ arrivalDetail.InspectStatus = model.IsQualified;
model.Origin = "WMS"; //鏉ユ簮
model.CreateTime = Db.GetDate(); //鍒涘缓鏃ユ湡
@@ -171,24 +184,19 @@
model.PassQty += item.Qty;
//淇敼搴撳瓨鏄庣粏鍚堟牸鐘舵��
item.InspectStatus = "1"; //1鍚堟牸
- //foreach (var b1 in box)
- //{
- // b1.InspectMark = "1"; //1鍚堟牸
- //}
}
else //涓嶅悎鏍�
{
//涓嶅悎鏍� 鐩稿悓鎵规銆佸叆搴撳崟搴撳瓨淇℃伅鍏ㄩ儴鏀逛负涓嶅悎鏍肩墿鏂� 涓斾笉鍚堟牸鏁伴噺澧炲姞涓哄悓鎵规鍚屽崟鍙疯鐗╂枡鍏ㄩ儴鏁伴噺涔嬪拰
model.FailQty += item.Qty;
item.InspectStatus = "2"; //2涓嶅悎鏍�
- //foreach (var b1 in box)
- //{
- // b1.InspectMark = "2"; //2涓嶅悎鏍�
- //}
}
+
Db.Updateable(box).ExecuteCommand();
Db.Updateable(item).ExecuteCommand();
}
+
+ Db.Updateable(arrivalDetail).ExecuteCommand();
var isquality = Db.Insertable(model).ExecuteCommand();
return isquality;
diff --git a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
index 021859a..7d8f8b7 100644
--- a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
+++ b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
@@ -34,9 +34,11 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
- public List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
+ public List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
+ string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
{
- string str = "select PalletNo,PalletNo2,PalletNo3,BoxNo,BoxNo2,BoxNo3,Status,LotNo,Qty,FullQty,SkuNo,SkuName,LotText,ProductionTime,InspectMark,BitBoxMark,InspectStatus,InspectTime from DataBoxInfo Where IsDel = @isdel";
+ string str = "select PalletNo,PalletNo2,PalletNo3,BoxNo,BoxNo2,BoxNo3,Status,LotNo,Qty,FullQty,SkuNo,SkuName," +
+ "LotText,ProductionTime,InspectMark,BitBoxMark,InspectStatus,InspectTime from DataBoxInfo Where IsDel = @isdel";
//鍒ゆ柇id鏄惁涓虹┖
if (!string.IsNullOrEmpty(id))
{
diff --git a/Wms/WMS.BLL/DataServer/StockDetailServer.cs b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
index 732a837..e8699c6 100644
--- a/Wms/WMS.BLL/DataServer/StockDetailServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
@@ -37,9 +37,16 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
- public List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime)
+ public List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status,
+ string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime)
{
- string str = "select detail.*,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 where detail.IsDel = @isdel";
+ string str = "select detail.*,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 " +
+ "where detail.IsDel = @isdel";
//鍒ゆ柇鐗╂枡鍙锋槸鍚︿负绌�
if (!string.IsNullOrEmpty(skuNo))
{
@@ -199,9 +206,11 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
- public List<DataStockDetail> GetBindListDaoChu(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)
+ public List<DataStockDetail> GetBindListDaoChu(string skuNo, string skuName, string palletNo, string lotNo, string boxNo,
+ string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)
{
- string str = "select Id,LotNo,LotText,SupplierLot,SkuNo,SkuName,Qty,LockQty,FrozenQty,AreaNo,LocatNo,PalletNo,PalletNo2,PalletNo3,InspectMark,BitPalletMark from DataStockDetail where IsDel = @isdel";
+ string str = "select Id,LotNo,LotText,SupplierLot,SkuNo,SkuName,Qty,LockQty,FrozenQty,AreaNo,LocatNo,PalletNo,PalletNo2," +
+ "PalletNo3,InspectMark,BitPalletMark from DataStockDetail where IsDel = @isdel";
//鍒ゆ柇鐗╂枡鍙锋槸鍚︿负绌�
if (!string.IsNullOrEmpty(skuNo))
{
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 6ee61f6..fa00550 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -845,8 +845,6 @@
throw new Exception(ex.Message);
}
}
-
-
#endregion
#region 瀵煎嚭搴撳瓨
@@ -939,7 +937,8 @@
/// <param name="startTime">寮�濮嬫椂闂�</param>
/// <param name="endTime">缁撴潫鏃堕棿</param>
/// <returns></returns>
- public List<StockDetailDto> GetInventoryList1DaoChu(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string startTime, string endTime)
+ public List<StockDetailDto> GetInventoryList1DaoChu(string skuNo, string skuName, string lotNo, string locatNo,
+ string palletNo, string status, string inspectStatus, string startTime, string endTime)
{
string str = "select detail.*,house.WareHouseName as WareHouseName,roadway.RoadwayName as RoadwayName from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo Where detail.IsDel = @isdel";
//鍒ゆ柇鐗╂枡缂栫爜鏄惁涓虹┖
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 13f01ae..10798d0 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -105,11 +105,13 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme)
+ public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status,
+ string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme)
{
try
{
- List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme);
+ List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark,
+ bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme);
return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
}
catch (Exception e)
@@ -134,7 +136,8 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
+ public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
+ string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
{
try
{
--
Gitblit v1.8.0