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/BllPdaServer/PdaAsnServer.cs | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
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,
--
Gitblit v1.8.0