lf/KDTECH.ProManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

增加字段，以及下拉动态绑定数据

Browse Source
This commit is contained in:
Jimmy 2021-07-14 00:27:11 +08:00
parent 988f9f74e8
commit 2c5e44a8e3
17 changed files with 8379 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Code/src/MineTec.ProManager.Application/Supplier/Dto/CreateUpdateSupplierDto.cs
View File

@ -112,6 +112,30 @@ namespace MineTec.ProManager.Supplier.Dto
[StringLength(100)]
public string Website { get; set; }
/// <summary>
/// 社会统一信用代码
/// </summary>
[StringLength(100)]
public string CreditCode { get; set; }
/// <summary>
/// 开户银行
/// </summary>
[StringLength(100)]
public string Bank { get; set; }
/// <summary>
/// 账号
/// </summary>
[StringLength(100)]
public string BankAccount { get; set; }
/// <summary>
/// 传真
/// </summary>
[StringLength(100)]
public string Fax { get; set; }
/// <summary>
/// 备注
/// </summary>

24
Code/src/MineTec.ProManager.Application/Supplier/Dto/SupplierDto.cs
View File

@ -112,6 +112,30 @@ namespace MineTec.ProManager.Supplier.Dto
[StringLength(100)]
public string Website { get; set; }
/// <summary>
/// 社会统一信用代码
/// </summary>
[StringLength(100)]
public string CreditCode { get; set; }
/// <summary>
/// 开户银行
/// </summary>
[StringLength(100)]
public string Bank { get; set; }
/// <summary>
/// 账号
/// </summary>
[StringLength(100)]
public string BankAccount { get; set; }
/// <summary>
/// 传真
/// </summary>
[StringLength(100)]
public string Fax { get; set; }
/// <summary>
/// 备注
/// </summary>

12
Code/src/MineTec.ProManager.Application/Supplier/Dto/UpdateSupplier.cs
View File

@ -34,6 +34,18 @@ namespace MineTec.ProManager.Supplier.Dto
public string Website { get; set; }//更新网站
/// 社会统一信用代码
public string CreditCode { get; set; }
/// 开户银行
public string Bank { get; set; }
/// 账号
public string BankAccount { get; set; }
/// 传真
public string Fax { get; set; }
public string Remark { get; set; } //备注
public int IsDelete { get; set; }//是否删除

4
Code/src/MineTec.ProManager.Application/Supplier/SupplierAppService.cs
View File

@ -101,6 +101,10 @@ namespace MineTec.ProManager.Supplier
query.Email = input.Email;
query.Address = input.Address;
query.Website = input.Website;
query.CreditCode = input.CreditCode;
query.Bank = input.Bank;
query.BankAccount = input.BankAccount;
query.Fax = input.Fax;
query.Remark = input.Remark;
}

24
Code/src/MineTec.ProManager.Core/Entitys/Supplier/Supplier.cs
View File

@ -112,6 +112,30 @@ namespace MineTec.ProManager.Entitys.Supplier
[StringLength(100)]
public string Website { get; set; }
/// <summary>
/// 社会统一信用代码
/// </summary>
[StringLength(100)]
public string CreditCode { get; set; }
/// <summary>
/// 开户银行
/// </summary>
[StringLength(100)]
public string Bank { get; set; }
/// <summary>
/// 账号
/// </summary>
[StringLength(100)]
public string BankAccount { get; set; }
/// <summary>
/// 传真
/// </summary>
[StringLength(100)]
public string Fax { get; set; }
/// <summary>
/// 备注
/// </summary>

2
Code/src/MineTec.ProManager.EntityFrameworkCore/EntityFrameworkCore/ProManagerDbContext.cs
View File

@ -40,7 +40,7 @@ namespace MineTec.ProManager.EntityFrameworkCore
public DbSet<Entitys.Order.BOM_Manager.BOM_Manager> BOM_Manager { get; set; }
//视图：添加新表时，若需要更新数据库，需先注释下面的视图注册代码
//视图：添加新表时，或更新数据库，需先注释下面的视图注册代码
public DbSet<Entitys.Graphic.GalleryInformation.ViewGalleryInformation> ViewGalleryInformation { get; set; }
//protected override void OnModelCreating(ModelBuilder modelBuilder)

2652
Code/src/MineTec.ProManager.EntityFrameworkCore/Migrations/20210713154917_addsupplierwords.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

84
Code/src/MineTec.ProManager.EntityFrameworkCore/Migrations/20210713154917_addsupplierwords.cs Normal file
View File

@ -0,0 +1,84 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace MineTec.ProManager.Migrations
{
public partial class addsupplierwords : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "Bank",
table: "Supplier",
maxLength: 100,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "BankaAcount",
table: "Supplier",
maxLength: 100,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CreditCode",
table: "Supplier",
maxLength: 100,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "Fax",
table: "Supplier",
maxLength: 100,
nullable: true);
migrationBuilder.CreateTable(
name: "BOM_Manager",
columns: table => new
{
Id = table.Column<Guid>(nullable: false),
CreateTime = table.Column<DateTime>(nullable: true),
CreateUserID = table.Column<string>(maxLength: 50, nullable: true),
CreateUserName = table.Column<string>(maxLength: 50, nullable: true),
UpdateTime = table.Column<DateTime>(nullable: true),
UpdateUserID = table.Column<string>(maxLength: 50, nullable: true),
UpdateUserName = table.Column<string>(maxLength: 50, nullable: true),
ProductProjectID = table.Column<string>(maxLength: 50, nullable: true),
ProductProjectName = table.Column<string>(maxLength: 50, nullable: true),
BOMID = table.Column<string>(maxLength: 50, nullable: true),
BOMName = table.Column<string>(maxLength: 50, nullable: true),
BOM_ProductionID = table.Column<string>(maxLength: 50, nullable: true),
BOM_ProductionName = table.Column<string>(maxLength: 50, nullable: true),
Remark = table.Column<string>(maxLength: 300, nullable: true),
IsAnnex = table.Column<int>(nullable: false),
IsDelete = table.Column<int>(nullable: false),
CreationTime = table.Column<DateTime>(nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_BOM_Manager", x => x.Id);
});
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "BOM_Manager");
migrationBuilder.DropColumn(
name: "Bank",
table: "Supplier");
migrationBuilder.DropColumn(
name: "BankaAcount",
table: "Supplier");
migrationBuilder.DropColumn(
name: "CreditCode",
table: "Supplier");
migrationBuilder.DropColumn(
name: "Fax",
table: "Supplier");
}
}
}

2652
Code/src/MineTec.ProManager.EntityFrameworkCore/Migrations/20210713155600_updatesupplierwords.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

34
Code/src/MineTec.ProManager.EntityFrameworkCore/Migrations/20210713155600_updatesupplierwords.cs Normal file
View File

@ -0,0 +1,34 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace MineTec.ProManager.Migrations
{
public partial class updatesupplierwords : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BankaAcount",
table: "Supplier");
migrationBuilder.AddColumn<string>(
name: "BankAcount",
table: "Supplier",
maxLength: 100,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BankAcount",
table: "Supplier");
migrationBuilder.AddColumn<string>(
name: "BankaAcount",
table: "Supplier",
type: "nvarchar(100)",
maxLength: 100,
nullable: true);
}
}
}

2652
Code/src/MineTec.ProManager.EntityFrameworkCore/Migrations/20210713161553_updatesupplierwords2.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

34
Code/src/MineTec.ProManager.EntityFrameworkCore/Migrations/20210713161553_updatesupplierwords2.cs Normal file
View File

@ -0,0 +1,34 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace MineTec.ProManager.Migrations
{
public partial class updatesupplierwords2 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BankAcount",
table: "Supplier");
migrationBuilder.AddColumn<string>(
name: "BankAccount",
table: "Supplier",
maxLength: 100,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BankAccount",
table: "Supplier");
migrationBuilder.AddColumn<string>(
name: "BankAcount",
table: "Supplier",
type: "nvarchar(100)",
maxLength: 100,
nullable: true);
}
}
}

86
Code/src/MineTec.ProManager.EntityFrameworkCore/Migrations/ProManagerDbContextModelSnapshot.cs
View File

@ -1909,6 +1909,76 @@ namespace MineTec.ProManager.Migrations
b.ToTable("BOMDetails");
});
modelBuilder.Entity("MineTec.ProManager.Entitys.Order.BOM_Manager.BOM_Manager", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<string>("BOMID")
.HasColumnType("nvarchar(50)")
.HasMaxLength(50);
b.Property<string>("BOMName")
.HasColumnType("nvarchar(50)")
.HasMaxLength(50);
b.Property<string>("BOM_ProductionID")
.HasColumnType("nvarchar(50)")
.HasMaxLength(50);
b.Property<string>("BOM_ProductionName")
.HasColumnType("nvarchar(50)")
.HasMaxLength(50);
b.Property<DateTime?>("CreateTime")
.HasColumnType("datetime2");
b.Property<string>("CreateUserID")
.HasColumnType("nvarchar(50)")
.HasMaxLength(50);
b.Property<string>("CreateUserName")
.HasColumnType("nvarchar(50)")
.HasMaxLength(50);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
b.Property<int>("IsAnnex")
.HasColumnType("int");
b.Property<int>("IsDelete")
.HasColumnType("int");
b.Property<string>("ProductProjectID")
.HasColumnType("nvarchar(50)")
.HasMaxLength(50);
b.Property<string>("ProductProjectName")
.HasColumnType("nvarchar(50)")
.HasMaxLength(50);
b.Property<string>("Remark")
.HasColumnType("nvarchar(300)")
.HasMaxLength(300);
b.Property<DateTime?>("UpdateTime")
.HasColumnType("datetime2");
b.Property<string>("UpdateUserID")
.HasColumnType("nvarchar(50)")
.HasMaxLength(50);
b.Property<string>("UpdateUserName")
.HasColumnType("nvarchar(50)")
.HasMaxLength(50);
b.HasKey("Id");
b.ToTable("BOM_Manager");
});
modelBuilder.Entity("MineTec.ProManager.Entitys.Order.BOM_Production.BOMDetails_Production", b =>
{
b.Property<Guid>("Id")
@ -2079,6 +2149,14 @@ namespace MineTec.ProManager.Migrations
.HasColumnType("nvarchar(100)")
.HasMaxLength(100);
b.Property<string>("Bank")
.HasColumnType("nvarchar(100)")
.HasMaxLength(100);
b.Property<string>("BankAccount")
.HasColumnType("nvarchar(100)")
.HasMaxLength(100);
b.Property<string>("Contacts")
.HasColumnType("nvarchar(50)")
.HasMaxLength(50);
@ -2097,10 +2175,18 @@ namespace MineTec.ProManager.Migrations
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
b.Property<string>("CreditCode")
.HasColumnType("nvarchar(100)")
.HasMaxLength(100);
b.Property<string>("Email")
.HasColumnType("nvarchar(100)")
.HasMaxLength(100);
b.Property<string>("Fax")
.HasColumnType("nvarchar(100)")
.HasMaxLength(100);
b.Property<string>("Fixedtelephone")
.HasColumnType("nvarchar(100)")
.HasMaxLength(100);

16
Pages/page/Order/OrderManager/addOrder.html
View File

@ -454,11 +454,11 @@
form.val("addOrder", { //formTest 即 class="layui-form" 所在元素属性 lay-filter="" 对应的值
"supplier_address": Supplierdata.address,// "name": "value"
"supplier_creditcode": Supplierdata.address,// "name": "value"
"supplier_bank": Supplierdata.address,// "name": "value"
"supplier_bankaccount": Supplierdata.address,// "name": "value"
"supplier_creditcode": Supplierdata.creditCode,// "name": "value"
"supplier_bank": Supplierdata.bank,// "name": "value"
"supplier_bankaccount": Supplierdata.bankAccount,// "name": "value"
"supplier_telnum": Supplierdata.fixedtelephone,// "name": "value"
"supplier_fax": Supplierdata.address,// "name": "value"
"supplier_fax": Supplierdata.fax,// "name": "value"
"supplier_contactperson": Supplierdata.contacts,// "name": "value"
"supplier_phonenum": Supplierdata.mobilephone,// "name": "value"
"supplier_email": Supplierdata.email,// "name": "value"
@ -494,11 +494,11 @@
form.val("addOrder", { //formTest 即 class="layui-form" 所在元素属性 lay-filter="" 对应的值
"client_address": clientdata.address,// "name": "value"
"client_creditcode": clientdata.address,// "name": "value"
"client_bank": clientdata.address,// "name": "value"
"client_bankaccount": clientdata.address,// "name": "value"
"client_creditcode": clientdata.creditCode,// "name": "value"
"client_bank": clientdata.bank,// "name": "value"
"client_bankaccount": clientdata.bankAccount,// "name": "value"
"client_telnum": clientdata.fixedtelephone,// "name": "value"
"client_fax": clientdata.address,// "name": "value"
"client_fax": clientdata.fax,// "name": "value"
"client_contactperson": clientdata.contacts,// "name": "value"
"client_phonenum": clientdata.mobilephone,// "name": "value"
"client_email": clientdata.email,// "name": "value"

28
Pages/page/Order/Supplier/addSupplier.html
View File

@ -86,6 +86,30 @@
<input type="text" name="website" placeholder="请输入网址" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">社会统一信用代码</label>
<div class="layui-input-block">
<input type="text" name="creditcode" placeholder="请输入社会统一信用代码" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">开户银行</label>
<div class="layui-input-block">
<input type="text" name="bank" placeholder="请输入开户银行" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">银行账号</label>
<div class="layui-input-block">
<input type="text" name="bankaccount" placeholder="请输入银行账号" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">传真</label>
<div class="layui-input-block">
<input type="text" name="fax" placeholder="请输入传真" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
@ -129,6 +153,10 @@
email: data.field.email,
address: data.field.address,
website: data.field.website,
creditCode: data.field.creditcode,
bank: data.field.bank,
bankAccount: data.field.bankaccount,
fax: data.field.fax,
remark: data.field.remark,
createTime: getDatetime(),

32
Pages/page/Order/Supplier/editSupplier.html
View File

@ -87,6 +87,30 @@
<input type="text" name="website" placeholder="请输入网址" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">社会统一信用代码</label>
<div class="layui-input-block">
<input type="text" name="creditcode" placeholder="请输入社会统一信用代码" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">开户银行</label>
<div class="layui-input-block">
<input type="text" name="bank" placeholder="请输入开户银行" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">银行账号</label>
<div class="layui-input-block">
<input type="text" name="bankaccount" placeholder="请输入银行账号" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">传真</label>
<div class="layui-input-block">
<input type="text" name="fax" placeholder="请输入传真" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
@ -145,6 +169,10 @@
'email': data.email,
'address': data.address,
'website': data.website,
'creditcode': data.creditCode,
'bank': data.bank,
'bankaccount': data.bankAccount,
'fax': data.fax,
'remark': data.remark,
});
},
@ -186,6 +214,10 @@
email: data.field.email,
address: data.field.address,
website: data.field.website,
creditCode: data.field.creditcode,
bank: data.field.bank,
bankAccount: data.field.bankaccount,
fax: data.field.fax,
remark: data.field.remark,
}), //参数值
type: "PUT", //请求方式

28
Pages/page/Order/Supplier/viewSupplier.html
View File

@ -94,6 +94,30 @@
<input type="text" name="website" disabled placeholder="请输入网址" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">社会统一信用代码</label>
<div class="layui-input-block">
<input type="text" name="creditcode" disabled placeholder="请输入社会统一信用代码" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">开户银行</label>
<div class="layui-input-block">
<input type="text" name="bank" disabled placeholder="请输入开户银行" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">银行账号</label>
<div class="layui-input-block">
<input type="text" name="bankaccount" disabled placeholder="请输入银行账号" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">传真</label>
<div class="layui-input-block">
<input type="text" name="fax" disabled placeholder="请输入传真" value="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
@ -145,6 +169,10 @@
'email': data.email,
'address': data.address,
'website': data.website,
'creditcode': data.creditCode,
'bank': data.bank,
'bankaccount': data.bankAccount,
'fax': data.fax,
'remark': data.remark,
});
},