JC24WMS
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chengsc
2024-10-20 f8957ba7f0ade842553bd37254cf31da639a1925 
 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs


@@ -388,7 +388,7 @@


                {


                    throw new Exception("托盘码不能为空");


                }


                if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)


                if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)


                {


                    throw new Exception("追溯条码和拣货数量不能同时输入");


                }


@@ -520,6 +520,7 @@


                    Db.Updateable(pallet).ExecuteCommand();


                    //修改出库单明细拣货数量


                    noticeDetail.CompleteQty += pickQty;


                    noticeDetail.Status = "2";


                    Db.Updateable(noticeDetail).ExecuteCommand();




                    var num = Db.Queryable<BllExportNoticeDetail>()


@@ -527,7 +528,10 @@


                    if (num <= 0)


                    {


                        notice.Status = "4"; //更改为执行完成


                        noticeDetail.Status = "3";


                        Db.Updateable(noticeDetail).ExecuteCommand();


                    }


                    


                    //修改出库单信息


                    Db.Updateable(notice).ExecuteCommand();


                }


@@ -535,7 +539,7 @@


                {


                    var biaoShi = "0";//0：整箱拣货、1：散支拣货、2：数量拣货


                    List<DataBoxInfo> boxInfos;


                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);


                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo && m.StockDetailId == stockDetail.Id);


                    if (boxInfo.Count() == 0)


                    {


                        throw new Exception("未查询到该箱码及追溯码的信息");


@@ -576,18 +580,18 @@




                        biaoShi = "1";


                    }


                    else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//数量拣货


                    else if (!string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)//数量拣货


                    {


                        if (boxInfo.Count() > 1)


                        {


                            throw new Exception("该箱码内存在支码不能进行数量拣货");


                        }


                        decimal boxQty = boxInfo.First().Qty;


                        if (Convert.ToInt32(pickQty1) > boxQty)


                        if (Convert.ToDecimal(pickQty1) > boxQty)


                        {


                            throw new Exception("拣货数量不能大于箱内数量");


                        }


                        if (Convert.ToInt32(pickQty1) > needQty)


                        if (Convert.ToDecimal(pickQty1) > needQty)


                        {


                            throw new Exception("拣货数量不能大于剩余待拣数量");


                        }


@@ -649,6 +653,7 @@




                        if (biaoShi != "2")


                        {


                            pickQty += item.Qty;


                            //删除库存箱码明细


                            Db.Deleteable(item).ExecuteCommand();


                        }


@@ -656,17 +661,20 @@


                        {


                            if (decimal.Parse(pickQty1) == item.Qty)


                            {


                                pickQty += item.Qty;


                                //删除库存箱码明细


                                Db.Deleteable(item).ExecuteCommand();


                                


                            }


                            else


                            {


                                pickQty += decimal.Parse(pickQty1);


                                item.Qty -= decimal.Parse(pickQty1);


                                item.BitBoxMark = "1";//零箱标识


                                Db.Updateable(item).ExecuteCommand();


                            }


                        }


                        pickQty += item.Qty;


                        


                    }


                    //改变库内箱码是否零箱信息


                    if (biaoShi == "1")


@@ -739,6 +747,7 @@


                    }


                    //修改出库单明细拣货数量


                    noticeDetail.CompleteQty += pickQty;


                    noticeDetail.Status = "2"; 


                    Db.Updateable(noticeDetail).ExecuteCommand();




                    var num = Db.Queryable<BllExportNoticeDetail>()


@@ -746,6 +755,9 @@


                    if (num <= 0)


                    {


                        notice.Status = "4"; //更改为执行完成




                        noticeDetail.Status = "3";


                        Db.Updateable(noticeDetail).ExecuteCommand();


                    }


                    //修改出库单信息


                    Db.Updateable(notice).ExecuteCommand();


@@ -809,7 +821,7 @@


                }


                //剩余拣货数量（待拣减去已拣）


                var needQty = allot.Qty - allot.CompleteQty;


                if (int.Parse(PickQty) > needQty)


                if (decimal.Parse(PickQty) > needQty)


                {


                    throw new Exception("拣货数量不能大于托内剩余待拣数量");


                }


@@ -872,7 +884,7 @@


                }


                else if (isComplete == 1)


                {


                    complete.CompleteQty += int.Parse(PickQty);


                    complete.CompleteQty += decimal.Parse(PickQty);


                    complete.UpdateUser = userId;


                    complete.UpdateTime = Db.GetDate();




@@ -880,7 +892,7 @@


                }




                //修改出库分配信息


                allot.CompleteQty += int.Parse(PickQty);


                allot.CompleteQty += decimal.Parse(PickQty);


                allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";


                allot.UpdateTime = DateTime.Now;


                Db.Updateable(allot).ExecuteCommand();


@@ -889,8 +901,8 @@




                //删除或修改库存明细


                stockDetail.BitPalletMark = "1";//修改为零托标识


                stockDetail.Qty -= int.Parse(PickQty);


                stockDetail.LockQty -= int.Parse(PickQty);


                stockDetail.Qty -= decimal.Parse(PickQty);


                stockDetail.LockQty -= decimal.Parse(PickQty);


                if (stockDetail.Qty == stockDetail.LockQty)


                {


                    stockDetail.Status = "2";


@@ -913,8 +925,8 @@


                    Db.Updateable(stockDetail).ExecuteCommand();


                }


                //删除或修改库存


                stock.Qty -= int.Parse(PickQty);


                stock.LockQty -= int.Parse(PickQty);


                stock.Qty -= decimal.Parse(PickQty);


                stock.LockQty -= decimal.Parse(PickQty);


                if (stock.Qty <= 0)


                {


                    Db.Deleteable(stock).ExecuteCommand();


@@ -940,6 +952,7 @@




                //修改出库单明细拣货数量


                noticeDetail.CompleteQty += int.Parse(PickQty);


                noticeDetail.Status = "2";


                Db.Updateable(noticeDetail).ExecuteCommand();




                var num = Db.Queryable<BllExportNoticeDetail>()


@@ -947,6 +960,8 @@


                if (num <= 0)


                {


                    notice.Status = "4"; //更改为执行完成


                    noticeDetail.Status = "3";


                    Db.Updateable(noticeDetail).ExecuteCommand();


                }


                //修改出库单信息


                Db.Updateable(notice).ExecuteCommand();


@@ -1337,35 +1352,35 @@


                                    {


                                        #region 分配




                                        //添加分配表信息


                                        var allot = new BllExportAllot


                                        {


                                            SONo = "",


                                            WaveNo = "",


                                            SODetailNo = 0,


                                            StockId = s.Id,


                                            LotNo = "",


                                            LotText = "",


                                            SupplierLot = "",


                                            SkuNo = s.SkuNo,


                                            SkuName = s.SkuName,


                                            Standard = s.Standard,


                                            PalletNo = s.PalletNo,


                                            IsBale = "0", //是否裹包


                                            IsBelt = "0", //是否打带


                                        ////添加分配表信息


                                        //var allot = new BllExportAllot


                                        //{


                                        //    SONo = "",


                                        //    WaveNo = "",


                                        //    SODetailNo = 0,


                                        //    StockId = s.Id,


                                        //    LotNo = "",


                                        //    LotText = "",


                                        //    SupplierLot = "",


                                        //    SkuNo = s.SkuNo,


                                        //    SkuName = s.SkuName,


                                        //    Standard = s.Standard,


                                        //    PalletNo = s.PalletNo,


                                        //    IsBale = "0", //是否裹包


                                        //    IsBelt = "0", //是否打带




                                            //BoxexQty = s.Qty,


                                            Qty = (int)s.Qty,


                                            CompleteQty = 0,


                                            Status = "1",


                                            LogisticsId = 0,


                                            IsAdvance = "0",


                                            OutMode = model.OutMode,//出库口


                                        //    //BoxexQty = s.Qty,


                                        //    Qty = (int)s.Qty,


                                        //    CompleteQty = 0,


                                        //    Status = "1",


                                        //    LogisticsId = 0,


                                        //    IsAdvance = "0",


                                        //    OutMode = model.OutMode,//出库口




                                            CreateUser = userId,


                                            CreateTime = DateTime.Now


                                        };


                                        Db.Insertable(allot).ExecuteCommand();


                                        //    CreateUser = userId,


                                        //    CreateTime = DateTime.Now


                                        //};


                                        //Db.Insertable(allot).ExecuteCommand();




                                        #endregion




@@ -1380,7 +1395,10 @@


                                        }


                                        //获取移库的库位


                                        var newSlot = MoveAddress(slotBefore.LocatNo, slotBefore.RoadwayNo, SkuNo, slotBefore.AreaNo);




                                        if (string.IsNullOrWhiteSpace(newSlot))


                                        {


                                            continue;


                                        }


                                        var taskNo = new Common().GetMaxNo("TK");


                                        var exTask = new LogTask    //出库任务


                                        {


@@ -1400,7 +1418,7 @@


                                            OrderType = "1",//0 入库单 1 出库单  2 盘点单  3 移库单


                                            CreateTime = serverTime, //创建时间


                                            CreateUser = userId, //创建人


                                            Msg = "Pda空托从" + locat == null ? "" : s.LocatNo + "到" + newSlot + "的移库任务", //关键信息


                                            Msg = "Pda空托从" + locat == null ? "" : slotBefore.LocatNo + "到" + newSlot + "的移库任务", //关键信息


                                                                                                                             //FinishDate = serverTime, //完成时间


                                        };


                                        moveDto.Add(new OutCommandDto()


@@ -1410,7 +1428,7 @@


                                            StartRoadway = locat.RoadwayNo, //所属巷道


                                            EndLocate = exTask.EndLocat, // 目标位置 


                                            TaskNo = exTask.TaskNo, // 任务号


                                            TaskType = "2",// 任务类型 (出库)


                                            TaskType = "2",// 任务类型 (移库)


                                            OutMode = "",  //目标地址


                                            Order = 1


                                        });


@@ -1422,6 +1440,12 @@


                                        //更改储位状态为移出中


                                        slotBefore.Status = "5"; //5 移出中


                                        Db.Updateable(slotBefore).ExecuteCommand();//修改储位信息


                                        var newSlot2 = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == newSlot && m.IsDel == "0");


                                        if (newSlot2!= null)


                                        {


                                            newSlot2.Status = "4";//移入中


                                            Db.Updateable(newSlot2).ExecuteCommand();//修改储位信息


                                        }


                                        #endregion


                                    }


                                    else  //出库


@@ -1429,17 +1453,17 @@


                                        #region 改变库存




                                        //增加库存锁定数量


                                        stock.LockQty += (int)s.Qty; //锁定数量


                                        stock.LockQty += (int)pallSku.Qty; //锁定数量


                                        stock.UpdateTime = serverTime; //修改时间


                                        stock.UpdateUser = userId; //修改人


                                        Db.Updateable(stock).ExecuteCommand();//修改库存总表信息




                                        //增加库存明细锁定数量


                                        s.LockQty += (int)s.Qty; //锁定数量


                                        s.UpdateTime = serverTime; //修改时间


                                        s.UpdateUser = userId; //修改人


                                        s.Status = "2"; //2 已分配


                                        Db.Updateable(s).ExecuteCommand();//修改库存明细信息


                                        pallSku.LockQty += (int)pallSku.Qty; //锁定数量


                                        pallSku.UpdateTime = serverTime; //修改时间


                                        pallSku.UpdateUser = userId; //修改人


                                        pallSku.Status = "2"; //2 已分配


                                        Db.Updateable(pallSku).ExecuteCommand();//修改库存明细信息




                                        #endregion




@@ -1451,19 +1475,19 @@


                                            SONo = "",


                                            WaveNo = "",


                                            SODetailNo = 0,


                                            StockId = s.Id,


                                            StockId = pallSku.Id,


                                            LotNo = "",


                                            LotText = "",


                                            SupplierLot = "",


                                            SkuNo = s.SkuNo,


                                            SkuName = s.SkuName,


                                            Standard = s.Standard,


                                            PalletNo = s.PalletNo,


                                            SkuNo = pallSku.SkuNo,


                                            SkuName = pallSku.SkuName,


                                            Standard = pallSku.Standard,


                                            PalletNo = pallSku.PalletNo,


                                            IsBale = "0", //是否裹包


                                            IsBelt = "0", //是否打带




                                            //BoxexQty = s.Qty,


                                            Qty = (int)s.Qty,


                                            Qty = (int)pallSku.Qty,


                                            CompleteQty = 0,


                                            Status = "1",


                                            LogisticsId = 0,


@@ -1487,9 +1511,9 @@


                                            Receiver = "PDA",


                                            IsSuccess = 1, //是否下发成功 0失败 1成功




                                            StartLocat = locat == null ? "" : s.LocatNo,//起始位置


                                            StartLocat = locat == null ? "" : pallSku.LocatNo,//起始位置


                                            EndLocat = model.OutMode,//目标位置


                                            PalletNo = s.PalletNo,//托盘码


                                            PalletNo = pallSku.PalletNo,//托盘码


                                            IsSend = 1,//是否可再次下发


                                            IsCancel = 1,//是否可取消


                                            IsFinish = 1,//是否可完成


@@ -1498,7 +1522,7 @@


                                            OrderType = "1",//0 入库单 1 出库单  2 盘点单  3 移库单


                                            CreateTime = serverTime, //创建时间


                                            CreateUser = userId, //创建人


                                            Msg = "Pda空托从" + locat == null ? "" : s.LocatNo + "到" + model.OutMode + "的出库任务", //关键信息


                                            Msg = "Pda空托从" + locat == null ? "" : pallSku.LocatNo + "到" + model.OutMode + "的出库任务", //关键信息


                                                                                                                             //FinishDate = serverTime, //完成时间


                                        };


                                        outDto2.Add(new OutCommandDto()


@@ -2714,7 +2738,7 @@


                    {


                        throw new Exception("托盘码不能为空");


                    }


                    if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)


                    if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)


                    {


                        throw new Exception("追溯条码和拣货数量不能同时输入");


                    }


@@ -2889,7 +2913,7 @@


                        }


                        biaoShi = "1";


                    }


                    else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//数量拣货


                    else if (!string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)//数量拣货


                    {


                        if (boxInfo.Count() > 1)


                        {


@@ -3055,7 +3079,7 @@


                    {


                        throw new Exception("托盘码不能为空");


                    }


                    if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)


                    if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)


                    {


                        throw new Exception("追溯条码和拣货数量不能同时输入");


                    }


@@ -3143,18 +3167,18 @@


                        }


                        biaoShi = "1";


                    }


                    else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//数量拣货


                    else if (!string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)//数量拣货


                    {


                        if (boxInfo.Count() > 1)


                        {


                            throw new Exception("该箱码内存在支码不能进行数量拣货");


                        }


                        decimal boxQty = boxInfo.First().Qty;


                        if (Convert.ToInt32(pickQty1) > boxQty)


                        if (Convert.ToDecimal(pickQty1) > boxQty)


                        {


                            throw new Exception("拣货数量不能大于箱内数量");


                        }


                        if (Convert.ToInt32(pickQty1) > needQty)


                        if (Convert.ToDecimal(pickQty1) > needQty)


                        {


                            throw new Exception("拣货数量不能大于剩余待拣数量");


                        }


@@ -3219,6 +3243,7 @@




                        if (biaoShi != "2")


                        {


                            pickQty += item.Qty;


                            //删除库存箱码明细


                            Db.Deleteable(item).ExecuteCommand();


                        }


@@ -3226,17 +3251,19 @@


                        {


                            if (decimal.Parse(pickQty1) == item.Qty)


                            {


                                pickQty += item.Qty;


                                //删除库存箱码明细


                                Db.Deleteable(item).ExecuteCommand();


                            }


                            else


                            {


                                pickQty += decimal.Parse(pickQty1);


                                item.Qty -= decimal.Parse(pickQty1);


                                item.BitBoxMark = "1";//零箱标识


                                Db.Updateable(item).ExecuteCommand();


                            }


                        }


                        pickQty += item.Qty;


                        


                    }


                    //改变库内箱码是否零箱信息


                    if (biaoShi == "1")


@@ -3515,7 +3542,7 @@


                            SkuName = allot2.SkuName,


                            Standard = allot2.Standard,


                            PalletNo = palletNo,


                            CompleteQty = int.Parse(PickQty),


                            CompleteQty = decimal.Parse(PickQty),


                            InspectMark = "1",




                            CreateUser = userId


@@ -3527,7 +3554,7 @@


                    }


                    else if (isComplete == 1)


                    {


                        complete.CompleteQty += int.Parse(PickQty);


                        complete.CompleteQty += decimal.Parse(PickQty);


                        complete.UpdateUser = userId;


                        complete.UpdateTime = Db.GetDate();




@@ -3537,8 +3564,8 @@






                    //修改出库分配信息


                    allot2.Qty += int.Parse(PickQty);


                    allot2.CompleteQty += int.Parse(PickQty);


                    allot2.Qty += decimal.Parse(PickQty);


                    allot2.CompleteQty += decimal.Parse(PickQty);


                    Db.Updateable(allot2).ExecuteCommand();




                    int isDel = 0;


@@ -3546,7 +3573,7 @@


                    //删除或修改库存明细


                    stockDetail.BitPalletMark = "1";//修改为零托标识


                    stockDetail.InspectMark = "1";//修改为抽检托标识


                    stockDetail.Qty -= int.Parse(PickQty);


                    stockDetail.Qty -= decimal.Parse(PickQty);


                    if (stockDetail.Qty == stockDetail.LockQty && stockDetail.Qty != 0)


                    {


                        stockDetail.Status = "2";


@@ -3594,10 +3621,10 @@


                    }




                    //修改出库单明细拣货数量


                    noticeDetail.Qty += int.Parse(PickQty);


                    noticeDetail.AllotQty += int.Parse(PickQty);


                    noticeDetail.FactQty += int.Parse(PickQty);


                    noticeDetail.CompleteQty += int.Parse(PickQty);


                    noticeDetail.Qty += decimal.Parse(PickQty);


                    noticeDetail.AllotQty += decimal.Parse(PickQty);


                    noticeDetail.FactQty += decimal.Parse(PickQty);


                    noticeDetail.CompleteQty += decimal.Parse(PickQty);


                    noticeDetail.Money = string.IsNullOrWhiteSpace(sku.Price.ToString()) ? null : sku.Price * noticeDetail.Qty;


                    Db.Updateable(noticeDetail).ExecuteCommand();




@@ -3646,7 +3673,7 @@


                    }


                    //剩余拣货数量（待拣减去已拣）


                    var needQty = allot.Qty - allot.CompleteQty;


                    if (int.Parse(PickQty) > needQty)


                    if (decimal.Parse(PickQty) > needQty)


                    {


                        throw new Exception("拣货数量不能大于托内剩余待拣数量");


                    }


@@ -3696,7 +3723,7 @@


                            SkuName = allot.SkuName,


                            Standard = allot.Standard,


                            PalletNo = palletNo,


                            CompleteQty = int.Parse(PickQty),


                            CompleteQty = decimal.Parse(PickQty),




                            CreateUser = userId,


                            CreateTime = Db.GetDate(),


@@ -3708,7 +3735,7 @@


                    }


                    else if (isComplete == 1)


                    {


                        complete.CompleteQty += int.Parse(PickQty);


                        complete.CompleteQty += decimal.Parse(PickQty);


                        complete.UpdateUser = userId;


                        complete.UpdateTime = Db.GetDate();




@@ -3718,7 +3745,7 @@






                    //修改出库分配信息


                    allot.CompleteQty += int.Parse(PickQty);


                    allot.CompleteQty += decimal.Parse(PickQty);


                    allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";




                    allot.UpdateTime = DateTime.Now;


@@ -3728,8 +3755,8 @@




                    //删除或修改库存明细


                    stockDetail.BitPalletMark = "1";//修改为零托标识


                    stockDetail.Qty -= int.Parse(PickQty);


                    stockDetail.LockQty -= int.Parse(PickQty);


                    stockDetail.Qty -= decimal.Parse(PickQty);


                    stockDetail.LockQty -= decimal.Parse(PickQty);


                    if (stockDetail.Qty == stockDetail.LockQty)


                    {


                        stockDetail.Status = "2";


@@ -3752,8 +3779,8 @@


                        Db.Updateable(stockDetail).ExecuteCommand();


                    }


                    //删除或修改库存


                    stock.Qty -= int.Parse(PickQty);


                    stock.LockQty -= int.Parse(PickQty);


                    stock.Qty -= decimal.Parse(PickQty);


                    stock.LockQty -= decimal.Parse(PickQty);


                    if (stock.Qty <= 0)


                    {


                        Db.Deleteable(stock).ExecuteCommand();


@@ -3778,7 +3805,7 @@


                    }




                    //修改出库单明细拣货数量


                    noticeDetail.CompleteQty += int.Parse(PickQty);


                    noticeDetail.CompleteQty += decimal.Parse(PickQty);


                    Db.Updateable(noticeDetail).ExecuteCommand();




                    var num = Db.Queryable<BllExportNoticeDetail>()


@@ -3835,7 +3862,7 @@


                {


                    throw new Exception("托盘码不能为空");


                }


                if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)


                if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)


                {


                    throw new Exception("追溯条码和拣货数量不能同时输入");


                }


@@ -3857,10 +3884,14 @@


                {


                    throw new Exception("未查询到该出库单的信息");


                }


                if (notice.Status != "3")


                if (notice.Type != "1" && notice.Type != "2" && notice.Type != "3")


                {


                    throw new Exception("出库单的状态不是正在执行，不能拣货");


                    if (notice.Status != "3")


                    {


                        throw new Exception("出库单的状态不是正在执行，不能拣货");


                    }


                }


               


                //出库单明细


                var noticeDetail = Db.Queryable<BllExportNoticeDetail>()


                    .First(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));


@@ -3897,7 +3928,7 @@


                #region 拼托信息


                var sdId = 0;


                bool isNew = false;


                var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == allot.SkuNo && m.LotNo == allot.LotNo);


                var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);


                if (pinStockDetail != null)


                {


                    if (palletNo != palletNoNew)//非整托拣货


@@ -4068,6 +4099,7 @@


                   


                    //修改出库单明细拣货数量


                    noticeDetail.CompleteQty += pickQty;


                    noticeDetail.Status = "2";


                    Db.Updateable(noticeDetail).ExecuteCommand();




                    var num = Db.Queryable<BllExportNoticeDetail>()


@@ -4075,6 +4107,8 @@


                    if (num <= 0)


                    {


                        notice.Status = "4"; //更改为执行完成


                        noticeDetail.Status = "3";


                        Db.Updateable(noticeDetail).ExecuteCommand();


                    }


                    //修改出库单信息


                    Db.Updateable(notice).ExecuteCommand();


@@ -4083,7 +4117,7 @@


                {


                    var biaoShi = "0";//0：整箱拣货、1：散支拣货、2：数量拣货


                    List<DataBoxInfo> boxInfos;


                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);


                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo && m.StockDetailId == stockDetail.Id);


                    if (boxInfo.Count() == 0)


                    {


                        throw new Exception("未查询到该箱码及追溯码的信息");


@@ -4124,7 +4158,7 @@




                        biaoShi = "1";


                    }


                    else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//数量拣货


                    else if (!string.IsNullOrEmpty(pickQty1) && decimal.Parse(pickQty1) > 0)//数量拣货


                    {


                        if (boxInfo.Count() > 1)


                        {


@@ -4220,6 +4254,8 @@


                        }


                        else//数量拣货


                        {


                            var boxInfo2 = Db.Queryable<DataBoxInfo>().First(m => m.IsDel == "0" && m.BoxNo == boxNo && m.StockDetailId == sdId);


                            


                            if (decimal.Parse(pickQty1) == item.Qty)


                            {


                                //修改库存箱码明细


@@ -4231,12 +4267,56 @@


                            }


                            else


                            {


                                if (boxInfo2 == null)


                                {


                                    var dataBoxInfo = new DataBoxInfo()


                                    {


                                        StockDetailId = sdId,


                                        BindNo = item.BindNo,


                                        BoxNo = item.BoxNo,


                                        BoxNo2 = item.BoxNo2,


                                        BoxNo3 = item.BoxNo3,


                                        PalletNo = item.PalletNo,


                                        PalletNo2 = item.PalletNo2,


                                        PalletNo3 = item.PalletNo3,


                                        Qty = decimal.Parse(pickQty1),


                                        FullQty = item.FullQty,


                                        Status = "5",


                                        LotNo = item.LotNo,


                                        LotText = item.LotText,


                                        SkuNo = item.SkuNo,


                                        SkuName = item.SkuName,


                                        Standard = item.Standard,


                                        ProductionTime = item.ProductionTime,


                                        SupplierLot = item.SupplierLot,


                                        InspectMark = item.InspectMark,


                                        BitBoxMark = "1",


                                        InspectStatus = item.InspectStatus,


                                        InspectTime = item.InspectTime,


                                    };




                                    Db.Insertable(dataBoxInfo).ExecuteCommand();


                                }


                                else


                                {


                                    boxInfo2.Qty += decimal.Parse(pickQty1);


                                    item.BitBoxMark = boxInfo2.Qty>= boxInfo2.FullQty? "0":"1" ;//零箱标识


                                    Db.Updateable(boxInfo2).ExecuteCommand();


                                }


                                item.Qty -= decimal.Parse(pickQty1);


                                item.BitBoxMark = "1";//零箱标识


                                Db.Updateable(item).ExecuteCommand();


                                if (item.Qty<=0)


                                {


                                    Db.Deleteable(item).ExecuteCommand();


                                }


                                else


                                {


                                    Db.Updateable(item).ExecuteCommand();


                                }




                            }




                            pickQty += int.Parse(pickQty1);


                            pickQty += decimal.Parse(pickQty1);


                        }


                    }


                    //改变库内箱码是否零箱信息


@@ -4300,6 +4380,7 @@


                    }


                    //修改出库单明细拣货数量


                    noticeDetail.CompleteQty += pickQty;


                    noticeDetail.Status = "2";


                    Db.Updateable(noticeDetail).ExecuteCommand();




                    var num = Db.Queryable<BllExportNoticeDetail>()


@@ -4307,17 +4388,21 @@


                    if (num <= 0)


                    {


                        notice.Status = "4"; //更改为执行完成


                        noticeDetail.Status = "3";


                        Db.Updateable(noticeDetail).ExecuteCommand();


                    }


                    


                    //修改出库单信息


                    Db.Updateable(notice).ExecuteCommand();


                }




                if (isNew)


                {


                    sd.Qty = pickQty;


                    sd.LockQty = pickQty;


                    var sd2 = Db.Queryable<DataStockDetail>().First(m=>m.Id == sdId);


                    sd2.Qty = pickQty;


                    sd2.LockQty = pickQty;




                    Db.Updateable(sd).ExecuteCommand();


                    Db.Updateable(sd2).ExecuteCommand();


                }


                else


                {


@@ -4401,7 +4486,7 @@


                }


                //剩余拣货数量（待拣减去已拣）


                var needQty = allot.Qty - allot.CompleteQty;


                if (int.Parse(PickQty) > needQty)


                if (decimal.Parse(PickQty) > needQty)


                {


                    throw new Exception("拣货数量不能大于托内剩余待拣数量");


                }


@@ -4420,7 +4505,7 @@


                }


                if (palletNo == palletNoNew)//原托盘与新托盘一致


                {


                    if (int.Parse(PickQty) != stockDetail.Qty)


                    if (decimal.Parse(PickQty) != stockDetail.Qty)


                    {


                        throw new Exception("原托盘与新托盘一致，需要把托盘上所有数量拣货");


                    }


@@ -4469,8 +4554,8 @@


                    sd.SkuName = stockDetail.SkuName;


                    sd.Standard = stockDetail.Standard;




                    sd.Qty = int.Parse(PickQty);


                    sd.LockQty = int.Parse(PickQty);


                    sd.Qty = decimal.Parse(PickQty);


                    sd.LockQty = decimal.Parse(PickQty);




                    sd.FrozenQty = 0;


                    sd.InspectQty = 0;


@@ -4513,8 +4598,8 @@


                    if (palletNo != palletNoNew)


                    {


                        //修改拼托托盘库存明细


                        pinStockDetail.Qty += int.Parse(PickQty);


                        pinStockDetail.LockQty += int.Parse(PickQty);


                        pinStockDetail.Qty += decimal.Parse(PickQty);


                        pinStockDetail.LockQty += decimal.Parse(PickQty);


                        Db.Updateable(pinStockDetail).ExecuteCommand();


                    }


                    else


@@ -4558,7 +4643,7 @@


                        SkuName = allot.SkuName,


                        Standard = allot.Standard,


                        PalletNo = palletNo,


                        CompleteQty = int.Parse(PickQty),


                        CompleteQty = decimal.Parse(PickQty),




                        CreateUser = userId,


                        CreateTime = Db.GetDate(),


@@ -4570,7 +4655,7 @@


                }


                else if (isComplete == 1)


                {


                    complete.CompleteQty += int.Parse(PickQty);


                    complete.CompleteQty += decimal.Parse(PickQty);


                    complete.UpdateUser = userId;


                    complete.UpdateTime = Db.GetDate();




@@ -4578,7 +4663,7 @@


                }




                //修改出库分配信息


                allot.CompleteQty += int.Parse(PickQty);


                allot.CompleteQty += decimal.Parse(PickQty);


                allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";


                allot.UpdateTime = DateTime.Now;


                Db.Updateable(allot).ExecuteCommand();


@@ -4589,8 +4674,8 @@


                {


                    //删除或修改库存明细


                    stockDetail.BitPalletMark = "1";//修改为零托标识


                    stockDetail.Qty -= int.Parse(PickQty);


                    stockDetail.LockQty -= int.Parse(PickQty);


                    stockDetail.Qty -= decimal.Parse(PickQty);


                    stockDetail.LockQty -= decimal.Parse(PickQty);


                    if (stockDetail.Qty == stockDetail.LockQty)


                    {


                        stockDetail.Status = "2";


@@ -4632,7 +4717,8 @@


                }




                //修改出库单明细拣货数量


                noticeDetail.CompleteQty += int.Parse(PickQty);


                noticeDetail.CompleteQty += decimal.Parse(PickQty);


                noticeDetail.Status = "2";


                Db.Updateable(noticeDetail).ExecuteCommand();




                var num = Db.Queryable<BllExportNoticeDetail>()


@@ -4640,6 +4726,8 @@


                if (num <= 0)


                {


                    notice.Status = "4"; //更改为执行完成


                    noticeDetail.Status = "3";


                    Db.Updateable(noticeDetail).ExecuteCommand();


                }


                //修改出库单信息


                Db.Updateable(notice).ExecuteCommand();