From d4c3ce363eef2474b9ece4505d9ba2ab26ca9f8b Mon Sep 17 00:00:00 2001
From: "vick_wang419@hotmail.com.tw" <vick_wang419@hotmail.com.tw>
Date: Thu, 25 Jan 2024 00:55:29 +0800
Subject: [PATCH] =?UTF-8?q?PTD=20=E8=A2=AB=E8=B2=A8=E3=80=81=E6=89=A3?=
 =?UTF-8?q?=E5=B8=B3=E3=80=81=E4=B8=80=E6=AE=B5=E5=BC=8F=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8D=A1=E6=8E=A7=E9=82=8F=E8=BC=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Views/PTD/PTD002.cshtml    | 14 ++++++--
 AMESCoreStudio.Web/Views/PTD/PTD006.cshtml    | 34 +++++++++++--------
 AMESCoreStudio.Web/Views/PTD/PTD007.cshtml    | 11 +++---
 .../Controllers/AMES/WipInfosController.cs    |  4 +--
 4 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml b/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml
index a42dc808..fa3368ff 100644
--- a/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml
+++ b/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml
@@ -192,7 +192,6 @@
                 var elem = data.elem; // 获得 radio 原始 DOM 对象
                 var checked = elem.checked; // 获得 radio 选中状态
                 var value = elem.value; // 获得 radio 值
-                var othis = data.othis; // 获得 radio 元素被替换后的 jQuery 对象
                 var checkboxElem = layui.$('input[lay-filter="check-filter"]');
                 if (value == 0 && checked) {
                     checkboxElem.prop('disabled', false);
@@ -372,9 +371,21 @@
             var recordDate = document.getElementById('recordDate').value;
             var location = document.getElementById('Location').value;
             var customer = document.getElementById('Customer').value;
+            var material = document.getElementById('PartNumber').value;
 
             var tableData = layui.table.cache['query'];
 
+
+            if (customer === "") {
+                hg.msg('Customer不得為空!');
+                return; // Do not add the row
+            }
+            if (material === "") {
+                hg.msg('料號不得為空!');
+                return; // Do not add the row
+            }
+            
+
             var postData = {
                 recordType: recordType,
                 workCenter: workCenter,
@@ -470,7 +481,6 @@
         hg.table.addRow = function (tableId, rowData) {
             // Get the table instance
             var table = layui.table;
-            console.log(table);
             if (isSNAlreadyExist(tableId, rowData.sn)) {
                 // Handle the case where SN already exists
                 layer.msg('SN 已存在!', { icon: 2 });
diff --git a/AMESCoreStudio.Web/Views/PTD/PTD006.cshtml b/AMESCoreStudio.Web/Views/PTD/PTD006.cshtml
index 5a25b3ac..cc792b47 100644
--- a/AMESCoreStudio.Web/Views/PTD/PTD006.cshtml
+++ b/AMESCoreStudio.Web/Views/PTD/PTD006.cshtml
@@ -167,13 +167,6 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.17.4/xlsx.full.min.js"></script>
     <script type="text/javascript">
         layui.use(['form', 'layer', 'laydate','table'], function () {
-            laydate = layui.laydate;
-            laydate.render({
-                elem: '#recordDate'
-                , trigger: 'click'
-                , format: 'yyyy/MM/dd'
-                , theme: 'grid'
-            });
 
             form.on('radio(radio-filter)', function (data) {
                 var elem = data.elem; // 获得 radio 原始 DOM 对象
@@ -399,12 +392,23 @@
             // Get the table instance
             var table = layui.table;
             if (isSNAlreadyExist(tableId, rowData.sn)) {
-                // Handle the case where SN already exists
-                layer.msg('SN 已存在!', { icon: 2 });
+                hg.msg('SN 已存在!');
                 return; // Do not add the row
             }
             var ExtNotes = document.getElementById('ExtNotes');
             var username = getCookie("UserID");
+            var workCenter = document.getElementById('WorkCenter').value;
+            var rbu = document.getElementById('RBU').value;
+            var customer = document.getElementById('Customer').value;
+            //卡控material & customer不得為空
+            if (customer === "") {
+                hg.msg('Customer不得為空!');
+                return; // Do not add the row
+            }
+            if (rowData.material === "") {
+                hg.msg('料號不得為空!');
+                return; // Do not add the row
+            }
 
             var postData = {
                 RecordTypeID: rowData.recordType,
@@ -413,10 +417,10 @@
                 InputSN: rowData.sn,
                 ShipmentSN: rowData.sn,
                 ProductID: rowData.material,
-                EmplID: username,
+                EmplID: customer,
                 ExtNotes: ExtNotes.value,
-                OwnerPlantID: WorkCenter.value,
-                OwnerCompanyID: RBU.value,
+                OwnerPlantID: workCenter,
+                OwnerCompanyID: rbu,
                 CreateDeptID: "",
                 CreatorID: username,
                 ModifyDeptID: "",
@@ -442,12 +446,12 @@
                         });
                         layer.msg('備貨成功!', { icon: 1 });
                     } else {
-                        layer.msg('備貨失敗，原因:' + result.data.msg, { icon: 2 });
+                        hg.msg('備貨失敗，原因:' + result.data.msg);
                         return;
                     }
                 },
                 error: function (error) {
-                    layer.msg('備貨失敗!原因:' + error.msg, { icon: 2 });
+                    hg.msg('備貨失敗!原因:' + error.msg);
                     return;
                 }
              });
@@ -492,7 +496,7 @@
                         });
 
                     } else {
-                        layer.msg('未找到要刪除的數據', { icon: 2 });
+                        hg.msg('未找到要刪除的數據');
                     }
                 });
             }
diff --git a/AMESCoreStudio.Web/Views/PTD/PTD007.cshtml b/AMESCoreStudio.Web/Views/PTD/PTD007.cshtml
index de2b7700..48678640 100644
--- a/AMESCoreStudio.Web/Views/PTD/PTD007.cshtml
+++ b/AMESCoreStudio.Web/Views/PTD/PTD007.cshtml
@@ -122,6 +122,11 @@
 
                 var tableData = table.checkStatus('query').data;
 
+                if (tableData.length == 0) {
+                    hg.msg('請勾選扣帳資訊!');
+                    return;
+                }
+
                 var postData = {
                     recordType: recordType,
                     workCenter: workCenter,
@@ -137,8 +142,6 @@
                     data: { data: JSON.stringify(postData) },
                     type: 'POST',
                     success: function (result) {
-                        console.log("扣帳結果:");
-                        console.log(result);
                         if (result.data.success) {
                             layer.msg('扣帳成功!', { icon: 1 });
                             // 重新加载表格数据
@@ -149,11 +152,11 @@
                             });
                             $("#rowCount").html("目前勾選項次 0 項，數量共 0 pcs");
                         } else {
-                            layer.msg('扣帳失敗，原因:' + result.data.msg, { icon: 2 });
+                            hg.msg('扣帳失敗，原因:' + result.data.msg);
                         }
                     },
                     error: function (error) {
-                        layer.msg('扣帳失敗!原因:' + error.msg, { icon: 2 });
+                        hg.msg('扣帳失敗!原因:' + error.msgs);
                     }
                 });
              });
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index bd411c5d..39b28864 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -3454,9 +3454,9 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                     await connPTD.OpenAsync();
                 }
                 string strSQL = $@"SELECT a.RecordTypeID ,a.RecordNumber ,a.RCLineNO 'LineNo',
-                                          a.SerialNumber 'SN',a.ProductID ,b.SoldCustomerID 'Customer',a.LocationID 'Location',
+                                          a.SerialNumber 'SN',a.ProductID ,a.EmplID 'Customer',a.LocationID 'Location',
                                           a.CreatorID ,a.CreateDate 
-                                   FROM  SFIS_PTD.dbo.ZProductTrans a join SFIS_PTD.dbo.ZDNDetail b on (a.RecordNumber = b.DNNO and a.RCLineNO = b.DNLineNO) where 1=1 ";
+                                   FROM  SFIS_PTD.dbo.ZProductTrans a where 1=1 ";
                 if (recordType != null && recordType != "" && recordType != "全部")
                 {
                     strSQL += $" And a.RecordTypeID ='{recordType}'";