wxw
2024-12-19 78279bd340545f8c07d1ff08764bd859ba404c83
Wms/WMS.BLL/BllTransServer/NoticeServer.cs
@@ -175,25 +175,7 @@
                {
                    #region 入库完成
                    case "0":
                        //入库单明细信息
                        var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(w => w.Id == taskInfo.NoticeDetailNo);
                        if (noticeDetail == null)
                        {
                            resultModel.Message = "该任务对应的入库单明细不存在!";
                            return resultModel;
                        }
                        //入库单信息
                        var notice = Db.Queryable<BllArrivalNotice>().First(w => w.ASNNo == noticeDetail.ASNNo);
                        if (notice == null)
                        {
                            resultModel.Message = "该任务对应的入库单不存在!";
                            return resultModel;
                        }
                        if (notice.Status == "3" || notice.Status == "4")
                        {
                            resultModel.Message = "该任务对应的入库单已执行完成!";
                            return resultModel;
                        }
                        //目标储位信息
                        var locatInfo = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.EndLocat && w.IsDel == "0");
                        if (locatInfo == null)
@@ -201,51 +183,13 @@
                            resultModel.Message = "目标储位信息不存在!";
                            return resultModel;
                        }
                        //库存明细
                        var sd1 = Db.Queryable<DataStockDetail>().First(w => w.PalletNo == taskInfo.PalletNo);
                        if (sd1 == null)
                        {
                            sd1 = new DataStockDetail()
                            {
                                LotNo = noticeDetail.LotNo,
                                LotText = noticeDetail.LotText,
                                SupplierLot = noticeDetail.SupplierLot,
                                SkuNo = noticeDetail.SkuNo,
                                SkuName = noticeDetail.SkuName,
                                Standard = noticeDetail.Standard,
                                Qty = 1,
                                LockQty = 0,
                                FrozenQty = 0,
                                InspectQty = 0,
                                ASNNo = noticeDetail.ASNNo,
                                ASNDetailNo = noticeDetail.Id,
                                WareHouseNo = locatInfo.WareHouseNo,//所属仓库
                                RoadwayNo = locatInfo.RoadwayNo,//所属巷道
                                AreaNo = locatInfo.AreaNo,//所属区域
                                LocatNo = locatInfo.LocatNo,//储位地址
                                PalletNo = taskInfo.PalletNo,
                                PalletNo2 = "",
                                PalletNo3 = "",
                                PalletTags = "0",
                                CompleteTime = comTime,
                                ProductionTime = null,
                                ExpirationTime = null,
                                Status = "0",
                                InspectMark = "0",
                                InspectStatus = "0",//待检验
                                BitPalletMark = "0",
                                PackagNo = "",
                                IsBale = "0",
                                IsBelt = "0",
                                PalletStatus = "2",
                                IsDel = "0",
                                CreateUser = 0,
                                CreateTime = comTime
                            };
                            //插入库存明细
                            Db.Insertable(sd1).ExecuteCommand();
                            resultModel.Message = $"该桶对应的库存信息不存在,桶号:{taskInfo.PalletNo}!";
                            return resultModel;
                        }
                        else
                        {
@@ -253,8 +197,6 @@
                            sd1.LockQty = 0;
                            sd1.FrozenQty = 0;
                            sd1.InspectQty = 0;
                            sd1.ASNNo = noticeDetail.ASNNo;
                            sd1.ASNDetailNo = noticeDetail.Id;
                            sd1.WareHouseNo = locatInfo.WareHouseNo;//所属仓库
                            sd1.RoadwayNo = locatInfo.RoadwayNo;//所属巷道
                            sd1.AreaNo = locatInfo.AreaNo;//所属区域
@@ -266,37 +208,53 @@
                            //修改库存明细
                            Db.Updateable(sd1).ExecuteCommand();
                        }
                        noticeDetail.CompleteQty += 1;//完成数量
                        noticeDetail.Status = "1";//0:等待执行 1:正在执行 2:执行完成
                        if (noticeDetail.CompleteQty >= noticeDetail.Qty)
                        {
                            noticeDetail.Status = "2";
                            noticeDetail.CompleteTime = comTime;
                        }
                        noticeDetail.UpdateUser = 0;
                        noticeDetail.UpdateTime = comTime;
                        //更新入库单明细
                        Db.Updateable(noticeDetail).ExecuteCommand();
                        notice.UpdateUser = 0;
                        notice.UpdateTime = comTime;
                        if (notice.Status == "0")
                        {
                            notice.Status = "1";
                        }
                        var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>().Count(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo && m.Status != "2");
                        if (asnDetailNum == 0)
                        {
                            notice.Status = "2";
                            notice.CompleteTime = comTime;//完成时间
                        }
                        //更新入库单
                        Db.Updateable(notice).ExecuteCommand();
                        locatInfo.Status = "1";//有物品
                        //更新储位状态
                        Db.Updateable(locatInfo).ExecuteCommand();
                        //入库单明细信息
                        var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(w => w.Id == taskInfo.NoticeDetailNo);
                        if (noticeDetail != null)
                        {
                            //入库单信息
                            var notice = Db.Queryable<BllArrivalNotice>().First(w => w.ASNNo == noticeDetail.ASNNo);
                            if (notice == null)
                            {
                                resultModel.Message = "该任务对应的入库单不存在!";
                                return resultModel;
                            }
                            if (notice.Status == "3" || notice.Status == "4")
                            {
                                resultModel.Message = "该任务对应的入库单已执行完成!";
                                return resultModel;
                            }
                            noticeDetail.CompleteQty += 1;//完成数量
                            noticeDetail.Status = "1";//0:等待执行 1:正在执行 2:执行完成
                            if (noticeDetail.CompleteQty >= noticeDetail.Qty)
                            {
                                noticeDetail.Status = "2";
                                noticeDetail.CompleteTime = comTime;
                            }
                            noticeDetail.UpdateUser = 0;
                            noticeDetail.UpdateTime = comTime;
                            //更新入库单明细
                            Db.Updateable(noticeDetail).ExecuteCommand();
                            notice.UpdateUser = 0;
                            notice.UpdateTime = comTime;
                            if (notice.Status == "0")
                            {
                                notice.Status = "1";
                            }
                            var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>().Count(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo && m.Status != "2");
                            if (asnDetailNum == 0)
                            {
                                notice.Status = "2";
                                notice.CompleteTime = comTime;//完成时间
                            }
                            //更新入库单
                            Db.Updateable(notice).ExecuteCommand();
                        }
                        #region 质检请验,去掉MES
                        //var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == noticeDetail.SkuNo && m.LotNo == noticeDetail.LotNo && m.SupplierLot == noticeDetail.SupplierLot);
@@ -394,25 +352,7 @@
                    #region 出库完成
                    case "1":
                        //出库单明细信息
                        var exNoticeDetail = Db.Queryable<BllExportNoticeDetail>().First(w => w.Id == taskInfo.NoticeDetailNo);
                        if (exNoticeDetail == null)
                        {
                            resultModel.Message = "该任务对应的出库单明细不存在!";
                            return resultModel;
                        }
                        //出库单信息
                        var exNotice = Db.Queryable<BllExportNotice>().First(w => w.SONo == exNoticeDetail.SONo);
                        if (exNotice == null)
                        {
                            resultModel.Message = "该任务对应的出库单不存在!";
                            return resultModel;
                        }
                        if (exNotice.Status == "4" || exNotice.Status == "5")
                        {
                            resultModel.Message = "该任务对应的出库单已执行完成!";
                            return resultModel;
                        }
                        //起始储位信息
                        var startLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.StartLocat && w.IsDel == "0");
                        if (startLocatInfo == null)
@@ -427,24 +367,6 @@
                            resultModel.Message = "库存信息不存在!";
                            return resultModel;
                        }
                        //修改出库单明细拣货数量
                        exNoticeDetail.CompleteQty += sd2.Qty;
                        Db.Updateable(exNoticeDetail).ExecuteCommand();
                        exNotice.UpdateUser = 0;
                        exNotice.UpdateTime = comTime;
                        if (exNotice.Status == "0" || exNotice.Status == "1" || exNotice.Status == "2")
                        {
                            exNotice.Status = "3";//更改为正在执行
                        }
                        var num = Db.Queryable<BllExportNoticeDetail>().Count(m => m.IsDel == "0" && m.SONo == exNoticeDetail.SONo && m.CompleteQty < m.Qty);
                        if (num <= 0)
                        {
                            exNotice.Status = "4"; //更改为执行完成
                        }
                        //修改出库单信息
                        Db.Updateable(exNotice).ExecuteCommand();
                        sd2.Qty = 0;
                        sd2.LockQty = 0;
                        sd2.FrozenQty = 0;
@@ -462,7 +384,40 @@
                        startLocatInfo.Status = "0";//空储位
                        //修改起始储位状态
                        Db.Updateable(startLocatInfo).ExecuteCommand();
                        //出库单明细信息
                        var exNoticeDetail = Db.Queryable<BllExportNoticeDetail>().First(w => w.Id == taskInfo.NoticeDetailNo);
                        if (exNoticeDetail != null)
                        {
                            //出库单信息
                            var exNotice = Db.Queryable<BllExportNotice>().First(w => w.SONo == exNoticeDetail.SONo);
                            if (exNotice == null)
                            {
                                resultModel.Message = "该任务对应的出库单不存在!";
                                return resultModel;
                            }
                            if (exNotice.Status == "4" || exNotice.Status == "5")
                            {
                                resultModel.Message = "该任务对应的出库单已执行完成!";
                                return resultModel;
                            }
                            exNotice.UpdateUser = 0;
                            exNotice.UpdateTime = comTime;
                            if (exNotice.Status == "0" || exNotice.Status == "1" || exNotice.Status == "2")
                            {
                                exNotice.Status = "3";//更改为正在执行
                            }
                            var num = Db.Queryable<BllExportNoticeDetail>().Count(m => m.IsDel == "0" && m.SONo == exNoticeDetail.SONo && m.CompleteQty < m.Qty);
                            if (num <= 0)
                            {
                                exNotice.Status = "4"; //更改为执行完成
                            }
                            //修改出库单信息
                            Db.Updateable(exNotice).ExecuteCommand();
                            //修改出库单明细拣货数量
                            exNoticeDetail.CompleteQty += sd2.Qty;
                            Db.Updateable(exNoticeDetail).ExecuteCommand();
                        }
                        break;
                    #endregion
@@ -492,7 +447,7 @@
                            sd3.RoadwayNo = endLocatInfo2.RoadwayNo;//所属巷道
                            sd3.AreaNo = endLocatInfo2.AreaNo;//所属区域
                            sd3.LocatNo = endLocatInfo2.LocatNo;//储位地址
                            if (endLocatInfo2.AreaNo.Contains("01"))//洁净区
                            if (endLocatInfo2.AreaNo.Contains("01"))//净桶区
                            {
                                sd3.PalletStatus = "0";                               
                            }