..

2020-12-02 16:22:40 +09:00
parent 1d7a24adbe
commit 0f44fbe9f8
18 changed files with 861 additions and 400 deletions
--- a/SubProject/FPJ0000/Model1.edmx
+++ b/SubProject/FPJ0000/Model1.edmx
@@ -130,6 +130,8 @@
          <Property Name="hrs" Type="float" />
          <Property Name="ot" Type="float" />
          <Property Name="userProcess" Type="nvarchar" MaxLength="100" />
+          <Property Name="requestpart" Type="varchar" MaxLength="50" />
+          <Property Name="package" Type="varchar" MaxLength="50" />
        </EntityType>
        <!--생성 중 오류 발생:
 경고 6002: 테이블/뷰 'EE.dbo.vUserWorkTimeList'에 기본 키가 정의되지 않았습니다. 키가 유추되었고 읽기 전용 테이블/뷰로 정의되었습니다.-->
@@ -197,7 +199,9 @@
    [vJobReportForUser].[svalue] AS [svalue], 
    [vJobReportForUser].[hrs] AS [hrs], 
    [vJobReportForUser].[ot] AS [ot], 
-    [vJobReportForUser].[userProcess] AS [userProcess]
+    [vJobReportForUser].[userProcess] AS [userProcess], 
+    [vJobReportForUser].[requestpart] AS [requestpart], 
+    [vJobReportForUser].[package] AS [package]
    FROM [dbo].[vJobReportForUser] AS [vJobReportForUser]</DefiningQuery>
          </EntitySet>
          <EntitySet Name="vUserWorkTimeList" EntityType="Self.vUserWorkTimeList" store:Type="Views" store:Schema="dbo">
@@ -304,8 +308,8 @@
          <EntitySet Name="vHoliday_uselist" EntityType="Self.vHoliday_uselist" />
          <EntitySet Name="vUserWorkTimeList" EntityType="Self.vUserWorkTimeList" />
          <EntitySet Name="HolidayLIst" EntityType="EEModel.HolidayLIst" />
-          <EntitySet Name="vJobReportForUser" EntityType="EEModel.vJobReportForUser" />
          <EntitySet Name="vGroupUser" EntityType="EEModel.vGroupUser" />
+          <EntitySet Name="vJobReportForUser" EntityType="EEModel.vJobReportForUser" />
        </EntityContainer>
        <EntityType Name="HolidayLIst">
          <Key>
@@ -318,23 +322,6 @@
          <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="vJobReportForUser">
-          <Key>
-            <PropertyRef Name="idx" />
-            <PropertyRef Name="gcode" />
-          </Key>
-          <Property Name="idx" Type="Int32" Nullable="false" />
-          <Property Name="pdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
-          <Property Name="gcode" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
-          <Property Name="id" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
-          <Property Name="name" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="process" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="type" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="svalue" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
-          <Property Name="hrs" Type="Double" />
-          <Property Name="ot" Type="Double" />
-          <Property Name="userProcess" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
-        </EntityType>
        <EntityType Name="vGroupUser">
          <Key>
            <PropertyRef Name="gcode" />
@@ -358,6 +345,25 @@
          <Property Name="processs" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
          <Property Name="id" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
        </EntityType>
+        <EntityType Name="vJobReportForUser">
+          <Key>
+            <PropertyRef Name="idx" />
+            <PropertyRef Name="gcode" />
+          </Key>
+          <Property Name="idx" Type="Int32" Nullable="false" />
+          <Property Name="pdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="gcode" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="id" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="name" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="process" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="type" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="svalue" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
+          <Property Name="hrs" Type="Double" />
+          <Property Name="ot" Type="Double" />
+          <Property Name="userProcess" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="requestpart" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="package" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+        </EntityType>
      </Schema>
    </edmx:ConceptualModels>
    <!-- C-S mapping content -->
@@ -458,23 +464,6 @@
              </MappingFragment>
            </EntityTypeMapping>
          </EntitySetMapping>
-          <EntitySetMapping Name="vJobReportForUser">
-            <EntityTypeMapping TypeName="EEModel.vJobReportForUser">
-              <MappingFragment StoreEntitySet="vJobReportForUser">
-                <ScalarProperty Name="userProcess" ColumnName="userProcess" />
-                <ScalarProperty Name="ot" ColumnName="ot" />
-                <ScalarProperty Name="hrs" ColumnName="hrs" />
-                <ScalarProperty Name="svalue" ColumnName="svalue" />
-                <ScalarProperty Name="type" ColumnName="type" />
-                <ScalarProperty Name="process" ColumnName="process" />
-                <ScalarProperty Name="name" ColumnName="name" />
-                <ScalarProperty Name="id" ColumnName="id" />
-                <ScalarProperty Name="gcode" ColumnName="gcode" />
-                <ScalarProperty Name="pdate" ColumnName="pdate" />
-                <ScalarProperty Name="idx" ColumnName="idx" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
          <EntitySetMapping Name="vGroupUser">
            <EntityTypeMapping TypeName="EEModel.vGroupUser">
              <MappingFragment StoreEntitySet="vGroupUser">
@@ -499,6 +488,25 @@
              </MappingFragment>
            </EntityTypeMapping>
          </EntitySetMapping>
+          <EntitySetMapping Name="vJobReportForUser">
+            <EntityTypeMapping TypeName="EEModel.vJobReportForUser">
+              <MappingFragment StoreEntitySet="vJobReportForUser">
+                <ScalarProperty Name="package" ColumnName="package" />
+                <ScalarProperty Name="requestpart" ColumnName="requestpart" />
+                <ScalarProperty Name="userProcess" ColumnName="userProcess" />
+                <ScalarProperty Name="ot" ColumnName="ot" />
+                <ScalarProperty Name="hrs" ColumnName="hrs" />
+                <ScalarProperty Name="svalue" ColumnName="svalue" />
+                <ScalarProperty Name="type" ColumnName="type" />
+                <ScalarProperty Name="process" ColumnName="process" />
+                <ScalarProperty Name="name" ColumnName="name" />
+                <ScalarProperty Name="id" ColumnName="id" />
+                <ScalarProperty Name="gcode" ColumnName="gcode" />
+                <ScalarProperty Name="pdate" ColumnName="pdate" />
+                <ScalarProperty Name="idx" ColumnName="idx" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
        </EntityContainerMapping>
      </Mapping>
    </edmx:Mappings>