From e15bebd3c84a4861250e62eb0ba507d60eb88d93 Mon Sep 17 00:00:00 2001 From: "BB.Wang" Date: Thu, 16 Mar 2023 08:43:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=94=E5=8A=A9Yiru=E4=B8=8A=E5=82=B3=201?= =?UTF-8?q?=E3=80=81SAP=E7=99=BC=E6=96=99=E8=B3=87=E6=96=99=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=EF=BC=9A=E9=9B=BB=E6=BA=90=E7=B7=9A&=E9=BB=9E?= =?UTF-8?q?=E6=96=99=202=E3=80=81IPQC=20=E5=B7=A1=E6=AA=A2=E6=AC=84?= =?UTF-8?q?=E4=BD=8D=E7=95=AB=E9=9D=A2=E9=A0=90=E8=A8=AD=E5=BE=88=E5=B0=8F?= =?UTF-8?q?=E4=B8=8D=E6=98=93=E8=BE=A8=E8=AE=80=EF=BC=8C=E9=80=B2=E8=A1=8C?= =?UTF-8?q?=E6=89=8B=E5=8B=95=E8=AA=BF=E6=95=B4=E9=A0=85=E7=9B=AE=E6=AC=84?= =?UTF-8?q?=E4=BD=8D=E5=AF=AC=E5=BA=A6=E5=BE=8C.=E7=9B=B8=E5=B0=8D?= =?UTF-8?q?=E6=87=89=E7=9A=84=E4=B8=8A=E5=82=B3=E5=9C=96=E7=89=87=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E6=9C=83=E8=88=87=E5=8E=9F=E6=AA=A2=E9=A9=97=E9=A0=85?= =?UTF-8?q?=E7=9B=AE=E6=AC=84=E4=BD=8D=E7=84=A1=E6=B3=95=E5=B0=8D=E9=BD=8A?= =?UTF-8?q?=203=E3=80=81=E5=A0=B1=E5=B7=A5(=E5=8A=A0=E5=B7=A5)=E7=B3=BB?= =?UTF-8?q?=E7=B5=B1=E6=98=AF=E5=90=A6=E8=83=BD=E6=8A=8A=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=9A=84=E7=BD=AE=E9=A0=82=204=E3=80=81=E5=85=A5?= =?UTF-8?q?=E5=BA=AB=E5=96=AE=E6=96=B0=E5=A2=9E=E5=82=99=E8=A8=BB=E6=AC=84?= =?UTF-8?q?=20=20(AP3.3)=205=E3=80=81=E5=85=A5=E5=BA=AB=E4=BD=9C=E6=A5=AD?= =?UTF-8?q?=E9=80=99=E5=80=8B=E7=A8=8B=E5=BC=8F=EF=BC=8C=E6=88=90=E5=80=89?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=A4=9A=E4=B8=80=E5=80=8B=E8=BC=B8=E5=85=A5?= =?UTF-8?q?=E6=AC=84=E4=BD=8DRecordDate=EF=BC=8C=E8=A9=B2=E6=AC=84?= =?UTF-8?q?=E4=BD=8D=E9=A0=90=E8=A8=AD=E5=80=BC=E5=B8=B6=E7=95=B6=E5=A4=A9?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E5=8F=AF=E4=BB=A5=E7=94=B1=E6=88=90=E5=80=89?= =?UTF-8?q?=E8=87=AA=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Views/PCS/PCS031.cshtml | 44 +++++++++++++------ AMESCoreStudio.Web/Views/SPC/SPC004V.cshtml | 15 +++++++ AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml | 7 +++ AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml | 6 +++ AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml | 7 ++- AMESCoreStudio.Web/Views/WHS/WHS019.cshtml | 1 + AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml | 2 +- .../AMES/CZmomaterialListController.cs | 24 +++++++++- .../AMES/WorkingHoursCollectionsController.cs | 1 + .../Models/AMES/FqcInhouseMaster.cs | 10 +++++ .../Models/AMES/PTD101AMESModel.cs | 6 ++- .../Models/AMES/WareHouseing.cs | 8 ++++ 12 files changed, 112 insertions(+), 19 deletions(-) diff --git a/AMESCoreStudio.Web/Views/PCS/PCS031.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS031.cshtml index 7b0aae5a..f0fb508f 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS031.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS031.cshtml @@ -96,16 +96,16 @@
-
- -
- -
-
+
+ +
+ +
+
@@ -127,10 +127,18 @@
+
+
+ +
+ +
+
+
- +
@@ -161,6 +169,12 @@ , format: 'yyyy/MM/dd' , theme: 'grid' }); + laydate.render({ + elem: '#recordDate' + , trigger: 'click' + , format: 'yyyy-MM-dd' + , theme: 'grid' + }); }); $('#inhouseNo1').on('keypress', function (event) { @@ -341,6 +355,7 @@ function edit(obj) { var recordmumber = $("#inhouseNo1").val(); + var recordDate = $("#recordDate").val(); if (recordmumber == '') { hg.msg('請輸入recordmumber！'); } @@ -348,7 +363,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: recordmumber, locationNo: obj.data.locationNo }, + data: { InhouseNo: obj.data.inhouseNo, boxNo: obj.data.serialNo, seq: obj.data.seqID, recordNumber: recordmumber, locationNo: obj.data.locationNo, recordDate: recordDate }, type: 'POST', success: function (data) { if (data.success) { @@ -374,7 +389,8 @@ handler: function (obj, row) { if (obj.checkstatus && obj.checkstatus.data.length > 0) { console.log(obj.checkstatus.data.map(function (x) { return x.serialNo }).join(',')) - var recordmumber = $("#inhouseNo1").val(); + var recordmumber = $("#inhouseNo1").val(); + var recorddate = $("#recordDate").val(); if (recordmumber == '') { hg.msg('請輸入recordmumber！'); @@ -383,7 +399,7 @@ hg.confirm("批量入庫所有选中的数据，確定要入庫吗？", function () { $.ajax({ url: '/PCS/PCS031inhouse_all', - data: { ids: obj.checkstatus.data.map(function (x) { return x.inhouseNo + "," + x.serialNo + "," + x.seqID + "," + recordmumber + "," + x.locationNo }) }, + data: { ids: obj.checkstatus.data.map(function (x) { return x.inhouseNo + "," + x.serialNo + "," + x.seqID + "," + recordmumber + "," + x.locationNo + "," + recorddate }) }, type: 'POST', success: function (data) { if (data.success) { diff --git a/AMESCoreStudio.Web/Views/SPC/SPC004V.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC004V.cshtml index 515f3364..938c93d5 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC004V.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC004V.cshtml @@ -2,6 +2,21 @@ ViewData["Title"] = "巡檢結果回覆"; Layout = "~/Views/Shared/_AMESLayout.cshtml"; } +
diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml index a2382d8c..6f08004c 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml @@ -23,6 +23,13 @@ margin-top: -10px; margin-left: -10px; margin-right: -10px; + + } + .layui-table-cell { + height: auto; + overflow: visible; + text-overflow: inherit; + white-space: normal } diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml index 6e307d4e..3c45ea2f 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml @@ -16,6 +16,12 @@ margin-left: -10px; margin-right: -10px; } + .layui-table-cell { + height:auto; + overflow:visible; + text-overflow:inherit; + white-space:normal + }
diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml index d4cc5e1b..762ee785 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml @@ -15,6 +15,12 @@ margin-left: -10px; margin-right: -10px; } + .layui-table-cell { + height: auto; + overflow: visible; + text-overflow: inherit; + white-space: normal + }
@@ -112,7 +118,6 @@ field: 'inspectionItem', title: '項目', align: 'left', - width: 450, sort: true, templet: function (d) { return d.inspectionItem['inspectionItemName']; diff --git a/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml index 4155f59b..39658087 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml @@ -267,6 +267,7 @@ { field: 'closeTime', title: '完工時間', + sort: true, templet: '
{{ layui.util.toDateString(d.closeTime, "yyyy/MM/dd HH:mm:ss") }}
' }, { diff --git a/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml index aec6fe9f..d938a581 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml @@ -304,7 +304,7 @@ elem: '#StartTime' , trigger: 'click' , type: 'datetime' - , format: 'yyyy-MM-dd HH:mm' + , format: 'yyyy-MM-dd' , theme: 'grid' }); laydate.render({ diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs index afeaa4dd..2823ef0b 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs @@ -43,7 +43,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// - /// 工單發料資料表 by ByMoID 查詢 + /// 工單發料資料表 查詢POWER CORD,E17 by ByMoID 查詢 /// /// MoID /// @@ -65,6 +65,26 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } - + /// + /// 工單發料資料表 查詢工單所有發料 by ByMoID 查詢 + /// + /// MoID + /// + [HttpGet("ByMoID_ALL/{id}")] + public async Task>> GetCZmomaterialListByMoID_ALL(string id) + { + var q = from q1 in _context.CZmomaterialLists.Where(w => w.MoID == id) + select new + { + q1.MoID, + q1.MaterialNo, + q1.DemandQty, + q1.RealsendQty + + }; + + return await q.ToListAsync(); + } + } } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs index 933d97f4..65bd3102 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs @@ -215,6 +215,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } } + workingHoursCollectionDtos = workingHoursCollectionDtos.OrderBy(o => o.CloseTime).ToList(); return workingHoursCollectionDtos; } //public async Task>> GetWorkingHoursCollectionDtoByQuery(string unitNo, string lineid, string stationid, string wipno, string itemno, string user, string sdate, string edate) diff --git a/AMESCoreStudio.WebApi/Models/AMES/FqcInhouseMaster.cs b/AMESCoreStudio.WebApi/Models/AMES/FqcInhouseMaster.cs index 2131fcab..1601f0d6 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/FqcInhouseMaster.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/FqcInhouseMaster.cs @@ -209,5 +209,15 @@ namespace AMESCoreStudio.WebApi.Models.AMES [StringLength(5)] public string LocationNo { get; set; } + + /// + /// 入庫單備註 + /// + [DataMember] + [Display(Name = "入庫單備註")] + [Column("INHOUSE_MEMO")] + [StringLength(100)] + public string InhouseMemo { get; set; } + } } diff --git a/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs b/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs index 51eeb7db..18640a56 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs @@ -54,7 +54,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// /// 正式資料:Ava.ptdbatch 測試資料 :test-Ava.ptdbatch-test /// - public string Key { get; set; } + public string Key { get; set; } + /// + /// RecordDate + /// + public string RecordDate { get; set; } } } diff --git a/AMESCoreStudio.WebApi/Models/AMES/WareHouseing.cs b/AMESCoreStudio.WebApi/Models/AMES/WareHouseing.cs index 7f59e1cb..a27c4858 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WareHouseing.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WareHouseing.cs @@ -85,5 +85,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Display(Name = "庫別")] public string LocationNo { get; set; } + /// + /// RECORD_DATE + /// + [Column("RECORD_DATE")] + [DataMember] + [Display(Name = "RECORDDATE")] + public DateTime Record_Date { get; set; } + } }