From 93b433bf96bb6d48c065933cfd7183c39b908bd1 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Wed, 26 Apr 2023 08:48:16 +0800 Subject: [PATCH] =?UTF-8?q?tyrp=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CountAdjusts/CountAdjust.cs | 1 + .../ScontrolExchange/Scontrol.cs | 2 +- .../WmsOutExchange/Wmsoutm.cs | 4 +- .../WmsOutExchange/WmsoutmManager.cs | 19 ++++++-- ...tAdjustDbContextModelCreatingExtensions.cs | 22 ++++----- ...iptNoteDbContextModelCreatingExtensions.cs | 22 ++++----- ...controlDbContextModelCreatingExtensions.cs | 35 +++++++------- ...WmsoutmDbContextModelCreatingExtensions.cs | 46 +++++++++---------- .../Outgoing/CountAdjustNoteConverter.cs | 2 +- .../Outgoing/CustomerReturnNoteConverter.cs | 4 +- .../Outgoing/DeliverNoteConverter.cs | 4 +- .../Outgoing/ItemTransformNoteConverter.cs | 2 +- .../Outgoing/ProductRecycleNoteConverter.cs | 4 +- .../RecycledMaterialReceiptNoteConverter.cs | 4 +- .../Outgoing/ScrapNoteConVerter.cs | 2 +- .../Outgoing/TransferNoteConverter.cs | 4 +- .../Outgoing/UnplannedIssueNoteConverter.cs | 4 +- .../Outgoing/UnplannedReceiptNoteConverter.cs | 4 +- .../Outgoing/WIPAdjusNoteConverter.cs | 2 +- .../appsettings.json | 2 +- .../AgentModule.cs | 2 +- 21 files changed, 100 insertions(+), 91 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/CountAdjusts/CountAdjust.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/CountAdjusts/CountAdjust.cs index 29819438c..641e15e60 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/CountAdjusts/CountAdjust.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/CountAdjusts/CountAdjust.cs @@ -51,4 +51,5 @@ public class CountAdjust : Entity ///有效码固定值Y /// public string mesout_asd_stat { get; set; } + } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ScontrolExchange/Scontrol.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ScontrolExchange/Scontrol.cs index ae791fffa..13d4b946f 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ScontrolExchange/Scontrol.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ScontrolExchange/Scontrol.cs @@ -29,7 +29,7 @@ public class Scontrol : Entity /// /// /// - public long scontrol_id { get; set; } + public decimal scontrol_id { get; set; } public override object[] GetKeys() { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutm.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutm.cs index df6607c82..034aef00e 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutm.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutm.cs @@ -51,9 +51,9 @@ public class Wmsoutm : Entity public string wmsoutm_tyrp_k { get; set; } - public long wmsoutm_id { get; set; } + public decimal wmsoutm_id { get; set; } - public decimal wmsoutm_open_qt { get; set; } + public decimal wmsoutm_open_qty { get; set; } public override object[] GetKeys() { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/WmsoutmManager.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/WmsoutmManager.cs index a3ff7766d..ae9ccb975 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/WmsoutmManager.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/WmsoutmManager.cs @@ -18,11 +18,20 @@ public class WmsoutmManager : DomainService, IWmsoutmManager public virtual async Task PostListAsync(List entities, List detailEntities) { - await _detailRepository.InsertManyAsync(detailEntities, true).ConfigureAwait(false); - var details = await _detailRepository.GetListAsync(r => r.wmsoutd_nbr == entities.First().wmsoutm_nbr).ConfigureAwait(false); - var maxid = details.Select(r => r.Id).Max(); - entities.First().wmsoutm_id = maxid; - await _repository.InsertManyAsync(entities).ConfigureAwait(false); + try + { + await _detailRepository.InsertManyAsync(detailEntities, true).ConfigureAwait(false); + var details = await _detailRepository.GetListAsync(r => r.wmsoutd_nbr == entities.First().wmsoutm_nbr).ConfigureAwait(false); + var maxid = details.Select(r => r.Id).Max(); + entities.First().wmsoutm_id = maxid; + await _repository.InsertManyAsync(entities).ConfigureAwait(false); + } + catch (System.Exception ex) + { + + throw; + } + } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/CountAdjusts/CountAdjustDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/CountAdjusts/CountAdjustDbContextModelCreatingExtensions.cs index 38e74af02..c7a1e2f00 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/CountAdjusts/CountAdjustDbContextModelCreatingExtensions.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/CountAdjusts/CountAdjustDbContextModelCreatingExtensions.cs @@ -15,17 +15,17 @@ public static class CountAdjustDbContextModelCreatingExtensions //Configure ABP properties b.ConfigureByConvention(); b.Property(e => e.Id).ValueGeneratedOnAdd().UseIdentityColumn().HasColumnName("mesout_asd_id").HasPrecision(20); - b.Property(q => q.mesout_asd_dt_w).HasMaxLength(20); - b.Property(q => q.mesout_asd_type).HasMaxLength(6); - b.Property(q => q.mesout_asd_part).HasMaxLength(20); - b.Property(q => q.mesout_asd_date).HasMaxLength(8); - b.Property(q => q.mesout_asd_loc).HasMaxLength(10); - b.Property(q => q.mesout_asd_code).HasMaxLength(5); - b.Property(q => q.mesout_asd_qty).HasPrecision(18, 2); - b.Property(q => q.mesout_asd_user).HasMaxLength(6); - b.Property(q => q.mesout_asd_refc).HasMaxLength(20); - b.Property(q => q.mesout_asd_k).HasMaxLength(20); - b.Property(q => q.mesout_asd_stat).HasMaxLength(1); + b.Property(q => q.mesout_asd_dt_w).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.mesout_asd_type).HasColumnType("char").HasMaxLength(6); + b.Property(q => q.mesout_asd_part).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.mesout_asd_date).HasColumnType("char").HasMaxLength(8); + b.Property(q => q.mesout_asd_loc).HasColumnType("char").HasMaxLength(10); + b.Property(q => q.mesout_asd_code).HasColumnType("char").HasMaxLength(5); + b.Property(q => q.mesout_asd_qty).HasPrecision(10, 2); + b.Property(q => q.mesout_asd_user).HasColumnType("char").HasMaxLength(6); + b.Property(q => q.mesout_asd_refc).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.mesout_asd_k).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.mesout_asd_stat).HasColumnType("char").HasMaxLength(1); }); } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ProductReceiptNote/ProductReceiptNoteDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ProductReceiptNote/ProductReceiptNoteDbContextModelCreatingExtensions.cs index 9a925a8ac..455fa184a 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ProductReceiptNote/ProductReceiptNoteDbContextModelCreatingExtensions.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ProductReceiptNote/ProductReceiptNoteDbContextModelCreatingExtensions.cs @@ -17,17 +17,17 @@ public static class ProductReceiptNoteDbContextModelCreatingExtensions //Properties //b.Property(q => q.Id).HasColumnName("Mesout_ref_nbr").HasMaxLength(20); - b.Property(q => q.mesout_ref_nbr).HasMaxLength(20); - b.Property(q => q.mesout_id).HasMaxLength(1); - b.Property(q => q.mesout_part).HasMaxLength(20); - b.Property(q => q.mesout_date).HasMaxLength(8); - b.Property(q => q.mesout_move).HasPrecision(18, 2); - b.Property(q => q.mesout_unable).HasPrecision(18, 2); - b.Property(q => q.mesout_loc).HasMaxLength(20); - b.Property(q => q.mesout_dt).HasMaxLength(20); - b.Property(q => q.memo).HasMaxLength(45); - b.Property(q => q.refno).HasMaxLength(45); - b.Property(q => q.mesout_bad).HasPrecision(18, 2); + b.Property(q => q.mesout_ref_nbr).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.mesout_id).HasColumnType("char").HasMaxLength(1); + b.Property(q => q.mesout_part).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.mesout_date).HasColumnType("char").HasMaxLength(8); + b.Property(q => q.mesout_move).HasPrecision(10, 2); + b.Property(q => q.mesout_unable).HasPrecision(10, 2); + b.Property(q => q.mesout_loc).HasColumnType("char").HasMaxLength(10); + b.Property(q => q.mesout_dt).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.memo).HasColumnType("char").HasMaxLength(45); + b.Property(q => q.refno).HasColumnType("char").HasMaxLength(45); + b.Property(q => q.mesout_bad).HasPrecision(10, 2); b.HasKey(x => new { x.mesout_ref_nbr, x.mesout_part }); }); diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ScontrolExchange/ScontrolDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ScontrolExchange/ScontrolDbContextModelCreatingExtensions.cs index 27cc9ed6d..b3560c276 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ScontrolExchange/ScontrolDbContextModelCreatingExtensions.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ScontrolExchange/ScontrolDbContextModelCreatingExtensions.cs @@ -16,12 +16,12 @@ public static class ScontrolDbContextModelCreatingExtensions b.ConfigureByConvention(); //Properties - b.Property(q => q.scontrol_nbr).HasMaxLength(10); - b.Property(q => q.scontrol_dt_w).HasMaxLength(20); - b.Property(q => q.scontrol_stat).HasMaxLength(1); - b.Property(q => q.scontrol_dt_k).HasMaxLength(20); - b.Property(q => q.scontrol_type).HasMaxLength(6); - b.Property(q => q.scontrol_id).HasPrecision(20); + b.Property(q => q.scontrol_nbr).HasColumnType("char").HasMaxLength(10); + b.Property(q => q.scontrol_dt_w).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.scontrol_stat).HasColumnType("char").HasMaxLength(1); + b.Property(q => q.scontrol_dt_k).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.scontrol_type).HasColumnType("char").HasMaxLength(6); + b.Property(q => q.scontrol_id).HasPrecision(20, 0); }); } @@ -36,20 +36,19 @@ public static class ScontrolDbContextModelCreatingExtensions //Properties b.Property(e => e.Id).ValueGeneratedOnAdd().UseIdentityColumn().HasColumnName("scmsend_id").HasPrecision(20); - b.Property(q => q.scmsend_type).HasMaxLength(6); - b.Property(q => q.scmsend_dt_w).HasMaxLength(20); - b.Property(q => q.scmsend_nbr).HasMaxLength(10); - b.Property(q => q.scmsend_stat1).HasMaxLength(1); - b.Property(q => q.scmsend_part).HasPrecision(20); - b.Property(q => q.scmsend_delv_date).HasMaxLength(8); - b.Property(q => q.scmsend_orderno).HasMaxLength(12); - b.Property(q => q.scmsend_loc).HasMaxLength(10); - b.Property(q => q.scmsend_date).HasMaxLength(8); + b.Property(q => q.scmsend_type).HasColumnType("char").HasMaxLength(6); + b.Property(q => q.scmsend_dt_w).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.scmsend_nbr).HasColumnType("char").HasMaxLength(10); + b.Property(q => q.scmsend_stat1).HasColumnType("char").HasMaxLength(1); + b.Property(q => q.scmsend_part).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.scmsend_delv_date).HasColumnType("char").HasMaxLength(8); + b.Property(q => q.scmsend_orderno).HasColumnType("char").HasMaxLength(12); + b.Property(q => q.scmsend_loc).HasColumnType("char").HasMaxLength(10); + b.Property(q => q.scmsend_date).HasColumnType("char").HasMaxLength(8); b.Property(q => q.scmsend_qty).HasPrecision(10, 2); - b.Property(q => q.scmsend_wipd_loc).HasMaxLength(6); - b.Property(q => q.scmsend_userid).HasMaxLength(6); + b.Property(q => q.scmsend_wipd_loc).HasColumnType("char").HasMaxLength(10); + b.Property(q => q.scmsend_userid).HasColumnType("char").HasMaxLength(6); }); } - } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/WmsOutExchange/WmsoutmDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/WmsOutExchange/WmsoutmDbContextModelCreatingExtensions.cs index f5fb6f2d3..4eb31fae0 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/WmsOutExchange/WmsoutmDbContextModelCreatingExtensions.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/WmsOutExchange/WmsoutmDbContextModelCreatingExtensions.cs @@ -16,24 +16,24 @@ public static class WmsoutmDbContextModelCreatingExtensions b.ConfigureByConvention(); //Properties - b.Property(q => q.wmsoutm_nbr).HasMaxLength(12); - b.Property(q => q.wmsoutm_type).HasMaxLength(5); - b.Property(q => q.wmsoutm_dt_w).HasMaxLength(20); - b.Property(q => q.wmsoutm_stat).HasMaxLength(1); - b.Property(q => q.wmsoutm_tyrp_dt).HasMaxLength(20); - b.Property(q => q.wmsoutm_user).HasPrecision(6); - b.Property(q => q.wmsoutm_dept).HasMaxLength(10); - b.Property(q => q.wmsoutm_date).HasMaxLength(8); - b.Property(q => q.wmsoutm_cust).HasMaxLength(6); - b.Property(q => q.wmsoutm_shm_nbr).HasMaxLength(12); - b.Property(q => q.wmsoutm_cust_loc).HasMaxLength(10); - b.Property(q => q.wmsoutm_stock_stat).HasMaxLength(1); - b.Property(q => q.wmsoutm_open_part).HasMaxLength(20); - b.Property(q => q.wmsoutm_open_loc).HasMaxLength(10); + b.Property(q => q.wmsoutm_nbr).HasColumnType("char").HasMaxLength(12); + b.Property(q => q.wmsoutm_type).HasColumnType("char").HasMaxLength(6); + b.Property(q => q.wmsoutm_dt_w).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.wmsoutm_stat).HasColumnType("char").HasMaxLength(1); + b.Property(q => q.wmsoutm_tyrp_dt).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.wmsoutm_tyrp_k).HasColumnType("char").HasMaxLength(1); + b.Property(q => q.wmsoutm_id).HasPrecision(20, 0); + b.Property(q => q.wmsoutm_user).HasColumnType("char").HasMaxLength(6); + b.Property(q => q.wmsoutm_dept).HasColumnType("char").HasMaxLength(10); + b.Property(q => q.wmsoutm_date).HasColumnType("char").HasMaxLength(8); + b.Property(q => q.wmsoutm_cust).HasColumnType("char").HasMaxLength(10); + b.Property(q => q.wmsoutm_shm_nbr).HasColumnType("char").HasMaxLength(12); + b.Property(q => q.wmsoutm_cust_loc).HasColumnType("char").HasMaxLength(10); + b.Property(q => q.wmsoutm_stock_stat).HasColumnType("char").HasMaxLength(1); + b.Property(q => q.wmsoutm_open_part).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.wmsoutm_open_loc).HasColumnType("char").HasMaxLength(10); b.Property(q => q.wmsoutm_open_hours).HasPrecision(10, 2); - b.Property(q => q.wmsoutm_tyrp_k).HasMaxLength(1); - b.Property(q => q.wmsoutm_id).HasPrecision(20); - b.Property(q => q.wmsoutm_open_qt).HasPrecision(10, 2); + b.Property(q => q.wmsoutm_open_qty).HasPrecision(10, 2); }); } @@ -47,13 +47,13 @@ public static class WmsoutmDbContextModelCreatingExtensions b.ConfigureByConvention(); //Properties - b.Property(e => e.Id).ValueGeneratedOnAdd().UseIdentityColumn().HasColumnName("wms_id").HasPrecision(20); - b.Property(q => q.wmsoutd_nbr).HasMaxLength(12); - b.Property(q => q.wmsoutd_part).HasMaxLength(20); - b.Property(q => q.wmsoutd_loc).HasMaxLength(10); + b.Property(e => e.Id).ValueGeneratedOnAdd().UseIdentityColumn().HasColumnName("wmsoutd_id").HasPrecision(20); + b.Property(q => q.wmsoutd_nbr).HasColumnType("char").HasMaxLength(12); + b.Property(q => q.wmsoutd_part).HasColumnType("char").HasMaxLength(20); + b.Property(q => q.wmsoutd_loc).HasColumnType("char").HasMaxLength(10); b.Property(q => q.wmsoutd_qty).HasPrecision(8, 2); - b.Property(q => q.wmsoutd_bcm_code).HasPrecision(5); - b.Property(q => q.wmsoutd_projt_id).HasMaxLength(20); + b.Property(q => q.wmsoutd_bcm_code).HasColumnType("char").HasMaxLength(5); + b.Property(q => q.wmsoutd_projt_id).HasColumnType("char").HasMaxLength(20); }); } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CountAdjustNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CountAdjustNoteConverter.cs index af7d5d81d..ab9fed69e 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CountAdjustNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CountAdjustNoteConverter.cs @@ -96,7 +96,7 @@ public class CountAdjustNoteConverter : IOutgoingConverter mesout_asd_loc = string.Empty, mesout_asd_code = detail.ReasonCode, mesout_asd_qty = detail.CountQty + detail.InventoryQty, - mesout_asd_user = exchangeCountAdjust.Worker, + mesout_asd_user = exchangeCountAdjust.Worker.Length >= 6 ? exchangeCountAdjust.Worker.Substring(0, 6) : exchangeCountAdjust.Worker, mesout_asd_k = string.Empty, mesout_asd_stat = "Y" }; diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CustomerReturnNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CustomerReturnNoteConverter.cs index 1005b7abb..17c559965 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CustomerReturnNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CustomerReturnNoteConverter.cs @@ -116,7 +116,7 @@ public class CustomerReturnNoteConverter : IOutgoingConverter wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), wmsoutm_stat = "Y", wmsoutm_tyrp_dt = "", - wmsoutm_user = exchangeOrder.Worker, + wmsoutm_user = exchangeOrder.Worker.Length >= 6 ? exchangeOrder.Worker.Substring(0, 6) : exchangeOrder.Worker, wmsoutm_dept = "",//根据Worker从UserDepartment中获取 wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), wmsoutm_cust = exchangeOrder.Customer, @@ -128,7 +128,7 @@ public class CustomerReturnNoteConverter : IOutgoingConverter wmsoutm_open_hours = 0, wmsoutm_tyrp_k = "", wmsoutm_id = 0,//明细中最大scmsend_id - wmsoutm_open_qt = 0, + wmsoutm_open_qty = 0, }; return ret; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs index 9db97c90e..6f1130c4f 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs @@ -111,7 +111,7 @@ public class DeliverNoteConverter : IOutgoingConverter wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), wmsoutm_stat = "Y", wmsoutm_tyrp_dt = "", - wmsoutm_user = exchangeOrder.Worker, + wmsoutm_user = exchangeOrder.Worker.Length >= 6 ? exchangeOrder.Worker.Substring(0, 6) : exchangeOrder.Worker, wmsoutm_dept = "", wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), wmsoutm_cust = exchangeOrder.Customer, @@ -123,7 +123,7 @@ public class DeliverNoteConverter : IOutgoingConverter wmsoutm_open_hours = 0, wmsoutm_tyrp_k = "", wmsoutm_id = 0,//明细中最大scmsend_id - wmsoutm_open_qt = 0, + wmsoutm_open_qty = 0, }; return ret; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ItemTransformNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ItemTransformNoteConverter.cs index bae2a8231..5fda9410c 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ItemTransformNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ItemTransformNoteConverter.cs @@ -110,7 +110,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Outgoing; mesout_asd_loc = detail.LocationErpCode, mesout_asd_code = detail.ReasonCode, mesout_asd_qty = detail.FromQty, - mesout_asd_user = exchangeCountAdjust.Worker, + mesout_asd_user = exchangeCountAdjust.Worker.Length >= 6 ? exchangeCountAdjust.Worker.Substring(0, 6) : exchangeCountAdjust.Worker, mesout_asd_k = string.Empty, mesout_asd_stat = "Y" diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductRecycleNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductRecycleNoteConverter.cs index 778dad2a5..e2fde345b 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductRecycleNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductRecycleNoteConverter.cs @@ -125,7 +125,7 @@ public class ProductRecycleNoteConverter : IOutgoingConverter wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), wmsoutm_stat = "Y", wmsoutm_tyrp_dt = "", - wmsoutm_user = exchangeOrder.Worker, + wmsoutm_user = exchangeOrder.Worker.Length >= 6 ? exchangeOrder.Worker.Substring(0, 6) : exchangeOrder.Worker, wmsoutm_dept = departmentCode,//根据Worker从UserDepartment中获取 wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), wmsoutm_cust = "", @@ -137,7 +137,7 @@ public class ProductRecycleNoteConverter : IOutgoingConverter wmsoutm_open_hours = 1,//无法取到转移工时 目前默认为1 wmsoutm_tyrp_k = "", wmsoutm_id = 0,//明细中最大scmsend_id - wmsoutm_open_qt = exchangeOrderDetail.Qty, + wmsoutm_open_qty = exchangeOrderDetail.Qty, }; return ret; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/RecycledMaterialReceiptNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/RecycledMaterialReceiptNoteConverter.cs index dc64e2b06..e9d892d1c 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/RecycledMaterialReceiptNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/RecycledMaterialReceiptNoteConverter.cs @@ -116,7 +116,7 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), wmsoutm_stat = "Y", wmsoutm_tyrp_dt = "", - wmsoutm_user = exchangeOrder.Worker, + wmsoutm_user = exchangeOrder.Worker.Length >= 6 ? exchangeOrder.Worker.Substring(0, 6) : exchangeOrder.Worker, wmsoutm_dept = "",//根据Worker从UserDepartment中获取 wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), wmsoutm_cust = "", @@ -128,7 +128,7 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter wmsoutm_open_hours = 0, wmsoutm_tyrp_k = "", wmsoutm_id = 0,//明细中最大scmsend_id - wmsoutm_open_qt = 0, + wmsoutm_open_qty = 0, }; return ret; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs index 8a4bb37f9..2137ee143 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs @@ -104,7 +104,7 @@ IOutgoingFromWmsManager outgoingFromWmsManager mesout_asd_loc = detail.FromLocationErpCode, mesout_asd_code = detail.ReasonCode, mesout_asd_qty = detail.Qty, - mesout_asd_user = exchangeScrap.Worker, + mesout_asd_user = exchangeScrap.Worker.Length >= 6 ? exchangeScrap.Worker.Substring(0, 6) : exchangeScrap.Worker, mesout_asd_k = string.Empty, mesout_asd_stat = "Y" }; diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs index 3fd884c13..8359539fe 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs @@ -188,7 +188,7 @@ public class TransferNoteConverter : IOutgoingConverter wmsoutm_dt_w = dt_w, wmsoutm_stat = "Y", wmsoutm_tyrp_dt = "", - wmsoutm_user = exchangeOrder.Worker, + wmsoutm_user = exchangeOrder.Worker.Length >= 6 ? exchangeOrder.Worker.Substring(0, 6) : exchangeOrder.Worker, wmsoutm_dept = departmentCode,//根据Worker从UserDepartment中获取 wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), wmsoutm_cust = "", @@ -200,7 +200,7 @@ public class TransferNoteConverter : IOutgoingConverter wmsoutm_open_hours = 0, wmsoutm_tyrp_k = "", wmsoutm_id = 0,//明细中最大scmsend_id - wmsoutm_open_qt = 0, + wmsoutm_open_qty = 0, }; return ret; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs index 8a48b7e26..574287fe0 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs @@ -116,7 +116,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), wmsoutm_stat = "Y", wmsoutm_tyrp_dt = "", - wmsoutm_user = exchangeOrder.Worker, + wmsoutm_user = exchangeOrder.Worker.Length >= 6 ? exchangeOrder.Worker.Substring(0, 6) : exchangeOrder.Worker, wmsoutm_dept = "",//根据Worker从UserDepartment中获取 wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), wmsoutm_cust = "", @@ -128,7 +128,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter wmsoutm_open_hours = 0, wmsoutm_tyrp_k = "", wmsoutm_id = 0,//明细中最大scmsend_id - wmsoutm_open_qt = 0, + wmsoutm_open_qty = 0, }; return ret; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs index bc4f6f856..60e3d52ed 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs @@ -116,7 +116,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), wmsoutm_stat = "Y", wmsoutm_tyrp_dt = "", - wmsoutm_user = exchangeOrder.Worker, + wmsoutm_user = exchangeOrder.Worker.Length>=6? exchangeOrder.Worker.Substring(0,6): exchangeOrder.Worker, wmsoutm_dept = "",//根据Worker从UserDepartment中获取 wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), wmsoutm_cust = "", @@ -128,7 +128,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter wmsoutm_open_hours = 0, wmsoutm_tyrp_k = "", wmsoutm_id = 0,//明细中最大scmsend_id - wmsoutm_open_qt = 0, + wmsoutm_open_qty = 0, }; return ret; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/WIPAdjusNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/WIPAdjusNoteConverter.cs index 7f3498c07..6a0a4ed82 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/WIPAdjusNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/WIPAdjusNoteConverter.cs @@ -94,7 +94,7 @@ public class WIPAdjusNoteConverter : IOutgoingConverter mesout_asd_loc = string.Empty, mesout_asd_code = detail.ReasonCode, mesout_asd_qty = detail.CountQty + detail.InventoryQty, - mesout_asd_user = exchangeCountAdjust.Worker, + mesout_asd_user = exchangeCountAdjust.Worker.Length >= 6 ? exchangeCountAdjust.Worker.Substring(0, 6) : exchangeCountAdjust.Worker, mesout_asd_k = string.Empty, mesout_asd_stat = "Y" }; diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json index 263acf7e6..bc4ac8442 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json @@ -19,7 +19,7 @@ "client_id": "Auth_App", "client_secret": "1q2w3E*", "grant_type": "password", - "username": "jiekou1", + "username": "jiekou", "password": "1q2w3E*", "company": "Faty" }, diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs index 3b5a3402e..31b6599f3 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs @@ -150,6 +150,6 @@ public class AgentModule : AbpModule ApplicationInitializationContext context) { context.AddBackgroundWorkerAsync(); - //context.AddBackgroundWorkerAsync(); + context.AddBackgroundWorkerAsync(); } }