Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/Backflu.cs

@@ -4,7 +4,8 @@ using Volo.Abp.Domain.Entities;
 namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes;
 public class Backflu : Entity
 {
-
+    [Key]
+    public long scmout_id { get; set; }
     /// <summary>
     /// MES写入时间
     /// </summary>
@@ -56,6 +57,6 @@ public class Backflu : Entity
 
     public override object[] GetKeys()
     {
-        return new object[] { scmout_type + scmout_nbr + scmout_part + scmout_no };
+        return new object[] { scmout_id };
     }
 }

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Backflus/BackflusDbContextModelCreatingExtensions.cs

@@ -14,6 +14,7 @@ public static class BackfluDbContextModelCreatingExtensions
             b.ToTable(options.TablePrefix + "scmout", options.Schema);
             //Configure ABP properties
             b.ConfigureByConvention();
+            b.Property(q => q.scmout_id).UseMySqlIdentityColumn().ValueGeneratedOnAdd();
             b.Property(q => q.scmout_dt_w).HasMaxLength(20);
             b.Property(q => q.scmout_type).HasMaxLength(6);
             b.Property(q => q.scmout_nbr).HasMaxLength(20);
@@ -26,7 +27,6 @@ public static class BackfluDbContextModelCreatingExtensions
             b.Property(q => q.scmout_in_loc).HasMaxLength(10);
             b.Property(q => q.scmout_stat).HasMaxLength(1);
             b.Property(q => q.BOMVer).HasMaxLength(50);           
-            b.HasKey(x => new { x.scmout_type,x.scmout_nbr,x.scmout_part,x.scmout_no });
         });
 
     }

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/PlanReader.cs

@@ -132,6 +132,7 @@ public class PlanReader : IReader
                 ? EnumOrderStatus.Open
                 : EnumOrderStatus.Close,
             Remark = plan.PlanMemo,
+            Lot="",
             // PoLine = "",
             // SupplierPackUom = plan.Unit,
             // SupplierPackQty = plan.Qty,

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs

@@ -59,7 +59,6 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //转换Scrap
         await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
 
-
         //上海和安徽无此接口
         //Logger.LogInformation($"Read Issue");
         //var pckHandleService = workerContext.ServiceProvider.GetRequiredService<IssueReader>();

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs

@@ -140,6 +140,7 @@ public class IncomingToWmsWorker : AsyncPeriodicBackgroundWorkerBase
                 break;
             case EnumIncomingDataType.BackFlush:
                 await incomingToWms.HandleBackFlushsAsync(workerContext).ConfigureAwait(false);
+                
                 break;
             case EnumIncomingDataType.None:
             default:

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseOrder/PurchaseOrderDetailExchangeDto.cs

@@ -44,4 +44,10 @@ public class PurchaseOrderDetailExchangeDto
     /// </summary>
     [Display(Name = "备注")]
     public string Remark { get; set; }
+
+    /// <summary>
+    /// 生产批次
+    /// </summary>
+    [Display(Name = "明细-生产批次")]
+    public string Lot { get; set; }
 }

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml

@@ -941,6 +941,11 @@
             备注
             </summary>
         </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PurchaseOrder.PurchaseOrderDetailExchangeDto.Lot">
+            <summary>
+            生产批次
+            </summary>
+        </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PurchaseOrder.PurchaseOrderExchangeDto.Number">
             <summary>
             订单号