chengsc
2024-10-23 0f925aa31ef78144d24878433302917c33d04c8d
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,