協助Yiru上傳

1、SAP發料資料解析：電源線&點料 2、IPQC 巡檢欄位畫面預設很小不易辨讀，進行手動調整項目欄位寬度後.相對應的上傳圖片位置會與原檢驗項目欄位無法對齊 3、報工(加工)系統是否能把未完成的置頂 4、入庫單新增備註欄 (AP3.3) 5、入庫作業這個程式，成倉需要多一個輸入欄位RecordDate，該欄位預設值帶當天，但可以由成倉自行修改
2 years ago · e15bebd3c8
12 changed files with 112 additions and 19 deletions
--- a/AMESCoreStudio.Web/Views/PCS/PCS031.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS031.cshtml
@ -96,16 +96,16 @@
                    </div>
                    <div class="layui-form-item">
                        <div class="layui-col-sm4">
-                          <div class="layui-inline">
-                            <label class="layui-form-label">是否入庫:</label>
-                            <div class="layui-input-inline">
-                                <select name="Status" id="Status" class="custom-select col-sm-2">
-                                    <option value="ALL">全部</option>
-                                    <option value="Y">已入庫</option>
-                                    <option value="N">待入庫</option>
-                                </select>
-                           </div>
-                        </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label">是否入庫:</label>
+                                <div class="layui-input-inline">
+                                    <select name="Status" id="Status" class="custom-select col-sm-2">
+                                        <option value="ALL">全部</option>
+                                        <option value="Y">已入庫</option>
+                                        <option value="N">待入庫</option>
+                                    </select>
+                                </div>
+                            </div>
                        </div>
                        <div class="layui-col-sm">
                            <div class="layui-inline layui-show-xs-block">
@ -127,10 +127,18 @@
                            </div>
                        </div>
                    </div>
+                    <div class="layui-col-sm4">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">RecordDate 輸入:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="recordDate" name="date_str" autocomplete="off" value="@System.DateTime.Now.ToString("yyyy-MM-dd")" class="layui-input" readonly="">
+                            </div>
+                        </div>
+                    </div>

-                   
                </div>
            </div>
+            

        </div>
        <table class="layui-hide" id="query" lay-filter="query"></table>
@ -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) {
--- 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";
 }
+<style>
+    /*    .control-label {
+                                                            justify-content: flex-end !important;
+                                                        }
+                                                    */
+
+
+   
+    .layui-table-cell {
+        height: auto;
+        overflow: visible;
+        text-overflow: inherit;
+        white-space: normal
+    }
+</style>

 <div class="layui-card">
    <div class="layui-card-header">
--- 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
    }
 </style>

--- 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
+    }
 </style>
 <div class="layui-card">
    <div class="layui-card-body">
--- 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
+    }
 </style>
 <div class="layui-card">
    <div class="layui-card-body">
@ -112,7 +118,6 @@
                        field: 'inspectionItem',
                        title: '項目',
                        align: 'left',
-                        width: 450,
                        sort: true,
                        templet: function (d) {
                            return d.inspectionItem['inspectionItemName'];
--- a/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml
@ -267,6 +267,7 @@
            {
                field: 'closeTime',
                title: '完工時間',
+                sort: true,
                templet: '<div>{{ layui.util.toDateString(d.closeTime, "yyyy/MM/dd HH:mm:ss") }}</div>'
            },
            {
--- 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({
--- a/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs
@ -43,7 +43,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES


        /// <summary>
-        /// 工單發料資料表 by ByMoID 查詢
+        /// 工單發料資料表 查詢POWER CORD,E17 by ByMoID 查詢
        /// </summary>
        /// <param name="id">MoID</param>
        /// <returns></returns>
@ -65,6 +65,26 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
        }


-      
+        /// <summary>
+        /// 工單發料資料表 查詢工單所有發料 by ByMoID 查詢
+        /// </summary>
+        /// <param name="id">MoID</param>
+        /// <returns></returns>
+        [HttpGet("ByMoID_ALL/{id}")]
+        public async Task<ActionResult<IEnumerable<dynamic>>> 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();
+        }
+
    }
 }
--- 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<ActionResult<IEnumerable<WorkingHoursCollectionDto>>> GetWorkingHoursCollectionDtoByQuery(string unitNo, string lineid, string stationid, string wipno, string itemno, string user, string sdate, string edate)
--- 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; }

+
+        /// <summary>
+        /// 入庫單備註
+        /// </summary>
+        [DataMember]
+        [Display(Name = "入庫單備註")]
+        [Column("INHOUSE_MEMO")]
+        [StringLength(100)]
+        public string InhouseMemo { get; set; }
+
    }
 }
--- a/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs
@ -54,7 +54,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES
        /// <summary>
        /// 正式資料:Ava.ptdbatch 測試資料 :test-Ava.ptdbatch-test
        /// </summary>
-        public string Key { get; set; } 
+        public string Key { get; set; }
+        /// <summary>
+        /// RecordDate
+        /// </summary>
+        public string RecordDate { get; set; }

    }
 }
--- 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; }

+        /// <summary>
+        /// RECORD_DATE
+        /// </summary>
+        [Column("RECORD_DATE")]
+        [DataMember]
+        [Display(Name = "RECORDDATE")]
+        public DateTime Record_Date { get; set; }
+
    }
 }