IPQC報表修改 日期格式與增加料號規格敘述

AMESCoreStudio.Web/Controllers/SPCController.cs

@@ -1291,14 +1291,15 @@ namespace AMESCoreStudio.Web.Controllers
                 {
                     InspectionNumber = IPQCQuery.InspectionNo,
                     OrderNumber = IPQCQuery.WipNo,
-                    InspectionDate = IPQCQuery.InspectionDate.ToString(),
+                    InspectionDate = IPQCQuery.InspectionDate.ToString("yyyy-MM-dd"),
                     ItemNo = IPQCQuery.ItemNo,
                     PlanQTY = IPQCQuery.PlanQTY.ToString(),
                     MedicalModel = IPQCQuery.CustomerMedical,
                     VIP = IPQCQuery.CustomerVIP,
                     BIOSVer = IPQCQuery.BIOS,
                     Approved = "沈俊輝",
-                    Inspector = IPQCQuery.UpdateUser_Name
+                    Inspector = IPQCQuery.UpdateUser_Name,
+                    ItemNoDesc = IPQCQuery.ItemNoDesc
 
                 };
 

AMESCoreStudio.Web/wwwroot/Reports/SPC005View.rdlc

@@ -49,6 +49,10 @@
           <DataField>ItemNo</DataField>
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
+        <Field Name="ItemNoDesc">
+          <DataField>ItemNoDesc</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
         <Field Name="OrderNumber">
           <DataField>OrderNumber</DataField>
           <rd:TypeName>System.String</rd:TypeName>
@@ -853,10 +857,10 @@
                   </Paragraph>
                 </Paragraphs>
                 <rd:DefaultName>OrderNumber</rd:DefaultName>
-                <Top>2.56704cm</Top>
+                <Top>2.5741cm</Top>
-                <Left>4.99031cm</Left>
+                <Left>4.99384cm</Left>
                 <Height>0.60324cm</Height>
-                <Width>23.6839cm</Width>
+                <Width>6.38847cm</Width>
                 <ZIndex>13</ZIndex>
                 <Style>
                   <Border>
@@ -960,9 +964,9 @@
                 </Paragraphs>
                 <rd:DefaultName>BIOSVer</rd:DefaultName>
                 <Top>3.17028cm</Top>
-                <Left>16.92302cm</Left>
+                <Left>16.89127cm</Left>
                 <Height>0.60324cm</Height>
-                <Width>3.29493cm</Width>
+                <Width>3.32668cm</Width>
                 <ZIndex>15</ZIndex>
                 <Style>
                   <Border>
@@ -2652,6 +2656,59 @@
                   <PaddingBottom>2pt</PaddingBottom>
                 </Style>
               </Textbox>
+              <Textbox Name="OrderNumber2">
+                <CanGrow>true</CanGrow>
+                <KeepTogether>true</KeepTogether>
+                <Paragraphs>
+                  <Paragraph>
+                    <TextRuns>
+                      <TextRun>
+                        <Value>=First(Fields!ItemNoDesc.Value, "DataSet1")</Value>
+                        <Style>
+                          <FontFamily>微軟正黑體</FontFamily>
+                        </Style>
+                      </TextRun>
+                    </TextRuns>
+                    <Style />
+                  </Paragraph>
+                </Paragraphs>
+                <rd:DefaultName>OrderNumber</rd:DefaultName>
+                <Top>2.5741cm</Top>
+                <Left>11.37878cm</Left>
+                <Height>0.60324cm</Height>
+                <Width>17.29543cm</Width>
+                <ZIndex>35</ZIndex>
+                <Style>
+                  <Border>
+                    <Style>Solid</Style>
+                    <Width>0.5pt</Width>
+                  </Border>
+                  <TopBorder>
+                    <Color>Black</Color>
+                    <Style>Solid</Style>
+                    <Width>0.5pt</Width>
+                  </TopBorder>
+                  <BottomBorder>
+                    <Color>Black</Color>
+                    <Style>Solid</Style>
+                    <Width>0.5pt</Width>
+                  </BottomBorder>
+                  <LeftBorder>
+                    <Color>Black</Color>
+                    <Style>Solid</Style>
+                    <Width>0.5pt</Width>
+                  </LeftBorder>
+                  <RightBorder>
+                    <Color>Black</Color>
+                    <Style>Solid</Style>
+                    <Width>0.5pt</Width>
+                  </RightBorder>
+                  <PaddingLeft>2pt</PaddingLeft>
+                  <PaddingRight>2pt</PaddingRight>
+                  <PaddingTop>2pt</PaddingTop>
+                  <PaddingBottom>2pt</PaddingBottom>
+                </Style>
+              </Textbox>
             </ReportItems>
             <KeepTogether>true</KeepTogether>
             <Top>0.31154cm</Top>

AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs

@@ -476,7 +476,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                        UpdateUser = q8.UserNo,
                                        UpdateUser_Name = q8.UserName,
                                        InspectionDate= q1.UpdateDate,
-                                       BarcodeNo = q1.BarcodeNo
+                                       BarcodeNo = q1.BarcodeNo,
+                                       ItemNoDesc = q4.Description
                                    };
 
             var query = await q.Distinct().ToListAsync();

AMESCoreStudio.WebApi/DTO/AMES/IpqcDto.cs

@@ -48,6 +48,14 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [Display(Name = "料號")]
         public string ItemNo { get; set; }
 
+        /// <summary>
+        /// 料號敘述
+        /// </summary>
+        [DataMember]
+        [Display(Name = "料號敘述")]
+        public string ItemNoDesc { get; set; }
+
+
         /// <summary>
         /// 工單數量
         /// </summary>

AMESCoreStudio.WebApi/DTO/AMES/SPC005VIiew.cs

@@ -35,6 +35,11 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// </summary>
         public string ItemNo { get; set; }
 
+        /// <summary>
+        /// 料號敘述
+        /// </summary>
+        public string ItemNoDesc { get; set; }
+
 
         /// <summary>
         /// 工單號碼