From d655515157cf65746d52f0a209968cfc20a3828b Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Tue, 26 Jan 2021 16:55:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=B7=BB=E5=8A=A0=E5=9C=B0?= =?UTF-8?q?=E7=82=B9=E5=92=8C=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/SCP_DC_UNI_CONTROLLER.cs | 2 +- Controller/SCP_INVOICE_CONTROLLER.cs | 3 +++ Models/ScpEntity/TB_INVOICE.cs | 2 ++ Models/ScpEntity/TB_INVOICE_DETAIL.cs | 5 ++++- Models/ScpEntity/V_TB_RECEIVE_LIST.cs | 1 + SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx | 2 +- SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx.cs | 2 ++ 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Controller/SCP_DC_UNI_CONTROLLER.cs b/Controller/SCP_DC_UNI_CONTROLLER.cs index 00ec6f4..d959d64 100644 --- a/Controller/SCP_DC_UNI_CONTROLLER.cs +++ b/Controller/SCP_DC_UNI_CONTROLLER.cs @@ -1311,7 +1311,7 @@ namespace CK.SCP.Controller //_add.VatDebitLC = _vinvoice.BlancePrice.Value;//税额调整 //_add.VatDebitTC = _vinvoice.ContractPrice.Value; // _addList.Add(_add); - } + } if ((_vinvoice.BlancePrice != null && _vinvoice.BlancePrice.Value != 0)) { _invMast.InvoiceAmountTC = (_vinvoice.TaxAmount == null ? 0 : _vinvoice.TaxAmount.Value) + _vinvoice.BlancePrice.Value; diff --git a/Controller/SCP_INVOICE_CONTROLLER.cs b/Controller/SCP_INVOICE_CONTROLLER.cs index 20ea900..ad98597 100644 --- a/Controller/SCP_INVOICE_CONTROLLER.cs +++ b/Controller/SCP_INVOICE_CONTROLLER.cs @@ -956,6 +956,7 @@ namespace CK.SCP.Controller invoice.CreateUser = p_entity.CreateUser; invoice.CreateTime = DateTime.Now; invoice.Site = p_entity.Site; + invoice.SubSite = p_entity.SubSite; invoice.State = (int)InvoiceState.New; invoice.IsDeleted = false; invoice.GUID = Guid.NewGuid(); @@ -976,6 +977,8 @@ namespace CK.SCP.Controller p_list.ForEach(p => { TB_INVOICE_DETAIL invocieDetail = new TB_INVOICE_DETAIL(); + invocieDetail.Site = invoice.Site; + invocieDetail.SubSite = invoice.SubSite; invocieDetail.InvcBillNum= invoice.InvcBillNum; invocieDetail.AsnBillNum = p.AsnBillNum; invocieDetail.PoBillNum = p.PoBillNum; diff --git a/Models/ScpEntity/TB_INVOICE.cs b/Models/ScpEntity/TB_INVOICE.cs index 13671bb..98a2951 100644 --- a/Models/ScpEntity/TB_INVOICE.cs +++ b/Models/ScpEntity/TB_INVOICE.cs @@ -16,6 +16,8 @@ namespace CK.SCP.Models.ScpEntity [StringLength(50)] public string Site { get; set; } [StringLength(50)] + public string SubSite { get; set; } + [StringLength(50)] public string InvoiceNum { get; set; } [StringLength(50)] public string ExpressNum { get; set; } diff --git a/Models/ScpEntity/TB_INVOICE_DETAIL.cs b/Models/ScpEntity/TB_INVOICE_DETAIL.cs index 0879727..a7cd28e 100644 --- a/Models/ScpEntity/TB_INVOICE_DETAIL.cs +++ b/Models/ScpEntity/TB_INVOICE_DETAIL.cs @@ -52,7 +52,10 @@ namespace CK.SCP.Models.ScpEntity [StringLength(50)] public string DiscountRemark { get; set; } public Nullable IsRed { get; set; } - + [StringLength(50)] + public string Site { get; set; } + [StringLength(50)] + public string SubSite { get; set; } } } diff --git a/Models/ScpEntity/V_TB_RECEIVE_LIST.cs b/Models/ScpEntity/V_TB_RECEIVE_LIST.cs index bb0e3cc..61845a4 100644 --- a/Models/ScpEntity/V_TB_RECEIVE_LIST.cs +++ b/Models/ScpEntity/V_TB_RECEIVE_LIST.cs @@ -31,6 +31,7 @@ namespace CK.SCP.Models.ScpEntity public System.Guid GUID { get; set; } public string AsnBillNum { get; set; } public string Site { get; set; } + public string SubSite { get; set; } public string VendId { get; set; } public Nullable ShipTime { get; set; } public string OperName { get; set; } diff --git a/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx b/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx index bb82f68..30a8d94 100644 --- a/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx +++ b/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx @@ -36,7 +36,7 @@ PageSize="1000" BoxFlex="1" CssClass="maingrid" - DataKeyNames="UID,RecvBillNum,PoLine,PartCode,Batch,Qty,DockCode,Remark,CreateTime,CreateUser,IsDeleted,GUID,AsnBillNum,Site,VendId,ShipTime,OperName,PartDesc1,State,PoBillNum,VendName,Site_Desc,PoUnit,LocUnit,Price,VendBatch,Currency,BillType_DESC,ErpRecvBillNum,PurCost,StdCost" + DataKeyNames="UID,RecvBillNum,PoLine,PartCode,Batch,Qty,DockCode,Remark,CreateTime,CreateUser,IsDeleted,GUID,AsnBillNum,Site,VendId,ShipTime,OperName,PartDesc1,State,PoBillNum,VendName,Site_Desc,PoUnit,LocUnit,Price,VendBatch,Currency,BillType_DESC,ErpRecvBillNum,PurCost,StdCost,SubSite" IsDatabasePaging="True" AllowPaging="True" SortDirection="DESC" diff --git a/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx.cs b/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx.cs index 64f8d60..371b2c5 100644 --- a/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx.cs +++ b/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx.cs @@ -213,6 +213,8 @@ namespace SCP.Views.SupplierData _entity.AsnBillNum = rowDataKeys[12] as string; _entity.Site = rowDataKeys[13] as string; invoice.Site = rowDataKeys[13] as string; + _entity.SubSite = rowDataKeys[31] as string; + invoice.SubSite = rowDataKeys[31] as string; _entity.VendId = rowDataKeys[14] as string; _entity.ShipTime = ConvertHelper.To(rowDataKeys[15]); _entity.OperName = rowDataKeys[16] as string;