工单

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -22,6 +22,7 @@ using MongoDB.Driver;
 using MongoDB.Driver.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using NPOI.SS.Formula.Functions;
 using NUglify.JavaScript.Syntax;
 using Org.BouncyCastle.Asn1.X500;
 using Org.BouncyCastle.Asn1.X509;
@@ -4960,8 +4961,8 @@ namespace Business.ResourceExamineManagement
                 long seqId = 0;
                 long.TryParse(rstSeqId, out seqId);
 
-                string strWoSql = "";
-                string strWoStuSql = "";
+                //string strWoSql = "";
+                //string strWoStuSql = "";
                 int index = 0;
                 workOrdMasters.ForEach(p =>
                 {
@@ -4980,10 +4981,11 @@ namespace Business.ResourceExamineManagement
                         index++;
                     }*/
                     //生成工单事务、工单下达事务
-                    strWoSql += "A," + p.Domain + "," + seqId.ToString() + ",nbr-wo-mes,工单," + p.WorkOrd + "," + p.RecID + "|";
-                    seqId++;
-                    strWoStuSql += "REL," + p.Domain + "," + seqId.ToString() + ",nbr-wo-stu,工单下达," + p.WorkOrd + "," + p.RecID + "|";
-                    seqId++;
+                    //strWoSql += "A," + p.Domain + "," + seqId.ToString() + ",nbr-wo-mes,工单," + p.WorkOrd + "," + p.RecID + "|";
+                    //seqId++;
+                    //strWoStuSql += "REL," + p.Domain + "," + seqId.ToString() + ",nbr-wo-stu,工单下达," + p.WorkOrd + "," + p.RecID + "|";
+                    //seqId++;
+                    p.Batch = p.WorkOrd.Substring(1);
                 });
                 var nbrlistDto = _serialNumberAppService.GetBillNo(workOrdMasters[0].Domain, "SM", nbrMasterList.Count, userAccount, 1);
 
@@ -4996,6 +4998,8 @@ namespace Business.ResourceExamineManagement
                         if (nbrlistDto[index] != null)
                         {
                             nm.Nbr = nbrlistDto[index].NbrResult.ToString();
+                            nm.Address = nm.WorkOrd.Substring(1);
+                            nm.Ufld1 = nm.WorkOrd.Substring(1);
                             nbrDtls.ForEach(i => { i.Nbr = nm.Nbr; });
                         }
                         index++;
@@ -5072,6 +5076,11 @@ namespace Business.ResourceExamineManagement
                         nbrDetailList.ForEach(c =>
                         {
                             c.NbrRecID = DBnbrList.Where(a => a.Nbr == c.Nbr).First().RecID;
+                            c.Address = c.WorkOrd.Substring(1);
+                            c.OrdNbr = c.WorkOrd.Substring(1);
+                            c.ERPfld1 = c.WorkOrd.Substring(1);
+                            c.OrdLine = c.Line;
+                            c.ERPfld2 = c.Line.ToString();
                         });
                         _nbrDetail.Insert(nbrDetailList);
                         await _businessDbContext.BulkUpdateAsync(weekplan);

MicroServices/Business/Business.Domain/StructuredDB/MES/IC/NbrDetail.cs

@@ -63,6 +63,36 @@ namespace Business.Domain
         [Comment("工单")]
         public string WorkOrd { get; set; }
 
+        /// <summary>
+        /// ERP工单
+        /// </summary>
+        [Comment("ERP工单")]
+        public string Address { get; set; }
+
+        /// <summary>
+        /// erpid
+        /// </summary>
+        [Comment("erpid")]
+        public string OrdNbr { get; set; }
+
+        /// <summary>
+        /// ERP行号
+        /// </summary>
+        [Comment("ERP行号")]
+        public short OrdLine { get; set; }
+
+        /// <summary>
+        /// ERPid
+        /// </summary>
+        [Comment("ERPid")]
+        public string ERPfld1 { get; set; }
+
+        /// <summary>
+        /// ERP行号
+        /// </summary>
+        [Comment("ERP行号")]
+        public string ERPfld2 { get; set; }
+
         /// <summary>
         /// 原始库位
         /// </summary>

MicroServices/Business/Business.Domain/StructuredDB/MES/IC/NbrMaster.cs

@@ -70,6 +70,12 @@ namespace Business.Domain
         [Comment("工单")]
         public string WorkOrd { get; set; }
 
+        /// <summary>
+        /// ERP工单
+        /// </summary>
+        [Comment("ERP工单")]
+        public string Address { get; set; }
+
         /// <summary>
         /// 订单数量
         /// </summary>

MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdMaster.cs

@@ -51,6 +51,12 @@ namespace Business.Domain
         [Comment("工单")]
         public string WorkOrd { get; set; }
 
+        /// <summary>
+        /// ERP工单
+        /// </summary>
+        [Comment("ERP工单")]
+        public string Batch { get; set; }
+
         /// <summary>
         /// 物料编号
         /// </summary>

MicroServices/Business/QuartzSettings/logs/logs.txt

@@ -3081,3 +3081,9 @@
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-05-12T15:52:35.9623447+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-05-12T15:52:35.9669846+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-05-12T15:52:35.9689853+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-05-13T17:32:53.8481267+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-05-13T17:32:53.8912724+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-05-13T17:32:53.8949289+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-05-13T17:32:53.8971095+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-05-13T17:32:53.9020019+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-05-13T17:32:53.9041633+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}