生成领料单逻辑调整。

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

@@ -1649,8 +1649,8 @@ namespace Business.ResourceExamineManagement
                     {
                         prapplyList.ForEach(p =>
                         {
-                            seqSql += "insert QadTracking(Ufld1,Domain,SeqID,TransType,Subject,[Order],Int1,CreateTime,CreateUser,UpdateTime,UpdateUser) value('A','" + p.factory_id.ToString() +
-                                "'," + seqId.ToString() + ",'nbr-pr-mes','请购单'," + p.pr_billno + " [Order]," + p.Id.ToString() + " as Int1,getdate() as CreateTime,'',getdate() as UpdateTime,'');";
+                            seqSql += "insert QadTracking(Ufld1,Domain,SeqID,TransType,Subject,[Order],Int1,CreateTime,CreateUser,UpdateTime,UpdateUser) values('A','" + p.factory_id.ToString() +
+                                "'," + seqId.ToString() + ",'nbr-pr-mes','请购单','" + p.pr_billno + "'," + p.Id.ToString() + ",getdate(),'',getdate(),'');";
                             seqId++;
                         });
                     }
@@ -1715,7 +1715,7 @@ namespace Business.ResourceExamineManagement
                     if (item_stockoccupy.Any())
                     {
                         var sklist = ObjectMapper.Map<List<mo_ic_item_stockoccupy>, List<ic_item_stockoccupy>>(item_stockoccupy);
-                        sklist.ForEach(s => { s.create_time = DateTime.Now; });
+                        sklist.ForEach(s => { s.create_time = DateTime.Now; s.GenerateNewId(help.NextId()); });
                         _businessDbContext.BulkInsert(sklist);
                     }
                     if (po_occupy.Any())
@@ -3911,7 +3911,8 @@ 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','工单',WorkOrd [Order],RecID as Int1,getdate() as CreateTime,CreateUser,getdate() as UpdateTime,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++;
                 });
                 
@@ -3960,7 +3961,8 @@ namespace Business.ResourceExamineManagement
                             insertOccuyy.Add(itemStockoccupyDto);
                         }
                     }); 
-                    seqSql += "insert QadTracking(Ufld1,Domain,SeqID,TransType,Subject,[Order],Int1,Ufld1,Ufld2,CreateTime,CreateUser,UpdateTime,UpdateUser) select 'A','" + domain + "'," + seqId.ToString() + " as SeqID,'nbr-sm-mes','领料申请单',Nbr as [Order],RecID as Int1,'A' as Ufld1,'sm' as Ufld2,getdate() as CreateTime,CreateUser,getdate() as UpdateTime,UpdateUser from NbrMaster where RecID=" + s.RecID + ";";
+                    seqSql += "insert QadTracking(Ufld1,Domain,SeqID,TransType,Subject,[Order],Int1,Ufld2,CreateTime,CreateUser,UpdateTime,UpdateUser) " +
+                    "select 'A','" + domain + "'," + seqId.ToString() + ",'nbr-sm-mes','领料申请单',Nbr,RecID,'sm',getdate(),CreateUser,getdate(),UpdateUser from NbrMaster where RecID=" + s.RecID + ";";
                     seqId++;
                 });
 

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

@@ -11,7 +11,7 @@ namespace Business.Domain
     /// </summary>
     [CollectionName("dopbase", "ic_item_stockoccupy")]
     [Comment("资源检查物料占用明细表")]
-    [Index(nameof(orderentry_id), nameof(icitem_number), nameof(fversion), nameof(tenant_id), nameof(company_id), nameof(factory_id), IsUnique = true)]
+    //[Index(nameof(orderentry_id), nameof(icitem_number), nameof(fversion), nameof(tenant_id), nameof(company_id), nameof(factory_id), IsUnique = true)]
     public class ic_item_stockoccupy : BaseEntity
     {
         /// <summary>

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs

@@ -46,7 +46,7 @@ namespace Business.EntityFrameworkCore
                 b.Property(x => x.Id).ValueGeneratedNever();//迁移sqlserver默认是自增，需要配置一下
             });
 
-            builder.Entity<ic_item_stockoccupy>(b =>
+            /*builder.Entity<ic_item_stockoccupy>(b =>
             {
                 b.ToTable("ic_item_stockoccupy");
                 b.HasIndex(b => new { b.orderentry_id,b.icitem_number,b.fversion, b.tenant_id, b.company_id, b.factory_id });
@@ -54,7 +54,7 @@ namespace Business.EntityFrameworkCore
                 b.Ignore(x => x.bang_id);
                 b.ConfigureByConvention();
                 b.Property(x => x.Id).ValueGeneratedNever();//迁移sqlserver默认是自增，需要配置一下
-            });
+            });*/
 
             builder.Entity<ic_substitute>(b =>
             {