11/05

BAS003/BAS005/BAS008增加製程單位欄位

AMESCoreStudio.Web/Views/BAS/BAS003.cshtml

@@ -157,7 +157,13 @@
                             return d.dept["deptName"];
                         }
                     },
-
+                    {
+                        field: 'unit',                        
+                        title: '製程單位',
+                        templet: function (d) {
+                            return d.unit["unitName"];
+                        }
+                    },
                     {
                         field: 'lineDesc',
                         minWidth: 100,

AMESCoreStudio.Web/Views/BAS/BAS005.cshtml

@@ -320,15 +320,14 @@
                             return layui.util.toDateString(d.bulletinTime, "yyyy-MM-dd");
                         }
                     },
-                    //{
+                    {
-                    //    field: 'right',
+                        field: 'unit',
-                    //    width: 200,
+                        width: 100,
-                    //    title: '操作',
+                        title: '製程單位',
-                    //    fixed: 'right',
+                        templet: function (item) {
-                    //    templet: function (d) {
+                            return item.unit["unitName"];
-                    //        return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">删除</a>'
+                        }
-                    //    }
+                    },
-                    //},
                     {
                         align: 'center', title: '操作',
                         templet: function (item) {

AMESCoreStudio.Web/Views/BAS/BAS008.cshtml

@@ -164,19 +164,24 @@
                         title: '測試類別',
                         width: 80
                     },
-                    {
-                        field: 'unitNo',
-                        title: '歸屬製程',
-                        width: 80
-                    },
                     //{
-                    //    field: 'unit',
+                    //    field: 'unitNo',
-                    //    width: 100,
                     //    title: '歸屬製程',
-                    //    templet: function (d) {
+                    //    width: 80
-                    //        return d.unit["unitName"];
-                    //    }
                     //},
+                    {
+                        field: 'unit',
+                        width: 100,
+                        title: '製程單位',
+                        templet: function (d) {
+                            var tt;
+                            if (d.unit== null)
+                                tt = "N/A";
+                            else
+                                tt = d.unit["unitName"];
+                            return tt
+                        }
+                    },
                     {
                         align: 'center' ,title: '操作', width: 160,
                         templet: function (item) {

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json

@@ -2502,8 +2502,17 @@
           "lib/netcoreapp2.1/WebApiClient.JIT.dll": {}
         }
       },
+      "AMESCoreStudio.CommonTools/1.0.0": {
+        "runtime": {
+          "AMESCoreStudio.CommonTools.dll": {}
+        },
+        "compile": {
+          "AMESCoreStudio.CommonTools.dll": {}
+        }
+      },
       "AMESCoreStudio.WebApi/1.0.0": {
         "dependencies": {
+          "AMESCoreStudio.CommonTools": "1.0.0",
           "Microsoft.EntityFrameworkCore": "5.0.8",
           "Microsoft.EntityFrameworkCore.Proxies": "5.0.8",
           "Microsoft.EntityFrameworkCore.SqlServer": "3.1.18",
@@ -5407,6 +5416,11 @@
       "path": "webapiclient.jit/1.1.4",
       "hashPath": "webapiclient.jit.1.1.4.nupkg.sha512"
     },
+    "AMESCoreStudio.CommonTools/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
     "AMESCoreStudio.WebApi/1.0.0": {
       "type": "project",
       "serviceable": false,

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json

@@ -31,6 +31,7 @@
     ".NETCoreApp,Version=v3.1": {
       "AMESCoreStudio.WebApi/1.0.0": {
         "dependencies": {
+          "AMESCoreStudio.CommonTools": "1.0.0",
           "Microsoft.EntityFrameworkCore": "5.0.8",
           "Microsoft.EntityFrameworkCore.Design": "5.0.8",
           "Microsoft.EntityFrameworkCore.Proxies": "5.0.8",
@@ -2443,6 +2444,14 @@
           "System.Xml.XmlDocument": "4.3.0"
         }
       },
+      "AMESCoreStudio.CommonTools/1.0.0": {
+        "runtime": {
+          "AMESCoreStudio.CommonTools.dll": {}
+        },
+        "compile": {
+          "AMESCoreStudio.CommonTools.dll": {}
+        }
+      },
       "Microsoft.AspNetCore.Antiforgery/3.1.0.0": {
         "compile": {
           "Microsoft.AspNetCore.Antiforgery.dll": {}
@@ -5297,6 +5306,11 @@
       "path": "system.xml.xmlserializer/4.3.0",
       "hashPath": "system.xml.xmlserializer.4.3.0.nupkg.sha512"
     },
+    "AMESCoreStudio.CommonTools/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
     "Microsoft.AspNetCore.Antiforgery/3.1.0.0": {
       "type": "referenceassembly",
       "serviceable": false,

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

@@ -382,6 +382,14 @@
             <param name="WipInfo"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.PutWipinfoToStatusNO(System.Int32,System.String)">
+            <summary>
+            更新工單資本資料-狀態
+            </summary>
+            <param name="id">工單ID</param>
+            <param name="statusno">狀態</param>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipLockController">
             <summary>
             
@@ -413,6 +421,37 @@
             <param name="wiplock"></param>
             <returns></returns>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipLogController">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipLogController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
+            <summary>
+            
+            </summary>
+            <param name="context"></param>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipLogController.GetWipLog">
+            <summary>
+            工單投產纪錄資料文件
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipLogController.GetWipLog(System.Int32)">
+            <summary>
+            工單投產纪錄資料文件 to WipID
+            </summary>
+            <param name="id">工單ID</param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipLogController.PostWipLog(AMESCoreStudio.WebApi.Models.AMES.WipLog)">
+            <summary>
+            新增工單投產纪錄資料文件
+            </summary>
+            <param name="wipLog">工單ID</param>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipStatusController">
             <summary>
             工單狀態維護
@@ -682,12 +721,27 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.LineInfoesController.GetLineInfoByWipID(System.Int32)">
+            <summary>
+            用工單ID查詢是否有正在開線
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.LineInfoesController.PutLineInfo(System.Int32,AMESCoreStudio.WebApi.Models.BAS.LineInfo)">
             <summary>
             更改單位资料
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.LineInfoesController.PutLineInfoToWipNO(System.Int32,System.Int32)">
+            <summary>
+            更新線別 ON/OFF
+            </summary>
+            <param name="id">Line ID</param>
+            <param name="wipid">工單ID</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.LineInfoesController.PostLineInfo(AMESCoreStudio.WebApi.Models.BAS.LineInfo)">
             <summary>
             新增單位资料
@@ -2058,6 +2112,11 @@
             異常原因資料
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.AMESContext.WipLogs">
+            <summary>
+            工單投產纪錄資料文件
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange">
             <summary>
             條碼變更資料表
@@ -3033,6 +3092,11 @@
             狀態
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.BAS.ClassInfo.Unit">
+            <summary>
+            生產單位
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Models.BAS.FactoryInfo">
             <summary>
             用户资料表
@@ -3235,7 +3299,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.BAS.LineInfo.WipNo">
             <summary>
-            生產單位
+            工單ID
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.BAS.LineInfo.StatusNo">
@@ -3258,6 +3322,11 @@
             修改時間
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.BAS.LineInfo.Unit">
+            <summary>
+            生產單位资料
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.BAS.LineInfo.Dept">
             <summary>
             部門资料
@@ -3598,6 +3667,11 @@
             狀態
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.BAS.Stations.Unit">
+            <summary>
+            生產單位资料
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Models.BAS.StationType">
             <summary>
             用户资料表

AMESCoreStudio.WebApi/Controllers/BAS/ClassInfoesController.cs

@@ -41,10 +41,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
             q = q.OrderBy(p => p.ClassID);
 
             var classInfo = await q.ToListAsync();
-            //foreach (var data in classInfo)
+            foreach (var data in classInfo)
-            //{
+            {
+                data.Unit = _context.FactoryUnits.Find(data.UnitNo);
                 // data.TestCol = data.BeginTime + " ~ " + data.EndTime;             
-            //}
+            }
 
             return classInfo;
             //return await _context.ClassInfo.ToListAsync();

AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs

@@ -46,7 +46,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
             foreach (var data in LineInfo)
             {
                 data.Dept = _context.DeptInfoes.Find(data.DeptID);
-                //data.Unit = _context.FactoryUnits.Find(data.UnitNo);
+                data.Unit = _context.FactoryUnits.Find(data.UnitNo);
             }
 
             if (LineInfo == null)

AMESCoreStudio.WebApi/Controllers/BAS/StationsesController.cs

@@ -37,17 +37,20 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
         public async Task<ActionResult<IEnumerable<Stations>>> GetStations()
         {
             IQueryable<Stations> q = _context.Stationses;
-            //q = q.Where(p => p.StationID > 0);
+            q = q.Where(p => p.UnitNo != "0");
             q = q.OrderBy(p => p.StationID);
 
             var Stations = await q.ToListAsync();
 
-            //foreach (var data in Stations)
+            foreach (var data in Stations)
-            //{
+            {
-            //    //data.Dept = _context.DeptInfoes.Find(data.DeptID);
+                //data.Dept = _context.DeptInfoes.Find(data.DeptID);
-            //    var tt = _context.FactoryUnits.Find(data.UnitNo);
+                if (data.UnitNo != "0")
-            //    data.UnitName = _context.FactoryUnits.Find(data.UnitNo).UnitName;
+                    data.Unit = _context.FactoryUnits.Find(data.UnitNo);
-            //}
+                else
+                    data.Unit.UnitName = "N/A";
+
+            }
 
 
             return Stations;

AMESCoreStudio.WebApi/Models/AMESContext.cs

@@ -85,8 +85,13 @@ namespace AMESCoreStudio.WebApi
             modelBuilder.Entity<WipBarcode>().HasKey(c => new { c.WipNO, c.StartNO, c.EndNO });
             modelBuilder.Entity<WipLog>().HasKey(c => new { c.WipID, c.CreateDate});
 
-            //modelBuilder.Entity<LineInfo>().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired();
+
-            //modelBuilder.Entity<LineInfo>().HasOne(r => r.Dept).WithMany().HasForeignKey(r => r.DeptID).IsRequired();
+            modelBuilder.Entity<AMESCoreStudio.WebApi.Models.BAS.ClassInfo>().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired();
+            modelBuilder.Entity<AMESCoreStudio.WebApi.Models.BAS.LineInfo>().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired();
+            modelBuilder.Entity<AMESCoreStudio.WebApi.Models.BAS.LineInfo>().HasOne(r => r.Dept).WithMany().HasForeignKey(r => r.DeptID).IsRequired();
+            modelBuilder.Entity < AMESCoreStudio.WebApi.Models.BAS.Stations>().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired();
+
+
         }
 
         /// <summary>

AMESCoreStudio.WebApi/Models/BAS/ClassInfo.cs

@@ -133,12 +133,8 @@ namespace AMESCoreStudio.WebApi.Models.BAS
         /// <summary>
         /// 生產單位
         /// </summary>
-        //public virtual System.Collections.Generic.ICollection<FactoryUnit> Unit { get; set; }
+        public virtual AMESCoreStudio.WebApi.Models.BAS.FactoryUnit Unit { get; set; }
-        //public virtual FactoryUnit Unit { get; set; }
+
-        //public class Other
-        //{
-        //    public string Member { get; set; }
-        //}
         
     }
 }

AMESCoreStudio.WebApi/Models/BAS/LineInfo.cs

@@ -94,7 +94,7 @@ namespace AMESCoreStudio.WebApi.Models.BAS
         /// <summary>
         /// 生產單位资料
         /// </summary>
-        //public virtual AMESCoreStudio.WebApi.Models.BAS.FactoryUnit Unit { get; set; }
+        public virtual AMESCoreStudio.WebApi.Models.BAS.FactoryUnit Unit { get; set; }
 
         /// <summary>
         /// 部門资料

AMESCoreStudio.WebApi/Models/BAS/Stations.cs

@@ -168,7 +168,7 @@ namespace AMESCoreStudio.WebApi.Models.BAS
         /// <summary>
         /// 生產單位资料
         /// </summary>
-        //public virtual String UnitName { get; set; }
+        public virtual AMESCoreStudio.WebApi.Models.BAS.FactoryUnit Unit { get; set; }
 
     }
 }

AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json

@@ -31,6 +31,7 @@
     ".NETCoreApp,Version=v3.1": {
       "AMESCoreStudio.WebApi/1.0.0": {
         "dependencies": {
+          "AMESCoreStudio.CommonTools": "1.0.0",
           "Microsoft.EntityFrameworkCore": "5.0.8",
           "Microsoft.EntityFrameworkCore.Design": "5.0.8",
           "Microsoft.EntityFrameworkCore.Proxies": "5.0.8",
@@ -2443,6 +2444,14 @@
           "System.Xml.XmlDocument": "4.3.0"
         }
       },
+      "AMESCoreStudio.CommonTools/1.0.0": {
+        "runtime": {
+          "AMESCoreStudio.CommonTools.dll": {}
+        },
+        "compile": {
+          "AMESCoreStudio.CommonTools.dll": {}
+        }
+      },
       "Microsoft.AspNetCore.Antiforgery/3.1.0.0": {
         "compile": {
           "Microsoft.AspNetCore.Antiforgery.dll": {}
@@ -5297,6 +5306,11 @@
       "path": "system.xml.xmlserializer/4.3.0",
       "hashPath": "system.xml.xmlserializer.4.3.0.nupkg.sha512"
     },
+    "AMESCoreStudio.CommonTools/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
     "Microsoft.AspNetCore.Antiforgery/3.1.0.0": {
       "type": "referenceassembly",
       "serviceable": false,

AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

@@ -382,6 +382,14 @@
             <param name="WipInfo"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.PutWipinfoToStatusNO(System.Int32,System.String)">
+            <summary>
+            更新工單資本資料-狀態
+            </summary>
+            <param name="id">工單ID</param>
+            <param name="statusno">狀態</param>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipLockController">
             <summary>
             
@@ -413,6 +421,37 @@
             <param name="wiplock"></param>
             <returns></returns>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipLogController">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipLogController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
+            <summary>
+            
+            </summary>
+            <param name="context"></param>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipLogController.GetWipLog">
+            <summary>
+            工單投產纪錄資料文件
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipLogController.GetWipLog(System.Int32)">
+            <summary>
+            工單投產纪錄資料文件 to WipID
+            </summary>
+            <param name="id">工單ID</param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipLogController.PostWipLog(AMESCoreStudio.WebApi.Models.AMES.WipLog)">
+            <summary>
+            新增工單投產纪錄資料文件
+            </summary>
+            <param name="wipLog">工單ID</param>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipStatusController">
             <summary>
             工單狀態維護
@@ -682,12 +721,27 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.LineInfoesController.GetLineInfoByWipID(System.Int32)">
+            <summary>
+            用工單ID查詢是否有正在開線
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.LineInfoesController.PutLineInfo(System.Int32,AMESCoreStudio.WebApi.Models.BAS.LineInfo)">
             <summary>
             更改單位资料
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.LineInfoesController.PutLineInfoToWipNO(System.Int32,System.Int32)">
+            <summary>
+            更新線別 ON/OFF
+            </summary>
+            <param name="id">Line ID</param>
+            <param name="wipid">工單ID</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.LineInfoesController.PostLineInfo(AMESCoreStudio.WebApi.Models.BAS.LineInfo)">
             <summary>
             新增單位资料
@@ -2058,6 +2112,11 @@
             異常原因資料
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.AMESContext.WipLogs">
+            <summary>
+            工單投產纪錄資料文件
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange">
             <summary>
             條碼變更資料表
@@ -3033,6 +3092,11 @@
             狀態
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.BAS.ClassInfo.Unit">
+            <summary>
+            生產單位
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Models.BAS.FactoryInfo">
             <summary>
             用户资料表
@@ -3235,7 +3299,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.BAS.LineInfo.WipNo">
             <summary>
-            生產單位
+            工單ID
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.BAS.LineInfo.StatusNo">
@@ -3258,6 +3322,11 @@
             修改時間
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.BAS.LineInfo.Unit">
+            <summary>
+            生產單位资料
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.BAS.LineInfo.Dept">
             <summary>
             部門资料
@@ -3598,6 +3667,11 @@
             狀態
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.BAS.Stations.Unit">
+            <summary>
+            生產單位资料
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Models.BAS.StationType">
             <summary>
             用户资料表