修改问题

chengsc

2024-11-03 5ce969ed34e91c931cce38e2feb5d2c208633a96

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -180,6 +180,7 @@
                //判断托盘绑定信息中是否有
                var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == detail.Id && m.PalletNo == model.PalletNo && m.Status != "2");
                var bindId = 0;
                var boxQtyZong = model.Detail.Sum(m => m.Qty);
                if (bind == null)
                {
                    bind = new BllPalletBind
@@ -189,7 +190,7 @@
                        PalletNo = model.PalletNo,
                        PalletNo2 = "",
                        PalletNo3 = "",
                        Qty = model.Qty,
                        Qty = boxQtyZong,
                        FullQty = pNum,
                        Status = "0",//等待执行
                        Type = model.Type, //托盘类型  0物料托  1空托盘托
@@ -213,7 +214,8 @@
                }
                else
                {
                    throw new Exception("组盘信息重复");
                    //throw new Exception("组盘信息重复");
                    return;
                }


@@ -316,8 +318,8 @@
                                Standard = box.Standard,
                                PackageStandard = box.PackageStandard,
                                StoreTime = box.StoreTime,
                                QtyCount = (int)box.QtyCount,
                                QtyOrd = (int)box.QtyOrd,
                                QtyCount = box.QtyCount.HasValue? (int)box.QtyCount : 0,
                                QtyOrd = box.QtyOrd.HasValue ? (int)box.QtyOrd : 0,
                                CreateUser = userId,
                                CreateTime = comTime,
                            };
@@ -493,6 +495,7 @@
                    .GroupBy((a, b) => new
                    {
                        a.PalletNo,
                        a.BindNo,
                        a.BoxNo,
                        a.SkuNo,
                        a.SkuName,
@@ -510,6 +513,7 @@
                    .Select((a, b) => new BoxInfoDto()
                    {
                        BoxNo = a.BoxNo,
                        BindNo = a.BindNo,
                        PalletNo = a.PalletNo,
                        Qty = SqlFunc.AggregateSum(a.Qty),
                        FullQty = a.FullQty,
@@ -540,9 +544,10 @@
        /// <param name="boxNo">箱码</param>
        /// <param name="boxNo3">支码</param>
        /// <returns></returns>
        public List<BoxInfoDto> GetBoxInfoByBoxNo(string boxNo, string boxNo3)
        public List<BoxInfoDto> GetBoxInfoByBoxNo(string bindNo, string boxNo, string boxNo3)
        {
            Expression<Func<BllBoxInfo, bool>> item = Expressionable.Create<BllBoxInfo>()
                .AndIF(!string.IsNullOrWhiteSpace(bindNo), it => it.BindNo == int.Parse(bindNo))
                .AndIF(!string.IsNullOrWhiteSpace(boxNo), it => it.BoxNo == boxNo.Trim())
                .AndIF(!string.IsNullOrWhiteSpace(boxNo3), it => it.BoxNo3.Contains(boxNo3.Trim()))
                .And(m => m.IsDel == "0")
@@ -2522,6 +2527,7 @@
                                SkuName = boxInfo.SkuName,
                                Standard = sku.Standard,
                                ProductionTime = boxInfo.ProductionTime,
                                ExpirationTime = boxInfo.ExpirationTime,
                                SupplierLot = boxInfo.SupplierLot,
                                InspectStatus = boxInfo.InspectStatus,
                                InspectMark = boxInfo.InspectMark,
@@ -2695,6 +2701,7 @@
                                    SkuName = demo.SkuName,
                                    Standard = noticeDetail.Standard,
                                    ProductionTime = demo.ProductionTime,
                                    ExpirationTime = demo.ExpirationTime,
                                    SupplierLot = demo.SupplierLot,
                                    InspectStatus = demo.InspectStatus,
                                    InspectMark = demo.InspectMark,