沈阳代码更改

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

Models/AppBoxEntity/AppBoxContext.cs

@@ -27,7 +27,7 @@ namespace CK.SCP.Models.AppBoxEntity
         public DbSet<TA_FACTORY> TA_FACTORY { get; set; }
         public DbSet<VenderUsers> VenderUsers { get; set; }
 
-        public DbSet<FactoryUsers> FactoryUsers { get; set; }
+        public DbSet<FactoryUsers> FactoryUsers { get; set; } 
         protected override void OnModelCreating(DbModelBuilder modelBuilder)
         {
             base.OnModelCreating(modelBuilder);

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

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

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();

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

SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE.aspx

@@ -82,7 +82,7 @@
                 <f:Grid ID="Grid_V_TB_INVOICE" runat="server" EnableCheckBoxSelect="false"
                     ShowHeader="False" SortField="CreateTime" OnSort="Grid_V_TB_INVOICE_Sort" AllowSorting="true" BoxFlex="1"
                     AllowPaging="True" PageSize="20" OnPageIndexChange="Grid_V_TB_INVOICE_PageIndexChange"
-                    ShowBorder="False" OnRowDoubleClick="Grid_V_TB_INVOICE_RowDoubleClick" BoxFlex="1"
+                    ShowBorder="False" OnRowDoubleClick="Grid_V_TB_INVOICE_RowDoubleClick" 
                     DataKeyNames="UID, InvcBillNum,State_DESC,InvoiceNum,ExpressNum,VendName,Amount,Tax,TaxAmount,ContractPrice,BlancePrice,Total,CreateTime,Remark" IsDatabasePaging="true">
        <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">

SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE_CONFIRM.aspx

@@ -84,7 +84,7 @@
                 </f:GroupPanel>
                 <f:Grid ID="Grid_V_TB_INVOICE" runat="server" EnableCheckBoxSelect="true" 
                     ShowHeader="False"  SortField="CreateTime" AllowPaging="True"  PageSize="20" 
-                    OnPageIndexChange="Grid_V_TB_INVOICE_PageIndexChange" OnSort="Grid_V_TB_INVOICE_Sort"  BoxFlex="1"
+                    OnPageIndexChange="Grid_V_TB_INVOICE_PageIndexChange" OnSort="Grid_V_TB_INVOICE_Sort" 
                     ShowBorder="False" OnRowDoubleClick="Grid_V_TB_INVOICE_RowDoubleClick" BoxFlex="1"
                     DataKeyNames="UID, InvcBillNum" AllowSorting="true" IsDatabasePaging="true" >
        <PageItems>

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