//修复bug：查询出入库单据信息 【Editby shaocx,2025-09-29】 -- 这个功能没测试过，不一定好使啊啊啊啊啊！！！！！

schangxiang@126.com

2 天以前 a544d13081b01f68824e80500c7c30ab2680d524

//修复bug：查询出入库单据信息 【Editby shaocx,2025-09-29】 -- 这个功能没测试过，不一定好使啊啊啊啊啊！！！！！

 DEmon/iWareCc/CreateMainTask/chain/±£´æÉú³ÉµÄÈë¿âÈÎÎñ.cs

@@ -12,7 +12,7 @@

namespace iWareCc.CreateMainTask.chain
{
    public  class ä¿å­˜ç”Ÿæˆçš„入库任务: IHandler
    public class ä¿å­˜ç”Ÿæˆçš„入库任务 : IHandler
    {
        /// <summary>
        /// è¯¥èŠ‚点的下一个节点
@@ -23,7 +23,7 @@
            set { nextHandler = value; }
        }

         private ConveyorEntity Conveyor;
        private ConveyorEntity Conveyor;

        private MainTaskContainer MainTaskContainer;

@@ -46,8 +46,12 @@
                try
                {
                    var task = MainTaskContainer.MainTask;
                    var mater = dbModel.BASEMaterials.FirstOrDefault(x=>x.code==task.MaterialCode);
                    var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.materialid == mater.id);
                    var mater = dbModel.BASEMaterials.FirstOrDefault(x => x.code == task.MaterialCode);

                    //修复bug：查询出入库单据信息 ã€Editby shaocx,2025-09-29】
                    //var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.materialid == mater.id);
                    var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.id == task.InOutListDetailId);

                    inoutlistdetail.isfinish = 1;
                    dbModel.TASKMainTasks.Add(task.ToOrm());


 DEmon/iWareCc/CreateMainTask/chain/¸ù¾ÝɨÂëÉú³ÉÈë¿âÖ÷ÈÎÎñ.cs

@@ -17,7 +17,7 @@

namespace iWareCc.CreateMainTask.chain
{
  public  class æ ¹æ®æ‰«ç ç”Ÿæˆå…¥åº“主任务: IHandler
    public class æ ¹æ®æ‰«ç ç”Ÿæˆå…¥åº“主任务 : IHandler
    {
        /// <summary>
        /// è¯¥èŠ‚点的下一个节点
@@ -62,7 +62,7 @@
                            var placematerial = dbModel.BASEPlaceMaterialViews.FirstOrDefault(x => x.materialcode == sc.RCheckMaterialCode.Trim());
                            if (placematerial != null)
                            {
                                

                                // alarm.SendGateAlarmTask((int)ESendCode.已在立库中不能入库);
                                LogTextHelper.WriteLine(Resources.LogDir + @"/自动生成入库主任务流程", "物料号：{0}", sc.RCheckMaterialCode + "已在立库中");
                                sc.RCheckMaterialCode = "";
@@ -82,7 +82,7 @@
                                return;
                            }

                            var task = dbModel.TASKMainTasks.FirstOrDefault(x => x.materialcode == sc.RCheckMaterialCode.Trim() && x.tasktype == (int)EMainTaskType.入库任务&&x.status==0);
                            var task = dbModel.TASKMainTasks.FirstOrDefault(x => x.materialcode == sc.RCheckMaterialCode.Trim() && x.tasktype == (int)EMainTaskType.入库任务 && x.status == 0);
                            if (task != null)
                            {
                                //alarm.SendGateAlarmTask((int)ESendCode.已存在该任务);
@@ -117,6 +117,10 @@
                                islots = 0,
                                priority = 0,

                                //赋值 ã€Editby shaocx,2025-09-29】
                                InOutListDetailId = inoutlistdetail.id,
                                //ListNo = inoutlistdetail.listno,

                            };
                            MainTaskContainer.MainTask = new MainTaskEntity(matask);
                        }
@@ -133,12 +137,12 @@
                            nextHandler.Handle();
                        }
                    }
                    else 
                    else
                    {
                        LogTextHelper.WriteLine(Resources.LogDir + @"/自动生成入库主任务流程", "未检测到有扫码信息");
                        return;
                    }
      

                }
                catch (Exception ex)
                {

 DEmon/iWareCc/CreateOutMainTask/chain/±£´æÉú³ÉµÄ³ö¿âÈÎÎñ.cs

@@ -11,7 +11,7 @@

namespace iWareCc.CreateOutMainTask.chain
{
   public class ä¿å­˜ç”Ÿæˆçš„出库任务 : IHandler
    public class ä¿å­˜ç”Ÿæˆçš„出库任务 : IHandler
    {
        /// <summary>
        /// è¯¥èŠ‚点的下一个节点
@@ -29,7 +29,7 @@
        /// </summary>
        /// <param name="resultContainer">结果容器</param>
        /// <param name="decompositionTaskContainer">WIP任务容器</param>
        public ä¿å­˜ç”Ÿæˆçš„出库任务( MainTaskContainer decompositionTaskContainer)
        public ä¿å­˜ç”Ÿæˆçš„出库任务(MainTaskContainer decompositionTaskContainer)
        {
            this.MainTaskContainer = decompositionTaskContainer;
        }
@@ -43,7 +43,11 @@
                {
                    var task = MainTaskContainer.MainTask;
                    var mater = dbModel.BASEMaterials.FirstOrDefault(x => x.code == task.MaterialCode);
                    var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.materialid == mater.id);

                    //修复bug：查询出入库单据信息 ã€Editby shaocx,2025-09-29】
                    //var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.materialid == mater.id);
                    var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.id == task.InOutListDetailId);

                    inoutlistdetail.isfinish = 1;
                    dbModel.TASKMainTasks.Add(task.ToOrm());


 DEmon/iWareCc/CreateOutMainTask/chain/Éú³É³ö¿âÖ÷ÈÎÎñ.cs

@@ -15,7 +15,7 @@

namespace iWareCc.CreateOutMainTask.chain
{
    public class ç”Ÿæˆå‡ºåº“主任务: IHandler
    public class ç”Ÿæˆå‡ºåº“主任务 : IHandler
    {
        /// <summary>
        /// è¯¥èŠ‚点的下一个节点
@@ -33,7 +33,7 @@
        /// </summary>
        /// <param name="resultContainer">结果容器</param>
        /// <param name="decompositionTaskContainer">WIP任务容器</param>
        public ç”Ÿæˆå‡ºåº“主任务( MainTaskContainer mainTaskContainer)
        public ç”Ÿæˆå‡ºåº“主任务(MainTaskContainer mainTaskContainer)
        {
            this.MainTaskContainer = mainTaskContainer;
        }
@@ -47,8 +47,8 @@
                try
                {

            
                    var inoutlistdetail = dbModel.BASEInOutListDetailViews.FirstOrDefault(x =>x.isfinish== 0&&x.typename=="出库");

                    var inoutlistdetail = dbModel.BASEInOutListDetailViews.FirstOrDefault(x => x.isfinish == 0 && x.typename == "出库");
                    if (inoutlistdetail == null)
                    {

@@ -58,24 +58,24 @@
                    string materialcode = inoutlistdetail.materialcode;
                    var placematerial = dbModel.BASEPlaceMaterialViews.FirstOrDefault(x => x.materialcode == materialcode);
                    if (placematerial == null)
                     {
                         inoutlistdetail.isfinish = 1;
                         dbModel.SaveChanges();
                                     // alarm.SendGateAlarmTask((int)ESendCode.已在立库中不能入库);
                         LogTextHelper.WriteLine(Resources.LogDir + @"/自动生成出库主任务流程", "物料号：{0}", materialcode + "不在立库中");
                    {
                        inoutlistdetail.isfinish = 1;
                        dbModel.SaveChanges();
                        // alarm.SendGateAlarmTask((int)ESendCode.已在立库中不能入库);
                        LogTextHelper.WriteLine(Resources.LogDir + @"/自动生成出库主任务流程", "物料号：{0}", materialcode + "不在立库中");
                        return;
                     }
                    }
                    var tasknew = dbModel.TASKPartTasks.FirstOrDefault(x => x.type == (int)EPartTaskType.输送机任务 && x.isreleased == (int)EYesOrNo.否 && x.isfinished == (int)EYesOrNo.否 && x.materialcode == materialcode && x.maintasktype == (int)EMainTaskType.出库任务);
                    if (tasknew != null)
                    {
                        LogTextHelper.WriteLine(Resources.LogDir + @"/自动生成出库主任务流程", "物料号：{0}", materialcode + "已在要执行的任务序列中");
                          return;
                        return;
                    }
                    var task = dbModel.TASKMainTasks.FirstOrDefault(x => x.materialcode == materialcode && x.tasktype == (int)EMainTaskType.出库任务&&x.status == 0);
                    var task = dbModel.TASKMainTasks.FirstOrDefault(x => x.materialcode == materialcode && x.tasktype == (int)EMainTaskType.出库任务 && x.status == 0);
                    if (task != null)
                    {
                       LogTextHelper.WriteLine(Resources.LogDir + @"/自动生成出库主任务流程", "物料号：{0}", "该任务已存在");
                       return;
                        LogTextHelper.WriteLine(Resources.LogDir + @"/自动生成出库主任务流程", "物料号：{0}", "该任务已存在");
                        return;
                    }
                    TASKMainTask matask = new TASKMainTask()
                    {
@@ -95,9 +95,14 @@
                        decompositiontimes = 0,
                        islots = 0,
                        priority = 0,


                        //赋值 ã€Editby shaocx,2025-09-29】
                        InOutListDetailId = inoutlistdetail.id,
                        ListNo = inoutlistdetail.listno,
                    };
                    MainTaskContainer.MainTask = new MainTaskEntity(matask);
       

                    if (nextHandler != null)
                    {
                        nextHandler.Handle();