From 298cbe11a8d27bb7e4986df21f49a015916ffa94 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 18 六月 2024 08:25:47 +0800
Subject: [PATCH] 修改入库页面
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 4 ++--
HTML/views/ASNSetting/PalletBind.html | 22 +++++++++++-----------
HTML/views/ASNSetting/ArrivalNotice.html | 32 ++++++++++++++++----------------
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index edec824..9013e63 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -87,18 +87,18 @@
class="layui-input">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <!-- <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-inline">
- <select name="Type" id="Type" lay-filter="Type" lay-search>
+ <select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
- <!-- JC23 -->
- <option value="0">鎴愬搧鍏ュ簱</option>
+ JC23 -->
+ <!--<option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">閲囪喘鍏ュ簱</option>
<option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
<option value="5">鍏跺畠鍏ュ簱</option>
<option value="6">浠ｅ偍鍏ュ簱</option>
- <!-- JC24 -->
+ JC24 -->
<!-- <option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">閲囪喘鍏ュ簱</option>
<option value="2">涓棿鍝佸叆搴�</option>-->
@@ -113,10 +113,10 @@
<!-- JC08 -->
<!-- <option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">鍘熸枡鍏ュ簱</option>
- <option value="2">閫�璐у叆搴�</option> -->
+ <option value="2">閫�璐у叆搴�</option>
</select>
</div>
- </div>
+ </div> -->
<div class="layui-inline">
<label class="layui-form-label" style="width: 90px;">涓婃父绯荤粺鍗曞彿</label>
<div class="layui-input-inline">
@@ -124,13 +124,13 @@
autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<label class="layui-form-label">瀹㈡埛鍚嶇О</label>
<div class="layui-input-inline">
<input type="text" id="CustomerName" name="CustomerName" placeholder="瀹㈡埛鍚嶇О" autocomplete="off"
class="layui-input">
</div>
- </div>
+ </div> -->
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-inline">
@@ -309,11 +309,11 @@
</div>
<!-- #endregion -->
- <script type="text/html" id="toolbarDemo">
+ <!-- <script type="text/html" id="toolbarDemo">
<button style="margin-right: 5px;" class="layui-btn layui-btn-sm layuiadmin-btn-list addClass" lay-event="add" >
<i class="layui-icon"></i>娣诲姞
</button>
- </script>
+ </script> -->
<script type="text/html" id="toolbarDemoList">
{{# function GetBtn2(d){
@@ -457,8 +457,8 @@
{field: 'ASNNo',title: '鍏ュ簱鍗曞彿',align: 'center',fixed: 'left',sort: true,width: 180, "disabled": true},
{field: 'Status',title: '鎵ц鐘舵��',align: 'center',templet: '#buttonTpl'},
{field: 'Origin',title: '鏉ユ簮',align: 'center',width: 80},
- {field: 'CustomerName',title: '瀹㈡埛鍚嶇О',align: 'center'},
- {field: 'Type',title: '鍗曟嵁绫诲瀷',align: 'center',templet: '#templetType'},
+ //{field: 'CustomerName',title: '瀹㈡埛鍚嶇О',align: 'center'},
+ // {field: 'Type',title: '鍗曟嵁绫诲瀷',align: 'center',templet: '#templetType'},
{field: 'OrderCode',title: '涓婃父绯荤粺鍗曞彿',align: 'center',width: 180},
{field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center',templet: '#templetCompleteTime'},
{field: 'Demo',title: '澶囨敞',align: 'center',width: 180},
@@ -491,10 +491,10 @@
}
var param = {
ASNNo: $("#ASNNo").val(),
- Type: $("#Type").val(),
+ Type: '',
Status: $("#Status").val(),
OrderCode:$("#OrderCode").val(),
- CustomerName: $("#CustomerName").val(),
+ CustomerName: '',
LotNo: $("#LotNo").val(),
SkuNo: $("#SkuNo").val(),
SkuName: $("#SkuName").val(),
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 8a091f9..2036e07 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -69,14 +69,14 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">鎵�灞炲贩閬�</label>
<div class="layui-input-inline">
<select name="RoadwayNo" id="RoadwayNo" lay-search>
<option value=""></option>
</select>
</div>
- </div>
+ </div> -
<!-- 鎵ц鐘舵�侀兘涓哄叆搴撳畬鎴愪笉鐢ㄤ綔涓烘煡璇㈡潯浠� -->
<div class="layui-inline" style="display: none;">
<label class="layui-form-label" style="width: 60px;">鎵ц鐘舵��</label>
@@ -149,7 +149,7 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title" id="tab">
<li class="layui-this">鎵樼洏淇℃伅</li>
- <li>绠辩爜淇℃伅</li>
+ <!-- <li>绠辩爜淇℃伅</li> -->
</ul>
<div id="center"></div>
@@ -183,17 +183,17 @@
</div>
</div>
</div>
- <button style="margin-right: 5px;position: absolute; top: 5px; right: 10px;"
+ <button style="margin-right: 5px;position: absolute; top: 5px; right: 10px;"
class="layui-btn layuiadmin-btn-list layui-btn-sm addClass" data-type="add">
<i class="layui-icon"></i>娣诲姞
- </button>
+ </button>
</div>
<!-- <a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>鎸囧畾鍌ㄤ綅</a> -->
<script type="text/html" id="PalletBindDemoList">
{{# function GetPalletBindBtn(d){
var html = '';
- if((d.LocatNo == "" || d.LocatNo == null) && (d.RoadwayNo=="" || d.RoadwayNo == null) && d.Type =="0")
+ if((d.LocatNo == "" || d.LocatNo == null) && d.Type =="0")&& //(d.RoadwayNo=="" || d.RoadwayNo == null)
{
html += `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a> `;
@@ -342,7 +342,7 @@
}}
</script>
- <script type="text/html" id="RoadwayButton">
+ <!-- <script type="text/html" id="RoadwayButton">
{{#
switch (d.RoadwayNo) {
case "R01": return '01宸烽亾';
@@ -358,7 +358,7 @@
default: return "";
}
- }}
+ }} -->
</script>
<!-- #endregion -->
</div>
@@ -406,7 +406,7 @@
bindPalletBind();
- bindBoxInfo("0");
+ //bindBoxInfo("0");
//鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
synData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
@@ -465,7 +465,7 @@
{ field: 'PalletNo2', title: '鎵樼洏鍙稬V2', align: 'center' },
{ field: 'PalletNo3', title: '鎵樼洏鍙稬V3', align: 'center' },
{ field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 90 },
- { field: 'RoadwayNo', title: '鎵�灞炲贩閬�', align: 'center', width: 90, templet: '#RoadwayButton' },
+ //{ field: 'RoadwayNo', title: '鎵�灞炲贩閬�', align: 'center', width: 90, templet: '#RoadwayButton' },
{ field: 'WareHouseNo', title: '鎵�灞炰粨搴�', align: 'center', width: 90, templet: '#WareHouseButton' },
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 110 },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
@@ -501,7 +501,7 @@
ASNNo: $("#ASNNo").val(),
PalletNo: $("#PalletNo").val(),
LocatNo: $("#LocatNo").val(),
- RoadwayNo: $("#RoadwayNo").val(),
+ RoadwayNo: '',
WareHouseNo: $("#WareHouseNo").val(),
Status: $("#Status").val(),
SkuNo: $("#SkuNo").val(),
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 86fe9e7..c4d2e1f 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -58,7 +58,7 @@
{
sqlPub += $"AND tb1.Status = '{model.Status}' ";
}
- if (!string.IsNullOrEmpty(model.Type))
+ /*if (!string.IsNullOrEmpty(model.Type))
{
if (model.Type == "3")
{
@@ -73,7 +73,7 @@
{
sqlPub += " AND tb1.Type != '3'";
- }
+ }*/
if (!string.IsNullOrEmpty(model.StartTime))
{
sqlPub += $"AND tb1.CreateTime >= '{model.StartTime}' ";
--
Gitblit v1.8.0