From 0f925aa31ef78144d24878433302917c33d04c8d Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 23 十月 2024 08:27:39 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 1 +
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 3 ++-
Wms/WMS.Entity/DataEntity/DataBoxInfo.cs | 7 +++++++
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 28 +++++++++++++++++++++++++++-
HTML/views/ASNSetting/ArrivalLogTask.html | 4 ++--
5 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalLogTask.html b/HTML/views/ASNSetting/ArrivalLogTask.html
index 4584c60..5cbcd1b 100644
--- a/HTML/views/ASNSetting/ArrivalLogTask.html
+++ b/HTML/views/ASNSetting/ArrivalLogTask.html
@@ -72,8 +72,8 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" 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/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 242eccd..a953fe4 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -394,7 +394,7 @@
sqlDetailStr += "LotNo,LotText,Qty,PackagNo,Price,Money,IsBale,IsBelt,SupplierLot,Status,Lot1,Lot2,UDF1,UDF2,UDF3,UDF4,UDF5,CreateUser) values ( ";
sqlDetailStr += $"'{model.ASNNo}','{detailModel.SkuNo}','{detailModel.SkuName}','{detailModel.Standard}', ";
sqlDetailStr += $"'{detailModel.LotNo}','{detailModel.LotText}','{detailModel.Qty}','{detailModel.PackagNo}','{detailModel.Price}', ";
- sqlDetailStr += $"'{detailModel.Money},'{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.Lot1}','{detailModel.Lot2}', ";
+ sqlDetailStr += $"'{detailModel.Money}','{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.Lot1}','{detailModel.Lot2}', ";
sqlDetailStr += $"'{detailModel.UDF1}','{detailModel.UDF2}','{detailModel.UDF3}','{detailModel.UDF4}','{detailModel.UDF5}','{model.CreateUser}');";
if (model.Type == "0")//鎴愬搧鍏ュ簱鍗曚笅鍙慦CS淇℃伅
@@ -467,6 +467,7 @@
}
catch (Exception ex)
{
+ Db.Ado.RollbackTran();
throw new Exception(ex.Message);
}
}
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index 3448fe9..14d73ed 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -297,6 +297,7 @@
CreateTime = a.CreateTime,
UpdateTime = a.UpdateTime
})
+ .OrderByDescending(a=>a.BoxNo)
.OrderByDescending(a => a.CreateTime)
.ToOffsetPage(model.Page, model.Limit, ref total);
count = total;
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 3a2dabc..4374581 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -22,6 +22,7 @@
using Utility.Tools;
using System.Reflection;
using System.IO;
+using System.Security.Cryptography.X509Certificates;
namespace WMS.BLL.BllPdaServer
{
@@ -2233,6 +2234,21 @@
var bindId = 0;
if (bind == null)
{
+
+ DateTime proTime;
+ DateTime expTime;
+ var bl1 = DateTime.TryParse(detail.Lot1, out proTime);
+ var bl2 = DateTime.TryParse(detail.Lot2, out expTime);
+
+ if (!bl1 && !string.IsNullOrWhiteSpace(detail.Lot1))
+ {
+ throw new Exception("鐢熶骇鏃ユ湡杞崲澶辫触");
+ }
+
+ if (!bl2 && !string.IsNullOrWhiteSpace(detail.Lot2))
+ {
+ throw new Exception("鏈夋晥鏈熻浆鎹㈠け璐�");
+ }
bind = new BllPalletBind
{
ASNNo = model.AsnNo,
@@ -2255,6 +2271,15 @@
Demo = model.Demo,
};
+
+ if (bl1)
+ {
+ bind.ProductionTime = proTime;
+ }
+ if (bl2)
+ {
+ bind.ExpirationTime = expTime;
+ }
//if (model.TableType == 0 && isDeposit == 0 && isTextTable == 0) 涓嶅お鐞嗚В杩欐浠ｇ爜鐨勫惈涔�
//{
// throw new Exception($"缁戝畾澶辫触锛寋model.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
@@ -2743,7 +2768,8 @@
InspectMark = item.InspectMark,
BitBoxMark = item.BitBoxMark,
InspectStatus = item.InspectStatus,
- //InspectTime = item.,
+ UDF1 = item.StoreTime == null? "":((DateTime)item.StoreTime).ToString("yyyy-MM-dd"),
+ //InspectTime = item.StoreTime,
IsDel = "0",
CreateUser = 0,
diff --git a/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs b/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs
index 517a22a..b0e185e 100644
--- a/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs
+++ b/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs
@@ -170,5 +170,12 @@
/// </summary>
public DateTime? InspectTime {get;set;}
+
+ /// <summary>
+ /// Desc:澶囩敤瀛楁 瀛樺偍鏈熻嚦
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string UDF1 { get; set; }
}
}
--
Gitblit v1.8.0