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


@@ -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("未查询到该箱码及追溯码的信息");


@@ -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();


@@ -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();


@@ -1372,12 +1387,14 @@


                                        #region 添加移库任务信息


                                        var stkModel = Db.Queryable<DataStockDetail>().First(m => m.LocatNo == slotBefore.LocatNo);


                                        string PalletNo = "LN000000";   // 默认演示托盘


                                        string SkuNo = "";


                                        if (stkModel != null)


                                        {


                                            PalletNo = stkModel.PalletNo;


                                            SkuNo = stkModel.SkuNo;


                                        }


                                        //获取移库的库位


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


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




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


                                        var exTask = new LogTask    //出库任务


@@ -1387,7 +1404,7 @@


                                            Receiver = "PDA",


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




                                            StartLocat = stkModel.LocatNo,//起始位置


                                            StartLocat = slotBefore.LocatNo,//起始位置


                                            EndLocat = newSlot,//目标位置


                                            PalletNo = PalletNo,//托盘码


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


@@ -2092,12 +2109,14 @@


                                        #region 添加移库任务信息


                                        var stkModel = Db.Queryable<DataStockDetail>().First(m=>m.LocatNo == slotBefore.LocatNo);


                                        string PalletNo = "LN000000";   // 默认演示托盘


                                        string SkuNo = "";


                                        if (stkModel != null)


                                        {


                                            PalletNo = stkModel.PalletNo;


                                            SkuNo= stkModel.SkuNo;


                                        }


                                        //获取移库的库位


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


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




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


                                        var exTask = new LogTask    // 移库任务


@@ -2107,7 +2126,7 @@


                                            Receiver = "WCS",


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




                                            StartLocat = stkModel.LocatNo,//起始位置


                                            StartLocat = slotBefore.LocatNo,//起始位置


                                            EndLocat = newSlot,//目标位置


                                            PalletNo = PalletNo,//托盘码


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


@@ -2371,20 +2390,31 @@


        }






        public string MoveAddress(string oldAddress, string roadWay, string skuNo)//01020201  排-列-层-深度


        public string MoveAddress(string oldAddress, string roadWay, string skuNo,string areaNo="")//01020201  排-列-层-深度


        {


            string nowAddress = "";




            //根据物料编码获取对应区域


            var skuCategoryNo = Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.SkuNo == skuNo).Select(a => a.CategoryNo).First();


            var category = Db.Queryable<SysMaterialCategory>().First(a => a.IsDel == "0" && a.CategoryNo == skuCategoryNo);


            var category = new SysMaterialCategory();


            if (!string.IsNullOrEmpty(skuNo))


            {


                //根据物料编码获取对应区域


                var skuCategoryNo = Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.SkuNo == skuNo).Select(a => a.CategoryNo).First();


                category = Db.Queryable<SysMaterialCategory>().First(a => a.IsDel == "0" && a.CategoryNo == skuCategoryNo);




                areaNo = category.AreaNo;


            }


            else


            {


                //todo 待验证


                category = Db.Queryable<SysMaterialCategory>().First(a => a.IsDel == "0" && a.AreaNo == areaNo);


            }




            // 获取移库目标储位


            var row = int.Parse(oldAddress.Substring(0, 2));


            var lie = int.Parse(oldAddress.Substring(2, 2));


            var ceng = int.Parse(oldAddress.Substring(4, 2));




            var sqlString = $@"select LocatNo,[Row],[Column],Layer, (ABS(Row-{row}) + ABS([Column]-{lie}) + ABS(Layer-{ceng}))  as distNum from SysStorageLocat where Flag = '0' and Status = '0' and Depth = '02' and RoadwayNo = '{roadWay}' and AreaNo in ('{category.AreaNo}') order by distNum;";


            var sqlString = $@"select LocatNo,[Row],[Column],Layer, (ABS(Row-{row}) + ABS([Column]-{lie}) + ABS(Layer-{ceng}))  as distNum from SysStorageLocat where Flag = '0' and Status = '0' and Depth = '02' and RoadwayNo = '{roadWay}' and AreaNo in ('{areaNo}') order by distNum;";




            var addressModels = Db.Ado.SqlQuery<AddressCls>(sqlString).ToList();


            if (addressModels.Count > 0)   // 判断同巷道内排空库位


@@ -3204,6 +3234,7 @@




                        if (biaoShi != "2")


                        {


                            pickQty += item.Qty;


                            //删除库存箱码明细


                            Db.Deleteable(item).ExecuteCommand();


                        }


@@ -3211,17 +3242,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")


@@ -3842,10 +3875,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));


@@ -3882,7 +3919,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)//非整托拣货


@@ -4053,6 +4090,7 @@


                   


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


                    noticeDetail.CompleteQty += pickQty;


                    noticeDetail.Status = "2";


                    Db.Updateable(noticeDetail).ExecuteCommand();




                    var num = Db.Queryable<BllExportNoticeDetail>()


@@ -4060,6 +4098,8 @@


                    if (num <= 0)


                    {


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


                        noticeDetail.Status = "3";


                        Db.Updateable(noticeDetail).ExecuteCommand();


                    }


                    //修改出库单信息


                    Db.Updateable(notice).ExecuteCommand();


@@ -4068,7 +4108,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("未查询到该箱码及追溯码的信息");


@@ -4205,6 +4245,8 @@


                        }


                        else//数量拣货


                        {


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


                            


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


                            {


                                //修改库存箱码明细


@@ -4216,9 +4258,53 @@


                            }


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


@@ -4285,6 +4371,7 @@


                    }


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


                    noticeDetail.CompleteQty += pickQty;


                    noticeDetail.Status = "2";


                    Db.Updateable(noticeDetail).ExecuteCommand();




                    var num = Db.Queryable<BllExportNoticeDetail>()


@@ -4292,17 +4379,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


                {


@@ -4618,6 +4709,7 @@




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


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


                noticeDetail.Status = "2";


                Db.Updateable(noticeDetail).ExecuteCommand();




                var num = Db.Queryable<BllExportNoticeDetail>()


@@ -4625,6 +4717,8 @@


                if (num <= 0)


                {


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


                    noticeDetail.Status = "3";


                    Db.Updateable(noticeDetail).ExecuteCommand();


                }


                //修改出库单信息


                Db.Updateable(notice).ExecuteCommand();