From e6e383664501644ba5327ac4fa3a8a22e2407827 Mon Sep 17 00:00:00 2001 From: TML <1448969505@qq.com> Date: Sun, 27 Sep 2020 08:41:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=88=E9=98=B3=E4=BB=A3=E7=A0=81=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/SCP_EXCEL_CONTROLLER.cs | 2 +- Models/AppBoxEntity/AppBoxContext.cs | 2 +- Models/ScpEntity/V_TB_FORECAST.cs | 6 +++--- Models/ScpEntity/V_TB_RECEIVE_LIST.cs | 2 +- .../沈阳金杯/SupplierData/SCP_INVOICE.aspx.cs | 4 ++++ .../SupplierData/SCP_INVOICE_EDIT.aspx.cs | 13 +++++++++++++ .../沈阳金杯/WarehouseData/SCP_INVOICE.aspx | 2 +- .../WarehouseData/SCP_INVOICE_CONFIRM.aspx | 2 +- SCP/default.aspx | 4 ++-- 9 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Controller/SCP_EXCEL_CONTROLLER.cs b/Controller/SCP_EXCEL_CONTROLLER.cs index 56c6b47..013aca5 100644 --- a/Controller/SCP_EXCEL_CONTROLLER.cs +++ b/Controller/SCP_EXCEL_CONTROLLER.cs @@ -62,7 +62,7 @@ namespace CK.SCP.Controller po_detail.发货数 = itm.ShippedQty.ToString(); po_detail.收货数 = itm.ReceivedQty.ToString(); po_detail.退货数 = itm.RejectQty; - po_detail.到货日期 = itm.EndTime == null ? string.Empty : ((DateTime)itm.BeginTime).ToString("yyyyMMdd"); ; + po_detail.到货日期 = itm.EndTime == null ? string.Empty : ((DateTime)itm.BeginTime).ToString("yyyyMMdd"); ; po_detail.单位 = itm.PoUnit; _exportDetailList.Add(po_detail); }); diff --git a/Models/AppBoxEntity/AppBoxContext.cs b/Models/AppBoxEntity/AppBoxContext.cs index bce08fc..1b2df8a 100644 --- a/Models/AppBoxEntity/AppBoxContext.cs +++ b/Models/AppBoxEntity/AppBoxContext.cs @@ -27,7 +27,7 @@ namespace CK.SCP.Models.AppBoxEntity public DbSet TA_FACTORY { get; set; } public DbSet VenderUsers { get; set; } - public DbSet FactoryUsers { get; set; } + public DbSet FactoryUsers { get; set; } protected override void OnModelCreating(DbModelBuilder modelBuilder) { base.OnModelCreating(modelBuilder); diff --git a/Models/ScpEntity/V_TB_FORECAST.cs b/Models/ScpEntity/V_TB_FORECAST.cs index 934a8d6..f0583eb 100644 --- a/Models/ScpEntity/V_TB_FORECAST.cs +++ b/Models/ScpEntity/V_TB_FORECAST.cs @@ -28,16 +28,16 @@ namespace CK.SCP.Models.ScpEntity public string Month { get; set; } [StringLength(50)] public string PoType { get; set; } - public int PoLine { get; set; } + public int? PoLine { get; set; } [StringLength(50)] public string Specifications { get; set; } public string Unit { get; set; } - public decimal Qty { get; set; } + public decimal? Qty { get; set; } public string ProductStatus { get; set; } public string IsUrgent { get; set; } public DateTime? ShippdedTime { get; set; } public string ShippdedPlace { get; set; } - public decimal MonthQty { get; set; } + public decimal? MonthQty { get; set; } public string Ontime { get; set; } public string Datetime { get; set; } [StringLength(50)] diff --git a/Models/ScpEntity/V_TB_RECEIVE_LIST.cs b/Models/ScpEntity/V_TB_RECEIVE_LIST.cs index 0300907..8f5c8b7 100644 --- a/Models/ScpEntity/V_TB_RECEIVE_LIST.cs +++ b/Models/ScpEntity/V_TB_RECEIVE_LIST.cs @@ -79,7 +79,7 @@ namespace CK.SCP.Models.ScpEntity [NotMapped] public bool IsCheck { set; get; } - public int ModType { set; get; } + public int? ModType { set; get; } [NotMapped] public decimal InputQty { set; get; } diff --git a/SCP/Views/沈阳金杯/SupplierData/SCP_INVOICE.aspx.cs b/SCP/Views/沈阳金杯/SupplierData/SCP_INVOICE.aspx.cs index f24ce23..ced3266 100644 --- a/SCP/Views/沈阳金杯/SupplierData/SCP_INVOICE.aspx.cs +++ b/SCP/Views/沈阳金杯/SupplierData/SCP_INVOICE.aspx.cs @@ -235,6 +235,10 @@ namespace SCP.Views.沈阳金杯.SupplierData DataSet ds = SCP_EXCEL_CONTROLLER.GET_INVOICE_EXECEL(_ls); PageBase.DataSetToExcel(ds, "发票明细"); } + protected void BTN_INV_Click(object sender, EventArgs e) + { + BindInvoice(); + } protected void Window1_Close(object sender, WindowCloseEventArgs e) { BindInvoice(); diff --git a/SCP/Views/沈阳金杯/SupplierData/SCP_INVOICE_EDIT.aspx.cs b/SCP/Views/沈阳金杯/SupplierData/SCP_INVOICE_EDIT.aspx.cs index 1bc9467..3a50355 100644 --- a/SCP/Views/沈阳金杯/SupplierData/SCP_INVOICE_EDIT.aspx.cs +++ b/SCP/Views/沈阳金杯/SupplierData/SCP_INVOICE_EDIT.aspx.cs @@ -588,6 +588,19 @@ namespace SCP.Views.沈阳金杯.SupplierData highlightRows.Text += e.RowIndex.ToString() + ","; } } + protected void btnRed_Click(object sender, EventArgs e) + { + string id = GetQueryValue("ID"); + V_TB_INVOICE _tb = new V_TB_INVOICE(); + _tb.InvcBillNum = id; + var ret = SCP_INVOICE_CONTROLLER.Add_New_Red_Invoice(_tb); + + if (ret.State == ReturnStatus.Succeed) + { + BindData(); + GetInvoice(); + } + } protected void Grid1_Sort(object sender, GridSortEventArgs e) { diff --git a/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE.aspx b/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE.aspx index e9e58f3..143c3c3 100644 --- a/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE.aspx +++ b/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE.aspx @@ -82,7 +82,7 @@ diff --git a/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE_CONFIRM.aspx b/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE_CONFIRM.aspx index 3e34f23..f3dc113 100644 --- a/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE_CONFIRM.aspx +++ b/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE_CONFIRM.aspx @@ -84,7 +84,7 @@ diff --git a/SCP/default.aspx b/SCP/default.aspx index 2d3bb7e..a8354e6 100644 --- a/SCP/default.aspx +++ b/SCP/default.aspx @@ -111,10 +111,10 @@ for (var i = 0; obj.options.length; i++) { - if ('QDVALEO' == obj.options[i].value) { + if ('0210' == obj.options[i].value) { obj.options[i].selected = true; _factory = document.getElementById(_factoryValue); - _factory.value = 'QDVALEO'; + _factory.value = '0210'; } }