yiming/17168ERP
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

調整

Browse Source
This commit is contained in:
minom
2026-07-22 18:04:17 +08:00
parent 07c5027ad8
commit da58dc92d0
19 changed files with 2105 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/App_Code/Model/Model.Context.cs
+4
View File
@@ -95,6 +95,10 @@ namespace Model
public virtual DbSet<AncestralTabletStatus> AncestralTabletStatus { get; set; }
public virtual DbSet<GuaDanOrderGuest> GuaDanOrderGuest { get; set; }
public virtual DbSet<auto_enroll> auto_enroll { get; set; }
public virtual DbSet<receipt_detail> receipt_detail { get; set; }
public virtual DbSet<receipt_master> receipt_master { get; set; }
public virtual DbSet<receipt_style> receipt_style { get; set; }
public virtual DbSet<receipt_style_d> receipt_style_d { get; set; }
public virtual int pager_eztrust(Nullable<int> startRowIndex, Nullable<int> pageSize, string tableName, string columnName, string sqlWhere, string orderBy, ObjectParameter rowCount)
{
web/App_Code/Model/Model.cs
+81 -2
View File
@@ -694,8 +694,8 @@ namespace Model
public int num { get; set; }
public int f_num { get; set; }
public System.DateTime start_date { get; set; }
public System.DateTime end_date { get; set; }
public Nullable<System.DateTime> start_date { get; set; }
public Nullable<System.DateTime> end_date { get; set; }
public string receipt_title { get; set; }
public string receipt_address { get; set; }
@@ -1539,6 +1539,85 @@ namespace Model
using System;
using System.Collections.Generic;
public partial class receipt_detail
{
public int num { get; set; }
public Nullable<int> receipt_num { get; set; }
public string title { get; set; }
public Nullable<int> amt { get; set; }
public string receipt_no { get; set; }
public string caseofficer { get; set; }
public string c_user { get; set; }
public string c_date { get; set; }
public string c_time { get; set; }
public string u_user { get; set; }
public string u_date { get; set; }
public string u_time { get; set; }
public string addr { get; set; }
}
}
namespace Model
{
using System;
using System.Collections.Generic;
public partial class receipt_master
{
public int num { get; set; }
public string order_no { get; set; }
public Nullable<int> total_amt { get; set; }
public string receipt_date { get; set; }
public Nullable<int> style_num { get; set; }
public string c_user { get; set; }
public string c_date { get; set; }
public string c_time { get; set; }
public string u_user { get; set; }
public string u_date { get; set; }
public string u_time { get; set; }
public string source { get; set; }
}
}
namespace Model
{
using System;
using System.Collections.Generic;
public partial class receipt_style
{
public int num { get; set; }
public string name { get; set; }
public string c_user { get; set; }
public string c_date { get; set; }
public string c_time { get; set; }
public string u_user { get; set; }
public string u_date { get; set; }
public string u_time { get; set; }
}
}
namespace Model
{
using System;
using System.Collections.Generic;
public partial class receipt_style_d
{
public int num { get; set; }
public Nullable<int> style_num { get; set; }
public string item_name { get; set; }
public string item_value { get; set; }
public string c_user { get; set; }
public string c_date { get; set; }
public string c_time { get; set; }
public string u_user { get; set; }
public string u_date { get; set; }
public string u_time { get; set; }
}
}
namespace Model
{
using System;
using System.Collections.Generic;
public partial class Region
{
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
web/App_Code/Model/Model.edmx
+215 -14
View File
@@ -343,10 +343,10 @@
</Key>
<Property Name="num" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="f_num" Type="int" Nullable="false" />
<Property Name="start_date" Type="date" Nullable="false" />
<Property Name="end_date" Type="date" Nullable="false" />
<Property Name="start_date" Type="date" />
<Property Name="end_date" Type="date" />
<Property Name="receipt_title" Type="nvarchar(max)" />
<Property Name="receipt_address" Type="nchar" MaxLength="200" />
<Property Name="receipt_address" Type="nvarchar" MaxLength="200" />
</EntityType>
<EntityType Name="bed_kind">
<Key>
@@ -419,7 +419,7 @@
<Property Name="smtp_def" Type="nvarchar" MaxLength="1" />
<Property Name="use_sender" Type="nvarchar" MaxLength="1" />
<Property Name="bed_order_no" Type="nvarchar" MaxLength="20" />
<Property Name="last_auto_order_no" Type="nvarchar" MaxLength="20" />
<Property Name="last_auto_order_no" Type="varchar" MaxLength="20" />
</EntityType>
<EntityType Name="country">
<Key>
@@ -795,6 +795,69 @@
<Property Name="pic1" Type="nvarchar" MaxLength="50" />
<Property Name="pro_id" Type="int" />
</EntityType>
<EntityType Name="receipt_detail">
<Key>
<PropertyRef Name="num" />
</Key>
<Property Name="num" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="receipt_num" Type="int" />
<Property Name="title" Type="nvarchar(max)" />
<Property Name="amt" Type="int" />
<Property Name="receipt_no" Type="varchar" MaxLength="50" />
<Property Name="caseofficer" Type="nvarchar" MaxLength="50" />
<Property Name="c_user" Type="varchar" MaxLength="30" />
<Property Name="c_date" Type="varchar" MaxLength="10" />
<Property Name="c_time" Type="varchar" MaxLength="6" />
<Property Name="u_user" Type="varchar" MaxLength="30" />
<Property Name="u_date" Type="varchar" MaxLength="10" />
<Property Name="u_time" Type="varchar" MaxLength="6" />
<Property Name="addr" Type="nvarchar" MaxLength="255" />
</EntityType>
<EntityType Name="receipt_master">
<Key>
<PropertyRef Name="num" />
</Key>
<Property Name="num" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="order_no" Type="varchar" MaxLength="50" />
<Property Name="total_amt" Type="int" />
<Property Name="receipt_date" Type="varchar" MaxLength="10" />
<Property Name="style_num" Type="int" />
<Property Name="c_user" Type="varchar" MaxLength="30" />
<Property Name="c_date" Type="varchar" MaxLength="10" />
<Property Name="c_time" Type="varchar" MaxLength="6" />
<Property Name="u_user" Type="varchar" MaxLength="30" />
<Property Name="u_date" Type="varchar" MaxLength="10" />
<Property Name="u_time" Type="varchar" MaxLength="6" />
<Property Name="source" Type="varchar" MaxLength="8" />
</EntityType>
<EntityType Name="receipt_style">
<Key>
<PropertyRef Name="num" />
</Key>
<Property Name="num" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="name" Type="nvarchar" MaxLength="50" />
<Property Name="c_user" Type="varchar" MaxLength="30" />
<Property Name="c_date" Type="varchar" MaxLength="10" />
<Property Name="c_time" Type="varchar" MaxLength="6" />
<Property Name="u_user" Type="varchar" MaxLength="30" />
<Property Name="u_date" Type="varchar" MaxLength="10" />
<Property Name="u_time" Type="varchar" MaxLength="6" />
</EntityType>
<EntityType Name="receipt_style_d">
<Key>
<PropertyRef Name="num" />
</Key>
<Property Name="num" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="style_num" Type="int" />
<Property Name="item_name" Type="varchar" MaxLength="50" />
<Property Name="item_value" Type="nvarchar" MaxLength="50" />
<Property Name="c_user" Type="varchar" MaxLength="30" />
<Property Name="c_date" Type="varchar" MaxLength="10" />
<Property Name="c_time" Type="varchar" MaxLength="6" />
<Property Name="u_user" Type="varchar" MaxLength="30" />
<Property Name="u_date" Type="varchar" MaxLength="10" />
<Property Name="u_time" Type="varchar" MaxLength="6" />
</EntityType>
<EntityType Name="Region">
<Key>
<PropertyRef Name="Uuid" />
@@ -1140,15 +1203,15 @@
</Dependent>
</ReferentialConstraint>
</Association>
<Association Name="FK_activity_activity_category_kind">
<End Role="activity_category_kind" Type="Self.activity_category_kind" Multiplicity="0..1" />
<Association Name="FK_activity_activity_kind">
<End Role="activity_kind" Type="Self.activity_kind" Multiplicity="0..1" />
<End Role="activity" Type="Self.activity" Multiplicity="*" />
<ReferentialConstraint>
<Principal Role="activity_category_kind">
<Principal Role="activity_kind">
<PropertyRef Name="num" />
</Principal>
<Dependent Role="activity">
<PropertyRef Name="category_kind" />
<PropertyRef Name="kind" />
</Dependent>
</ReferentialConstraint>
</Association>
@@ -2188,6 +2251,10 @@
<EntitySet Name="project" EntityType="Self.project" Schema="dbo" store:Type="Tables" />
<EntitySet Name="project_kind" EntityType="Self.project_kind" Schema="dbo" store:Type="Tables" />
<EntitySet Name="project_sub" EntityType="Self.project_sub" Schema="dbo" store:Type="Tables" />
<EntitySet Name="receipt_detail" EntityType="Self.receipt_detail" Schema="dbo" store:Type="Tables" />
<EntitySet Name="receipt_master" EntityType="Self.receipt_master" Schema="dbo" store:Type="Tables" />
<EntitySet Name="receipt_style" EntityType="Self.receipt_style" Schema="dbo" store:Type="Tables" />
<EntitySet Name="receipt_style_d" EntityType="Self.receipt_style_d" Schema="dbo" store:Type="Tables" />
<EntitySet Name="Region" EntityType="Self.Region" Schema="dbo" store:Type="Tables" />
<EntitySet Name="RegionAndRoomAndBedSchedule" EntityType="Self.RegionAndRoomAndBedSchedule" Schema="dbo" store:Type="Tables" />
<EntitySet Name="RegionRoomBed" EntityType="Self.RegionRoomBed" Schema="dbo" store:Type="Tables" />
@@ -2246,8 +2313,8 @@
<End Role="actItem" EntitySet="actItem" />
<End Role="actItem_files" EntitySet="actItem_files" />
</AssociationSet>
<AssociationSet Name="FK_activity_activity_category_kind" Association="Self.FK_activity_activity_category_kind">
<End Role="activity_category_kind" EntitySet="activity_category_kind" />
<AssociationSet Name="FK_activity_activity_kind" Association="Self.FK_activity_activity_kind">
<End Role="activity_kind" EntitySet="activity_kind" />
<End Role="activity" EntitySet="activity" />
</AssociationSet>
<AssociationSet Name="FK_activity_check_activity" Association="Self.FK_activity_check_activity">
@@ -2953,7 +3020,7 @@
<Property Name="smtp_def" Type="String" MaxLength="1" FixedLength="false" Unicode="true" />
<Property Name="use_sender" Type="String" MaxLength="1" FixedLength="false" Unicode="true" />
<Property Name="bed_order_no" Type="String" MaxLength="20" FixedLength="false" Unicode="true" />
<Property Name="last_auto_order_no" Type="String" MaxLength="20" FixedLength="false" Unicode="true" />
<Property Name="last_auto_order_no" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="country">
<Key>
@@ -4620,6 +4687,10 @@
<End Role="auto_enroll" EntitySet="auto_enroll" />
<End Role="pro_order" EntitySet="pro_order" />
</AssociationSet>
<EntitySet Name="receipt_detail" EntityType="Model.receipt_detail" />
<EntitySet Name="receipt_master" EntityType="Model.receipt_master" />
<EntitySet Name="receipt_style" EntityType="Model.receipt_style" />
<EntitySet Name="receipt_style_d" EntityType="Model.receipt_style_d" />
</EntityContainer>
<ComplexType Name="sp_helpdiagramdefinition_Result">
<Property Type="Int32" Name="version" Nullable="true" />
@@ -5343,10 +5414,10 @@
</Key>
<Property Name="num" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="f_num" Type="Int32" Nullable="false" />
<Property Name="start_date" Type="DateTime" Precision="0" Nullable="false" />
<Property Name="end_date" Type="DateTime" Precision="0" Nullable="false" />
<Property Name="start_date" Type="DateTime" Precision="0" />
<Property Name="end_date" Type="DateTime" Precision="0" />
<Property Name="receipt_title" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
<Property Name="receipt_address" Type="String" MaxLength="200" FixedLength="true" Unicode="true" />
<Property Name="receipt_address" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
<NavigationProperty Name="followers" Relationship="Model.FK_auto_enroll_followers" FromRole="auto_enroll" ToRole="follower" />
<NavigationProperty Name="pro_order" Relationship="Model.FK_pro_order_auto_enroll" FromRole="auto_enroll" ToRole="pro_order" />
</EntityType>
@@ -5376,6 +5447,69 @@
</Dependent>
</ReferentialConstraint>
</Association>
<EntityType Name="receipt_detail">
<Key>
<PropertyRef Name="num" />
</Key>
<Property Name="num" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="receipt_num" Type="Int32" />
<Property Name="title" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
<Property Name="amt" Type="Int32" />
<Property Name="receipt_no" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="caseofficer" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
<Property Name="c_user" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
<Property Name="c_date" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="c_time" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
<Property Name="u_user" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
<Property Name="u_date" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="u_time" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
<Property Name="addr" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
</EntityType>
<EntityType Name="receipt_master">
<Key>
<PropertyRef Name="num" />
</Key>
<Property Name="num" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="order_no" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="total_amt" Type="Int32" />
<Property Name="receipt_date" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="style_num" Type="Int32" />
<Property Name="c_user" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
<Property Name="c_date" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="c_time" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
<Property Name="u_user" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
<Property Name="u_date" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="u_time" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
<Property Name="source" Type="String" MaxLength="8" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="receipt_style">
<Key>
<PropertyRef Name="num" />
</Key>
<Property Name="num" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="name" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
<Property Name="c_user" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
<Property Name="c_date" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="c_time" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
<Property Name="u_user" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
<Property Name="u_date" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="u_time" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="receipt_style_d">
<Key>
<PropertyRef Name="num" />
</Key>
<Property Name="num" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="style_num" Type="Int32" />
<Property Name="item_name" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="item_value" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
<Property Name="c_user" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
<Property Name="c_date" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="c_time" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
<Property Name="u_user" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
<Property Name="u_date" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="u_time" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
</EntityType>
</Schema>
</edmx:ConceptualModels>
<!-- C-S mapping content -->
@@ -6447,6 +6581,73 @@
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="receipt_detail">
<EntityTypeMapping TypeName="Model.receipt_detail">
<MappingFragment StoreEntitySet="receipt_detail">
<ScalarProperty Name="addr" ColumnName="addr" />
<ScalarProperty Name="u_time" ColumnName="u_time" />
<ScalarProperty Name="u_date" ColumnName="u_date" />
<ScalarProperty Name="u_user" ColumnName="u_user" />
<ScalarProperty Name="c_time" ColumnName="c_time" />
<ScalarProperty Name="c_date" ColumnName="c_date" />
<ScalarProperty Name="c_user" ColumnName="c_user" />
<ScalarProperty Name="caseofficer" ColumnName="caseofficer" />
<ScalarProperty Name="receipt_no" ColumnName="receipt_no" />
<ScalarProperty Name="amt" ColumnName="amt" />
<ScalarProperty Name="title" ColumnName="title" />
<ScalarProperty Name="receipt_num" ColumnName="receipt_num" />
<ScalarProperty Name="num" ColumnName="num" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="receipt_master">
<EntityTypeMapping TypeName="Model.receipt_master">
<MappingFragment StoreEntitySet="receipt_master">
<ScalarProperty Name="source" ColumnName="source" />
<ScalarProperty Name="u_time" ColumnName="u_time" />
<ScalarProperty Name="u_date" ColumnName="u_date" />
<ScalarProperty Name="u_user" ColumnName="u_user" />
<ScalarProperty Name="c_time" ColumnName="c_time" />
<ScalarProperty Name="c_date" ColumnName="c_date" />
<ScalarProperty Name="c_user" ColumnName="c_user" />
<ScalarProperty Name="style_num" ColumnName="style_num" />
<ScalarProperty Name="receipt_date" ColumnName="receipt_date" />
<ScalarProperty Name="total_amt" ColumnName="total_amt" />
<ScalarProperty Name="order_no" ColumnName="order_no" />
<ScalarProperty Name="num" ColumnName="num" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="receipt_style">
<EntityTypeMapping TypeName="Model.receipt_style">
<MappingFragment StoreEntitySet="receipt_style">
<ScalarProperty Name="u_time" ColumnName="u_time" />
<ScalarProperty Name="u_date" ColumnName="u_date" />
<ScalarProperty Name="u_user" ColumnName="u_user" />
<ScalarProperty Name="c_time" ColumnName="c_time" />
<ScalarProperty Name="c_date" ColumnName="c_date" />
<ScalarProperty Name="c_user" ColumnName="c_user" />
<ScalarProperty Name="name" ColumnName="name" />
<ScalarProperty Name="num" ColumnName="num" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="receipt_style_d">
<EntityTypeMapping TypeName="Model.receipt_style_d">
<MappingFragment StoreEntitySet="receipt_style_d">
<ScalarProperty Name="u_time" ColumnName="u_time" />
<ScalarProperty Name="u_date" ColumnName="u_date" />
<ScalarProperty Name="u_user" ColumnName="u_user" />
<ScalarProperty Name="c_time" ColumnName="c_time" />
<ScalarProperty Name="c_date" ColumnName="c_date" />
<ScalarProperty Name="c_user" ColumnName="c_user" />
<ScalarProperty Name="item_value" ColumnName="item_value" />
<ScalarProperty Name="item_name" ColumnName="item_name" />
<ScalarProperty Name="style_num" ColumnName="style_num" />
<ScalarProperty Name="num" ColumnName="num" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
</EntityContainerMapping>
</Mapping>
</edmx:Mappings>
web/App_Code/Model/Model.edmx.diagram
+4
View File
@@ -165,6 +165,10 @@
<EntityTypeShape EntityType="Model.auto_enroll" Width="1.5" PointX="5.25" PointY="37.875" />
<AssociationConnector Association="Model.FK_auto_enroll_followers" />
<AssociationConnector Association="Model.FK_pro_order_auto_enroll" />
<EntityTypeShape EntityType="Model.receipt_detail" Width="1.5" PointX="23.375" PointY="7.75" />
<EntityTypeShape EntityType="Model.receipt_master" Width="1.5" PointX="25.375" PointY="7.75" />
<EntityTypeShape EntityType="Model.receipt_style" Width="1.5" PointX="19.375" PointY="25.75" />
<EntityTypeShape EntityType="Model.receipt_style_d" Width="1.5" PointX="26.375" PointY="0.75" />
</Diagram>
</edmx:Diagrams>
</edmx:Designer>
web/App_Code/Model/ViewModel/receipt.cs
+42
View File
@@ -0,0 +1,42 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Model.ViewModel
{
/// <summary>
/// receipt 的摘要描述
/// </summary>
public class receipt_master
{
public receipt_master()
{
//
// TODO: 在這裡新增建構函式邏輯
//
}
public int? num { get; set; }
public string order_no { get; set; }
public int? total_amt { get; set; }
public int? style_num { get; set; }
public string source { get; set; }
public string receipt_date { get; set; }
public List<receipt_detail> list { get;set ; }
}
public class receipt_detail
{
public receipt_detail()
{
}
public int? num { get; set; }
public int? receipt_num { get; set; }
public string title { get; set; }
public string receipt_no { get; set; }
public int? amt { get; set; }
public string caseofficer { get; set; }
public string addr { get; set; }
}
}