zhaowc
2025-03-27 d07f25c163706ac46a83bd2c63db1e3c52715222
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1957,62 +1957,62 @@
                #region 测试版本
                //读取json文件,添加数据
                var ss = AppDomain.CurrentDomain.BaseDirectory;
                string filePath = Path.Combine(ss, "CreateBoxInfo.json");
                string json = File.ReadAllText(filePath);
                var person = JsonConvert.DeserializeObject<List<BllBoxInfo>>(json);
                ////读取json文件,添加数据
                //var ss = AppDomain.CurrentDomain.BaseDirectory;
                //string filePath = Path.Combine(ss, "CreateBoxInfo.json");
                //string json = File.ReadAllText(filePath);
                //var person = JsonConvert.DeserializeObject<List<BllBoxInfo>>(json);
                var comTime = DateTime.Now;
                //添加箱码信息表中  //暂时这些写--添加数据,后续需要和赋码系统对接后 根据明确返回的数据格式更改
                foreach (var item in person)
                {
                    if (item.BoxNo!= boxNo)
                    {
                        continue;
                    }
                ////添加箱码信息表中  //暂时这些写--添加数据,后续需要和赋码系统对接后 根据明确返回的数据格式更改
                //foreach (var item in person)
                //{
                //    if (item.BoxNo!= boxNo)
                //    {
                //        continue;
                //    }
                    var sku = Db.Queryable<SysMaterials>().First(m=>m.IsDel =="0" && m.SkuNo == item.SkuNo);
                    if (sku == null)
                    {
                        continue;
                    }
                    var boxInfo = new BllBoxInfo()
                    {
                        ASNNo = "",
                        //ASNDetailNo = 0,
                        OrderCode = "",
                        //BindNo = 0,
                        BoxNo = item.BoxNo,
                        BoxNo2 = item.BoxNo2,
                        BoxNo3 = item.BoxNo3,
                        PalletNo = "",
                        Qty = item.Qty,
                        FullQty = item.FullQty,
                        Status = "0",
                        SkuNo = item.SkuNo,
                        SkuName = sku.SkuName,
                        LotNo = item.LotNo,
                        LotText = item.LotText,
                        SupplierLot = item.SupplierLot,
                        ProductionTime = item.ProductionTime,
                        ExpirationTime = item.ExpirationTime,
                        //CompleteTime = comTime,
                        InspectMark = item.InspectMark,
                        BitBoxMark = item.BitBoxMark,
                        InspectStatus = item.InspectStatus,
                        Origin = "赋码",
                        Standard = item.Standard,
                        PackageStandard = item.PackageStandard,
                        StoreTime = item.StoreTime,
                        QtyOrd = item.QtyOrd,
                        QtyCount = item.QtyCount,
                        CreateUser = 0,
                        CreateTime = comTime,
                    };
                    list.Add(boxInfo);
                }
                Db.Insertable(list).ExecuteCommand();
                //    var sku = Db.Queryable<SysMaterials>().First(m=>m.IsDel =="0" && m.SkuNo == item.SkuNo);
                //    if (sku == null)
                //    {
                //        continue;
                //    }
                //    var boxInfo = new BllBoxInfo()
                //    {
                //        ASNNo = "",
                //        //ASNDetailNo = 0,
                //        OrderCode = "",
                //        //BindNo = 0,
                //        BoxNo = item.BoxNo,
                //        BoxNo2 = item.BoxNo2,
                //        BoxNo3 = item.BoxNo3,
                //        PalletNo = "",
                //        Qty = item.Qty,
                //        FullQty = item.FullQty,
                //        Status = "0",
                //        SkuNo = item.SkuNo,
                //        SkuName = sku.SkuName,
                //        LotNo = item.LotNo,
                //        LotText = item.LotText,
                //        SupplierLot = item.SupplierLot,
                //        ProductionTime = item.ProductionTime,
                //        ExpirationTime = item.ExpirationTime,
                //        //CompleteTime = comTime,
                //        InspectMark = item.InspectMark,
                //        BitBoxMark = item.BitBoxMark,
                //        InspectStatus = item.InspectStatus,
                //        Origin = "赋码",
                //        Standard = item.Standard,
                //        PackageStandard = item.PackageStandard,
                //        StoreTime = item.StoreTime,
                //        QtyOrd = item.QtyOrd,
                //        QtyCount = item.QtyCount,
                //        CreateUser = 0,
                //        CreateTime = comTime,
                //    };
                //    list.Add(boxInfo);
                //}
                //Db.Insertable(list).ExecuteCommand();
                #endregion
@@ -2025,7 +2025,7 @@
                    { "Token", token }, //分配的令牌(变量)
                    { "Barcode", boxNo },//要查询的条码
                    { "getParent", getParentVal },//是否查询父码
                    { "getChildren", getChildrenVal } //是否查询子码
                    { "getChildren", getChildrenVal } //是否查询子码  aaa
                };
                //程序正式发布后放开
@@ -2050,10 +2050,10 @@
                            throw new Exception("获取信息不一致");
                        }
                        var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == fuMaModel.Product.ProductCode);
                        var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == fuMaModel.MaterialNum);
                        if (sku == null)
                        {
                            throw new Exception("未查询到箱码中的物料信息");
                            throw new Exception("未查询到箱码中和赋码提供的物料信息一致的数据");
                        }
                        var boxInfo = new BllBoxInfo()
                        {
@@ -2582,6 +2582,7 @@
                    DateTime proTime;
                    DateTime expTime;
                    DateTime sortTime;
                    var bl1 = DateTime.TryParse(detail.Lot1, out proTime);
                    var bl2 = DateTime.TryParse(detail.Lot2, out expTime);