From 369add6412e52aa6f5cdc6c4b6572434253a4ee0 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 05 二月 2024 16:00:05 +0800
Subject: [PATCH] 修改托盘标签页面查询条件
---
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 2 +-
HTML/views/ASNSetting/LabelBox.html | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/HTML/views/ASNSetting/LabelBox.html b/HTML/views/ASNSetting/LabelBox.html
index 79afd1a..ec5c961 100644
--- a/HTML/views/ASNSetting/LabelBox.html
+++ b/HTML/views/ASNSetting/LabelBox.html
@@ -94,13 +94,14 @@
</div>
<div class="layui-inline" style="margin-right: 0;">
- <label class="layui-form-label">鏄惁浣跨敤</label>
+ <label class="layui-form-label">鏍囩鐘舵��</label>
<div class="layui-input-inline" style="margin-right: 0;">
<div class="layui-input-inline" style="margin-right: 0;">
<select name="Status" id="Status" lay-filter="Status" lay-search>
<option value=""></option>
- <option value="0">鍚�</option>
- <option value="1">鏄�</option>
+ <option value="0">鏈粍鎵�</option>
+ <option value="1">宸茬粍鎵�</option>
+ <option value="2">宸插叆搴�</option>
</select>
</div>
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index 4011efa..e05c647 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -412,7 +412,7 @@
.AndIF(!string.IsNullOrWhiteSpace(model.SkuNo), it => it.SkuNo.Contains(model.SkuNo.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.SupplierLot), it => it.SupplierLot.Contains(model.SupplierLot.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(model.Status), it => it.Status == model.SupplierLot)
+ .AndIF(!string.IsNullOrWhiteSpace(model.Status), it => it.Status == model.Status)
.AndIF(!string.IsNullOrWhiteSpace(model.ProductionTime), it => it.ProductionTime >= Convert.ToDateTime(model.ProductionTime))
.AndIF(!string.IsNullOrWhiteSpace(model.ProductionTime), it => it.ProductionTime <= Convert.ToDateTime(model.ProductionTime).AddDays(1))
.And(it => it.IsDel == "0" && it.Origin == "WMS鐢熸垚")
--
Gitblit v1.8.0