修改问题

chengsc

2024-10-23 0f925aa31ef78144d24878433302917c33d04c8d

修改问题

 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>

 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")//成品入库单下发WCS信息
@@ -467,6 +467,7 @@
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                throw new Exception(ex.Message);
            }
        }

 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;

 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,

 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; }
    }
}