From 6e4e55d23a0497bb9cc229f29c1a8a97733d8be0 Mon Sep 17 00:00:00 2001 From: qian Date: Mon, 9 Sep 2024 15:31:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsnBackgroundWorker.cs | 167 +++++++++--------- .../Asns/X12AsnAppService.cs | 34 ++-- .../PurchaseOrders/PurchaseOrderAppService.cs | 4 +- .../Receipts/ReceiptAppService.cs | 21 ++- .../Validator.cs | 11 ++ .../appsettings.json | 2 +- .../AsnOptions.cs | 6 +- .../EnumExchangeDataErrorCode.cs | 2 +- .../NoPoASN/AsnDet.cs | 44 ++--- .../NoPoASN/AsnMstr.cs | 40 ++--- .../appsettings.Production.json | 2 +- .../appsettings.json | 4 +- 12 files changed, 183 insertions(+), 154 deletions(-) diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs index 728526c..5382ad6 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs @@ -100,58 +100,60 @@ namespace Win_in.Sfs.Scp.WebApi await scpAsnManager.GetUnreadAsnsAsync(siteCode, lastUid, _options.BatchSize); Logger.LogInformation($"{siteCode}: {scpAsns.Count} ASNs were Found"); - var baseUrl = _options.BaseUrl; - var username = _options.Username; - var password = _options.Password; + //var baseUrl = _options.BaseUrl; + //var username = _options.Username; + //var password = _options.Password; foreach (var asn in scpAsns) { var barcodes = await scpAsnManager.GetBarcodesAsync(siteCode, asn.AsnBillNum); var noPoAsn = CreateNoPoAsn(asn, barcodes); - + asnX12List.Add(noPoAsn); asn.IsPort = 1; - var apiUrl = ""; + //var apiUrl = ""; var jsonString = noPoAsn.JsonString; - try - { - var result = await _postService.PostAsync(baseUrl, apiUrl, jsonString, username, password); - if (result == null) - { - noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.None, "Boomi没有返回值","Boomi接口执行失败"); - } - if (result?.Status == "SUCCESS") - { - noPoAsn.SetSuccess("Boomi", "Boomi接口执行成功"); - } - else if (result?.Status == "EXCEPTION") - { - noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.Exception, "EXCEPTION" + result?.ErrorMessage, "Boomi接口执行失败"); - } - else if (result?.Status == "FAIL") - { - noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.FAIL, "FAIL" + result?.ErrorMessage, "Boomi接口执行失败"); - } - } - catch (Exception e) - { - Logger.LogException(e); - e = e.GetBaseException(); - noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.Exception, "接口程序异常"+e.Message, "Boomi接口执行失败"); - } - finally - { - asnX12List.Add(noPoAsn); - } - //if (asn.AsnBillNum.StartsWith(_options.QadAsnPrefix))//ASN to QAD + #region + //try //{ - // //埃驰要求不传托盘信息 @20220905 - // barcodes.ForEach(p => p.PalletCode = ""); - // //埃驰要求不传托盘信息 @20220905 - - // var asnX12 = CreateX12Asn(site, asn, barcodes); - // asnX12List.Add(asnX12); + // var result = await _postService.PostAsync(baseUrl, apiUrl, jsonString, username, password); + // if (result == null) + // { + // noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.None, "Boomi没有返回值","Boomi接口执行失败"); + // } + // if (result?.Status == "SUCCESS") + // { + // noPoAsn.SetSuccess("Boomi", "Boomi接口执行成功"); + // } + // else if (result?.Status == "EXCEPTION") + // { + // noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.Exception, "EXCEPTION" + result?.ErrorMessage, "Boomi接口执行失败"); + // } + // else if (result?.Status == "FAIL") + // { + // noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.FAIL, "FAIL" + result?.ErrorMessage, "Boomi接口执行失败"); + // } //} + //catch (Exception e) + //{ + // Logger.LogException(e); + // e = e.GetBaseException(); + // noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.Exception, "接口程序异常"+e.Message, "Boomi接口执行失败"); + //} + //finally + //{ + // asnX12List.Add(noPoAsn); + //} + #endregion + if (asn.AsnBillNum.StartsWith(_options.QadAsnPrefix))//ASN to QAD + { + //埃驰要求不传托盘信息 @20220905 + barcodes.ForEach(p => p.PalletCode = ""); + //埃驰要求不传托盘信息 @20220905 + + var asnX12 = CreateX12Asn(site, asn, barcodes); + asnX12List.Add(asnX12); + } Logger.LogInformation($"{siteCode}:{asn.Id} {asn.AsnBillNum} was loaded"); } @@ -175,55 +177,54 @@ namespace Win_in.Sfs.Scp.WebApi var asnMstr = new AsnMstr() { - traceId = asn.Site+"-"+ asn.Id .ToString()+ "-"+ Guid.NewGuid().ToString(), - uid = asn.Id, - company = asn.Site, - site = asn.Site, - asnNbr = asn.AsnBillNum, - rpNbr = asn.AskBillNum, - poNbr = asn.PoBillNum, - vendorCode = asn.VendId, - contacts = asn.ReceiveUser, - phone = "", - truckNbr = asn.PlateNumber, - whse = "", - dock = asn.Dock, - shipDate = asn.ShipTime, - dueDate = asn.ReceiveTime, - timeWindow = asn.ReceivedPort, - remark = asn.Remark, - subsite=asn.WebSubSite + UID = asn.Id, + Company = asn.Site, + Site = asn.Site, + AsnNbr = asn.AsnBillNum, + RpNbr = asn.AskBillNum, + PoNbr = asn.PoBillNum, + VendorCode = asn.VendId, + Contacts = asn.ReceiveUser, + Phone = "", + TruckNbr = asn.PlateNumber, + Whse = "", + Dock = asn.Dock, + ShipDate = asn.ShipTime, + DueDate = asn.ReceiveTime, + TimeWindow = asn.ReceivedPort, + Remark = asn.Remark, + Subsite = asn.WebSubSite, }; - if (string.IsNullOrEmpty(asnMstr.timeWindow)) + if (string.IsNullOrEmpty(asnMstr.TimeWindow)) { - asnMstr.timeWindow = "00:00-00:00"; + asnMstr.TimeWindow = "00:00-00:00"; } foreach (var barcode in barcodes) { var det = new AsnDet() { - asnNbr = asn.AsnBillNum, - poNbr = asn.PoBillNum, - poLine = barcode.PoBillLine, - partCode = barcode.PartCode, - lot = barcode.Batch, - qty = barcode.Qty, - productionDate = barcode.ProduceDate, - wareClass = "", - wareCode = "", - stdPackQty = barcode.PackQty, - poUm = barcode.PoUnit, - locUm = barcode.LocUnit, - umConv = 1, - partType = "", - supplierlot = barcode.VendBatch, - status = barcode.State.ToString(), - labelCode = barcode.Extend2, - entireBarCode = barcode.FullBarCode, - palletLabelCode = barcode.PalletCode, - remark = barcode.Remark, + AsnNbr = asn.AsnBillNum, + PoNbr = asn.PoBillNum, + PoLine = barcode.PoBillLine, + PartCode = barcode.PartCode, + Lot = barcode.Batch, + Qty = barcode.Qty, + ProductionDate = barcode.ProduceDate, + WareClass = "", + WareCode = "", + StdPackQty = barcode.PackQty, + PoUm = barcode.PoUnit, + LocUm = barcode.LocUnit, + UmConv = 1, + PartType = "", + Supplierlot = barcode.VendBatch, + Status = barcode.State.ToString(), + LabelCode = barcode.Extend2, + EntireBarCode = barcode.FullBarCode, + PalletLabelCode = barcode.PalletCode, + Remark = barcode.Remark, }; - asnMstr.details.Add(det); + asnMstr.Details.Add(det); } var jsonString = JsonSerializer.Serialize(asnMstr); var ediString = jsonString; diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/X12AsnAppService.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/X12AsnAppService.cs index e63b3f3..e167485 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/X12AsnAppService.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/X12AsnAppService.cs @@ -30,6 +30,7 @@ using IdentityModel; using Microsoft.Extensions.Options; using Volo.Abp; using System.Drawing; +using Volo.Abp.Data; namespace Win_in.Sfs.Scp.WebApi { @@ -45,17 +46,18 @@ namespace Win_in.Sfs.Scp.WebApi private readonly IX12AsnRepository _x12AsnRepository; private readonly ITenantRepository _tenantRepository; private readonly IOptions _options; - + private readonly IDataFilter _dataFilter; public X12AsnAppService( IX12AsnRepository repository , ITenantRepository tenantRepository , IOptions options - + , IDataFilter dataFilter ) : base(repository) { _x12AsnRepository = repository; _tenantRepository = tenantRepository; _options = options; + _dataFilter = dataFilter; } /// @@ -99,12 +101,14 @@ namespace Win_in.Sfs.Scp.WebApi { try { - Validator.CheckSite(_tenantRepository, site); + + Validator.CheckSite(_tenantRepository, site); if (count < 1 || count > _options.Value.MaxCount) { throw new UserFriendlyException($"Count must between 1 and {_options.Value.MaxCount}"); } + } catch (Exception ex) { @@ -113,12 +117,14 @@ namespace Win_in.Sfs.Scp.WebApi new(ex.Message) }); } + using (_dataFilter.Disable()) + { + var entities = await _x12AsnRepository.GetUnreadListAsync(site, count, autoUpdateStatus); - var entities = await _x12AsnRepository.GetUnreadListAsync(site, count, autoUpdateStatus); - - var dtos = BuildDtos(entities); - - return new ListResultDto(dtos); + var dtos = BuildDtos(entities); + return new ListResultDto(dtos); + } + } @@ -149,15 +155,17 @@ namespace Win_in.Sfs.Scp.WebApi new(ex.Message) }); } + using (_dataFilter.Disable()) + { - var entities = await _x12AsnRepository.GetNoPoUnreadListAsync(site, count, autoUpdateStatus); - - // var dtos = BuildDtos(entities); + var entities = await _x12AsnRepository.GetNoPoUnreadListAsync(site, count, autoUpdateStatus); - var dtos = BuildAsnMstrDtos(entities); + // var dtos = BuildDtos(entities); - return new ListResultDto(dtos); + var dtos = BuildAsnMstrDtos(entities); + return new ListResultDto(dtos); + } } /// diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/PurchaseOrders/PurchaseOrderAppService.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/PurchaseOrders/PurchaseOrderAppService.cs index d387a01..5d2b709 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/PurchaseOrders/PurchaseOrderAppService.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/PurchaseOrders/PurchaseOrderAppService.cs @@ -107,8 +107,8 @@ namespace Win_in.Sfs.Scp.WebApi try { - Validator.CheckSite(_tenantRepository, entity.Site); - Validator.CheckSite(_tenantRepository, entity.Company); + //Validator.CheckSite(_tenantRepository, entity.Site); + //Validator.CheckSite(_tenantRepository, entity.Company); if (entity.PoNumber.StartsWith(_options.Value.ValidPoPre, true, CultureInfo.CurrentCulture)) { diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs index f099c14..d086df9 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs @@ -15,6 +15,7 @@ using Win_in.Sfs.Scp.v1.Domain; using Volo.Abp.TenantManagement; using Microsoft.IdentityModel.Logging; using Microsoft.Extensions.Logging; +using Volo.Abp.Domain.Repositories; namespace Win_in.Sfs.Scp.WebApi { @@ -99,22 +100,32 @@ namespace Win_in.Sfs.Scp.WebApi Validator.CheckSite(_tenantRepository, entity.Site); Validator.CheckSite(_tenantRepository, entity.Company); var tenant = await _tenantStore.FindAsync(entity.Site); - bool flag = true; + //bool flag = true; using (CurrentTenant.Change(tenant.Id, tenant.Name)) { using (_dataFilter.Disable()) { Validator.CheckSupplierCode(_taVenderRepository, entity.Site, entity.SupplierCode); - flag =await _tbReceiptRepository.GetCountAsync(ObjectMapper.Map(entity)); - if (!flag) + string message = Validator.CheckReceipt(_receiptRepository, ObjectMapper.Map(entity)); + //flag =await _tbReceiptRepository.GetCountAsync(ObjectMapper.Map(entity)); + if (!string.IsNullOrEmpty(message)) { + Logger.LogInformation(message); var tbReceipt = ObjectMapper.Map(entity); Logger.LogInformation("TB_RECEIVE_QAD瀛樺湪锛丼ite = " + tbReceipt.Site + " ErpRecvBillNum = " + tbReceipt.ErpRecvBillNum + " AsnBillNum = " + tbReceipt.AsnBillNum + " BillType = " + tbReceipt.BillType + " CreateTime = " + tbReceipt.CreateTime + " State = " + tbReceipt.State ); } + else + { + var tbReceipt = ObjectMapper.Map(entity); + Logger.LogInformation("TB_RECEIVE_QA涓嶅瓨鍦紒Site = " + tbReceipt.Site + " ErpRecvBillNum = " + + tbReceipt.ErpRecvBillNum + " AsnBillNum = " + tbReceipt.AsnBillNum + " BillType = " + tbReceipt.BillType + " CreateTime = " + tbReceipt.CreateTime + + " State = " + tbReceipt.State + ); + } await UpsertTbReceiptAndTbReceiptDetailAsync(entity, tenant.Id/*, flag*/); } @@ -124,12 +135,12 @@ namespace Win_in.Sfs.Scp.WebApi { var qad = ObjectMapper.Map(entity); - Logger.LogInformation("TB_RECEIVE_QAD锛丼ite = " + qad.Site + " ErpRecvBillNum = " + + Logger.LogInformation("TB_RECEIVE_QAD寮傚父锛丼ite = " + qad.Site + " ErpRecvBillNum = " + qad.ErpRecvBillNum + " AsnBillNum = " + qad.AsnBillNum + " BillType = " + qad.BillType + " CreateTime = " + qad.CreateTime + " State = " + qad.State ); var detail_qad = ObjectMapper.Map(entity); - Logger.LogInformation("TB_RECEIVE_DETAIL_QAD锛丼ite = " + detail_qad.Site + " ErpRecvBillNum = " + + Logger.LogInformation("TB_RECEIVE_DETAIL_QAD寮傚父锛丼ite = " + detail_qad.Site + " ErpRecvBillNum = " + detail_qad.ErpRecvBillNum + " PoLine = " + detail_qad.PoLine + " BillType = " + detail_qad.BillType + " CreateTime = " + detail_qad.CreateTime + " State = " + detail_qad.State + " qty = " + detail_qad.Qty + " DockCode = " + detail_qad.DockCode + " Batch =" + detail_qad.Batch + " VendBatch = " + detail_qad.VendBatch + " Remark =" + detail_qad.Remark + " PoUnit= " + detail_qad.PoUnit + " Rate =" + detail_qad.Rate diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Validator.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Validator.cs index d88d31b..70672b5 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Validator.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Validator.cs @@ -5,6 +5,7 @@ using Volo.Abp; using Volo.Abp.MultiTenancy; using Volo.Abp.TenantManagement; using Win_in.Sfs.Scp.v1.Domain; +using Win_in.Sfs.Scp.v1.EntityFrameworkCore; namespace Win_in.Sfs.Scp.WebApi; @@ -38,5 +39,15 @@ public static class Validator } } + + public static string CheckReceipt(IReceiptRepository ReceiptRepository, TB_RECEIVE_QAD taPart) + { + string message = ""; + if (ReceiptRepository.Any(p => p.Site == taPart.Site && p.RcNumber == taPart.RecvBillNum)) + { + message = $"Wrong RcNumber code: [{taPart.RecvBillNum}] of Site: [{taPart.Site}]"; + } + return message; + } } diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.DbMigrator/appsettings.json b/WebApiService/src/Win_in.Sfs.Scp.WebApi.DbMigrator/appsettings.json index 8f67deb..b0032c4 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.DbMigrator/appsettings.json +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.DbMigrator/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=Scp_WebApi;User ID=sa;Password=Microsoft2008;connection timeout=600;" + "Default": "Server=dev.ccwin-in.com,6207;Database=Scp_WebApi_UAT;User ID=sa;Password=ChangkeTec@2021;connection timeout=600;" }, "IdentityServer": { "Clients": { diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/AsnOptions.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/AsnOptions.cs index 9732c57..c1be7f3 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/AsnOptions.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/AsnOptions.cs @@ -12,9 +12,9 @@ public class AsnOptions public string ValidPoPre { get; set; } = "PO"; public string QadAsnPrefix { get; set; } = "B"; public string NoPoAsnPrefix { get; set; } = "T"; - public string BaseUrl { get; set; } = "https://api.iacgroup.com:9100/ws/simple/createWMSSupplierASN"; - public string Username { get; set; } = "SCP-CH@iac-PJL8W6"; - public string Password { get; set; } = "f0475092-c891-4d36-b2c1-dfd39fa0e436"; + //public string BaseUrl { get; set; } = "https://api.iacgroup.com:9100/ws/simple/createWMSSupplierASN"; + //public string Username { get; set; } = "SCP-CH@iac-PJL8W6"; + //public string Password { get; set; } = "f0475092-c891-4d36-b2c1-dfd39fa0e436"; public List Sites { get; set; } =new() ; public class Site diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/EnumExchangeDataErrorCode.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/EnumExchangeDataErrorCode.cs index 5eb7f88..ea5e80b 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/EnumExchangeDataErrorCode.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/EnumExchangeDataErrorCode.cs @@ -6,5 +6,5 @@ public enum EnumExchangeDataErrorCode UnknownDataType = 1, WrongDataFormat = 2, Exception = 9, - FAIL=8 + //FAIL=8 } \ No newline at end of file diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnDet.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnDet.cs index ca04bc1..6fbdfeb 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnDet.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnDet.cs @@ -6,7 +6,7 @@ namespace Win_in.Sfs.Scp.WebApi /// /// QAD鍙戣揣鍗曟槑缁(ASN detail) SupplierAsnDetailInput /// - public class AsnDet + public class AsnDet { /// /// 鑷闀挎暟瀛椾富閿 @@ -16,103 +16,103 @@ namespace Win_in.Sfs.Scp.WebApi /// /// 閫佽揣鍗曞彿 /// - public virtual string asnNbr { get; set; } + public virtual string AsnNbr { get; set; } /// /// 閲囪喘璁㈠崟鍙 /// - public virtual string poNbr { get; set; } + public virtual string PoNbr { get; set; } /// /// 閲囪喘璁㈠崟琛 /// - public virtual int poLine { get; set; } + public virtual int PoLine { get; set; } /// /// 鐗╂枡鍙 /// - public virtual string partCode { get; set; } + public virtual string PartCode { get; set; } /// /// 鎵规 /// - public virtual string lot { get; set; } + public virtual string Lot { get; set; } /// /// 閫佽揣鎬婚噺 /// - public virtual decimal qty { get; set; } + public virtual decimal Qty { get; set; } /// /// 鐢熶骇鏃ユ湡 /// - public virtual DateTime? productionDate { get; set; } + public virtual DateTime? ProductionDate { get; set; } /// /// 鍣ㄥ叿鍨嬪彿 /// - public virtual string wareClass { get; set; } + public virtual string WareClass { get; set; } /// /// 鍣ㄥ叿鍙 /// - public virtual string wareCode { get; set; } + public virtual string WareCode { get; set; } /// /// 鏍囧噯鍖呰閲 /// - public virtual decimal stdPackQty { get; set; } + public virtual decimal StdPackQty { get; set; } /// /// 閲囪喘鍗曚綅 /// - public virtual string poUm { get; set; } + public virtual string PoUm { get; set; } /// /// 鍩烘湰鍗曚綅 /// - public virtual string locUm { get; set; } + public virtual string LocUm { get; set; } /// /// 杞崲鐜 /// - public virtual decimal umConv { get; set; } + public virtual decimal UmConv { get; set; } /// /// 鐗╂枡绫诲瀷 /// - public virtual string partType { get; set; } + public virtual string PartType { get; set; } /// /// 渚涘簲鍟嗘壒鍙 /// - public virtual string supplierlot { get; set; } + public virtual string Supplierlot { get; set; } /// /// 鐘舵侊紙0:Closed,1:Open) /// - public virtual string status { get; set; } + public virtual string Status { get; set; } /// /// 鏍囩浠ｇ爜 /// - public virtual string labelCode { get; set; } + public virtual string LabelCode { get; set; } /// /// 瀹屾暣鏉＄爜鏁版嵁 /// - public virtual string entireBarCode { get; set; } + public virtual string EntireBarCode { get; set; } /// /// 鎵樼洏鏍囩浠ｇ爜 /// - public virtual string palletLabelCode { get; set; } + public virtual string PalletLabelCode { get; set; } /// /// 澶囨敞 /// - public virtual string remark { get; set; } - + public virtual string Remark { get; set; } + } } diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs index 119fd0e..2c14936 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs @@ -7,95 +7,93 @@ namespace Win_in.Sfs.Scp.WebApi /// /// QAD鍙戣揣鍗曚富琛(ASN Master) SupplierAsnCreateInput ISupplierAsnAppService /// - public class AsnMstr + public class AsnMstr { - public string traceId { get; set; } /// /// 鑷闀挎暟瀛椾富閿 /// - public virtual long uid { get; set; } + public virtual long UID { get; set; } /// /// 鍏徃 /// - public virtual string company { get; set; } + public virtual string Company { get; set; } /// /// 宸ュ巶 /// - public virtual string site { get; set; } + public virtual string Site { get; set; } /// /// 閫佽揣鍗曞彿 /// - public virtual string asnNbr { get; set; } + public virtual string AsnNbr { get; set; } /// /// 瑕佽揣璁″垝鍗曞彿 /// - public virtual string rpNbr { get; set; } + public virtual string RpNbr { get; set; } /// /// 閲囪喘璁㈠崟鍙 /// - public virtual string poNbr { get; set; } + public virtual string PoNbr { get; set; } /// /// 渚涘簲鍟 /// - public virtual string vendorCode { get; set; } + public virtual string VendorCode { get; set; } /// /// 鑱旂郴浜 /// - public virtual string contacts { get; set; } + public virtual string Contacts { get; set; } /// /// 鑱旂郴鐢佃瘽 /// - public virtual string phone { get; set; } + public virtual string Phone { get; set; } /// /// 杞︾墝鍙 /// - public virtual string truckNbr { get; set; } + public virtual string TruckNbr { get; set; } /// /// 浠撳簱 /// - public virtual string whse { get; set; } + public virtual string Whse { get; set; } /// /// 鏀惰揣鍙 /// - public virtual string dock { get; set; } + public virtual string Dock { get; set; } /// /// 鍙戣揣鏃ユ湡 /// - public DateTime? shipDate { get; set; } + public DateTime? ShipDate { get; set; } /// /// 鍒拌揣鏃ユ湡 /// - public DateTime? dueDate { get; set; } + public DateTime? DueDate { get; set; } /// /// 鏃堕棿绐楀彛 /// - public string timeWindow { get; set; } + public string TimeWindow { get; set; } /// /// 澶囨敞 /// - public virtual string remark { get; set; } - + public virtual string Remark { get; set; } /// /// 宸ュ巶缂栫爜 /// - public virtual string subsite { get; set; } + public virtual string Subsite { get; set; } - public virtual List details { get; set; } = new List(); + public virtual List Details { get; set; } = new List(); } } diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.Production.json b/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.Production.json index 32ae2b0..280e256 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.Production.json +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.Production.json @@ -5,7 +5,7 @@ "RedirectAllowedUrls": "https://scp.iacchina.net:9988" }, "ConnectionStrings": { - "Default": "Server=127.0.0.1,13314;Database=Scp_WebApi;User ID=superadmin;Password=Microsoft@2021;connection timeout=600;" + "Default": "Server=dev.ccwin-in.com,6207;Database=Scp_WebApi_UAT;User ID=sa;Password=ChangkeTec@2021;connection timeout=600;" }, "AuthServer": { "Authority": "https://scp.iacchina.net:9988", diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.json b/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.json index 8c3ef5d..46c229d 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.json +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.json @@ -5,7 +5,7 @@ "RedirectAllowedUrls": "https://localhost:9988" }, "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=Scp_WebApi;User ID=sa;Password=Microsoft2008;connection timeout=600;" + "Default": "Server=dev.ccwin-in.com,6207;Database=Scp_WebApi_UAT;User ID=sa;Password=ChangkeTec@2021;connection timeout=600;" //"V1Scp": "Server=127.0.0.1;Database=SCP_HZ;User ID=sa;Password=Microsoft2008;connection timeout=600;" }, @@ -70,7 +70,7 @@ { "Name": "MSSqlServer", "Args": { - "connectionString": "Server=127.0.0.1;Database=Scp_WebApi;User ID=sa;Password=Microsoft2008;connection timeout=600;", + "connectionString": "Server=dev.ccwin-in.com,6207;Database=Scp_WebApi_UAT;User ID=sa;Password=ChangkeTec@2021;connection timeout=600;", "tableName": "AppLogs", "autoCreateSqlTable": true }