From cfe19c291c3c8362372c60a10f1d5a11927639f8 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期三, 17 七月 2024 17:00:29 +0800
Subject: [PATCH] Merge branch 'hwh'
---
Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs | 8
HTML/views/HouseWithinSetting/StockCheck.html | 1396 ++++++++++++++++++++++++----------------------
Wms/WMS.Entity/LogEntity/LogTask.cs | 2
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 355 +++++++++++
Wms/Wms/Controllers/DownApiController.cs | 27
5 files changed, 1,111 insertions(+), 677 deletions(-)
diff --git a/HTML/views/HouseWithinSetting/StockCheck.html b/HTML/views/HouseWithinSetting/StockCheck.html
index b1219ad..7adf894 100644
--- a/HTML/views/HouseWithinSetting/StockCheck.html
+++ b/HTML/views/HouseWithinSetting/StockCheck.html
@@ -1,157 +1,163 @@
<!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>
- .layui-table-tool-panel{
- top: auto;
- bottom: 29px;
- }
- .layui-table-tool{
- padding-left: 5px;
- }
- /* 琛ㄦ牸涓嬫媺灏忕澶撮殣钘� */
- .layui-table-grid-down {
- display: none;
- }
- </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">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鐩樼偣鍗曞彿</label>
- <div class="layui-input-inline">
- <input type="text" id="CRNo" name="CRNo" 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="Status" id="Status" lay-filter="Status" lay-search>
- <option value=""></option>
- <option value="0">绛夊緟鎵ц</option>
- <option value="1">姝ｅ湪鎵ц</option>
- <option value="2">鐩樼偣瀹屾垚</option>
- <option value="3">鐢熸垚璋冩暣</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鎵樼洏鏉＄爜</label>
- <div class="layui-input-inline">
- <input type="text" id="PalletNo" name="PalletNo" 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">
- <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" autocomplete="off" name="StartTime" id="StartTime" class="layui-input"
- placeholder="寮�濮嬫棩鏈�">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">缁撴潫鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="text" autocomplete="off" name="EndTime" id="EndTime" class="layui-input"
- placeholder="缁撴潫鏃ユ湡">
- </div>
- </div>
- <div class="layui-inline" id="divPickingArea" style="display: none; padding-top: 10px;">
- <label class="layui-form-label">鍑哄簱鍙�</label>
- <div class="layui-input-inline">
- <select name="PickingArea" id="PickingArea" lay-search>
- <option value=""></option>
- <option value="1">1</option>
- <option value="2">2</option>
- <option value="3">3</option>
- <option value="4">4</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>
- </div>
- <!-- 缁存姢澶囨敞寮规 -->
- <div class="layui-inline" id="divEditDemo" style="display: none; padding-top: 10px;">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline" style="width: 300px;height: 100%;">
- <textarea placeholder="璇疯緭鍏ュ唴瀹�" id="NoticeDemo" name="NoticeDemo" class="layui-textarea"></textarea>
- </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>
+ .layui-table-tool-panel {
+ top: auto;
+ bottom: 29px;
+ }
+
+ .layui-table-tool {
+ padding-left: 5px;
+ }
+
+ /* 琛ㄦ牸涓嬫媺灏忕澶撮殣钘� */
+ .layui-table-grid-down {
+ display: none;
+ }
+ </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">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鐩樼偣鍗曞彿</label>
+ <div class="layui-input-inline">
+ <input type="text" id="CRNo" name="CRNo" 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="Status" id="Status" lay-filter="Status" lay-search>
+ <option value=""></option>
+ <option value="0">绛夊緟鎵ц</option>
+ <option value="1">姝ｅ湪鎵ц</option>
+ <option value="2">鐩樼偣瀹屾垚</option>
+ <option value="3">鐢熸垚璋冩暣</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵樼洏鏉＄爜</label>
+ <div class="layui-input-inline">
+ <input type="text" id="PalletNo" name="PalletNo" 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">
+ <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" autocomplete="off" name="StartTime" id="StartTime" class="layui-input"
+ placeholder="寮�濮嬫棩鏈�">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" autocomplete="off" name="EndTime" id="EndTime" class="layui-input"
+ placeholder="缁撴潫鏃ユ湡">
+ </div>
+ </div>
+ <div class="layui-inline" id="divPickingArea" style="display: none; padding-top: 10px;">
+ <label class="layui-form-label">鍑哄簱鍙�</label>
+ <div class="layui-input-inline">
+ <select name="PickingArea" id="PickingArea" lay-search>
+ <option value=""></option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</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>
+ </div>
+
+ <!-- 缁存姢澶囨敞寮规 -->
+ <div class="layui-inline" id="divEditDemo" style="display: none; padding-top: 10px;">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline" style="width: 300px;height: 100%;">
+ <textarea placeholder="璇疯緭鍏ュ唴瀹�" id="NoticeDemo" name="NoticeDemo"
+ class="layui-textarea"></textarea>
</div>
</div>
</div>
- <div id="center"></div>
- <div class="layui-card-body">
- <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>
+ <div id="center"></div>
+ <div class="layui-card-body">
+ <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>
+ <div 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>
- <div 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>
- <script type="text/html" id="table-content-list">
+ <!-- #endregion -->
+ </div>
+ <script type="text/html" id="table-content-list">
{{#
var html = '';
@@ -163,6 +169,9 @@
</a>`;
}
if(d.Status == 0 || d.Status == 1){
+ html += `<a class="layui-btn layui-btn-xs checkOut" lay-event="vision">
+ <i class="layui-icon layui-icon-ok"></i>瑙嗚鐩樼偣
+ </a>`;
html += `<a class="layui-btn layui-btn-xs checkOut" lay-event="outbound">
<i class="layui-icon layui-icon-ok"></i>鍑哄簱
</a>`;
@@ -179,9 +188,9 @@
}}
</script>
-
- <script type="text/html" id="toolbarDemo">
-
+
+ <script type="text/html" id="toolbarDemo">
+
<button class="layui-btn layuiadmin-btn-list layui-btn-sm addClass" lay-event="add">
<i class="layui-icon"></i>娣诲姞
</button>
@@ -190,8 +199,8 @@
</button>
</script>
- <!-- 鎬诲崟鏉ユ簮 -->
- <script type="text/html" id="OriginzongButton">
+ <!-- 鎬诲崟鏉ユ簮 -->
+ <script type="text/html" id="OriginzongButton">
{{# if(d.Origin=='0'){ }}
<p>鎿嶄綔浜哄垱寤�</p>
{{# } else if(d.Origin=='1'){ }}
@@ -199,8 +208,8 @@
{{# } }}
</script>
- <!-- 鎬诲崟鏄惁澶嶇洏 -->
- <script type="text/html" id="IsDoubleCheckButton">
+ <!-- 鎬诲崟鏄惁澶嶇洏 -->
+ <script type="text/html" id="IsDoubleCheckButton">
{{# if(d.AuditStatusNo=='0'){ }}
<p>鍚�</p>
{{# } else if(d.AuditStatusNo=='1'){ }}
@@ -208,8 +217,8 @@
{{# } }}
</script>
- <!-- 鎬诲崟瀹℃牳鐘舵�� -->
- <script type="text/html" id="AuditStatusButton">
+ <!-- 鎬诲崟瀹℃牳鐘舵�� -->
+ <script type="text/html" id="AuditStatusButton">
{{# if(d.AuditStatusNo=='0'){ }}
<p>寰呭鏍�</p>
{{# } else if(d.AuditStatusNo=='9'){ }}
@@ -217,8 +226,8 @@
{{# } }}
</script>
- <!-- 鎬诲崟鎵ц鐘舵�� -->
- <script type="text/html" id="StatuszongButton">
+ <!-- 鎬诲崟鎵ц鐘舵�� -->
+ <script type="text/html" id="StatuszongButton">
{{#
var html = ``;
if(d.Status=='0'){
@@ -237,43 +246,43 @@
}}
</script>
- <!-- 鎬诲崟寮�濮嬫椂闂� -->
- <script type="text/html" id="CheckDateButton">
+ <!-- 鎬诲崟寮�濮嬫椂闂� -->
+ <script type="text/html" id="CheckDateButton">
{{#
return formatDate(d.CheckDate);
}}
</script>
-
- <!-- 鎬诲崟瀹屾垚鏃堕棿 -->
- <script type="text/html" id="CompleteDateButtom">
+
+ <!-- 鎬诲崟瀹屾垚鏃堕棿 -->
+ <script type="text/html" id="CompleteDateButtom">
{{#
return formatDate(d.CompleteDate);
}}
</script>
-
- <!-- 鎬诲崟瀹℃牳鏃堕棿 -->
- <script type="text/html" id="AuditTimeButton">
+
+ <!-- 鎬诲崟瀹℃牳鏃堕棿 -->
+ <script type="text/html" id="AuditTimeButton">
{{#
return formatDate(d.AuditTime);
}}
</script>
-
- <!-- 鍒涘缓鏃堕棿 -->
- <script type="text/html" id="CreateTimeButton">
+
+ <!-- 鍒涘缓鏃堕棿 -->
+ <script type="text/html" id="CreateTimeButton">
{{#
return formatDate(d.CreateTime);
}}
</script>
-
- <!-- 淇敼鏃堕棿 -->
- <script type="text/html" id="UpdateTimeButton">
+
+ <!-- 淇敼鏃堕棿 -->
+ <script type="text/html" id="UpdateTimeButton">
{{#
return formatDate(d.UpdateTime);
}}
</script>
- <!-- 鏄庣粏鎵ц鐘舵�� -->
- <script type="text/html" id="StatusmingButton">
+ <!-- 鏄庣粏鎵ц鐘舵�� -->
+ <script type="text/html" id="StatusmingButton">
{{#
var html = ``;
if(d.Status=='0'){
@@ -294,8 +303,8 @@
}}
</script>
- <!-- 鏄庣粏鐩樼偣缁撴灉 -->
- <script type="text/html" id="CheckResultButton">
+ <!-- 鏄庣粏鐩樼偣缁撴灉 -->
+ <script type="text/html" id="CheckResultButton">
{{#
var html = ``;
if(d.CheckResult=='0'){
@@ -314,533 +323,574 @@
}}
</script>
-
- </div>
+
</div>
</div>
-
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../js/jquery-3.5.1.min.js"></script>
- <script src="../../js/jquery.cookie.js"></script>
- <script src="../../js/public.js"></script>
- <script>
-
- layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'layer', 'laydate'], function() {
- var table = layui.table,
- form = layui.form,
- laypage = layui.laypage,
- layer = layui.layer;
- laydate = layui.laydate;
- var $ = layui.$;
- var h1 = GetTableTopHeight();
- var h2 = GetTableBottomHeight();
-
- laydate.render({
- elem: '#StartTime'
- , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
- });
- laydate.render({
- elem: '#EndTime'
- , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
- });
- var isChongFu = true;
- var xqid = "kong";
+ </div>
- //鎬诲崟
- var TotalColsArrz =
- [[
- {field:'',title: '搴忓彿', type: 'numbers', width: 65, fixed: 'left', "disabled": true, },
- {field: 'CrNo', title: '鐩樼偣鍗曞彿', align: 'center', fixed: 'left', width: 165, },
- {field: 'Origin',title: '鏉ユ簮',align: 'center', templet: '#OriginzongButton', },
- {field: 'Status',title: '鎵ц鐘舵��',align: 'center', templet: '#StatuszongButton', },
- {field: 'CheckDate',title: '寮�濮嬫椂闂�',align: 'center', templet: '#CheckDateButton', },
- {field: 'CompleteDate',title: '瀹屾垚鏃堕棿',align: 'center', templet: '#CompleteDateButtom', },
- {field: 'Demo',title: '澶囨敞',align: 'center',width: 180},
- {field: 'AuditStatusNo',title: '瀹℃牳鐘舵��',align: 'center',width: 130,hide:true, templet: '#AuditStatusButton', },
- {field: 'IsDoubleCheck', title: '鏄惁澶嶇洏', align: 'center', width: 180, hide:true, templet: '#IsDoubleCheckButton', },
- {field: 'AuditUserName',title: '瀹℃牳浜�',align: 'center',width: 180,hide:true},
- {field: 'AuditTime',title: '瀹℃牳鏃堕棿',align: 'center',width: 95,hide:true , templet: '#AuditTimeButton', },
- {field: 'CreateUserName', title:'鍒涘缓浜�', align:'center', },
- {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center', templet: '#CreateTimeButton', },
- {field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 120,hide:true},
- {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',width: 160,hide:true, templet: '#UpdateTimeButton', },
- {field:'caozuo',title: '鎿嶄綔',fixed: 'right',align: 'center',toolbar: '#table-content-list',width: 240 }
- ]];
- var TotalColsSysArrz=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArrz)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script src="../../js/public.js"></script>
+ <script>
- //鏄庣粏
- var TotalColsArrm =
- [[
- {field:'',title:'搴忓彿', type:'numbers', width:65, fixed:'left', "disabled": true, },
- {field:'CrNo', title:'鐩樼偣鍗曞彿', align:'center', fixed:'left', width: 165, },
- {field:'PalletNo', title:'鎵樼洏鍙�', align:'center', fixed:'left', width: 165, },
- {field:'Qty', title:'搴撳瓨鏁伴噺', align:'center', fixed:'left', width: 105, },
- {field:'RealQty', title:'瀹為檯鏁伴噺', align:'center', width: 105, },
- {field:'Status', title:'鎵ц鐘舵��', align:'center', width: 105, templet : '#StatusmingButton', },
- {field:'CheckResult', title:'鐩樼偣缁撴灉', align:'center', width:105, templet : '#CheckResultButton', },
- {field:'SkuNo', title:'鐗╂枡缂栫爜', align:'center', width:105, },
- {field:'SkuName', title:'鐗╂枡鍚嶇О', align:'center', width:125, },
- {field:'Standard', title:'瑙勬牸', align:'center', width:225, },
- {field:'LotNo', title:'鎵规鍙�', align:'center', width:105, },
- {field:'LotText', title:'鎵规鎻忚堪', align:'center', width:105, },
- {field:'SupplierLot', title:'渚涜揣鎵规', align:'center', width:105, },
- {field: 'CreateUserName', title:'鍒涘缓浜�', align:'center', width:100, },
- {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 160, templet: '#CreateTimeButton',},
- {field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 120,hide:true},
- {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',width: 160,hide:true, templet: '#UpdateTimeButton',},
- ]];
- var TotalColsSysArrm=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArrm)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
- refreshTable();
- var colsJsonz;
- var colsJsonm;
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'table', 'laypage', 'layer', 'laydate'], function () {
+ var table = layui.table,
+ form = layui.form,
+ laypage = layui.laypage,
+ layer = layui.layer;
+ laydate = layui.laydate;
+ var $ = layui.$;
+ var h1 = GetTableTopHeight();
+ var h2 = GetTableBottomHeight();
+
+ laydate.render({
+ elem: '#StartTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ laydate.render({
+ elem: '#EndTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ var isChongFu = true;
+ var xqid = "kong";
+
+ //鎬诲崟
+ var TotalColsArrz =
+ [[
+ { field: '', title: '搴忓彿', type: 'numbers', width: 65, fixed: 'left', "disabled": true, },
+ { field: 'CrNo', title: '鐩樼偣鍗曞彿', align: 'center', fixed: 'left', width: 165, },
+ { field: 'Origin', title: '鏉ユ簮', align: 'center', templet: '#OriginzongButton', },
+ { field: 'Status', title: '鎵ц鐘舵��', align: 'center', templet: '#StatuszongButton', },
+ { field: 'CheckDate', title: '寮�濮嬫椂闂�', align: 'center', templet: '#CheckDateButton', },
+ { field: 'CompleteDate', title: '瀹屾垚鏃堕棿', align: 'center', templet: '#CompleteDateButtom', },
+ { field: 'Demo', title: '澶囨敞', align: 'center', width: 180 },
+ { field: 'AuditStatusNo', title: '瀹℃牳鐘舵��', align: 'center', width: 130, hide: true, templet: '#AuditStatusButton', },
+ { field: 'IsDoubleCheck', title: '鏄惁澶嶇洏', align: 'center', width: 180, hide: true, templet: '#IsDoubleCheckButton', },
+ { field: 'AuditUserName', title: '瀹℃牳浜�', align: 'center', width: 180, hide: true },
+ { field: 'AuditTime', title: '瀹℃牳鏃堕棿', align: 'center', width: 95, hide: true, templet: '#AuditTimeButton', },
+ { field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', },
+ { field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', templet: '#CreateTimeButton', },
+ { field: 'UpdateUserName', title: '淇敼浜�', align: 'center', width: 120, hide: true },
+ { field: 'UpdateTime', title: '淇敼鏃堕棿', align: 'center', width: 160, hide: true, templet: '#UpdateTimeButton', },
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list', width: 240 }
+ ]];
+ var TotalColsSysArrz = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArrz)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+
+ //鏄庣粏
+ var TotalColsArrm =
+ [[
+ { field: '', title: '搴忓彿', type: 'numbers', width: 65, fixed: 'left', "disabled": true, },
+ { field: 'CrNo', title: '鐩樼偣鍗曞彿', align: 'center', fixed: 'left', width: 165, },
+ { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', fixed: 'left', width: 165, },
+ { field: 'Qty', title: '搴撳瓨鏁伴噺', align: 'center', fixed: 'left', width: 105, },
+ { field: 'RealQty', title: '瀹為檯鏁伴噺', align: 'center', width: 105, },
+ { field: 'Status', title: '鎵ц鐘舵��', align: 'center', width: 105, templet: '#StatusmingButton', },
+ { field: 'CheckResult', title: '鐩樼偣缁撴灉', align: 'center', width: 105, templet: '#CheckResultButton', },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 105, },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 125, },
+ { field: 'Standard', title: '瑙勬牸', align: 'center', width: 225, },
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 105, },
+ { field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 105, },
+ { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 105, },
+ { field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 100, },
+ { field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#CreateTimeButton', },
+ { field: 'UpdateUserName', title: '淇敼浜�', align: 'center', width: 120, hide: true },
+ { field: 'UpdateTime', title: '淇敼鏃堕棿', align: 'center', width: 160, hide: true, templet: '#UpdateTimeButton', },
+ ]];
+ var TotalColsSysArrm = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArrm)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ refreshTable();
+ var colsJsonz;
+ var colsJsonm;
+ // refreshTablemx(xqid);
+
+ //娓叉煋鐩樼偣鎬诲崟
+ function refreshTable() {
+ var param1 = {
+ // Href:'QualityControl/QualityInformation'
+ Href: 'BllCheck/GetStockCheckList'
+ };
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ console.log(1)
+ colsJsonz = TotalColsArrz
+ } else {
+ console.log(2)
+ colsJsonz = eval(res.data);
+ }
+ } else {
+ colsJsonz = TotalColsArrz
+ }
+ // tableclass(LotNo,SkuNo,SkuName,IsQualified);
+ var param = {
+ CrNo: $("#CRNo").val(),
+ Status: $("#Status").val(),
+
+ PalletNo: $("#PalletNo").val(),
+ SkuNo: $("#SkuNo").val(),
+ SkuName: $("#SkuName").val(),
+ LotNo: $("#LotNo").val(),
+ StartTime: $("#StartTime").val(),
+ EndTime: $("#EndTime").val(),
+ };
+ table.render({
+ elem: '#LAY-app-content-list',
+ url: IP + "/BllCheck/GetStockCheckList",
+ method: 'post',
+ height: h1,//'full-'+hei1
+ 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) {
+ initMenu();
+ var soCode = "res.data[0].SONo";
+ if (res.data.length != 0) {
+ soCode = res.data[0].SONo;
+ }
+ refreshTablemx(soCode)
+ //鑷畾涔夊垪瀹�
+ SetTableColW('LAY-app-content-list', 'BllCheck/GetStockCheckList', TotalColsSysArrz);
+ },
+ cols: colsJsonz
+ });
+
+ // table.render({
+ // elem: '#LAY-app-content-list',
+ // url: IP+"/BllCheck/GetStockCheckList",
+ // method: 'POST',
+ // height: h1 ,//'full-'+hei1
+ // id: 'LAY-app-content-list',
+ // where: param,
+ // contentType: 'application/json',
+ // headers:{ToKen:$.cookie('token')},
+ // page: true,
+ // even: true,
+ // limit: pageCnt,
+ // limits: pageLimits,
+ // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ // done: function(res){
+ // initMenu();
+ // var soCode = "res.data[0].SONo";
+ // if (res.data.length != 0) {
+ // soCode = res.data[0].SONo;
+ // }
+ // refreshTablemx(soCode)
+ // },
+ // cols: [
+ // [
+ // {title: '搴忓彿', type: 'numbers', width: 65, fixed: 'left', },
+ // {field: 'CrNo', title: '鐩樼偣鍗曞彿', align: 'center', fixed: 'left', width: 165, },
+ // {field: 'Origin',title: '鏉ユ簮',align: 'center', templet: '#OriginzongButton', },
+ // {field: 'Status',title: '鎵ц鐘舵��',align: 'center', templet: '#StatuszongButton', },
+ // {field: 'CheckDate',title: '寮�濮嬫椂闂�',align: 'center', templet: '#CheckDateButton', },
+ // {field: 'CompleteDate',title: '瀹屾垚鏃堕棿',align: 'center', templet: '#CompleteDateButtom', },
+ // {field: 'AuditStatusNo',title: '瀹℃牳鐘舵��',align: 'center',width: 130,hide:true, templet: '#AuditStatusButton', },
+ // {field: 'IsDoubleCheck', title: '鏄惁澶嶇洏', align: 'center', width: 180, hide:true, templet: '#IsDoubleCheckButton', },
+ // {field: 'AuditUserName',title: '瀹℃牳浜�',align: 'center',width: 180,hide:true},
+ // {field: 'AuditTime',title: '瀹℃牳鏃堕棿',align: 'center',width: 95,hide:true , templet: '#AuditTimeButton', },
+ // {field: 'CreateUserName', title:'鍒涘缓浜�', align:'center', },
+ // {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center', templet: '#CreateTimeButton', },
+ // {field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 120,hide:true},
+ // {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',width: 160,hide:true, templet: '#UpdateTimeButton', },
+ // {title: '鎿嶄綔',fixed: 'right',align: 'center',toolbar: '#table-content-list',width: 240 }
+ // ]]
+ // });
+ });
+ }
+ //娓叉煋鍑哄簱鍗曟槑缁�
+ function refreshTablemx(crNo) {
+ var param1 = {
+ // Href:'QualityControl/QualityInformation'
+ Href: 'BllCheck/GetStockCheckDetailList'
+ };
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ colsJsonm = TotalColsArrm
+ } else {
+ colsJsonm = eval(res.data);
+ }
+ } else {
+ colsJsonm = TotalColsArrm
+ }
+ var param = {
+ CrNo: crNo,
+ };
+ table.render({
+ elem: '#LAY-app-content-list2',
+ url: IP + "/BllCheck/GetStockCheckDetailList",
+ method: 'post',
+ height: h2,//'full-'+hei1
+ id: 'LAY-app-content-list2',
+ 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) {
+ initMenu();
+ //鑷畾涔夊垪瀹�
+ SetTableColW('LAY-app-content-list2', 'BllCheck/GetStockCheckDetailList', TotalColsSysArrm);
+ },
+ cols: colsJsonm
+ });
+ // var param = {
+ // CrNo: crNo,
+ // };
+ // table.render({
+ // elem: '#LAY-app-content-list2',
+ // url: IP + "/BllCheck/GetStockCheckDetailList",
+ // method: 'POST',
+ // height: h2,
+ // id: 'LAY-app-content-list2',
+ // where: param,
+ // contentType: 'application/json',
+ // headers:{ToKen:$.cookie('token')},
+ // toolbar:'#toolbarDemo',
+ // defaultToolbar: ['filter'], //'print', 'exports'
+ // page: true,
+ // limit: pageCnt,
+ // limits: pageLimits,
+ // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ // done: function(){
+ // initMenu();
+ // },
+ // cols: [
+ // [
+ // {title:'搴忓彿', type:'numbers', width:65, fixed:'left', },
+ // {field:'CrNo', title:'鐩樼偣鍗曞彿', align:'center', fixed:'left', width: 165, },
+ // {field:'PalletNo', title:'鎵樼洏鍙�', align:'center', fixed:'left', width: 165, },
+ // {field:'Qty', title:'搴撳瓨鏁伴噺', align:'center', fixed:'left', width: 105, },
+ // {field:'RealQty', title:'瀹為檯鏁伴噺', align:'center', width: 105, },
+ // {field:'Status', title:'鎵ц鐘舵��', align:'center', width: 105, templet : '#StatusmingButton', },
+ // {field:'CheckResult', title:'鐩樼偣缁撴灉', align:'center', width:105, templet : '#CheckResultButton', },
+ // {field:'SkuNo', title:'鐗╂枡缂栫爜', align:'center', width:105, },
+ // {field:'SkuName', title:'鐗╂枡鍚嶇О', align:'center', width:125, },
+ // {field:'Standard', title:'瑙勬牸', align:'center', width:225, },
+ // {field:'LotNo', title:'鎵规鍙�', align:'center', width:105, },
+ // {field:'LotText', title:'鎵规鎻忚堪', align:'center', width:105, },
+ // {field:'SupplierLot', title:'渚涜揣鎵规', align:'center', width:105, },
+ // {field: 'CreateUserName', title:'鍒涘缓浜�', align:'center', width:100, },
+ // {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 160, templet: '#CreateTimeButton',},
+ // {field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 120,hide:true},
+ // {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',width: 160,hide:true, templet: '#UpdateTimeButton',},
+ // ]]
+ // });
+ });
+ }
+ //鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ refreshTable();
// refreshTablemx(xqid);
-
- //娓叉煋鐩樼偣鎬诲崟
- function refreshTable() {
- var param1={
- // Href:'QualityControl/QualityInformation'
- Href:'BllCheck/GetStockCheckList'
- };
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- console.log(1)
- colsJsonz=TotalColsArrz
- }else{
- console.log(2)
- colsJsonz= eval(res.data);
- }
- }else{
- colsJsonz=TotalColsArrz
- }
- // tableclass(LotNo,SkuNo,SkuName,IsQualified);
- var param = {
- CrNo: $("#CRNo").val(),
- Status: $("#Status").val(),
-
- PalletNo: $("#PalletNo").val(),
- SkuNo: $("#SkuNo").val(),
- SkuName: $("#SkuName").val(),
- LotNo: $("#LotNo").val(),
- StartTime: $("#StartTime").val(),
- EndTime: $("#EndTime").val(),
- };
- table.render({
- elem: '#LAY-app-content-list',
- url: IP + "/BllCheck/GetStockCheckList",
- method: 'post',
- height: h1 ,//'full-'+hei1
- 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) {
- initMenu();
- var soCode = "res.data[0].SONo";
- if (res.data.length != 0) {
- soCode = res.data[0].SONo;
- }
- refreshTablemx(soCode)
- //鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list','BllCheck/GetStockCheckList',TotalColsSysArrz);
- },
- cols: colsJsonz
- });
-
- // table.render({
- // elem: '#LAY-app-content-list',
- // url: IP+"/BllCheck/GetStockCheckList",
- // method: 'POST',
- // height: h1 ,//'full-'+hei1
- // id: 'LAY-app-content-list',
- // where: param,
- // contentType: 'application/json',
- // headers:{ToKen:$.cookie('token')},
- // page: true,
- // even: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // done: function(res){
- // initMenu();
- // var soCode = "res.data[0].SONo";
- // if (res.data.length != 0) {
- // soCode = res.data[0].SONo;
- // }
- // refreshTablemx(soCode)
- // },
- // cols: [
- // [
- // {title: '搴忓彿', type: 'numbers', width: 65, fixed: 'left', },
- // {field: 'CrNo', title: '鐩樼偣鍗曞彿', align: 'center', fixed: 'left', width: 165, },
- // {field: 'Origin',title: '鏉ユ簮',align: 'center', templet: '#OriginzongButton', },
- // {field: 'Status',title: '鎵ц鐘舵��',align: 'center', templet: '#StatuszongButton', },
- // {field: 'CheckDate',title: '寮�濮嬫椂闂�',align: 'center', templet: '#CheckDateButton', },
- // {field: 'CompleteDate',title: '瀹屾垚鏃堕棿',align: 'center', templet: '#CompleteDateButtom', },
- // {field: 'AuditStatusNo',title: '瀹℃牳鐘舵��',align: 'center',width: 130,hide:true, templet: '#AuditStatusButton', },
- // {field: 'IsDoubleCheck', title: '鏄惁澶嶇洏', align: 'center', width: 180, hide:true, templet: '#IsDoubleCheckButton', },
- // {field: 'AuditUserName',title: '瀹℃牳浜�',align: 'center',width: 180,hide:true},
- // {field: 'AuditTime',title: '瀹℃牳鏃堕棿',align: 'center',width: 95,hide:true , templet: '#AuditTimeButton', },
- // {field: 'CreateUserName', title:'鍒涘缓浜�', align:'center', },
- // {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center', templet: '#CreateTimeButton', },
- // {field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 120,hide:true},
- // {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',width: 160,hide:true, templet: '#UpdateTimeButton', },
- // {title: '鎿嶄綔',fixed: 'right',align: 'center',toolbar: '#table-content-list',width: 240 }
- // ]]
- // });
- });
- }
- //娓叉煋鍑哄簱鍗曟槑缁�
- function refreshTablemx(crNo) {
- var param1={
- // Href:'QualityControl/QualityInformation'
- Href:'BllCheck/GetStockCheckDetailList'
- };
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- colsJsonm=TotalColsArrm
- }else{
- colsJsonm= eval(res.data);
- }
- }else{
- colsJsonm=TotalColsArrm
- }
- var param = {
- CrNo: crNo,
- };
- table.render({
- elem: '#LAY-app-content-list2',
- url: IP + "/BllCheck/GetStockCheckDetailList",
- method: 'post',
- height: h2 ,//'full-'+hei1
- id: 'LAY-app-content-list2',
- 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) {
- initMenu();
- //鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list2','BllCheck/GetStockCheckDetailList',TotalColsSysArrm);
- },
- cols: colsJsonm
- });
- // var param = {
- // CrNo: crNo,
- // };
- // table.render({
- // elem: '#LAY-app-content-list2',
- // url: IP + "/BllCheck/GetStockCheckDetailList",
- // method: 'POST',
- // height: h2,
- // id: 'LAY-app-content-list2',
- // where: param,
- // contentType: 'application/json',
- // headers:{ToKen:$.cookie('token')},
- // toolbar:'#toolbarDemo',
- // defaultToolbar: ['filter'], //'print', 'exports'
- // page: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // done: function(){
- // initMenu();
- // },
- // cols: [
- // [
- // {title:'搴忓彿', type:'numbers', width:65, fixed:'left', },
- // {field:'CrNo', title:'鐩樼偣鍗曞彿', align:'center', fixed:'left', width: 165, },
- // {field:'PalletNo', title:'鎵樼洏鍙�', align:'center', fixed:'left', width: 165, },
- // {field:'Qty', title:'搴撳瓨鏁伴噺', align:'center', fixed:'left', width: 105, },
- // {field:'RealQty', title:'瀹為檯鏁伴噺', align:'center', width: 105, },
- // {field:'Status', title:'鎵ц鐘舵��', align:'center', width: 105, templet : '#StatusmingButton', },
- // {field:'CheckResult', title:'鐩樼偣缁撴灉', align:'center', width:105, templet : '#CheckResultButton', },
- // {field:'SkuNo', title:'鐗╂枡缂栫爜', align:'center', width:105, },
- // {field:'SkuName', title:'鐗╂枡鍚嶇О', align:'center', width:125, },
- // {field:'Standard', title:'瑙勬牸', align:'center', width:225, },
- // {field:'LotNo', title:'鎵规鍙�', align:'center', width:105, },
- // {field:'LotText', title:'鎵规鎻忚堪', align:'center', width:105, },
- // {field:'SupplierLot', title:'渚涜揣鎵规', align:'center', width:105, },
- // {field: 'CreateUserName', title:'鍒涘缓浜�', align:'center', width:100, },
- // {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 160, templet: '#CreateTimeButton',},
- // {field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 120,hide:true},
- // {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',width: 160,hide:true, templet: '#UpdateTimeButton',},
- // ]]
- // });
- });
- }
- //鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- refreshTable();
- // refreshTablemx(xqid);
+ });
+ //鏉冮檺
+ function initMenu() {
+ $(function () {
+ $(".addClass").hide();
+ $(".editClass").hide();
+ $(".delClass").hide();
+ $(".checkOut").hide();
+ $(".addAdjust").hide();
+ $(".editDemoClass").hide();//澶囨敞
});
- //鏉冮檺
- function initMenu() {
- $(function() {
- $(".addClass").hide();
- $(".editClass").hide();
- $(".delClass").hide();
- $(".checkOut").hide();
- $(".addAdjust").hide();
- $(".editDemoClass").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() {
- $(".addClass").show();
- });
- }
- if (res.data[k].MenuName == "缂栬緫鐩樼偣鍗�") {
- $(function() {
- $(".editClass").show();
- });
- }
- if (res.data[k].MenuName == "鍒犻櫎鐩樼偣鍗�") {
- $(function() {
- $(".delClass").show();
- });
- }
- if (res.data[k].MenuName == "鐩樼偣鍑哄簱") {
- $(function() {
- $(".checkOut").show();
- });
- }
- if (res.data[k].MenuName == "璋冩暣搴撳瓨") {
- $(function() {
- $(".addAdjust").show();
- });
- }
- if (res.data[k].MenuName == "缁存姢鐩樼偣鍗曞娉�") {
- $(function() {
- $(".editDemoClass").show();
- });
- }
+ 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 () {
+ $(".addClass").show();
+ });
}
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ if (res.data[k].MenuName == "缂栬緫鐩樼偣鍗�") {
+ $(function () {
+ $(".editClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "鍒犻櫎鐩樼偣鍗�") {
+ $(function () {
+ $(".delClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "鐩樼偣鍑哄簱") {
+ $(function () {
+ $(".checkOut").show();
+ });
+ }
+ if (res.data[k].MenuName == "璋冩暣搴撳瓨") {
+ $(function () {
+ $(".addAdjust").show();
+ });
+ }
+ if (res.data[k].MenuName == "缁存姢鐩樼偣鍗曞娉�") {
+ $(function () {
+ $(".editDemoClass").show();
+ });
+ }
}
- });
- }
- //瑙﹀彂琛屽崟鍑讳簨浠�
- table.on('row(LAY-app-content-list)', function(obj) {
- refreshTablemx(obj.data.CrNo);
- xqid = "obj.data.CrNo";
- });
-
-
-
- //--------------------------------------------------------------------------------------------
- //澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(LAY-app-content-list2)', function(obj){
- var checkStatus = table.checkStatus(obj.config.id);
- if (obj.event == "add") {
- layer.open({
- type: 2,
- title: '娣诲姞鐩樼偣鍗�',
- content: 'StockCheckFrom.html',
- maxmin: true,
- area: ['1200px', '90%'],
- });
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
}
});
- //鐩戝惉鏁版嵁鎿嶄綔
- table.on('tool(LAY-app-content-list)', function(obj) {
- var data = obj.data;
- console.log(data);
- Id = data.Id;
- CrNo = data.CrNo;
- if (obj.event === 'del') {//鍒犻櫎
- layer.confirm('纭畾鍒犻櫎姝ゅ崟鎹悧锛�', function(index) {
- var param = {
- Id: parseInt(Id),
- };
- sendData(IP + "/BllCheck/DelStockCheck", param, 'post', function(res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 1000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- refreshTable();
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- });
- });
- } else if (obj.event === 'finish') {//鐢熸垚璋冩暣鍗�
- layer.confirm('纭畾璋冩暣搴撳瓨鍚楋紵', function(index) {
- var param = {
- Id: parseInt(Id),
- Origin:data.Origin
- };
- sendData(IP + "/UpApi/FinishCr", param, 'post', function(res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 1000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- refreshTable();
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- refreshTable();
- });
- }
- });
- });
- }else if(obj.event === 'edit'){//缂栬緫
- layer.open({
- type: 2,
- title: '缂栬緫鐩樼偣鍗�',
- content: 'StockCheckFrom.html?crNo='+CrNo,
- maxmin: true,
- area: ['1200px', '90%'],
- });
- }else if(obj.event === 'outbound'){
- layer.open({
- type: 1,
- title: '纭鍑哄簱鍙�',
- content: $('#divPickingArea'),
- maxmin: true,
- area: ['300px','265px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
- var pa = $('#PickingArea').val();
- if (isChongFu== true) {
- isChongFu= false;
-
- var param = {
- crNo: data.CrNo,
- outMode: pa,
- };
- sendData(IP + "/DownApi/CheckOutHouse", param, 'get', function(res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- refreshTable();
- isChongFu= true;
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- refreshTable();
- isChongFu= true;
- });
- }
- layer.close(index);
- });
- }else{
- layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- }
+ }
+ //瑙﹀彂琛屽崟鍑讳簨浠�
+ table.on('row(LAY-app-content-list)', function (obj) {
+ refreshTablemx(obj.data.CrNo);
+ xqid = "obj.data.CrNo";
+ });
+
+
+
+ //--------------------------------------------------------------------------------------------
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(LAY-app-content-list2)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ if (obj.event == "add") {
+ layer.open({
+ type: 2,
+ title: '娣诲姞鐩樼偣鍗�',
+ content: 'StockCheckFrom.html',
+ maxmin: true,
+ area: ['1200px', '90%'],
+ });
+ }
+ });
+ //鐩戝惉鏁版嵁鎿嶄綔
+ table.on('tool(LAY-app-content-list)', function (obj) {
+ var data = obj.data;
+ console.log(data);
+ Id = data.Id;
+ CrNo = data.CrNo;
+ if (obj.event === 'del') {//鍒犻櫎
+ layer.confirm('纭畾鍒犻櫎姝ゅ崟鎹悧锛�', function (index) {
+ var param = {
+ Id: parseInt(Id),
+ };
+ sendData(IP + "/BllCheck/DelStockCheck", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
}
- });
- }else if(obj.event === 'editDemo'){//缂栬緫澶囨敞
- $('#NoticeDemo').val(data.Demo);
- layer.open({
- type: 1,
- title: '缁存姢澶囨敞',
- content: $('#divEditDemo'),
- maxmin: false,
- area: ['420px','260px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
- var demo = $('#NoticeDemo').val();
+ });
+ });
+ } else if (obj.event === 'finish') {//鐢熸垚璋冩暣鍗�
+ layer.confirm('纭畾璋冩暣搴撳瓨鍚楋紵', function (index) {
+ var param = {
+ Id: parseInt(Id),
+ Origin: data.Origin
+ };
+ sendData(IP + "/UpApi/FinishCr", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ });
+ }
+ });
+ });
+ } else if (obj.event === 'edit') {//缂栬緫
+ layer.open({
+ type: 2,
+ title: '缂栬緫鐩樼偣鍗�',
+ content: 'StockCheckFrom.html?crNo=' + CrNo,
+ maxmin: true,
+ area: ['1200px', '90%'],
+ });
+ } else if (obj.event === 'outbound') {
+ layer.open({
+ type: 1,
+ title: '纭鍑哄簱鍙�',
+ content: $('#divPickingArea'),
+ maxmin: true,
+ area: ['300px', '265px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ var pa = $('#PickingArea').val();
+ if (isChongFu == true) {
+ isChongFu = false;
+
var param = {
- id: data.Id,
- demo: demo,
+ crNo: data.CrNo,
+ outMode: pa,
};
- sendData(IP + "/BllCheck/EditNoticeDemo", param, 'get', function(res) {
+ sendData(IP + "/DownApi/CheckOutHouse", param, 'get', function (res) {
+ console.log(res);
if (res.code == 0) { //鎴愬姛
- refreshTable();
layer.msg(res.msg, {
icon: 1,
- time: 1500 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
-
+ time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ isChongFu = true;
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
refreshTable();
+ isChongFu = true;
});
}
layer.close(index);
});
+ } else {
+ layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
}
- });
- }
- });
-
- var $ = layui.$,
- active = {
- customCols: function(){
- layer.open({
- type: 2,
- title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllCheck/GetStockCheckList&ColsSysArr='+TotalColsSysArrz,
- maxmin: false,
- resize: false,
- area: ['970px', '650px']
+ }
+ });
+ } else if (obj.event === 'vision') {
+
+ layer.confirm('纭畾瑙嗚鐩樼偣', function () {
+ if (isChongFu == true) {
+ isChongFu = false;
+ var param = {
+ crNo: data.CrNo
+ };
+ sendData(IP + "/DownApi/CheckVision", param, 'get', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ isChongFu = true;
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ isChongFu = true;
+ });
+ }
+ layer.close(index);
});
- },
- customCols2: function(){
- layer.open({
- type: 2,
- title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllCheck/GetStockCheckDetailList&ColsSysArr='+TotalColsSysArrm,
- maxmin: false,
- resize: false,
- area: ['970px', '650px']
+ } else {
+ layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ isChongFu = true
});
}
- };
- $('.layui-btn').on('click', function() {
- var type = $(this).data('type');
- active[type] ? active[type].call(this) : '';
- });
-
+ }, function () {
+
+ });
+ } else if (obj.event === 'editDemo') {//缂栬緫澶囨敞
+ $('#NoticeDemo').val(data.Demo);
+ layer.open({
+ type: 1,
+ title: '缁存姢澶囨敞',
+ content: $('#divEditDemo'),
+ maxmin: false,
+ area: ['420px', '260px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ var demo = $('#NoticeDemo').val();
+ var param = {
+ id: data.Id,
+ demo: demo,
+ };
+ sendData(IP + "/BllCheck/EditNoticeDemo", param, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ refreshTable();
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1500 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ });
+ }
+ layer.close(index);
+ });
+ }
+ });
+ }
});
- </script>
- </body>
-</html>
+
+ var $ = layui.$,
+ active = {
+ customCols: function () {
+ layer.open({
+ type: 2,
+ title: '鑷畾涔夊垪',
+ content: '../SystemSettings/HeaderSetting.html?Href=BllCheck/GetStockCheckList&ColsSysArr=' + TotalColsSysArrz,
+ maxmin: false,
+ resize: false,
+ area: ['970px', '650px']
+ });
+ },
+ customCols2: function () {
+ layer.open({
+ type: 2,
+ title: '鑷畾涔夊垪',
+ content: '../SystemSettings/HeaderSetting.html?Href=BllCheck/GetStockCheckDetailList&ColsSysArr=' + TotalColsSysArrm,
+ maxmin: false,
+ resize: false,
+ area: ['970px', '650px']
+ });
+ }
+ };
+ $('.layui-btn').on('click', function () {
+ var type = $(this).data('type');
+ active[type] ? active[type].call(this) : '';
+ });
+
+ });
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index 07e232b..a93d0a0 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -909,7 +909,7 @@
{
throw Oops.Bah("闇�閰嶇疆鐩樼偣鏂瑰紡");
}
- var list = await Db.Queryable<BllStockCheckDetail>().Where(a => a.IsDel == "0" && a.CRNo == crNo && a.Status == 0).ToListAsync();
+ var list = await Db.Queryable<BllStockCheckDetail>().Where(a => a.IsDel == "0" && a.CRNo == crNo && (a.Status == 0 || a.Status == 1 || a.Status == 2)).ToListAsync();
if (list.Count == 0) //鍒ゆ柇鏄惁鏈夐渶瑕佷笅鍙戠殑鐩樼偣鏄庣粏
{
throw Oops.Bah("褰撳墠鐩樼偣鍗曟嵁鏃犻渶瑕佷笅鍙戠殑鎵樼洏");
@@ -921,6 +921,10 @@
throw Oops.Bah("宸叉湁姝ｅ湪鍑哄簱鎴栧緟鐩樼偣鐨勬暟鎹紝璇峰畬鎴愮洏鐐瑰悗鍐嶅嚭搴�");
}
list = new List<BllStockCheckDetail>() { list.FirstOrDefault() };
+ }
+ else
+ {
+ list = list.Where(s => s.Status == 0).ToList();
}
#region
//瑕佸嚭搴撶殑鎵樼洏闆嗗悎
@@ -1182,11 +1186,11 @@
}
if (flagList.Count(m => m == 3) > 0)
{
- str += "4.鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�";
+ str += "3.鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�";
}
if (flagList.Count(m => m == 4) > 0)
{
- str += "3.瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱銆�";
+ str += "4.瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱銆�";
}
if (flagList.Count(m => m == 5) > 0)
{
@@ -1222,7 +1226,352 @@
return outDtoList;
#endregion
}
+
+ /// <summary>
+ /// 瑙嗚鐩樼偣
+ /// </summary>
+ /// <param name="crNo"></param>
+ /// <param name="url"></param>
+ /// <param name="str"></param>
+ /// <returns></returns>
+ public async Task<List<OutCommandDto>> CheckVision(string crNo, string url, string str)
+ {
+ #region 闆嗗悎
+ var outDtoList = new List<OutCommandDto>(); //鍑哄簱鏁版嵁鐨勯泦鍚�
+ //璁板綍閿欒淇℃伅鐨勯泦鍚�
+ var flagList = new List<int>();//1:褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝ｅ湪绉诲嚭銆�2 鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)銆�3鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�4 瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱
+ #endregion
+ var com = new Common();
+ //assign.IsHavePyTask();
+ var notice = await Db.Queryable<BllStockCheck>().FirstAsync(m => m.CRNo == crNo && m.IsDel == "0");
+ if (notice == null)
+ {
+ throw Oops.Bah($"鏈壘鍒皗crNo}鐩樼偣鍗曚俊鎭�");
+ }
+ //鎵�鏈夎鍑哄簱鐨勭洏鐐规槑缁嗕俊鎭�(绛夊緟鐨勪俊鎭拰寰呮嫞璐х殑淇℃伅)
+ var funSetting = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "InventoryCheckMethod");
+ if (funSetting == null || funSetting.IsEnable == "OFF")
+ {
+ throw Oops.Bah("闇�閰嶇疆鐩樼偣鏂瑰紡");
+ }
+ var list = await Db.Queryable<BllStockCheckDetail>().Where(a => a.IsDel == "0" && a.CRNo == crNo && (a.Status == 0 || a.Status == 1 || a.Status == 2)).ToListAsync();
+ if (list.Count == 0) //鍒ゆ柇鏄惁鏈夐渶瑕佷笅鍙戠殑鐩樼偣鏄庣粏
+ {
+ throw Oops.Bah("褰撳墠鐩樼偣鍗曟嵁鏃犻渶瑕佷笅鍙戠殑鎵樼洏");
+ }
+ if (funSetting.SetValue == "once")
+ {
+ if (list.Any(s => s.Status == 1 || s.Status == 2))
+ {
+ throw Oops.Bah("宸叉湁姝ｅ湪鍑哄簱鎴栧緟鐩樼偣鐨勬暟鎹紝璇峰畬鎴愮洏鐐瑰悗鍐嶅嚭搴�");
+ }
+ list = new List<BllStockCheckDetail>() { list.FirstOrDefault() };
+ }
+ else
+ {
+ list = list.Where(s => s.Status == 0).ToList();
+ }
+ #region
+ //瑕佸嚭搴撶殑鎵樼洏闆嗗悎
+ var outLpnList = list.Select(m => m.PalletNo).Distinct().ToList();
+ //瑕佸嚭搴撶殑鏄庣粏闆嗗悎
+ var outStockDetail = await Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && outLpnList.Contains(m.PalletNo)).ToListAsync();
+ var outStockBox = await Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && outLpnList.Contains(m.PalletNo)).ToListAsync();
+ //鑾峰彇鐗╂枡淇℃伅
+ var skuNo = await Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.Type == "4").Select(a => a.SkuNo).ToListAsync();
+ var time = DateTime.Now;
+ //Db.BeginTran();
+ //寰幆鐩樼偣鏄庣粏鐨勪俊鎭敓鎴愬嚭搴撲换鍔�
+ foreach (var item in list)
+ {
+ if (item.Status == 0)
+ {
+ var logList = new List<BllStockCheckLog>();
+ //鍒ゆ柇鏄惁涓烘棤鐮佺墿鏂�
+ if (skuNo.Contains(item.SkuNo))
+ {
+ var de = outStockDetail.First(m => m.IsDel == "0" &&
+ m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo);
+
+ var checkLog = new BllStockCheckLog()
+ {
+ CRNo = item.CRNo,
+ PalletNo = item.PalletNo,
+ BoxNo = "",
+ BoxNo2 = "",
+ BoxNo3 = "",
+ Qty = (int?)de.Qty,
+ SkuNo = de.SkuNo,
+ SkuName = de.SkuName,
+ Standard = de.Standard,
+ LotNo = de.LotNo,
+ LotText = de.LotText,
+ SupplierLot = de.SupplierLot,
+
+ CreateUser = _userManager.UserId,
+ CreateTime = time
+ };
+ logList.Add(checkLog);
+
+ }
+ else
+ {
+ var de = outStockDetail.Where(m =>
+ m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo).Select(m => m.Id).ToList();
+ var bo = outStockBox.Where(m => de.Contains(m.StockDetailId)).ToList();
+ foreach (var b in bo)
+ {
+ var checkLog = new BllStockCheckLog()
+ {
+ CRNo = item.CRNo,
+ PalletNo = item.PalletNo,
+ BoxNo = b.BoxNo,
+ BoxNo2 = b.BoxNo2,
+ BoxNo3 = b.BoxNo3,
+ Qty = b.Qty,
+ SkuNo = b.SkuNo,
+ SkuName = b.SkuName,
+ Standard = b.Standard,
+ LotNo = b.LotNo,
+ LotText = b.LotText,
+ SupplierLot = b.SupplierLot,
+
+ CreateUser = _userManager.UserId,
+ CreateTime = time
+ };
+ logList.Add(checkLog);
+ }
+ }
+
+ //鐢熸垚鐩樼偣璁板綍
+ await Db.Insertable(logList).ExecuteCommandAsync();
+ }
+ // 鍌ㄤ綅鍙�
+ var locateNo = outStockDetail.First(m => m.PalletNo == item.PalletNo && m.SkuNo == item.SkuNo && m.LotNo == item.LotNo).LocatNo;
+
+ #region 鍒ゆ柇
+ //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱鍐�
+ if (string.IsNullOrWhiteSpace(locateNo))
+ {
+ var de = outStockDetail.First(m => m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo);
+ //鍒ゆ柇鏄惁鏄浂绠卞簱锛屽綋鍓嶆槑缁嗕俊鎭洿鎺ユ洿鏂板嚭搴撳畬鎴�
+ if (de != null && de.WareHouseNo == "W02")
+ {
+ //鐩樼偣鏄庣粏鐘舵�佹敼涓哄緟鐩樼偣
+ item.Status = 2;
+ await Db.Updateable(item).ExecuteCommandAsync();
+ //鐩樼偣淇℃伅淇敼
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ }
+ //搴撳瓨涓綋鍓嶆墭鐩樼殑淇℃伅
+ var stockDetail = await Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == item.PalletNo).ToListAsync();
+ foreach (var s in stockDetail)
+ {
+ s.LocatNo = "";//鍌ㄤ綅鏇存敼锛堟敼涓虹┖锛�
+ s.WareHouseNo = "";//鎵�灞炰粨搴撴洿鏀癸紙鏀逛负绌猴級
+ s.RoadwayNo = "";//鎵�灞炲贩閬撴洿鏀癸紙鏀逛负绌猴級
+ s.AreaNo = "";//鎵�灞炲尯鍩熸洿鏀癸紙鏀逛负绌猴級
+ await Db.Updateable(s).ExecuteCommandAsync();
+ }
+ flagList.Add(5);
+ continue;
+ }
+ //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ叆搴撲腑
+ var imBl = com.GetImTask(item.PalletNo);
+ if (imBl != null)
+ {
+ flagList.Add(4);
+ continue;
+ }
+ //鍒ゆ柇鏄惁鏄凡缁忓嚭杩囧簱鍙堝洖搴擄紙鐘舵�佷负寰呮嫞璐х殑 1锛�
+ if (item.Status == 0)
+ {
+ //濡傛灉涓嶅湪浠撳簱鍐咃紝褰撳墠鏄庣粏淇℃伅鐩存帴鏇存柊鍑哄簱瀹屾垚
+ item.Status = 2;//鐘舵��
+ await Db.Updateable(item).ExecuteCommandAsync();
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ }
+ }
+ continue;
+ }
+ //褰撳墠鍑哄簱鐨勫偍浣嶄俊鎭�
+ var locate = await Db.Queryable<SysStorageLocat>().FirstAsync(m => m.LocatNo == locateNo && m.IsDel == "0");
+ if (locate == null)
+ {
+ flagList.Add(2);
+ continue;
+ }
+ //鍒ゆ柇鍌ㄤ綅鏍囧織鏄惁涓烘崯鍧�
+ if (locate.Flag == "2")
+ {
+ flagList.Add(3);
+ continue;
+ }
+ #endregion
+ if (locate.Status == "1") //鏈夌墿鍝�
+ {
+ #region 娣诲姞鍑哄簱浠诲姟
+ var taskNo = new Common().GetMaxNo("TK");
+ //娣诲姞鍑哄簱浠诲姟
+ var exTask = new LogTask
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ StartLocat = locate.LocatNo,//璧峰浣嶇疆
+ //EndLocat = outMode,//鐩爣浣嶇疆
+ PalletNo = item.PalletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "4",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗� 4瑙嗚鐩樼偣
+
+ CreateTime = time
+ };
+ await Db.Insertable(exTask).ExecuteCommandAsync();
+
+ outDtoList.Add(new OutCommandDto()
+ {
+ PalletNo = item.PalletNo,//鎵樼洏鍙�
+ StartLocate = locate.LocatNo, // 璧峰浣嶇疆
+ StartRoadway = locate.RoadwayNo,
+ EndLocate = "", // 鐩爣浣嶇疆
+ TaskNo = exTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ });
+ #endregion
+
+ #region 鏀瑰彉鏁版嵁
+ if (item.Status == 0)//鍒ゆ柇鎵樼洏鏄惁涓嬪彂杩�
+ {
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ }
+ }
+ locate.Status = "3"; //瑕佸嚭搴撶殑鍌ㄤ綅鏀瑰彉鐘舵�� 姝ｅ湪鍑哄簱
+ await Db.Updateable(locate).ExecuteCommandAsync();
+
+ item.TaskNo = exTask.TaskNo; // 鍑哄簱鍒嗛厤淇℃伅涓洿鏂颁换鍔″彿
+ item.Status = 1; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛�
+ await Db.Updateable(item).ExecuteCommandAsync();
+ #endregion
+
+ flagList.Add(0);
+ }
+ else if (locate.Status == "3") //鍑哄簱涓�
+ {
+ #region 鏀瑰彉鏁版嵁
+ //鍒ゆ柇鏄惁鏄凡缁忓嚭杩囧簱鍙堝洖搴擄紙鐘舵�佷负寰呮嫞璐х殑 1锛�
+ if (item.Status == 0)
+ {
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+
+ }
+ }
+ var taskNo = Db.Queryable<LogTask>().First(m => m.OrderType == "2" && m.TaskNo != item.TaskNo && m.Status == "1" && m.PalletNo == item.PalletNo);
+ item.TaskNo = taskNo.TaskNo;
+ item.Status = 1; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛�
+ await Db.Updateable(item).ExecuteCommandAsync();
+
+ #endregion
+ }
+ else if (locate.Status == "5") //绉诲嚭涓�
+ {
+ flagList.Add(1);
+ }
+ }
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", crNo, "鍑哄簱", $"鐐瑰嚮鍑哄簱鎸夐挳鐩樼偣鍗曞彿涓猴細{crNo}鐨勭洏鐐瑰崟", userId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "鐩樼偣鍗曟嵁",
+ FkNo = crNo,
+ TypeName = "鍑哄簱",
+ Msg = $"鐐瑰嚮鍑哄簱鎸夐挳鐩樼偣鍗曞彿涓猴細{crNo}鐨勭洏鐐瑰崟"
+ });
+ //Db.CommitTran();
+
+ str = string.Empty;
+ if (flagList.Count(m => m == 1) > 0)
+ {
+ str += "1.褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝ｅ湪绉诲嚭銆�";
+ }
+ if (flagList.Count(m => m == 2) > 0)
+ {
+ str += "2.鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)銆�";
+ }
+ if (flagList.Count(m => m == 3) > 0)
+ {
+ str += "3.鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�";
+ }
+ if (flagList.Count(m => m == 4) > 0)
+ {
+ str += "4.瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱銆�";
+ }
+ if (flagList.Count(m => m == 5) > 0)
+ {
+ str += "5.瑕佸嚭搴撶殑鎵樼洏鍦ㄩ浂绠卞簱銆�";
+ }
+ if (!string.IsNullOrEmpty(str))
+ throw Oops.Bah(str);
+ if (outDtoList.Count > 0)
+ {
+ // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ var list2 = outDtoList.Select(m => m.TaskNo).ToList();
+ var jsonData = JsonConvert.SerializeObject(outDtoList);
+ string response = "";
+
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ //response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS"); //姝ｅ紡鐗堟湰鏀惧紑
+ var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+ ////瑙ｆ瀽杩斿洖鏁版嵁
+ //var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+ //if (wcsModel.StatusCode == 0)
+ //{
+ // //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ // new TaskServer().EditTaskIssueOk(list2, time1, time2);
+ // str += "涓嬪彂鎴愬姛";
+ //}
+ //if (wcsModel.StatusCode == -1)
+ //{
+ // new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
+ // throw Oops.Bah(wcsModel.Msg);
+ //}
+ }
+ return outDtoList;
+ #endregion
+ }
//鐩樼偣鍑哄簱瀹屾垚
public async Task CheckSuccess(string taskNo, int userId)
{
diff --git a/Wms/WMS.Entity/LogEntity/LogTask.cs b/Wms/WMS.Entity/LogEntity/LogTask.cs
index 53d440d..fdbd504 100644
--- a/Wms/WMS.Entity/LogEntity/LogTask.cs
+++ b/Wms/WMS.Entity/LogEntity/LogTask.cs
@@ -128,7 +128,7 @@
public int? IsFinish {get;set;}
/// <summary>
- /// Desc:鍗曟嵁绫诲瀷 0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+ /// Desc:鍗曟嵁绫诲瀷 0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗� 4瑙嗚鐩樼偣
/// Default:
/// Nullable:True
/// </summary>
diff --git a/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs b/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs
index c9c34be..a8c8e2e 100644
--- a/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs
+++ b/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs
@@ -104,6 +104,14 @@
/// <param name="str"></param>
/// <returns></returns>
Task<List<OutCommandDto>> CheckOutHouse(string crNo, string outMode, string url, string str);
+ /// <summary>
+ /// 瑙嗚鐩樼偣
+ /// </summary>
+ /// <param name="crNo"></param>
+ /// <param name="url"></param>
+ /// <param name="str"></param>
+ /// <returns></returns>
+ Task<List<OutCommandDto>> CheckVision(string crNo, string url, string str);
/// <summary>
/// 鐩樼偣鍑哄簱瀹屾垚
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 8297390..d8da14f 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -194,7 +194,34 @@
return Ok(new { code = 0, msg = str, data = list });
}
+ /// <summary>
+ /// 鎸囦护涓嬪彂锛堣瑙夌洏鐐癸級
+ /// </summary>
+ /// <param name="crNo"></param>
+ /// <param name="outMode"></param>
+ /// <returns></returns>
+ [Authorize]
+ [HttpGet]
+ [UnitOfWork]
+ public async Task<IActionResult> CheckVision(string crNo)
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ string str = "";
+ var list = await _crCheckSvc.CheckVision(crNo, _config.WcsHost + _config.IssueComApiUrl, str);
+ return Ok(new { code = 0, msg = str, data = list });
+
+ }
/// <summary>
/// 閲嶆柊涓嬪彂鐩樼偣浠诲姟
/// </summary>
--
Gitblit v1.8.0