Administrator
2024-06-24 842c9a82b6a9d8d80d370cbf6dedbd2302ba5fab
Wms/WMS.BLL/BllTransServer/NoticeServer.cs
@@ -29,7 +29,7 @@
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public ErpModel CreateAsn(AsnInfo model)
        public ErpModel CreateAsnWork(AsnInfo model)
        {
            try
            {
@@ -55,7 +55,7 @@
                    Origin = string.IsNullOrEmpty(model.Origin) ? "MES" : model.Origin,
                    CustomerNo = model.Customer,
                    CustomerName = "",
                    OrderCode = model.OrderCode,
                    OrderCode = model.OrderCode
                };
                // 入库明细表信息
@@ -127,7 +127,7 @@
        /// <param name="TaskNo"></param>
        /// <param name="Status"></param>
        /// <returns></returns>
        public ErpModel FinishTask(string TaskNo,string Status)
        public ErpModel RCSFinishTask(string TaskNo,string Status)
        {
            try
            {
@@ -464,11 +464,68 @@
                        //修改起始储位状态
                        Db.Updateable(startLocatInfo).ExecuteCommand();
                        endLocatInfo.Status = "1";//空储位
                        endLocatInfo.Status = "1";//有物品
                        //修改目标储位状态
                        Db.Updateable(endLocatInfo).ExecuteCommand();
                        break;
                    #endregion
                    #region 任务完成
                    case "2":
                        //起始储位信息
                        var startLocatInfo2 = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.StartLocat && w.IsDel == "0");
                        if (startLocatInfo2 == null)
                        {
                            resultModel.Message = "起始储位信息不存在!";
                            return resultModel;
                        }
                        //目标储位信息
                        var endLocatInfo2 = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.EndLocat && w.IsDel == "0");
                        if (endLocatInfo2 == null)
                        {
                            resultModel.Message = "目标储位信息不存在!";
                            return resultModel;
                        }
                        //库存明细
                        var sd3 = Db.Queryable<DataStockDetail>().First(w => w.PalletNo == taskInfo.PalletNo);
                        if (sd3 == null)
                        {
                            resultModel.Message = "库存信息不存在!";
                            return resultModel;
                        }
                        sd3.WareHouseNo = endLocatInfo2.WareHouseNo;//所属仓库
                        sd3.RoadwayNo = endLocatInfo2.RoadwayNo;//所属巷道
                        sd3.AreaNo = endLocatInfo2.AreaNo;//所属区域
                        sd3.LocatNo = endLocatInfo2.LocatNo;//储位地址
                        if (endLocatInfo2.AreaNo == "A01")//洁净区
                        {
                            sd3.PalletStatus = "0";
                        }
                        else if (endLocatInfo2.AreaNo == "A02")//预混区
                        {
                            sd3.PalletStatus = "1";
                        }
                        else if (endLocatInfo2.AreaNo == "A03")//半成品区
                        {
                            sd3.PalletStatus = "2";
                        }
                        else if (endLocatInfo2.AreaNo == "A04")//脏桶区
                        {
                            sd3.PalletStatus = "3";
                        }
                        //修改库存明细
                        Db.Updateable(sd3).ExecuteCommand();
                        startLocatInfo2.Status = "0";//空储位
                        //修改起始储位状态
                        Db.Updateable(startLocatInfo2).ExecuteCommand();
                        endLocatInfo2.Status = "1";//有物品
                        //修改目标储位状态
                        Db.Updateable(endLocatInfo2).ExecuteCommand();
                        break;
                    #endregion
                }
                taskInfo.Status = "2";//执行完成
@@ -495,7 +552,7 @@
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public SoResInfo ErpAddExportNotice(SoInfo model)
        public SoResInfo CreateSoWork(SoInfo model)
        {
            try
            {