美新

yanjinhui

2025-03-11 cdd170dd9008d8124d63c76ba186e34cfe61a619

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

@@ -5,6 +5,7 @@
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
using StackExchange.Profiling.Internal;
using WIDESEA_ISerialPortRepository;
using WIDESEA_SerialPortRepository;
using WIDESEAWCS_Core;
@@ -42,11 +43,12 @@
        {
            try
            { 
                var query = BaseDal.Db.Queryable<Dt_NjTask>();
                var query = BaseDal.QueryData();
                // ç”Ÿæˆ OR æŸ¥è¯¢æ¡ä»¶ å³ä»»æ„å­—段都可以查看
                if (!string.IsNullOrEmpty(mhuNjtakeTDO.trainkind) || !string.IsNullOrEmpty(mhuNjtakeTDO.trainnum) ||
                    !string.IsNullOrEmpty(mhuNjtakeTDO.track) || !string.IsNullOrEmpty(mhuNjtakeTDO.coachnum) ||
                    !string.IsNullOrEmpty(mhuNjtakeTDO.bogie) || !string.IsNullOrEmpty(mhuNjtakeTDO.processdept))
                    !string.IsNullOrEmpty(mhuNjtakeTDO.bogie) || !string.IsNullOrEmpty(mhuNjtakeTDO.processdept)||
                    !string.IsNullOrEmpty(mhuNjtakeTDO.taskstatus) || !string.IsNullOrEmpty(mhuNjtakeTDO.createtime))
                {
                    BaseDal.QueryData(x =>
                        (!string.IsNullOrEmpty(mhuNjtakeTDO.trainkind) && x.trainKind.Contains(mhuNjtakeTDO.trainkind)) ||
@@ -54,7 +56,9 @@
                        (!string.IsNullOrEmpty(mhuNjtakeTDO.track) && x.track.Contains(mhuNjtakeTDO.track)) ||
                        (!string.IsNullOrEmpty(mhuNjtakeTDO.coachnum) && x.coachNum.Contains(mhuNjtakeTDO.coachnum)) ||
                        (!string.IsNullOrEmpty(mhuNjtakeTDO.bogie) && x.bogie.Contains(mhuNjtakeTDO.bogie)) ||
                        (!string.IsNullOrEmpty(mhuNjtakeTDO.processdept) && x.processDept.Contains(mhuNjtakeTDO.processdept))
                        (!string.IsNullOrEmpty(mhuNjtakeTDO.processdept) && x.processDept.Contains(mhuNjtakeTDO.processdept))||
                        (!string.IsNullOrEmpty(mhuNjtakeTDO.taskstatus) && x.processDept.Contains(mhuNjtakeTDO.taskstatus))||
                        (!string.IsNullOrEmpty(mhuNjtakeTDO.createtime) && x.processDept.Contains(mhuNjtakeTDO.createtime))
                    );
                }

@@ -118,7 +122,7 @@
                    return new WebResponseContent { Status = false, Message = "没有找到" };
                }

                task.Taskstatus = "已派工";
                task.Taskstatus = 1;//已派工

                if (existtepm == null)
                {
@@ -204,9 +208,9 @@
                // å®šä¹‰ä»»åŠ¡æ‹†è§£çš„组信息
                var groups = new[]
                {
                    new { Grouptype= "电气",Pustatus="待领筒",Zhijianyuan = task.zhiJianYuan_DQ, Lijuzouyeyuan = task.liJu_DQ, Fuzyuan = task.fuZhu_DQ },
                    new { Grouptype = "机械",Pustatus="待领筒", Zhijianyuan = task.zhiJianYuan_LC, Lijuzouyeyuan = task.liJu_LC, Fuzyuan = task.fuZhu_LC },
                    new { Grouptype = "地沟",Pustatus="待领筒", Zhijianyuan = task.zhiJianYuan_DG, Lijuzouyeyuan = task.liJu_DG, Fuzyuan = task.fuZhu_DG }
                    new { Grouptype= "电气",Pustatus=0,Zhijianyuan = task.zhiJianYuan_DQ, Lijuzouyeyuan = task.liJu_DQ, Fuzyuan = task.fuZhu_DQ },
                    new { Grouptype = "机械",Pustatus=0, Zhijianyuan = task.zhiJianYuan_LC, Lijuzouyeyuan = task.liJu_LC, Fuzyuan = task.fuZhu_LC },
                    new { Grouptype = "地沟",Pustatus=0, Zhijianyuan = task.zhiJianYuan_DG, Lijuzouyeyuan = task.liJu_DG, Fuzyuan = task.fuZhu_DG }
                 };


@@ -296,10 +300,10 @@
                    return new WebResponseContent { Status = false, Message = "没有找到" };
                }

                task.Taskstatus = "已派工";
                task.Taskstatus = 1;//已派工

                     
                    task.TakeName = notempDTO.takename;

                task.TakeName = notempDTO.takename;
                    task.jiShuYuan = notempDTO.jishuyuan;
                    task.zhiJianYuan_DG = notempDTO.zhijianyuan_dg;
                    task.zhiJianYuan_DQ = notempDTO.zhijianyuan_dq;
@@ -363,9 +367,9 @@
                // å®šä¹‰ä»»åŠ¡æ‹†è§£çš„组信息
                var groups = new[]
                {
                    new { Grouptype= "电气",Pustatus="待领筒",Zhijianyuan = task.zhiJianYuan_DQ, Lijuzouyeyuan = task.liJu_DQ, Fuzyuan = task.fuZhu_DQ },
                    new { Grouptype = "机械",Pustatus="待领筒", Zhijianyuan = task.zhiJianYuan_LC, Lijuzouyeyuan = task.liJu_LC, Fuzyuan = task.fuZhu_LC },
                    new { Grouptype = "地沟",Pustatus="待领筒", Zhijianyuan = task.zhiJianYuan_DG, Lijuzouyeyuan = task.liJu_DG, Fuzyuan = task.fuZhu_DG }
                    new { Grouptype= "电气",Pustatus=0,Zhijianyuan = task.zhiJianYuan_DQ, Lijuzouyeyuan = task.liJu_DQ, Fuzyuan = task.fuZhu_DQ },
                    new { Grouptype = "机械",Pustatus=0, Zhijianyuan = task.zhiJianYuan_LC, Lijuzouyeyuan = task.liJu_LC, Fuzyuan = task.fuZhu_LC },
                    new { Grouptype = "地沟",Pustatus=0, Zhijianyuan = task.zhiJianYuan_DG, Lijuzouyeyuan = task.liJu_DG, Fuzyuan = task.fuZhu_DG }
                 };

                // é€šè¿‡å¾ªçŽ¯åˆ›å»ºå¯¹è±¡
@@ -436,8 +440,8 @@
                    }
                }

                // ç”Ÿæˆ NJtaskID，例如 KH030601, KH030602...
                string CustomizeID = $"{todayPrefix}{nextNumber:D2}";
                // ç”Ÿæˆ NJtaskID，例如 KH0306001, KH0306002...
                string CustomizeID = $"{todayPrefix}{nextNumber:D3}";//D3表示 3位数，不足补0
                #endregion

                var addnj = new Dt_NjTask ()
@@ -449,7 +453,7 @@
                    coachNum=addNjtDTO.coachnum,
                    bogie=addNjtDTO.bogie,
                   processDept=addNjtDTO.processdept,
                   Taskstatus="未派工",
                   Taskstatus=0,
                    createTime=DateTime.Now,
                };