修改问题

Administrator

2024-06-25 8dbd0c5af65835a1f99a2ac359660d1fa964d945

修改问题

 Wms/WMS.BLL/BllTransServer/NoticeServer.cs

@@ -471,22 +471,8 @@
                        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;
                        }
                    #region 移库完成
                    case "3":
                        //库存明细
                        var sd3 = Db.Queryable<DataStockDetail>().First(w => w.PalletNo == taskInfo.PalletNo);
                        if (sd3 == null)
@@ -494,37 +480,61 @@
                            resultModel.Message = "库存信息不存在!";
                            return resultModel;
                        }
                        sd3.WareHouseNo = endLocatInfo2.WareHouseNo;//所属仓库
                        sd3.RoadwayNo = endLocatInfo2.RoadwayNo;//所属巷道
                        sd3.AreaNo = endLocatInfo2.AreaNo;//所属区域
                        sd3.LocatNo = endLocatInfo2.LocatNo;//储位地址
                        if (endLocatInfo2.AreaNo == "A01")//洁净区
                        if (taskInfo.Type == "0")//入库任务
                        {
                            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";
                        }
                            //目标储位信息
                            var endLocatInfo2 = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.EndLocat && w.IsDel == "0");
                            if (endLocatInfo2 == null)
                            {
                                resultModel.Message = "目标储位信息不存在!";
                                return resultModel;
                            }
                            endLocatInfo2.Status = "1";//有物品
                            //修改目标储位状态
                            Db.Updateable(endLocatInfo2).ExecuteCommand();

                            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";
                            }
                        }
                        if (taskInfo.Type == "1")//出库任务
                        {
                            //起始储位信息
                            var startLocatInfo2 = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.StartLocat && w.IsDel == "0");
                            if (startLocatInfo2 == null)
                            {
                                resultModel.Message = "起始储位信息不存在!";
                                return resultModel;
                            }
                            startLocatInfo2.Status = "0";//空储位
                            //修改起始储位状态
                            Db.Updateable(startLocatInfo2).ExecuteCommand();

                            sd3.WareHouseNo = "";//所属仓库
                            sd3.RoadwayNo = "";//所属巷道
                            sd3.AreaNo = "";//所属区域
                            sd3.LocatNo = "";//储位地址
                        }
                        //修改库存明细
                        Db.Updateable(sd3).ExecuteCommand();

                        startLocatInfo2.Status = "0";//空储位
                        //修改起始储位状态
                        Db.Updateable(startLocatInfo2).ExecuteCommand();

                        endLocatInfo2.Status = "1";//有物品
                        //修改目标储位状态
                        Db.Updateable(endLocatInfo2).ExecuteCommand();
                        break;    
                    #endregion
                }

 Wms/WMS.BLL/DataServer/StockDetailServer.cs

@@ -9,6 +9,7 @@
using WMS.Entity.BllQualityEntity;
using WMS.Entity.Context;
using WMS.Entity.DataEntity;
using WMS.Entity.SysEntity;
using WMS.IBLL.IDataServer;

namespace WMS.BLL.DataServer
@@ -437,6 +438,13 @@
                {
                    throw new Exception($"库存中已有编号为：{PalletNo}的明细，请勿重复添加!");
                }
                //目标储位信息
                var locatInfo = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == LocatNo && w.Status == "0" && w.IsDel == "0");
                if (locatInfo == null)
                {
                    throw new Exception("储位地址不存在!");
                }
                
                Db.BeginTran();

                var comTime = DateTime.Now;
@@ -474,6 +482,10 @@
                //插入库存明细
                Db.Insertable(model).ExecuteCommand();

                locatInfo.Status = "1";//有物品
                //修改目标储位状态
                Db.Updateable(locatInfo).ExecuteCommand();

                Db.CommitTran();
            }
            catch (Exception e)

 Wms/Wms/Controllers/BllSoController.cs

@@ -724,7 +724,7 @@
        {
            try
            {
                var type = new List<string>(){"1","4"};
                var type = new List<string>(){"1","3","4"};
                var bolls = _taskSvc.GetTaskList( type, model.Type,model.Status,model.TaskNo,model.IsSuccess,model.PalletNo,model.Msg,model.Page, model.Limit, out int count);

                return Ok(new { code = 0, count, msg = "出库任务信息", data = bolls });