Yiru修正完工入庫

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -1343,7 +1343,7 @@ namespace AMESCoreStudio.Web
 
         #region PTD101AMES 完工入庫序號轉檔
         [WebApiClient.Attributes.HttpPost("http://nportal.avalue.com.tw/PTD_Batch/api/PTD101AMES")]
-        ITask<List<PTD101AMESModel>> PostPTD101AMES([FromBody, RawJsonContent] string model);
+        ITask<dynamic> PostPTD101AMES([FromBody, RawJsonContent] string model);
 
         #endregion
 

AMESCoreStudio.Web/Views/PCS/PCS031.cshtml

@@ -68,7 +68,6 @@
             </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>
@@ -96,8 +95,33 @@
                             </button>
                         </div>
                     </div>
+                    <div class="layui-row">
+                        <div class="layui-form-item">
+                        </div>
+                    </div>
                 </div>
             </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>
+                            <div class="layui-input-inline">
+                                <input id="inhouseNo1" name="inhouseNo1" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                 
+                    <div class="layui-col-sm1">
+                        
+                    </div>
+                    <div class="layui-row">
+                        <div class="layui-form-item">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
         </div>
         <table class="layui-hide" id="query" lay-filter="query"></table>
     </div>
@@ -128,6 +152,43 @@
         });
 
        
+
+        $('#inhouseNo1').on('keypress', function (event) {
+
+            if (event.keyCode == 13) {
+                var data = $("#inhouseNo1").val();
+                if (data == '') {
+                    alert("請輸入recordNumber")
+                }
+                else
+                {
+                    $('#recordNumber ').each(function () {
+                        $(this).val(data);
+                    });
+                }
+                
+            }
+
+        });
+
+        $('#querysubmitTmp').click(function () {
+            var data = $("#inhouseNo1").val();
+          
+            var data = $("#inhouseNo1").val();
+            if (data == '') {
+                alert("請輸入recordNumber")
+            }
+            else {
+                $('#recordNumber ').each(function () {
+                    $(this).val(data);
+                });
+            }
+
+        });
+       
+
+
+
     //    alert('測試文字1');
 
         //监听表单提交事件
@@ -139,12 +200,24 @@
     //    alert('測試文字2');
 
         var tableCols = [[
-            { type: 'checkbox' },
+            
+            {
+                type: 'checkbox', title: '全選',
+               
+            },
             {
                 field: 'serialNo',
                 width: 145,
                 title: '箱號',
-                sort: true
+                sort: true,
+                totalRowText : '合計:'
+            },
+            {
+                field: 'boxQty',
+                width: 70,
+                title: '數量',
+                sort: true,
+                totalRow: true
             },
             {
                 field: 'inhouseNo',
@@ -197,7 +270,14 @@
                 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;
+                        txt = '<div class="layui-input-inline" style="width:130px"><input id="locationNo" name="locationNo" autocomplete="off" class="layui-input" value="' + d.locationNo +'" ></div>';
+                    if (d.recordNumber != null) {
+                        if (d.locationNo != null)
+                            txt = d.locationNo
+                        else
+                            txt = "";
+                    }
+                       
                     return txt;
                 }
 
@@ -209,9 +289,10 @@
                 fixed: 'right',
                 edit: 'text',
                 templet: function (d) {
-                    var txt = '<div class="layui-input-inline" style="width:130px"><input id="recordNumber" name="recordNumber" autocomplete="off" class="layui-input" placeholder="請輸入資料recordNumber"></div>';
+                    var txt = '<div class="layui-input-inline" style="width:130px"><input id="recordNumber" name="recordNumber" autocomplete="off" class="layui-input" placeholder="請輸入recordNumber"></div>';
                     if (d.recordNumber != null)
                         txt = d.recordNumber;
+
                     return txt;
                 }
 
@@ -259,6 +340,7 @@
             };
     //    alert('測試文字4');
 
+
         function detail(obj) {
             //  if (obj.data.wipID) {
             hg.open('箱號資料查詢', '/PCS/PCS031V?InhouseNo=' + obj.data.inhouseNo + '&SeqID=' + obj.data.seqID, '', '', true);
@@ -328,7 +410,7 @@
        // alert('測試文字6');
         //基本数据表格
  
-        var table = hg.table.datatable('query', 'FQC查詢', '/PCS/PCS031Query', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        var table = hg.table.datatable('query', 'FQC查詢', '/PCS/PCS031Query', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports'],true);
        
        // alert('測試文字7');
     </script>

AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs

@@ -502,6 +502,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             IQueryable<FqcInhouseMaster_WareDto> q = from q1 in _context.FqcInhouseMasters
                                                      join q2 in _context.FqcInhouseDetails on new { q1.InhouseNo, q1.SeqID } equals new { q2.InhouseNo, q2.SeqID }
+                                                     join q2_1 in _context.WipBoxs on  q2.SerialNo equals q2_1.BoxNo
                                                      join q3 in _context.FqcResultMasters on q1.InhouseNo equals q3.InhouseNo
                                                      join q4 in _context.WareHouseings on new { q2.InhouseNo, q2.SeqID, q2.SerialNo } equals new { q4.InhouseNo, q4.SeqID, q4.SerialNo } into q2q4
                                                      from q402 in q2q4.DefaultIfEmpty()
@@ -519,7 +520,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                                          EndTime = q3.EndTime,
                                                          RecordNumber = q402.RecordNumber,
                                                          RecordDate = q402.Create_Date,
-                                                         LocationNo = q1.LocationNo
+                                                         LocationNo = q1.LocationNo,
+                                                         BoxQty = q2_1.BoxCnt.ToString()
                                                      };
             //q1.Status == "P" ? "允收" : q1.Status == "R" ? "批退" : "未驗收完成",
             //IQueryable <FqcInhouseDetail> q1 = _context.FqcInhouseDetails;

AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMaster_WareDto.cs

@@ -131,5 +131,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [Display(Name = "入庫單號")]
         public string LocationNo { get; set; }
 
+        /// <summary>
+        /// 數量
+        /// </summary>
+        [DataMember]
+        [Display(Name = "數量")]
+        public string BoxQty { get; set; }
+
     }
 }

AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs

@@ -54,7 +54,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 正式資料:Ava.ptdbatch 測試資料 :test-Ava.ptdbatch-test
         /// </summary>
-        public string Key { get; set; } = "test-Ava.ptdbatch-test";
+        public string Key { get; set; } = "Ava.ptdbatch";
 
     }
 }