还原

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;

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<AsnOptions> _options;
-
+        private readonly IDataFilter _dataFilter;
         public X12AsnAppService(
             IX12AsnRepository repository
             , ITenantRepository tenantRepository
             , IOptions<AsnOptions> options
-
+            , IDataFilter dataFilter
         ) : base(repository)
         {
             _x12AsnRepository = repository;
             _tenantRepository = tenantRepository;
             _options = options;
+            _dataFilter = dataFilter;
         }
 
         /// <summary>
@@ -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<IMultiTenant>())
+            {
+                var entities = await _x12AsnRepository.GetUnreadListAsync(site, count, autoUpdateStatus);
 
-            var entities = await _x12AsnRepository.GetUnreadListAsync(site, count, autoUpdateStatus);
-
-            var dtos = BuildDtos(entities);
-
-            return new ListResultDto<X12AsnDTO>(dtos);
+                var dtos = BuildDtos(entities);
+                return new ListResultDto<X12AsnDTO>(dtos);
+            }
+            
 
         }
 
@@ -149,15 +155,17 @@ namespace Win_in.Sfs.Scp.WebApi
                     new(ex.Message)
                 });
             }
+            using (_dataFilter.Disable<IMultiTenant>())
+            {
 
-            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<AsnMstrDTO>(dtos);
+                var dtos = BuildAsnMstrDtos(entities);
 
+                return new ListResultDto<AsnMstrDTO>(dtos);
+            }
         }
 
         /// <summary>

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))
                 {

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<IMultiTenant>())
                     {
 
                         Validator.CheckSupplierCode(_taVenderRepository, entity.Site, entity.SupplierCode);
-                        flag =await _tbReceiptRepository.GetCountAsync(ObjectMapper.Map<Receipt, TB_RECEIVE_QAD>(entity));
-                        if (!flag)
+                        string message = Validator.CheckReceipt(_receiptRepository, ObjectMapper.Map<Receipt, TB_RECEIVE_QAD>(entity));
+                        //flag =await _tbReceiptRepository.GetCountAsync(ObjectMapper.Map<Receipt, TB_RECEIVE_QAD>(entity));
+                        if (!string.IsNullOrEmpty(message))
                         {
+                            Logger.LogInformation(message); 
                             var tbReceipt = ObjectMapper.Map<Receipt, TB_RECEIVE_QAD>(entity);
                             Logger.LogInformation("TB_RECEIVE_QAD存在！Site = " + tbReceipt.Site + "  ErpRecvBillNum = " +
                                                  tbReceipt.ErpRecvBillNum + " AsnBillNum = " + tbReceipt.AsnBillNum + " BillType = " + tbReceipt.BillType + " CreateTime = " + tbReceipt.CreateTime +
                                                  " State = " + tbReceipt.State
                                                  );
                         }
+                        else
+                        {
+                            var tbReceipt = ObjectMapper.Map<Receipt, TB_RECEIVE_QAD>(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<Receipt, TB_RECEIVE_QAD>(entity);
                 
-                 Logger.LogInformation("TB_RECEIVE_QAD！Site = " + qad.Site + "  ErpRecvBillNum = " +
+                 Logger.LogInformation("TB_RECEIVE_QAD异常！Site = " + qad.Site + "  ErpRecvBillNum = " +
                     qad.ErpRecvBillNum + " AsnBillNum = " + qad.AsnBillNum + " BillType = " + qad.BillType + " CreateTime = " + qad.CreateTime +
                     " State = " + qad.State
                     );
                 var detail_qad = ObjectMapper.Map<Receipt,TB_RECEIVE_DETAIL_QAD>(entity);
-                Logger.LogInformation("TB_RECEIVE_DETAIL_QAD！Site = " + detail_qad.Site + "  ErpRecvBillNum = " +
+                Logger.LogInformation("TB_RECEIVE_DETAIL_QAD异常！Site = " + 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

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;
+    }
 }
 

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": {

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<Site> Sites { get; set; } =new() ;
 
     public class Site

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
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnDet.cs

@@ -6,7 +6,7 @@ namespace Win_in.Sfs.Scp.WebApi
     /// <summary>
     /// QAD发货单明细(ASN detail) SupplierAsnDetailInput
     /// </summary>
-    public class AsnDet 
+    public class AsnDet
     {
         /// <summary>
         /// 自增长数字主键
@@ -16,103 +16,103 @@ namespace Win_in.Sfs.Scp.WebApi
         /// <summary>
         /// 送货单号
         /// </summary>
-        public virtual string asnNbr { get; set; }
+        public virtual string AsnNbr { get; set; }
 
         /// <summary>
         /// 采购订单号
         /// </summary>
-        public virtual string poNbr { get; set; }
+        public virtual string PoNbr { get; set; }
 
         /// <summary>
         /// 采购订单行
         /// </summary>
-        public virtual int poLine { get; set; }
+        public virtual int PoLine { get; set; }
 
         /// <summary>
         /// 物料号
         /// </summary>
-        public virtual string partCode { get; set; }
+        public virtual string PartCode { get; set; }
 
         /// <summary>
         /// 批次
         /// </summary>
-        public virtual string lot { get; set; }
+        public virtual string Lot { get; set; }
 
         /// <summary>
         /// 送货总量
         /// </summary>
-        public virtual decimal qty { get; set; }
+        public virtual decimal Qty { get; set; }
 
         /// <summary>
         /// 生产日期
         /// </summary>
-        public virtual DateTime? productionDate { get; set; }
+        public virtual DateTime? ProductionDate { get; set; }
 
         /// <summary>
         /// 器具型号
         /// </summary>
-        public virtual string wareClass { get; set; }
+        public virtual string WareClass { get; set; }
 
         /// <summary>
         /// 器具号
         /// </summary>
-        public virtual string wareCode { get; set; }
+        public virtual string WareCode { get; set; }
 
         /// <summary>
         /// 标准包装量
         /// </summary>
-        public virtual decimal stdPackQty { get; set; }
+        public virtual decimal StdPackQty { get; set; }
 
         /// <summary>
         /// 采购单位
         /// </summary>
-        public virtual string poUm { get; set; }
+        public virtual string PoUm { get; set; }
 
         /// <summary>
         /// 基本单位
         /// </summary>
-        public virtual string locUm { get; set; }
+        public virtual string LocUm { get; set; }
 
         /// <summary>
         /// 转换率
         /// </summary>
-        public virtual decimal umConv { get; set; }
+        public virtual decimal UmConv { get; set; }
 
         /// <summary>
         /// 物料类型
         /// </summary>
-        public virtual string partType { get; set; }
+        public virtual string PartType { get; set; }
 
         /// <summary>
         /// 供应商批号
         /// </summary>
-        public virtual string supplierlot { get; set; }
+        public virtual string Supplierlot { get; set; }
 
         /// <summary>
         /// 状态（0:Closed,1:Open)
         /// </summary>
-        public virtual string status { get; set; }
+        public virtual string Status { get; set; }
 
         /// <summary>
         /// 标签代码
         /// </summary>
-        public virtual string labelCode { get; set; }
+        public virtual string LabelCode { get; set; }
 
         /// <summary>
         /// 完整条码数据
         /// </summary>
-        public virtual string entireBarCode { get; set; }
+        public virtual string EntireBarCode { get; set; }
 
         /// <summary>
         /// 托盘标签代码
         /// </summary>
-        public virtual string palletLabelCode { get; set; }
+        public virtual string PalletLabelCode { get; set; }
 
         /// <summary>
         /// 备注
         /// </summary>
-        public virtual string remark { get; set; }
-        
+        public virtual string Remark { get; set; }
+
 
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs

@@ -7,95 +7,93 @@ namespace Win_in.Sfs.Scp.WebApi
     /// <summary>
     /// QAD发货单主表(ASN Master) SupplierAsnCreateInput ISupplierAsnAppService
     /// </summary>
-    public class AsnMstr 
+    public class AsnMstr
     {
-        public string traceId { get; set; }
         /// <summary>
         /// 自增长数字主键
         /// </summary>
-        public virtual long uid { get; set; }
+        public virtual long UID { get; set; }
 
         /// <summary>
         /// 公司
         /// </summary>
-        public virtual string company { get; set; }
+        public virtual string Company { get; set; }
 
         /// <summary>
         /// 工厂
         /// </summary>
-        public virtual string site { get; set; }
+        public virtual string Site { get; set; }
 
         /// <summary>
         /// 送货单号
         /// </summary>
-        public virtual string asnNbr { get; set; }
+        public virtual string AsnNbr { get; set; }
 
         /// <summary>
         /// 要货计划单号
         /// </summary>
-        public virtual string rpNbr { get; set; }
+        public virtual string RpNbr { get; set; }
 
         /// <summary>
         /// 采购订单号
         /// </summary>
-        public virtual string poNbr { get; set; }
+        public virtual string PoNbr { get; set; }
 
         /// <summary>
         /// 供应商
         /// </summary>
-        public virtual string vendorCode { get; set; }
+        public virtual string VendorCode { get; set; }
 
         /// <summary>
         /// 联系人
         /// </summary>
-        public virtual string contacts { get; set; }
+        public virtual string Contacts { get; set; }
 
         /// <summary>
         /// 联系电话
         /// </summary>
-        public virtual string phone { get; set; }
+        public virtual string Phone { get; set; }
 
         /// <summary>
         /// 车牌号
         /// </summary>
-        public virtual string truckNbr { get; set; }
+        public virtual string TruckNbr { get; set; }
 
         /// <summary>
         /// 仓库
         /// </summary>
-        public virtual string whse { get; set; }
+        public virtual string Whse { get; set; }
 
         /// <summary>
         /// 收货口
         /// </summary>
-        public virtual string dock { get; set; }
+        public virtual string Dock { get; set; }
 
         /// <summary>
         /// 发货日期
         /// </summary>
-        public DateTime? shipDate { get; set; }
+        public DateTime? ShipDate { get; set; }
 
         /// <summary>
         /// 到货日期
         /// </summary>
-        public DateTime? dueDate { get; set; }
+        public DateTime? DueDate { get; set; }
 
         /// <summary>
         /// 时间窗口
         /// </summary>
-        public string timeWindow { get; set; }
+        public string TimeWindow { get; set; }
 
         /// <summary>
         /// 备注
         /// </summary>
-        public virtual string remark { get; set; }
-
+        public virtual string Remark { get; set; }
         /// <summary>
         /// 工厂编码
         /// </summary>
-        public virtual string subsite { get; set; }
+        public virtual string Subsite { get; set; }
 
-        public virtual List<AsnDet> details { get; set; } = new List<AsnDet>();
+        public virtual List<AsnDet> Details { get; set; } = new List<AsnDet>();
 
     }
 }

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",

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
         }