1. Yiru增加TE所需使用之WEBAPI (POWER CORD)

2. Yiru增加入庫單及完工入庫庫別可輸入

AMESCoreStudio.Web/Views/PCS/PCS031.cshtml

@@ -68,6 +68,7 @@
             </div>
             <div class="layui-row">
                 <div class="layui-form-item">
+                    
                     <div class="layui-col-sm4">
                         <div class="layui-inline">
                             <label class="layui-form-label">RecordNumber:</label>
@@ -187,6 +188,20 @@
                 sort: true,
                 templet: '<div>{{ layui.util.toDateString(d.endTime, "yyyy/MM/dd") }}</div>'
             },
+            {
+                field: 'locationNo',
+                width: 150,
+                title: '庫別',
+                fixed: 'right',
+                edit: 'text',
+                templet: function (d) {
+                    var txt = '<div class="layui-input-inline" style="width:130px"><input id="locationNo" name="locationNo" autocomplete="off" class="layui-input" placeholder="請輸入庫別"></div>';
+                    if (d.locationNo != null)
+                        txt = d.locationNo;
+                    return txt;
+                }
+
+            },
             {
                 field: 'recordNumber',
                 width: 150,
@@ -255,7 +270,7 @@
             hg.confirm("送驗單號_箱號：【" + obj.data.inhouseNo + "_" + obj.data.serialNo+ "】，確定要入庫嗎？", function () {
                 $.ajax({
                     url: '/PCS/PCS031inhouse',
-                    data: { InhouseNo: obj.data.inhouseNo, boxNo: obj.data.serialNo, seq: obj.data.seqID, recordNumber: obj.data.recordNumber },
+                    data: { InhouseNo: obj.data.inhouseNo, boxNo: obj.data.serialNo, seq: obj.data.seqID, recordNumber: obj.data.recordNumber, locationNo: obj.data.locationNo },
                     type: 'POST',
                     success: function (data) {
                         if (data.success) {
@@ -285,7 +300,7 @@
                     hg.confirm("批量入庫所有选中的数据，確定要入庫吗？", function () {
                         $.ajax({
                             url: '/PCS/PCS031inhouse_all',
-                            data: { ids: obj.checkstatus.data.map(function (x) { return x.inhouseNo + "," + x.serialNo + "," + x.seqID + "," + x.recordNumber }) },
+                            data: { ids: obj.checkstatus.data.map(function (x) { return x.inhouseNo + "," + x.serialNo + "," + x.seqID + "," + x.recordNumber + "," + x.locationNO }) },
                             type: 'POST',
                             success: function (data) {
                                 if (data.success) {

AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs

@@ -518,7 +518,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                                          CreateDate = q1.CreateDate,
                                                          EndTime = q3.EndTime,
                                                          RecordNumber = q402.RecordNumber,
-                                                         RecordDate = q402.Create_Date
+                                                         RecordDate = q402.Create_Date,
+                                                         LocationNo = q1.LocationNo
                                                      };
             //q1.Status == "P" ? "允收" : q1.Status == "R" ? "批退" : "未驗收完成",
             //IQueryable <FqcInhouseDetail> q1 = _context.FqcInhouseDetails;

AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMaster_WareDto.cs

@@ -123,5 +123,13 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [DataMember]
         [Display(Name = "Record日期")]
         public DateTime? RecordDate { get; set; }
+
+        /// <summary>
+        /// 庫別
+        /// </summary>
+        [DataMember]
+        [Display(Name = "入庫單號")]
+        public string LocationNo { get; set; }
+
     }
 }

AMESCoreStudio.WebApi/Models/AMES/FqcInhouseMaster.cs

@@ -211,5 +211,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         public DateTime? UpdateDate { get; set; } = DateTime.Now;
 
+        /// <summary>
+        /// 庫別
+        /// </summary>
+        [DataMember]
+        [Display(Name = "庫別")]
+        [Column("LOCATION_NO")]
+        [StringLength(5)]
+        public string LocationNo { get; set; }
+
     }
 }

AMESCoreStudio.WebApi/Models/AMES/WareHouseing.cs

@@ -69,12 +69,21 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public decimal Create_UserID { get; set; }
        
         
-        
+        /// <summary>
+        /// 
+        /// </summary>
         [Column("CREATE_DATE")]
         [DataMember]
         [Display(Name = "建立日期")]
         public DateTime Create_Date { get; set; } = DateTime.Now;
 
+        /// <summary>
+        /// 
+        /// </summary>
+        [Column("LOCATION_NO")]
+        [DataMember]
+        [Display(Name = "庫別")]
+        public string LocationNo { get; set; }
 
     }
 }

AMESCoreStudio.WebApi/Models/AMESContext.cs

@@ -132,7 +132,8 @@ namespace AMESCoreStudio.WebApi
             modelBuilder.Entity<WareHouseing>().HasKey(c => new { c.InhouseNo, c.SeqID, c.SerialNo });
             modelBuilder.Entity<OutfitFactoryInfo>().HasKey(c => new { c.OutfitFactoryID });
             modelBuilder.Entity<OutfitInfoBlob>().HasKey(c => new { c.OutfitID });
-		modelBuilder.Entity<RLabelReprint>().HasKey(c => new { c.SerialNumber,c.ReprintTime});
+		    modelBuilder.Entity<RLabelReprint>().HasKey(c => new { c.SerialNumber,c.ReprintTime});
+            modelBuilder.Entity<CZmomaterialList>().HasNoKey();
             //Yiru End  ---------------------------------------------------------------------------------------------------------------------------
 
 
@@ -912,6 +913,11 @@ namespace AMESCoreStudio.WebApi
         /// SOP資訊 - SOP類型為暫行文件
         /// </summary>
         public virtual DbSet<CTempSop> CTempSops { get; set; }
+
+        /// <summary> yiru add
+        /// 工單發料資料
+        /// </summary>
+        public DbSet<CZmomaterialList> CZmomaterialLists { get; set; }
     }
 
 }