111

yanjinhui

2025-03-26 da2e87c2a05debbcc7dac5efb5d13c92d533782f

111

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/SerialPortService/NjTaskServer.cs

@@ -71,7 +71,7 @@

                //2.确定是新建模板还是更新已有模板
                bool isNewTemplate = existtepm == null;
                if (isNewTemplate)
                if (existtepm == null)
                {
                    existtepm = new Dt_Template
                    {
@@ -87,11 +87,17 @@
                        liJu_Lc = njtakeDTO.liju_lc,
                        fuZhu_Dg = njtakeDTO.fuzhu_dg,
                        fuZhu_Dq = njtakeDTO.fuzhu_dq,
                        fuZhu_Lc = njtakeDTO.fuzhu_lc
                        fuZhu_Lc = njtakeDTO.fuzhu_lc,
                        Creater = "admin",
                        CreateDate = DateTime.Now
                    };
                }
                else
                {
                    existtepm.TakeName = njtakeDTO.takename;
                    existtepm.jiShuYuan = njtakeDTO.jishuyuan;
                    existtepm.gongZhang = njtakeDTO.gongzhang;

                    existtepm.zhiJianYuan_Dq = njtakeDTO.zhijianyuan_dq;
                    existtepm.zhiJianYuan_Lc = njtakeDTO.zhijianyuan_lc;
                    existtepm.zhiJianYuan_Dg = njtakeDTO.zhijianyuan_dg;
@@ -101,6 +107,7 @@
                    existtepm.fuZhu_Dg = njtakeDTO.fuzhu_dg;
                    existtepm.fuZhu_Dq = njtakeDTO.fuzhu_dq;
                    existtepm.fuZhu_Lc = njtakeDTO.fuzhu_lc;
                    existtepm.ModifyDate = DateTime.Now;
                }

                // 3. æ›´æ–°ä»»åŠ¡è¡¨
@@ -109,44 +116,44 @@
                task.startTime = DateTime.Now;
                ApplyTemplateToTask(task, existtepm, isNewTemplate, njtakeDTO);

                // 4. æ’入历史记录
                var history = new Dt_NJtakeHistory
                {
                    taskID = task.id,
                    trainKind = task.trainKind,
                    TakeName = task.TakeName,
                    trainNum = task.trainNum,
                    track = task.track,
                    coachNum = task.coachNum,
                    bogie = task.bogie,
                    processDept = task.processDept,
                    jiShuYuan = task.jiShuYuan,
                    zhiJianYuan_LC = task.zhiJianYuan_LC,
                    zhiJianYuan_DG = task.zhiJianYuan_DG,
                    zhiJianYuan_DQ = task.zhiJianYuan_DQ,
                    gongZhang = task.gongZhang,
                    liJu_LC = task.liJu_LC,
                    liJu_DG = task.liJu_DG,
                    liJu_DQ = task.liJu_DQ,
                    fuZhu_LC = task.fuZhu_LC,
                    fuZhu_DQ = task.fuZhu_DQ,
                    fuZhu_DG = task.fuZhu_DG,
                    createTime = (DateTime)task.createTime,
                    dispatchTime = (DateTime)task.dispatchTime,
                    startTime = (DateTime)task.startTime,
                    startTime_LC = (DateTime)task.startTime_LC,
                    endTime_LC = (DateTime)task.endTime_LC,
                    startTime_DG = (DateTime)task.startTime_DG,
                    endTime_DG = (DateTime)task.endTime_DG,
                    startTime_DQ = (DateTime)task.startTime_DQ,
                    endTime_DQ = (DateTime)task.endTime_DQ,
                    endTime = (DateTime)task.endTime,
                    confirmTime_JS = (DateTime)task.confirmTime_JS,
                    confirmTime_GZ = (DateTime)task.confirmTime_GZ,
                    confirmTime_LC = (DateTime)task.confirmTime_LC,
                    confirmTime_DG = (DateTime)task.confirmTime_DG,
                    confirmTime_DQ = (DateTime)task.confirmTime_DQ
                };
                //// 4. æ’入历史记录
                //var history = new Dt_NJtakeHistory
                //{
                //    taskID = task.id,
                //    trainKind = task.trainKind,
                //    TakeName = task.TakeName,
                //    trainNum = task.trainNum,
                //    track = task.track,
                //    coachNum = task.coachNum,
                //    bogie = task.bogie,
                //    processDept = task.processDept,
                //    jiShuYuan = task.jiShuYuan,
                //    zhiJianYuan_LC = task.zhiJianYuan_LC,
                //    zhiJianYuan_DG = task.zhiJianYuan_DG,
                //    zhiJianYuan_DQ = task.zhiJianYuan_DQ,
                //    gongZhang = task.gongZhang,
                //    liJu_LC = task.liJu_LC,
                //    liJu_DG = task.liJu_DG,
                //    liJu_DQ = task.liJu_DQ,
                //    fuZhu_LC = task.fuZhu_LC,
                //    fuZhu_DQ = task.fuZhu_DQ,
                //    fuZhu_DG = task.fuZhu_DG,
                //    createTime = (DateTime)task.createTime,
                //    dispatchTime = (DateTime)task.dispatchTime,
                //    startTime = (DateTime)task.startTime,
                //    startTime_LC = (DateTime)task.startTime_LC,
                //    endTime_LC = (DateTime)task.endTime_LC,
                //    startTime_DG = (DateTime)task.startTime_DG,
                //    endTime_DG = (DateTime)task.endTime_DG,
                //    startTime_DQ = (DateTime)task.startTime_DQ,
                //    endTime_DQ = (DateTime)task.endTime_DQ,
                //    endTime = (DateTime)task.endTime,
                //    confirmTime_JS = (DateTime)task.confirmTime_JS,
                //    confirmTime_GZ = (DateTime)task.confirmTime_GZ,
                //    confirmTime_LC = (DateTime)task.confirmTime_LC,
                //    confirmTime_DG = (DateTime)task.confirmTime_DG,
                //    confirmTime_DQ = (DateTime)task.confirmTime_DQ
                //};

                // 5. æ’入任务分解数据
                var listp = new List<Dt_Putake>
@@ -169,7 +176,7 @@
                }

                BaseDal.UpdateData(task);
                _nJtakeHistoryRepository.AddData(history);
                //_nJtakeHistoryRepository.AddData(history);
                _putakeRepository.AddData(listp);

                _unitOfWorkManage.CommitTran();

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/SerialPortService/PutakeServer.cs

@@ -55,7 +55,8 @@
        {
            try
            {
                var putake = BaseDal.QueryData(i => i.Njtakeid == id&&i.Grouptype==gruops).FirstOrDefault();
                var putakeList = BaseDal.QueryData(i => i.Grouptype == gruops && i.Pustatus != (int)cond.已完成).ToList();
                var putake = putakeList.Where(i => i.Njtakeid == id).FirstOrDefault();
                var nj = _iNjTaskRepository.QueryData(i => i.NJtaskID == id).FirstOrDefault();
                if (putake == null)
                {
@@ -74,6 +75,10 @@
                {
                    
                    case cond.待领筒: //
                        if(putakeList.Where(a=>a.Pustatus== (int)cond.待作业).Count() > 0)
                        {
                            return new WebResponseContent { Status = false, Message = "当前有作业未完成，请先完成正在执行的作业" };
                        }
                        putake.Pustatus = (int)cond.待作业; // æžšä¸¾è½¬ int
                        if (gruops=="机械")
                        {

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_Server/Controllers/SerialPort/NjTaskController.cs

@@ -72,7 +72,7 @@
        /// </summary>
        /// <param name="putNjtDTO"></param>
        /// <returns></returns>
        [HttpPut, Route("PuNjtake"), AllowAnonymous]
        [HttpPost, Route("PuNjtake"), AllowAnonymous]
        public WebResponseContent PuNjtake([FromBody] PutNjtDTO putNjtDTO)
        {
            return Service.PuNjtake(putNjtDTO);