From ca51f22e75893d013954ae77a5d218e605baf9e1 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Fri, 5 May 2023 13:35:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?EOS=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/PlanReader.cs | 1 + .../WMS/PurchaseOrder/PurchaseOrderDetailExchangeDto.cs | 6 ++++++ .../Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/PlanReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/PlanReader.cs index 57156aedf..296063800 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/PlanReader.cs +++ b/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, diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseOrder/PurchaseOrderDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseOrder/PurchaseOrderDetailExchangeDto.cs index 536ca066a..d6b6be50d 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseOrder/PurchaseOrderDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseOrder/PurchaseOrderDetailExchangeDto.cs @@ -44,4 +44,10 @@ public class PurchaseOrderDetailExchangeDto /// [Display(Name = "备注")] public string Remark { get; set; } + + /// + /// 生产批次 + /// + [Display(Name = "明细-生产批次")] + public string Lot { get; set; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml index 89fa4a1e8..35fdcdbee 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml @@ -941,6 +941,11 @@ 备注 + + + 生产批次 + + 订单号 From ec59f712b36018cad78de6fe79aaa18a80b0d656 Mon Sep 17 00:00:00 2001 From: "mingliang.tang" Date: Fri, 5 May 2023 13:36:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?mes=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Backflus/Backflu.cs | 5 +++-- .../BackflusDbContextModelCreatingExtensions.cs | 4 ++-- .../Incoming/MesIncomingBackgroundWorker.cs | 1 - .../IncomingToWmsWorker.cs | 1 + ...Sfs.Wms.DataExchange.Application.Contracts.xml | 15 +++++++++++++++ 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/Backflu.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/Backflu.cs index ba7f8d84d..6bda0023b 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/Backflu.cs +++ b/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; } /// /// MES写入时间 /// @@ -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 }; } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Backflus/BackflusDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Backflus/BackflusDbContextModelCreatingExtensions.cs index c8f89e671..538442014 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Backflus/BackflusDbContextModelCreatingExtensions.cs +++ b/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); @@ -25,8 +26,7 @@ public static class BackfluDbContextModelCreatingExtensions b.Property(q => q.scmout_qty).HasPrecision(10, 2); 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 }); + b.Property(q => q.BOMVer).HasMaxLength(50); }); } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs index 2d0fb7efe..2d1e6a1a3 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs +++ b/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(); diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs index 907622f56..3ccb99a71 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs +++ b/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: diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml index c1283a9e2..89fa4a1e8 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml @@ -876,6 +876,11 @@ 物品代码 + + + 库位组 + + 排序批次 @@ -1601,6 +1606,11 @@ 来源ERP库位 + + + 库位组 + + 数量 @@ -1636,6 +1646,11 @@ 来源ERP库位 + + + 库位组 + + 数量