From 117428d9dd0d183ffdb01981df76bb568098c191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Tue, 18 Aug 2020 09:41:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SCP/Admin/MakeInitUser.aspx | 37 ------
SCP/Admin/MakeInitUser.aspx.cs | 161 ------------------------
SCP/Admin/MakeInitUser.aspx.designer.cs | 96 --------------
SCP/Handlers/ServiceHandler.ashx | 1 -
SCP/Handlers/ServiceHandler.ashx.cs | 34 -----
5 files changed, 329 deletions(-)
delete mode 100644 SCP/Admin/MakeInitUser.aspx
delete mode 100644 SCP/Admin/MakeInitUser.aspx.cs
delete mode 100644 SCP/Admin/MakeInitUser.aspx.designer.cs
delete mode 100644 SCP/Handlers/ServiceHandler.ashx
delete mode 100644 SCP/Handlers/ServiceHandler.ashx.cs
diff --git a/SCP/Admin/MakeInitUser.aspx b/SCP/Admin/MakeInitUser.aspx
deleted file mode 100644
index fae0311..0000000
--- a/SCP/Admin/MakeInitUser.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MakeInitUser.aspx.cs" Inherits="SCP.Admin.MakeInitUser" %>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SCP/Admin/MakeInitUser.aspx.cs b/SCP/Admin/MakeInitUser.aspx.cs
deleted file mode 100644
index 34dc1c6..0000000
--- a/SCP/Admin/MakeInitUser.aspx.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using CK.SCP.Models.AppBoxEntity;
-using CK.SCP.Models.AppBoxEntity.ExcelImportEntity;
-using CK.SCP.Utils;
-using FineUI;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace SCP.Admin
-{
- public partial class MakeInitUser : PageBase
- {
- protected void Page_Load(object sender, EventArgs e)
- {
-
- }
-
- protected void BTN_Make_Click(object sender, EventArgs e)
- {
- try
- {
- var vendList = SCPDB.TA_VENDER.ToList();
- List list = new List();
- foreach (var itm in vendList)
- {
- APPBOX_USER_EXCEL excel = new APPBOX_USER_EXCEL();
- excel.登录名称 = itm.VendId;
- excel.密码 = "666666";
- excel.性别 = "男";
- excel.姓名 = itm.VendName;
- excel.电子邮件 = itm.VendId + "@163.com";
- excel.供应商编号 = itm.VendId;
- excel.所属地点 = itm.Site;
- list.Add(excel);
- }
- List _ls = new List();
- list.ForEach(itm =>
- {
- var userList = DB.Users.Where(p => p.Name == itm.登录名称).ToList();
- if(userList.Count==0)
- {
- User item = new User();
- item.Name = itm.登录名称 + "@" + itm.所属地点;
- item.Password = PasswordUtil.CreateDbPassword(itm.密码.Trim());
- item.ChineseName = itm.姓名.Trim();
- item.Gender = itm.性别;
- item.CompanyEmail = itm.电子邮件.Trim();
- item.Email = itm.电子邮件.Trim();
- item.Remark = itm.所属地点;
- item.Enabled = true;
- item.CreateTime = DateTime.Now;
- item.SupplierCode = itm.供应商编号;
- if (!string.IsNullOrEmpty(itm.供应商编号))
- {
- var _role = DB.Roles.Where(p => p.Name == "供应商").FirstOrDefault();
- if (_role != null)
- {
- item.Roles = new List();
- int[] roleIDs = new int[] { _role.ID };
-
- AddEntities(item.Roles, roleIDs);
- }
- item.SupplierCode = itm.供应商编号;
- }
- DB.Users.Add(item);
- }
-
-
- });
- if (DB.SaveChanges() != -1)
- {
-
- }
- }
- catch (Exception ex)
- {
- Alert.Show(ex.Message);
- }
-
- }
-
-
- protected void BTN_Rel_Click(object sender, EventArgs e)
- {
-
- }
-
- protected void Button1_Click(object sender, EventArgs e)
- {
- try
- {
-
- var _userlist = DB.Users.ToList();
- foreach (var itm in _userlist)
- {
- if (!string.IsNullOrEmpty(itm.Remark))
- {
- var _factory = itm.Remark;
- var _f = DB.TA_FACTORY.Where(p => p.FactoryId == _factory).FirstOrDefault();
- int[] titleIDs = new int[] { _f.ID };
-
- AddEntities(itm.TA_FACTORY, titleIDs);
-
- }
-
-
- }
- DB.SaveChanges();
- }
- catch (Exception ex)
- {
- Alert.Show(ex.Message);
- return;
- }
- }
-
- protected void Button2_Click(object sender, EventArgs e)
- {
- try
- {
- var _userlist = DB.Users.ToList();
- foreach (var itm in _userlist)
- {
- if (!string.IsNullOrEmpty(itm.Remark))
- {
-
-
- var _VenderUsers = DB.VenderUsers.Where(p => p.UserId == itm.ID).ToList();
- if (_VenderUsers != null && _VenderUsers.Count > 0)
- {
- DB.VenderUsers.RemoveRange(_VenderUsers);
- }
- List _vList = new List();
- VenderUsers _vus = new VenderUsers();
- _vus.UserId = itm.ID;
- _vus.VenderId = itm.Name.Split('@')[0];
- _vList.Add(_vus);
- if (_vList.Count > 0)
- {
- var ls = _vList.Where(p => p.UserId > 0 && !string.IsNullOrEmpty(p.VenderId));
- DB.VenderUsers.AddRange(ls.ToArray());
- }
- }
-
- }
- DB.SaveChanges();
-
- }
- catch (Exception ex)
- {
- Alert.Show(ex.Message);
- return;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/SCP/Admin/MakeInitUser.aspx.designer.cs b/SCP/Admin/MakeInitUser.aspx.designer.cs
deleted file mode 100644
index 02558da..0000000
--- a/SCP/Admin/MakeInitUser.aspx.designer.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//------------------------------------------------------------------------------
-// <自动生成>
-// 此代码由工具生成。
-//
-// 对此文件的更改可能导致不正确的行为，如果
-// 重新生成代码，则所做更改将丢失。
-//
-//------------------------------------------------------------------------------
-
-namespace SCP.Admin {
-
-
- public partial class MakeInitUser {
-
- ///
- /// form1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
- ///
- /// PageManager1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.PageManager PageManager1;
-
- ///
- /// Panel1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.Panel Panel1;
-
- ///
- /// Form2 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.Form Form2;
-
- ///
- /// FormRow1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.FormRow FormRow1;
-
- ///
- /// BTN_Make 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.Button BTN_Make;
-
- ///
- /// Button2 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.Button Button2;
-
- ///
- /// Button1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.Button Button1;
-
- ///
- /// Window1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.Window Window1;
- }
-}
diff --git a/SCP/Handlers/ServiceHandler.ashx b/SCP/Handlers/ServiceHandler.ashx
deleted file mode 100644
index b6bff6d..0000000
--- a/SCP/Handlers/ServiceHandler.ashx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebHandler Language="C#" CodeBehind="ServiceHandler.ashx.cs" Class="SCP.Handlers.ServiceHandler" %>
diff --git a/SCP/Handlers/ServiceHandler.ashx.cs b/SCP/Handlers/ServiceHandler.ashx.cs
deleted file mode 100644
index 6ef45b1..0000000
--- a/SCP/Handlers/ServiceHandler.ashx.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace SCP.Handlers
-{
- ///
- /// ServiceHandler 的摘要说明
- ///
- public class ServiceHandler : IHttpHandler
- {
-
- public void ProcessRequest(HttpContext context)
- {
-
-
- context.Response.ContentType = "json";
- context.Response.Write("Hello World");
- }
-
- public bool IsReusable
- {
- get
- {
- return false;
- }
- }
- //public string GetUnCompleteAsk()
- //{
-
- //}
- }
-}
\ No newline at end of file
From 575abcd709c621a8bc6ef9c0b07286393d579fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Tue, 18 Aug 2020 09:45:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SCP/Handlers/ReceiveHandler.ashx | 1 -
SCP/Handlers/ReceiveHandler.ashx.cs | 73 -----------------------------
SCP/SCP.csproj | 40 ----------------
3 files changed, 114 deletions(-)
delete mode 100644 SCP/Handlers/ReceiveHandler.ashx
delete mode 100644 SCP/Handlers/ReceiveHandler.ashx.cs
diff --git a/SCP/Handlers/ReceiveHandler.ashx b/SCP/Handlers/ReceiveHandler.ashx
deleted file mode 100644
index ab799d9..0000000
--- a/SCP/Handlers/ReceiveHandler.ashx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebHandler Language="C#" CodeBehind="ReceiveHandler.ashx.cs" Class="SCP.Handlers.ReceiveHandler" %>
diff --git a/SCP/Handlers/ReceiveHandler.ashx.cs b/SCP/Handlers/ReceiveHandler.ashx.cs
deleted file mode 100644
index eeb6615..0000000
--- a/SCP/Handlers/ReceiveHandler.ashx.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace SCP.Handlers
-{
- ///
- /// ReceiveHandler 的摘要说明
- ///
- public class ReceiveHandler : IHttpHandler
- {
-
- public void ProcessRequest(HttpContext context)
- {
- string rowId = context.Request.QueryString["id"];
- int rowIdInt = Convert.ToInt32(rowId);
-
- JObject jo = new JObject();
-
- JArray ja = new JArray();
-
- Random rd = new Random();
- for (int i = 0; i < 3; i++)
- {
- JObject joItem = new JObject();
-
- if (i == 0)
- {
- joItem.Add("type", "入学");
- }
- else if (i == 1)
- {
- joItem.Add("type", "期中");
- }
- else if (i == 2)
- {
- joItem.Add("type", "期末");
- }
-
- int randomMinValue = 80;
- int randomMaxValue = 100;
- if (rowIdInt % 2 == 0)
- {
- randomMinValue = 40;
- randomMaxValue = 80;
- }
- joItem.Add("yuwen", rd.Next(randomMinValue, randomMaxValue));
- joItem.Add("shuxue", rd.Next(randomMinValue, randomMaxValue));
- joItem.Add("yingwen", rd.Next(randomMinValue, randomMaxValue));
- joItem.Add("wuli", rd.Next(randomMinValue, randomMaxValue));
- joItem.Add("huaxue", rd.Next(randomMinValue, randomMaxValue));
-
- ja.Add(joItem);
- }
-
- jo.Add("data", ja);
- jo.Add("total", ja.Count);
-
- context.Response.ContentType = "text/plain";
- context.Response.Write(jo.ToString(Newtonsoft.Json.Formatting.None));
- }
-
- public bool IsReusable
- {
- get
- {
- return false;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/SCP/SCP.csproj b/SCP/SCP.csproj
index 7013896..63dd90b 100644
--- a/SCP/SCP.csproj
+++ b/SCP/SCP.csproj
@@ -177,7 +177,6 @@
-
@@ -2906,12 +2905,10 @@
-
-
@@ -4496,7 +4493,6 @@
-
@@ -4508,9 +4504,7 @@
-
-
@@ -4647,13 +4641,6 @@
log_view.aspx
-
- MakeInitUser.aspx
- ASPXCodeBehind
-
-
- MakeInitUser.aspx
-
menu.aspx
ASPXCodeBehind
@@ -4893,12 +4880,6 @@
MakeVerifyCode.ashx
-
- ReceiveHandler.ashx
-
-
- ServiceHandler.ashx
-
Price.aspx
ASPXCodeBehind
@@ -5524,13 +5505,6 @@
ViewSwitcher.ascx
-
- SCP_COMPARE.aspx
- ASPXCodeBehind
-
-
- SCP_COMPARE.aspx
-
SCP_INVOICE_VIEW.aspx
ASPXCodeBehind
@@ -5608,13 +5582,6 @@
SCP_RECEIVE_DETAIL_VIEW.aspx
-
- SCP_REJECT.aspx
- ASPXCodeBehind
-
-
- SCP_REJECT.aspx
-
SCP_RECEIVE.aspx
ASPXCodeBehind
@@ -5622,13 +5589,6 @@
SCP_RECEIVE.aspx
-
- SCP_REJECT_DETAIL.aspx
- ASPXCodeBehind
-
-
- SCP_REJECT_DETAIL.aspx
-
SCP_RECEIVE_DETAIL.aspx
ASPXCodeBehind
From 7102c36ccff430cbe880481c134c02641fcb60d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Tue, 18 Aug 2020 10:13:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=20=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Models/ScpEntity/SCP_OTD_EXPORT.cs | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/Models/ScpEntity/SCP_OTD_EXPORT.cs b/Models/ScpEntity/SCP_OTD_EXPORT.cs
index eb2833e..ec2fecb 100644
--- a/Models/ScpEntity/SCP_OTD_EXPORT.cs
+++ b/Models/ScpEntity/SCP_OTD_EXPORT.cs
@@ -6,6 +6,18 @@ using System.Threading.Tasks;
namespace CK.SCP.Models.ScpEntity
{
+ public class InvoiceCreateQueryParm
+ {
+ public string ReceiveID { set; get; }
+ public string VendId { set; get; }
+ public string Modify { set; get; }
+ public string IsAll { set; get; }
+ public string Tax { set; get; }
+ public string CJ { set; get; }
+ public string TZ { set; get; }
+
+
+ }
public class SCP_OTD_EXPORT
{
public string VendId { get; set; } //供应商编号