生成工单事务调整

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

@@ -3976,12 +3976,14 @@ namespace Business.ResourceExamineManagement
             if (nbrMasterList.Any())
             {
                 string seqSql = "";
-               var weekplan = _replenishmentWeekPlan.GetListAsync(s => s.factory_id.ToString() == domain && workOrdMasters.Select(x => x.WorkOrd).Contains(s.OrderNO)).Result;
+                var weekplan = _replenishmentWeekPlan.GetListAsync(s => s.factory_id.ToString() == domain && workOrdMasters.Select(x => x.WorkOrd).Contains(s.OrderNO)).Result;
                 var worklistDto = _serialNumberAppService.GetBillNo(domain, "WOlot", workOrdMasters.Count, userAccount, 1);
                 var rstSeqId = _serialNumberAppService.GetSeqIdList(domain, 1, 1);
                 long seqId = 0;
                 long.TryParse(rstSeqId, out seqId);
 
+                string strWoSql = "";
+                string strWoStuSql = "";
                 int index = 0;
                 workOrdMasters.ForEach(p =>
                 {
@@ -3999,16 +4001,21 @@ namespace Business.ResourceExamineManagement
                         }
                         index++;
                     }
-                    //添加工单推送事务数据
-                    seqSql += "insert QadTracking(Ufld1,Domain,SeqID,TransType,Subject,[Order],Int1,CreateTime,CreateUser,UpdateTime,UpdateUser) " +
-                    "select 'A','" + domain + "'," + seqId.ToString() + ",'nbr-wo-mes','工单','" + p.WorkOrd + "'," + p.RecID + ",getdate(),CreateUser,getdate(),UpdateUser from WorkOrdMaster where RecID=" + p.RecID.ToString() + ";";
+                    ////添加工单推送事务数据
+                    //seqSql += "insert QadTracking(Ufld1,Domain,SeqID,TransType,Subject,[Order],Int1,CreateTime,CreateUser,UpdateTime,UpdateUser) " +
+                    //"select 'A','" + domain + "'," + seqId.ToString() + ",'nbr-wo-mes','工单','" + p.WorkOrd + "'," + p.RecID + ",getdate(),CreateUser,getdate(),UpdateUser from WorkOrdMaster where RecID=" + p.RecID.ToString() + ";";
+                    //seqId++;
+                    ////添加工单状态推送事务数据
+                    //seqSql += "insert QadTracking(Ufld1,Domain,SeqID,TransType,Subject,[Order],Int1,CreateTime,CreateUser,UpdateTime,UpdateUser) " +
+                    //"select 'REL','" + domain + "'," + seqId.ToString() + ",'nbr-wo-stu','工单下达','" + p.WorkOrd + "'," + p.RecID + ",getdate(),CreateUser,getdate(),UpdateUser from WorkOrdMaster where RecID=" + p.RecID.ToString() + ";";
+                    //seqId++;
+
+                    strWoSql += "'A,"+p.Domain+","+ seqId.ToString()+ ",nbr-wo-mes,工单," + p.WorkOrd+","+p.RecID+ ",getdate(),getdate()," + p.CreateUser+","+p.UpdateUser+"|";
                     seqId++;
-                    //添加工单状态推送事务数据
-                    seqSql += "insert QadTracking(Ufld1,Domain,SeqID,TransType,Subject,[Order],Int1,CreateTime,CreateUser,UpdateTime,UpdateUser) " +
-                    "select 'REL','" + domain + "'," + seqId.ToString() + ",'nbr-wo-stu','工单下达','" + p.WorkOrd + "'," + p.RecID + ",getdate(),CreateUser,getdate(),UpdateUser from WorkOrdMaster where RecID=" + p.RecID.ToString() + ";";
+                    strWoStuSql += "'REL," + p.Domain + "," + seqId.ToString() + ",nbr-wo-stu,工单下达," + p.WorkOrd + "," + p.RecID + ",getdate(),getdate()," + p.CreateUser + "," + p.UpdateUser + "|";
                     seqId++;
                 });
-                
+
                 var nbrlistDto = _serialNumberAppService.GetBillNo(workOrdMasters[0].Domain, "SM", nbrMasterList.Count, userAccount, 1);
                 if (nbrlistDto.Any())
                 {
@@ -4072,6 +4079,13 @@ namespace Business.ResourceExamineManagement
                             string sql =string.Format("exec pr_WMS_BPM_AddMobileTask @TaskID='{0}',@PlanDate='{1}',@ExecuterTypeID=2,@CreateUser='{2}'", a.Nbr, a.Date.Value.ToString("yyyy-MM-dd"), a.CreateUser);
                             _businessDbContext.Database.ExecuteSqlRaw(sql);
                         });
+                        if (!string.IsNullOrEmpty(strWoSql))
+                        {
+                            strWoSql = strWoSql.Substring(0, strWoSql.Length - 1);
+                            strWoStuSql = strWoStuSql.Substring(0, strWoStuSql.Length - 1);
+                            string sql = string.Format("exec pr_WMS_AddWorkOrdSeq @strWoSql='{0}',@strWoStuSql='{1}'", strWoSql, strWoStuSql);
+                            _businessBangDbContext.Database.ExecuteSqlRaw(sql);
+                        }
                         if (!string.IsNullOrEmpty(seqSql)) {
                             _businessBangDbContext.Database.ExecuteSqlRaw(seqSql);
                         }

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

@@ -111,6 +111,24 @@ namespace Business.Domain
         [Comment("创建时间")]
         public DateTime? CreateTime { get; set; }
 
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        [Comment("修改时间")]
+        public DateTime? UpdateTime { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Comment("创建人")]
+        public string CreateUser { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        [Comment("修改人")]
+        public string UpdateUser { get; set; }
+
         /// <summary>
         /// 类型:正常工单-空或者Null；反之则为特殊工单
         /// </summary>