出貨序號取貨規則 增加[DD]

首件檢查匯出PDF 相關修正

AMESCoreStudio.Web/Controllers/SPCController.cs

@@ -1620,7 +1620,7 @@ namespace AMESCoreStudio.Web.Controllers
                     MedicalModel = IPQCQuery.CustomerMedical,
                     VIP = IPQCQuery.CustomerVIP,
                     BIOSVer = IPQCQuery.BIOS,
-                    Approved = "黃信志",
+                    Approved = "陳信志",
                     Inspector = IPQCQuery.UpdateUser_Name,
                     ItemNoDesc = IPQCQuery.ItemNoDesc
 

AMESCoreStudio.Web/Views/BAS/BAS019C.cshtml

@@ -41,6 +41,8 @@
                 <label class="control-label col-sm-9">：生產月別</label>
                 <label class="control-label col-sm-3">[WW]</label>
                 <label class="control-label col-sm-9">：生產週別</label>
+                <label class="control-label col-sm-3">[DD]</label>
+                <label class="control-label col-sm-9">：生產日期</label>
                 <label class="control-label col-sm-3">[SN3]</label>
                 <label class="control-label col-sm-9">：3碼流水號 </label>
                 <label class="control-label col-sm-3">[SN4]</label>

AMESCoreStudio.Web/Views/BAS/BAS019U.cshtml

@@ -47,6 +47,7 @@
                 <label class="control-label col-sm-9">[M]：生產月別A~L(代表1~12月)</label>
                 <label class="control-label col-sm-9">[MM]：生產月別</label>
                 <label class="control-label col-sm-9">[WW]：生產週別</label>
+                <label class="control-label col-sm-9">[DD]：生產日期</label>
                 <label class="control-label col-sm-9">[SN3]：3碼流水號 </label>
                 <label class="control-label col-sm-9">[SN4]：4碼流水號 </label>
                 <label class="control-label col-sm-9">[LOT3]：3碼生產批號 </label>

AMESCoreStudio.Web/Views/SPC/SPC005.cshtml

@@ -259,7 +259,7 @@
                         if ($("#Type").val() == 1001) {
                             btns = btns + '<a class="layui-btn layui-btn-xs" lay-event="PDF">PDF</a> ';
                         }
-                        if ($("#Type").val() == 1002) {
+                        if ($("#Type").val() == 1000 || $("#Type").val() == 1002) {
                             btns = btns + '<a class="layui-btn layui-btn-xs" lay-event="PDF_FAI">PDF</a> ';
                         }
                                                      

AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml

@@ -121,7 +121,7 @@
             </div>*@
         </form>
         <form id="modeltable" method="post">
-            @if (ViewBag.InspectionTypeID == 1002)
+            @if (ViewBag.InspectionTypeID == 1000)
             {
                 <i>QO4-067</i>
             }

AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml

@@ -126,7 +126,7 @@
                     </div>*@
         </form>
         <form id="modeltable">
-            @if (ViewBag.InspectionTypeID == 1002)
+            @if (ViewBag.InspectionTypeID == 1000)
             {
                 <i>QO4-067</i>
             }

AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml

@@ -57,7 +57,7 @@
             <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
         </form>
         <form id="modeltable" method="post">
-            @if (ViewBag.InspectionTypeID == 1002)
+            @if (ViewBag.InspectionTypeID == 1000)
             {
                 <i>QO4-067</i>
             }

AMESCoreStudio.Web/wwwroot/Reports/SPC005ViewFAI.rdlc

@@ -1220,7 +1220,7 @@
                 </Paragraphs>
                 <rd:DefaultName>Textbox76</rd:DefaultName>
                 <Top>8.57413cm</Top>
-                <Left>14.96744cm</Left>
+                <Left>17.11939cm</Left>
                 <Height>1.00557cm</Height>
                 <Width>3.14055cm</Width>
                 <ZIndex>15</ZIndex>
@@ -1241,9 +1241,9 @@
                 <MIMEType>image/png</MIMEType>
                 <Sizing>FitProportional</Sizing>
                 <Top>8.57413cm</Top>
-                <Left>20.21795cm</Left>
+                <Left>22.75795cm</Left>
                 <Height>1.00557cm</Height>
-                <Width>8.45626cm</Width>
+                <Width>5.06959cm</Width>
                 <ZIndex>16</ZIndex>
                 <Style>
                   <Border>
@@ -1360,7 +1360,7 @@
                   </Paragraph>
                 </Paragraphs>
                 <Top>8.57413cm</Top>
-                <Left>18.21382cm</Left>
+                <Left>20.40104cm</Left>
                 <Height>1.00557cm</Height>
                 <Width>4.594cm</Width>
                 <ZIndex>20</ZIndex>

AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs

@@ -616,7 +616,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                     from q8 in cp8.DefaultIfEmpty()
                                     select new IpqcDto
                                     {
-                                        InspectionNo = "IPQC-" + q1.InspectionID.ToString(),
+                                        InspectionNo =  q1.InspectionID.ToString(),
                                         WipNo = q1.WipNo,
                                         ItemNo = q1.ItemNo,
                                         PlanQTY = q4.PlanQTY,

AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs

@@ -687,7 +687,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 serialRuleDetail_NEW.WNum = week;
 
             }
+            if (strRule.Contains("[DD]"))//日期
+            {
+                serialRuleDetail_NEW.DNum = wipShcDate.Day;
+                serialRuleDetail_NEW.SnNum = 0;
 
+            }
             if (strRule.Contains("[LOT3]") || strRule.Contains("[LOT4]"))
             {
                 serialRuleDetail_NEW.LotNum = int.Parse(lotNo);
@@ -801,6 +806,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     //  serial = serial.Replace("[WW]", SerialRuleDetail.WNum.ToString().Length == 1 ? SerialRuleDetail.WNum.ToString().PadLeft(2, '0') : SerialRuleDetail.WNum.ToString());
                     serial = serial.Replace("[WW]", SerialRuleDetail.WNum.ToString("00"));
                 }
+                if (strRule.Contains("[DD]"))//日期
+                {
+                    serial = serial.Replace("[DD]", SerialRuleDetail.DNum.ToString("00"));
+
+                }
                 if (strRule.Contains("[LOT3]"))
                 {
                      serial = serial.Replace("[LOT3]", lotNo);

AMESCoreStudio.WebApi/Models/AMES/SerialRule.cs

@@ -150,5 +150,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("M_CODE")]
         [DataMember]
         public string MCode { get; set; }
+
+
+        /// <summary>
+        /// 日期
+        /// </summary>
+        [Column("D_NUM")]
+        [DataMember]
+        public int DNum { get; set; }
     }
 }

AMESCoreStudio.WebApi/Models/AMES/SerialRuleDetail.cs

@@ -120,5 +120,12 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("M_CODE")]
         [DataMember]
         public string MCode { get; set; }
+
+        /// <summary>
+        /// 日期
+        /// </summary>
+        [Column("D_NUM")]
+        [DataMember]
+        public int DNum { get; set; }
     }
 }