Merge branch 'master' of https://gitee.com/zxyabc/COMONE

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;

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;

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

Models/ScpEntity/TB_INVOICE_DETAIL.cs

@@ -52,7 +52,10 @@ namespace CK.SCP.Models.ScpEntity
         [StringLength(50)]
         public string DiscountRemark { get; set; }
         public Nullable<System.Boolean> IsRed { get; set; }
-
+        [StringLength(50)]
+        public string Site { get; set; }
+        [StringLength(50)]
+        public string SubSite { get; set; }
 
     }
 }

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<System.DateTime> ShipTime { get; set; }
         public string OperName { get; set; }

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" 

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<DateTime?>(rowDataKeys[15]);
                     _entity.OperName = rowDataKeys[16] as string;