修改数据类型

yuyou_x

2024-03-29 598ba81de7ee41a1f62fd818bf9c29e910ec3306

修改数据类型

 Wms/Model/ModelDto/BllAsnDto/BoxInfoDto.cs

@@ -73,14 +73,14 @@
        /// Default:
        /// Nullable:False
        /// </summary>           
        public int? Qty { get; set; }
        public decimal? Qty { get; set; }

        /// <summary>
        /// Desc:整箱数量
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? FullQty { get; set; }
        public decimal? FullQty { get; set; }

        /// <summary>
        /// Desc:状态

 Wms/Model/ModelDto/BllCheckDto/StockCheckDto.cs

@@ -110,7 +110,7 @@
        /// <summary>
        /// 实际数量
        /// </summary>           
        public int? RealQty { get; set; }
        public decimal? RealQty { get; set; }

        /// <summary>
        /// 盘点结果
@@ -192,7 +192,7 @@
        public string Standard { get; set; }
        public string LotNo { get; set; }
        public string LotText { get; set; }
        public int Qty { get; set; }
        public decimal Qty { get; set; }
        public string SupplierLot { get; set; }
        public string PalletNo { get; set; }

@@ -233,12 +233,12 @@
        /// <summary>
        /// 库存数量
        /// </summary>           
        public int? Qty { get; set; }
        public decimal? Qty { get; set; }

        /// <summary>
        /// 实际数量
        /// </summary>           
        public int? RealQty { get; set; }
        public decimal? RealQty { get; set; }

        /// <summary>
        /// 盘点结果

 Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs

@@ -366,7 +366,7 @@
        /// <summary>
        /// Desc:拣货数量
        /// </summary>           
        public int? CompleteQty { get; set; }
        public decimal? CompleteQty { get; set; }

        /// <summary>
        /// Desc:新托盘

 Wms/Model/ModelDto/PdaDto/PdaCheckDto.cs

@@ -8,7 +8,7 @@
    {
        public string PalletNo { get; set; }
        public string BoxNo { get; set; }
        public int Qty { get; set; }
        public decimal Qty { get; set; }

        public string SkuNo { get; set; }
        public string SkuName { get; set; }

 Wms/Model/ModelDto/PdaDto/PdaSoDto.cs

@@ -17,11 +17,11 @@
    public class BoxInfo
    {
        public string BoxNo { get; set; }                     // 箱码/支码
        public int Qty { get; set; }                       // 箱内数量 
        public decimal Qty { get; set; }                       // 箱内数量 
        public string SkuNo { get; set; }                   // 物料编码 
        public string SkuName { get; set; }                 // 物料名称
        public string LotNo { get; set; }                   // 批次 
        public int? PickedQty { get; set; }                       // 箱内已拣数量
        public decimal? PickedQty { get; set; }                       // 箱内已拣数量
    }
    public class DetailIdSkuLotNo
    {

 Wms/Model/ModelVm/BllAsnVm/PalletBindVm.cs

@@ -67,14 +67,14 @@
        /// Default:
        /// Nullable:False
        /// </summary>           
        public int? Qty { get; set; }
        public decimal? Qty { get; set; }

        /// <summary>
        /// Desc:整托数量
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? FullQty { get; set; }
        public decimal? FullQty { get; set; }

        /// <summary>
        /// Desc:状态

 Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs

@@ -757,7 +757,7 @@
                            ASNNo = asnList.ASNNo,
                            ASNDetailNo = asnList.Id,
                            BoxNo = maxBoxCode, 
                            Qty = int.Parse(boxQty.ToString()),
                            Qty = boxQty,
                            FullQty = bNum,
                            Status = "0",
                            SkuNo = asnList.SkuNo,

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -371,7 +371,7 @@
                }
                Db.BeginTran();
                var time = DateTime.Now;
                var qty = 0;
                decimal qty = 0;
                foreach (var item in boxInfos)
                {
                    //删除解绑箱支信息

 Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs

@@ -200,7 +200,7 @@
                    LotNo = m.LotNo,
                    LotText = m.LotText,
                    SupplierLot = m.SupplierLot,
                    Qty = (int)m.Qty,
                    Qty = (decimal)m.Qty,

                    PalletNo = m.PalletNo
                }).ToList();
@@ -641,7 +641,7 @@
                                    BoxNo2 = l.BoxNo2,
                                    BoxNo3 = l.BoxNo3,
                                    PalletNo = l.PalletNo,
                                    Qty = (int)l.RealQty,
                                    Qty = (decimal)l.RealQty,
                                    FullQty = stockBoxInfo.FullQty,//满箱数量
                                    Status = "2",
                                    SkuNo = l.SkuNo,
@@ -658,12 +658,12 @@
                                };
                                Db.Insertable<DataBoxInfo>(databox).ExecuteCommand();
                                //库存明细增加数量
                                stockDetailInfo.Qty += (int)l.RealQty;
                                stockDetailInfo.Qty += l.RealQty;
                            }
                            else
                            {
                                //库存明细增加数量
                                stockDetailInfo.Qty = (int)l.RealQty;
                                stockDetailInfo.Qty = l.RealQty;
                            }
                            stockDetailInfo.Status = "0";

@@ -676,11 +676,11 @@
                            }
                            if (sku.Type != "4")
                            {
                                de.Qty += (int)l.RealQty;
                                de.Qty += (decimal)l.RealQty;
                            }
                            else
                            {
                                de.Qty += (int)(l.RealQty - l.Qty);
                                de.Qty += (decimal)(l.RealQty - l.Qty);
                            }

                            Db.Updateable(de).ExecuteCommand();

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -324,7 +324,7 @@
                    PalletNo3 = model.PalletNo3,
                    Status = "1",
                    CompleteTime = DateTime.Now,
                    Qty = (int)model.Qty,
                    Qty = (decimal)model.Qty,
                    FullQty = null,
                    SkuNo = "100099",
                    SkuName = "托盘",
@@ -415,7 +415,7 @@
                    UpbindPalletNo = upBindPalletNo,
                    PalletNo2 = bindVms[0].PalletNo2,
                    PalletNo3 = bindVms[0].PalletNo3,
                    Qty = (int)bindVms[0].Qty,
                    Qty = bindVms[0].Qty,
                    LotNo = bindVms[0].LotNo,
                    LotText = bindVms[0].LotText,
                    SupplierLot = bindVms[0].SupplierLot,
@@ -801,7 +801,7 @@
                            return strMsg;
                        }
                        #endregion
                        var pallQty = 0;//托盘上数量
                        decimal pallQty = 0;//托盘上数量
                        var boxinfo2 = boxinfo.Where(w => w.SkuNo == noticeItem.SkuNo && w.LotNo == noticeItem.LotNo && w.PalletNo == model.PalletNo).ToList();
                        if (boxinfo2.Count <= 0)
                        {
@@ -1402,7 +1402,7 @@
                {
                    throw new Exception("-1:箱码信息不存在，请核查!");
                }
                var bNum = 0;//数量
                decimal bNum = 0;//数量
                //验证箱码是否已绑定托盘
                foreach (var item in boxinfo)
                {
@@ -2090,7 +2090,7 @@
                    var boxGroup = boxInfoList.GroupBy(m => m.BoxNo).ToList();
                    foreach (var g in boxGroup)
                    {
                        var boxFullQty = 0;//箱内总数量
                        decimal boxFullQty = 0;//箱内总数量
                        foreach (var box in g)
                        {
                            if (box.BindNo != null && box.BindNo != 0)

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -139,7 +139,7 @@
                    {
                        PalletNo = palletNo,
                        SkuNo = sku,
                        Qty = (int?)stockDetail.Qty,
                        Qty = stockDetail.Qty,
                        CheckResult = 4,
                    };

@@ -276,14 +276,14 @@


                    var list = checkLog.ToList();
                    var num = 0;
                    decimal num = 0;
                    foreach (var l in list)
                    {
                        l.RealQty = 0;
                        l.CheckResult = 1;
                        l.CheckDate = time;
                        l.CheckUserId = userId;
                        num -= int.Parse(l.RealQty.ToString());
                        num -= (decimal)l.RealQty;
                    }
                    if (checkDetail.RealQty == null)
                    {

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -447,7 +447,7 @@
                    {
                        throw new Exception("拣货数量不能大于箱内剩余待拣数量");
                    }
                    var pickQty = 0;//拣货的数量
                    decimal pickQty = 0;//拣货的数量
                    var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
                    var comList = new List<BllCompleteDetail>();
                    foreach (var item in boxInfos)
@@ -580,7 +580,7 @@
                        {
                            throw new Exception("该箱码内存在支码不能进行数量拣货");
                        }
                        int boxQty = boxInfo.First().Qty;
                        decimal boxQty = boxInfo.First().Qty;
                        if (Convert.ToInt32(pickQty1) > boxQty)
                        {
                            throw new Exception("拣货数量不能大于箱内数量");
@@ -616,7 +616,7 @@
                            }
                        }
                    }
                    var pickQty = 0;//拣货的数量
                    decimal pickQty = 0;//拣货的数量

                    var comList = new List<BllCompleteDetail>();
                    foreach (var item in boxInfos)
@@ -1614,7 +1614,7 @@
                        {
                            throw new Exception("该箱码内存在支码不能进行数量拣货");
                        }
                        int boxQty = boxInfo.First().Qty;
                        decimal boxQty = boxInfo.First().Qty;
                        if (Convert.ToInt32(pickQty1) > boxQty)
                        {
                            throw new Exception("拣货数量不能大于箱内数量");
@@ -1640,7 +1640,7 @@
                            }
                        }
                    }
                    var pickQty = 0;//拣货的数量
                    decimal pickQty = 0;//拣货的数量

                    var comList = new List<BllCompleteDetail>();
                    foreach (var item in boxInfos)
@@ -1868,7 +1868,7 @@
                        {
                            throw new Exception("该箱码内存在支码不能进行数量拣货");
                        }
                        int boxQty = boxInfo.First().Qty;
                        decimal boxQty = boxInfo.First().Qty;
                        if (Convert.ToInt32(pickQty1) > boxQty)
                        {
                            throw new Exception("拣货数量不能大于箱内数量");
@@ -1903,7 +1903,7 @@
                            }
                        }
                    }
                    var pickQty = 0;//拣货的数量
                    decimal pickQty = 0;//拣货的数量

                    var comList = new List<BllCompleteDetail>();
                    foreach (var item in boxInfos)
@@ -2692,7 +2692,7 @@
                }
                #endregion

                var pickQty = 0;//拣货的数量
                decimal pickQty = 0;//拣货的数量
                if (string.IsNullOrWhiteSpace(boxNo))//整托拣货
                {
                    List<DataBoxInfo> boxInfos;
@@ -2848,7 +2848,7 @@
                        {
                            throw new Exception("该箱码内存在支码不能进行数量拣货");
                        }
                        int boxQty = boxInfo.First().Qty;
                        decimal boxQty = boxInfo.First().Qty;
                        if (Convert.ToInt32(pickQty1) > boxQty)
                        {
                            throw new Exception("拣货数量不能大于箱内数量");

 Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs

@@ -79,14 +79,14 @@
        /// Default:
        /// Nullable:False
        /// </summary>           
        public int Qty {get;set;}
        public decimal Qty {get;set;}

        /// <summary>
        /// Desc:整箱数量
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? FullQty {get;set;}
        public decimal? FullQty {get;set;}

        /// <summary>
        /// Desc:状态

 Wms/WMS.Entity/BllAsnEntity/BllPalletUnbind.cs

@@ -72,7 +72,7 @@
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? Qty {get;set;}
        public decimal? Qty {get;set;}

        /// <summary>
        /// Desc:二级托盘号

 Wms/WMS.Entity/BllCheckEntity/BllStockCheckDetail.cs

@@ -37,7 +37,7 @@
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? RealQty {get;set;}
        public decimal? RealQty {get;set;}

        /// <summary>
        /// Desc:盘点结果

 Wms/WMS.Entity/BllCheckEntity/BllStockCheckLog.cs

@@ -94,14 +94,14 @@
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? Qty {get;set;}
        public decimal? Qty {get;set;}

        /// <summary>
        /// Desc:实际数量
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? RealQty {get;set;}
        public decimal? RealQty {get;set;}

        /// <summary>
        /// Desc:盘点结果

 Wms/WMS.Entity/BllSoEntity/BllCompleteDetail.cs

@@ -114,7 +114,7 @@
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? CompleteQty {get;set;}
        public decimal? CompleteQty {get;set;}

        /// <summary>
        /// Desc:新托盘

 Wms/WMS.Entity/DataEntity/DataBoxInfo.cs

@@ -72,14 +72,14 @@
        /// Default:
        /// Nullable:False
        /// </summary>           
        public int Qty {get;set;}
        public decimal Qty {get;set;}

        /// <summary>
        /// Desc:整箱数量
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? FullQty {get;set;}
        public decimal? FullQty {get;set;}

        /// <summary>
        /// Desc:状态

 Wms/WMS.Entity/DataEntity/DataStock.cs

@@ -78,6 +78,6 @@
        /// Default:
        /// Nullable:False
        /// </summary>           
        public int FrozenQty { get; set; }
        public decimal FrozenQty { get; set; }
    }
}