..

2021-07-16 13:53:52 +09:00
parent 7b7c5d1f4f
commit 9e64a0d603
37 changed files with 2215 additions and 140 deletions
--- a/SubProject/FPJ0000/Model1.edmx
+++ b/SubProject/FPJ0000/Model1.edmx
@@ -18,6 +18,7 @@
          <Property Name="jobreport" Type="int" />
          <Property Name="savecost" Type="int" />
          <Property Name="scheapp" Type="int" />
+          <Property Name="equipment" Type="int" />
        </EntityType>
        <EntityType Name="Common">
          <Key>
@@ -34,6 +35,18 @@
          <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
          <Property Name="wdate" Type="smalldatetime" Nullable="false" />
        </EntityType>
+        <EntityType Name="EETGW_DocuForm">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
+          <Property Name="cate" Type="varchar" MaxLength="2" />
+          <Property Name="title" Type="varchar" MaxLength="100" />
+          <Property Name="body" Type="varchar(max)" />
+          <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
+          <Property Name="wdate" Type="smalldatetime" Nullable="false" />
+        </EntityType>
        <EntityType Name="EETGW_JobReport_EBoard">
          <Key>
            <PropertyRef Name="idx" />
@@ -71,6 +84,7 @@
          <Property Name="wdate" Type="smalldatetime" Nullable="false" />
          <Property Name="원인2" Type="nvarchar(max)" />
          <Property Name="결과2" Type="nvarchar(max)" />
+          <Property Name="refdata" Type="bit" />
        </EntityType>
        <EntityType Name="EETGW_Note">
          <Key>
@@ -148,6 +162,8 @@
          <Property Name="cnt" Type="int" />
          <Property Name="remark_req" Type="varchar(max)" />
          <Property Name="remark_ans" Type="varchar(max)" />
+          <Property Name="bef_time" Type="float" />
+          <Property Name="aft_time" Type="float" />
          <Property Name="edate" Type="varchar" MaxLength="50" />
          <Property Name="progress" Type="int" />
          <Property Name="memo" Type="nvarchar" MaxLength="255" />
@@ -299,6 +315,7 @@
          <Property Name="EB_RepairTime" Type="float" />
          <Property Name="EB_ConstNew" Type="float" />
          <Property Name="EB_BoardName" Type="nvarchar" MaxLength="255" />
+          <Property Name="bAlert" Type="bit" />
        </EntityType>
        <EntityType Name="Purchase">
          <Key>
@@ -319,6 +336,7 @@
          <Property Name="pumunit" Type="varchar" MaxLength="50" />
          <Property Name="pumqty" Type="int" />
          <Property Name="pumprice" Type="decimal" Precision="18" Scale="0" />
+          <Property Name="pumpriceD" Type="decimal" Precision="18" Scale="2" />
          <Property Name="pumamt" Type="decimal" Precision="18" Scale="0" />
          <Property Name="supply" Type="varchar" MaxLength="200" />
          <Property Name="supplyidx" Type="int" />
@@ -481,10 +499,12 @@
          <Property Name="hrs" Type="float" />
          <Property Name="ot" Type="float" />
          <Property Name="UserProcess" Type="varchar" MaxLength="50" />
+          <Property Name="holyot" Type="float" />
        </EntityType>
        <EntityContainer Name="EEModelStoreContainer">
          <EntitySet Name="Auth" EntityType="Self.Auth" Schema="dbo" store:Type="Tables" />
          <EntitySet Name="Common" EntityType="Self.Common" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="EETGW_DocuForm" EntityType="Self.EETGW_DocuForm" Schema="dbo" store:Type="Tables" />
          <EntitySet Name="EETGW_JobReport_EBoard" EntityType="Self.EETGW_JobReport_EBoard" Schema="dbo" store:Type="Tables" />
          <EntitySet Name="EETGW_Note" EntityType="Self.EETGW_Note" Schema="dbo" store:Type="Tables" />
          <EntitySet Name="EETGW_Project_Layout" EntityType="Self.EETGW_Project_Layout" Schema="dbo" store:Type="Tables" />
@@ -581,7 +601,8 @@
    [vUserWorkTimeList].[uname] AS [uname], 
    [vUserWorkTimeList].[hrs] AS [hrs], 
    [vUserWorkTimeList].[ot] AS [ot], 
-    [vUserWorkTimeList].[UserProcess] AS [UserProcess]
+    [vUserWorkTimeList].[UserProcess] AS [UserProcess], 
+    [vUserWorkTimeList].[holyot] AS [holyot]
    FROM [dbo].[vUserWorkTimeList] AS [vUserWorkTimeList]</DefiningQuery>
          </EntitySet>
        </EntityContainer>
@@ -670,6 +691,7 @@
          <Property Name="hrs" Type="Double" />
          <Property Name="ot" Type="Double" />
          <Property Name="UserProcess" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="holyot" Type="Double" />
        </EntityType>
        <EntityContainer Name="EEEntities" annotation:LazyLoadingEnabled="true">
          <EntitySet Name="Common" EntityType="Self.Common" />
@@ -692,6 +714,7 @@
          <EntitySet Name="Projects" EntityType="EEModel.Projects" />
          <EntitySet Name="vEETGW_Project_LayoutList" EntityType="EEModel.vEETGW_Project_LayoutList" />
          <EntitySet Name="EETGW_Project_Layout" EntityType="EEModel.EETGW_Project_Layout" />
+          <EntitySet Name="EETGW_DocuForm" EntityType="EEModel.EETGW_DocuForm" />
        </EntityContainer>
        <EntityType Name="HolidayLIst">
          <Key>
@@ -741,6 +764,7 @@
          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
          <Property Name="원인2" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
          <Property Name="결과2" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="refdata" Type="Boolean" />
        </EntityType>
        <EntityType Name="EETGW_SaveCost">
          <Key>
@@ -778,6 +802,8 @@
          <Property Name="fanout" Type="Boolean" />
          <Property Name="weekly" Type="Boolean" />
          <Property Name="Highlight" Type="Boolean" />
+          <Property Name="bef_time" Type="Double" />
+          <Property Name="aft_time" Type="Double" />
        </EntityType>
        <EntityType Name="MailData">
          <Key>
@@ -861,6 +887,7 @@
          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
          <Property Name="inqty" Type="Int32" />
+          <Property Name="pumpriceD" Type="Decimal" Precision="18" Scale="2" />
        </EntityType>
        <EntityType Name="EETGW_Note">
          <Key>
@@ -987,6 +1014,7 @@
          <Property Name="jobreport" Type="Int32" />
          <Property Name="savecost" Type="Int32" />
          <Property Name="scheapp" Type="Int32" />
+          <Property Name="equipment" Type="Int32" />
        </EntityType>
        <EntityType Name="Projects">
          <Key>
@@ -1043,6 +1071,7 @@
          <Property Name="EB_RepairTime" Type="Double" />
          <Property Name="EB_ConstNew" Type="Double" />
          <Property Name="EB_BoardName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
+          <Property Name="bAlert" Type="Boolean" />
        </EntityType>
        <EntityType Name="vEETGW_Project_LayoutList">
          <Key>
@@ -1078,6 +1107,18 @@
          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
        </EntityType>
+        <EntityType Name="EETGW_DocuForm">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="gcode" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="cate" Type="String" MaxLength="2" FixedLength="false" Unicode="false" />
+          <Property Name="title" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="body" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
+        </EntityType>
      </Schema>
    </edmx:ConceptualModels>
    <!-- C-S mapping content -->
@@ -1156,6 +1197,7 @@
          <EntitySetMapping Name="vUserWorkTimeList">
            <EntityTypeMapping TypeName="EEModel.vUserWorkTimeList">
              <MappingFragment StoreEntitySet="vUserWorkTimeList">
+                <ScalarProperty Name="holyot" ColumnName="holyot" />
                <ScalarProperty Name="UserProcess" ColumnName="UserProcess" />
                <ScalarProperty Name="gcode" ColumnName="gcode" />
                <ScalarProperty Name="yymm" ColumnName="yymm" />
@@ -1182,6 +1224,7 @@
          <EntitySetMapping Name="EETGW_JobReport_EBoard">
            <EntityTypeMapping TypeName="EEModel.EETGW_JobReport_EBoard">
              <MappingFragment StoreEntitySet="EETGW_JobReport_EBoard">
+                <ScalarProperty Name="refdata" ColumnName="refdata" />
                <ScalarProperty Name="결과2" ColumnName="결과2" />
                <ScalarProperty Name="원인2" ColumnName="원인2" />
                <ScalarProperty Name="wdate" ColumnName="wdate" />
@@ -1221,6 +1264,8 @@
          <EntitySetMapping Name="EETGW_SaveCost">
            <EntityTypeMapping TypeName="EEModel.EETGW_SaveCost">
              <MappingFragment StoreEntitySet="EETGW_SaveCost">
+                <ScalarProperty Name="aft_time" ColumnName="aft_time" />
+                <ScalarProperty Name="bef_time" ColumnName="bef_time" />
                <ScalarProperty Name="Highlight" ColumnName="Highlight" />
                <ScalarProperty Name="weekly" ColumnName="weekly" />
                <ScalarProperty Name="fanout" ColumnName="fanout" />
@@ -1305,6 +1350,7 @@
          <EntitySetMapping Name="Purchase">
            <EntityTypeMapping TypeName="EEModel.Purchase">
              <MappingFragment StoreEntitySet="Purchase">
+                <ScalarProperty Name="pumpriceD" ColumnName="pumpriceD" />
                <ScalarProperty Name="inqty" ColumnName="inqty" />
                <ScalarProperty Name="wdate" ColumnName="wdate" />
                <ScalarProperty Name="wuid" ColumnName="wuid" />
@@ -1461,6 +1507,7 @@
          <EntitySetMapping Name="Auth">
            <EntityTypeMapping TypeName="EEModel.Auth">
              <MappingFragment StoreEntitySet="Auth">
+                <ScalarProperty Name="equipment" ColumnName="equipment" />
                <ScalarProperty Name="scheapp" ColumnName="scheapp" />
                <ScalarProperty Name="savecost" ColumnName="savecost" />
                <ScalarProperty Name="jobreport" ColumnName="jobreport" />
@@ -1476,6 +1523,7 @@
          <EntitySetMapping Name="Projects">
            <EntityTypeMapping TypeName="EEModel.Projects">
              <MappingFragment StoreEntitySet="Projects">
+                <ScalarProperty Name="bAlert" ColumnName="bAlert" />
                <ScalarProperty Name="EB_BoardName" ColumnName="EB_BoardName" />
                <ScalarProperty Name="EB_ConstNew" ColumnName="EB_ConstNew" />
                <ScalarProperty Name="EB_RepairTime" ColumnName="EB_RepairTime" />
@@ -1565,6 +1613,19 @@
              </MappingFragment>
            </EntityTypeMapping>
          </EntitySetMapping>
+          <EntitySetMapping Name="EETGW_DocuForm">
+            <EntityTypeMapping TypeName="EEModel.EETGW_DocuForm">
+              <MappingFragment StoreEntitySet="EETGW_DocuForm">
+                <ScalarProperty Name="wdate" ColumnName="wdate" />
+                <ScalarProperty Name="wuid" ColumnName="wuid" />
+                <ScalarProperty Name="body" ColumnName="body" />
+                <ScalarProperty Name="title" ColumnName="title" />
+                <ScalarProperty Name="cate" ColumnName="cate" />
+                <ScalarProperty Name="gcode" ColumnName="gcode" />
+                <ScalarProperty Name="idx" ColumnName="idx" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
        </EntityContainerMapping>
      </Mapping>
    </edmx:Mappings>