新增 完工入庫作業

AMESCoreStudio.Web/AppSetting.cs

@@ -16,6 +16,10 @@ namespace AMESCoreStudio.Web
         /// </summary>
         public string ApiUrl { get; set; }
 
+        //Yiru Add  -------------------------------------------------------------------
+        public string Location { get; set; }
+        //Yiru End  -------------------------------------------------------------------
+
         public static AppSetting Setting { get; set; } = new AppSetting();
     }
 }

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -6317,6 +6317,356 @@ namespace AMESCoreStudio.Web.Controllers
 
         #endregion
 
+        //YIRU ADD  -------------------------------------------------------------------------------------------------------------------------------
+
+        #region PCS031 完工入庫
+        public IActionResult PCS031()
+        {
+            return View();
+        }
+
+        public async Task<IActionResult> PCS031QueryAsync(string barcodeNo, string wipNo
+          , string boxNo, string inhouseNo, string date_str, string date_end
+          , string status, int page = 0, int limit = 10)
+        {
+            //IResultModel<FqcInhouseMasterDto> result = await _fqcApi.GetFqcInhouseMasterQuery(barcodeNo: barcodeNo, wipNo: wipNo
+            //, boxNo: boxNo, inhouseNo: inhouseNo, date_str: date_str, date_end: date_end
+            //, status: status, page: page, limit: limit);
+            IResultModel<FqcInhouseMaster_WareDto> result = await _pcsApi.GetFqcInhouseMasterMultiQuery(barcodeNo: barcodeNo, wipNo: wipNo
+             , boxNo: boxNo, inhouseNo: inhouseNo, date_str: date_str, date_end: date_end
+             , status: status, page: page, limit: limit);
+            if (result.Data.Count() != 0)
+            {
+                var Data = result.Data.Where(w => w.StatusName == "允收");
+                return Json(new Table() { code = 0, msg = "", data = Data, count = Data.Count() });
+            }
+            return Json(new Table() { count = 0, data = null });
+        }
+        public async Task<IActionResult> PCS031inhouse_allAsync(string[] ids)
+        {
+            string msg = "";
+            if (ids.Length > 0)
+            {
+                for (int i = 0; i < ids.Length; i++)
+                {
+                    string InhouseNo = ids[i].Split(',')[0];
+                    string boxNo = ids[i].Split(',')[1];
+                    string seq = ids[i].Split(',')[2];
+                    string recordNumber = ids[i].Split(',')[3];
+                    var result = await PCS0311inhouse(InhouseNo, boxNo, Convert.ToInt16(seq), recordNumber);
+
+                    if (!result.success)
+                    {
+                        msg += result.msg + "<br>";
+                    }
+
+                }
+
+                return Json(new Result() { success = true, msg = "批次入庫完成<br>" + msg });
+            }
+            else
+            {
+                return Json(new Result() { success = false, msg = "NO Select Data" });
+            }
+
+        }
+        public async Task<IActionResult> PCS031inhouseAsync(string InhouseNo, string boxNo, int seq, string recordNumber)
+        {
+            var result = await PCS0311inhouse(InhouseNo, boxNo, seq, recordNumber);
+            return Json(new Result() { success = result.success, msg = result.msg });
+
+
+
+        }
+
+
+        private async Task<Result> PCS0311inhouse(string InhouseNo, string boxNo, int seq, string recordNumber)
+        {
+            /* 1.依barcodeinfo 查詢 該箱號所屬序號
+            * 2.查詢所有序號查詢該流程 是否為最後一個流程(入庫)，即在可入庫狀態
+            * 3.若有序號不可入庫 => 畫面顯示不可入之序號
+            * 4.所有序號可入庫 = >
+            */
+
+            var result = await _fqcApi.GetBarcodeInfoesByBoxNo(boxNo: boxNo);
+
+            if (result.Count() != 0)
+            {
+                var _msg = string.Empty;
+
+                if (recordNumber == null) _msg = "請輸入入庫箱號";
+                if (AppSetting.Setting.Location == "9000" || AppSetting.Setting.Location == "0S08")
+                {
+                    if (recordNumber.Length != 10 || !recordNumber.StartsWith("50000"))
+                    {
+                        _msg = "箱號:" + boxNo + " recordNumber 必須為10碼且為50000開頭,RecordNumber format error<br>";
+
+                    }
+
+                }
+                foreach (var item in result)
+                {
+                    var FlowStation_result = await _basApi.GetRuleStation(item.RuleStationID);
+                    if (FlowStation_result.Count() != 0)
+                    {
+                        var FlowRule_result = await _basApi.GetRuleStationsByFlow(FlowStation_result.Select(s => s.FlowRuleID).First());
+                        if (FlowRule_result.Count() != 0)
+                        {
+                            var LastRuleStationID = FlowRule_result.Where(w => w.StationID != 1000).OrderBy(o => o.Sequence).Select(s => s.RuleStationID).Last();
+
+                            if (item.RuleStationID != LastRuleStationID || item.RuleStatus != "P" || item.StatusID != -1)
+                            {
+                                _msg += "序號【" + item.BarcodeNo + "】，流程尚未完成，不可入庫!<br>";
+                            }
+                        }
+                        else
+                        {
+                            _msg = "查無序號" + item.BarcodeNo + "目前流程(flowID)";
+                        }
+                    }
+
+                    else
+                    {
+                        _msg = "查無序號" + item.BarcodeNo + "目前流程(rule_station_ID)";
+                    }
+                }
+                if (_msg == string.Empty)
+                {
+
+                    var FlowRules_result = await _basApi.GetFlowRulesByUnit("W");
+                    if (FlowRules_result.Count() != 0)
+                    {
+                        var ruleStations_result = await GetRuleStationByFlowRuleID(FlowRules_result.Select(s => s.FlowRuleID).First());
+                        var RuleStationID = ruleStations_result.Select(s => s.RuleStationID).First();
+
+                        var Wipinfo_result = await _pcsApi.GetWipInfo(result.Select(s => s.WipID).First());
+                        var Wipinfo_LineID = Wipinfo_result.Select(s => s.LineID).First();  //lineid
+                        var WipAtt_result = await _pcsApi.GetWipAtt(Wipinfo_result.Select(s => s.WipNO).First()); //料號
+                        var Userinfo_result = await _sysApi.GetUserInfo(GetLogInUserID());
+
+
+
+                        List<PTD101AMESModel> PTD101AMESModels = new List<PTD101AMESModel>();
+                        foreach (var item in result)
+                        {
+
+                            BarcodeInfo barcodeInfo = new BarcodeInfo
+                            {
+                                BarcodeID = item.BarcodeID,
+                                BarcodeNo = item.BarcodeNo,
+                                StatusNo = item.StatusNo,
+                                RuleStationID = RuleStationID,
+                                RuleStatus = "P",//F 不良 
+                                BoxNo = item.BoxNo,
+                                WipID = item.WipID,
+                                StatusID = -1,
+                                CreateUserID = item.CreateUserID,
+                                CreateDate = item.CreateDate,
+                                UpdateDate = System.DateTime.Now
+
+
+                            };
+
+                            await _pcsApi.PutBarcodeInfoes(JsonConvert.SerializeObject(barcodeInfo));
+
+                            var barcodeStations = new BarcodeStation
+                            {
+                                BarcodeID = item.BarcodeID,
+                                WipID = item.WipID,
+                                RuleStationID = RuleStationID,
+                                RuleStatus = "P",
+                                InputDate = DateTime.Now,
+                                LineId = (int)Wipinfo_LineID,
+                                CreateUserID = item.CreateUserID,
+                                GetRuleStation = new RuleStation
+                                {
+                                    //RuleStationID = RuleStationID,
+                                    //FlowRuleID = "",
+                                    //StationID ="",
+                                    //StationDescl
+                                    //Sequence="",
+                                    //StationType = "",
+                                    //CreateUserId =item.CreateUserID,
+                                    //CreateDate = DateTime.Now,
+                                    //UpdateDate = DateTime.Now
+
+
+                                }
+                            };
+                            await _pcsApi.PostBarcodeStation(JsonConvert.SerializeObject(barcodeStations));
+
+
+
+                            PTD101AMESModels.Add(new PTD101AMESModel
+                            {
+                                FQCID = InhouseNo,
+                                SSN = item.ExtraBarcodeNo,
+                                ISN = item.BarcodeNo,
+                                RecordNumber = recordNumber,
+                                PN = WipAtt_result.ItemNO,
+                                EmpID = Userinfo_result.Select(s => s.UserNo).FirstOrDefault(),
+                                Location = AppSetting.Setting.Location
+
+
+                            });
+
+
+                        }
+
+                        var Warehouseing = new WareHouseing
+                        {
+                            InhouseNo = InhouseNo,
+                            SeqID = seq,
+                            SerialNo = boxNo,
+                            Serial_Type = "B",
+                            RecordNumber = recordNumber,
+                            Create_UserID = Userinfo_result.Select(s => s.UserID).FirstOrDefault(),
+                            Create_Date = DateTime.Now
+                        };
+
+                        await _pcsApi.PostWareHouseing(JsonConvert.SerializeObject(Warehouseing));
+                        // await _pcsApi.PostPTD101AMES(JsonConvert.SerializeObject(PTD101AMESModels));
+
+
+                    }
+                    else
+                    {
+                        _msg = "查無入庫代碼(W)";
+                    }
+
+
+
+                    //執行入庫作業
+                    return new Result() { success = true, msg = "入庫完成" };
+                }
+                else
+                {
+                    return new Result() { success = false, msg = _msg };
+                }
+
+
+            }
+            else
+            {
+                return new Result() { success = false, msg = "NO SN DATA" };
+            }
+
+
+        }
+
+
+        #endregion
+
+        #region PCS031V入庫單箱號查詢
+        public async Task<IActionResult> PCS031V(string InhouseNo, int SeqID)
+        {
+            var model = new FqcDto();
+            model.InhouseNo = InhouseNo;// "QWO0002A1001";
+            model.SeqID = SeqID;
+            IResultModel<FqcDto> result;
+            result = await _fqcApi.GetFqcQuery(model.InhouseNo, model.SeqID);
+
+            if (result.Data.Count() != 0)
+            {
+                model = result.Data.FirstOrDefault();
+                model.h_InhouseNo = model.InhouseNo;
+                model.h_SeqID = model.SeqID.ToString();
+            }
+            else
+            {
+                ModelState.AddModelError("error", "找不到入庫單號【" + model.InhouseNo + "】的資料");
+                model.h_InhouseNo = "";
+                model.h_SeqID = "";
+            }
+
+            return View("PCS031V", model);
+            //  return View(model);
+        }
+
+
+        [HttpGet]
+        public async Task<IActionResult> PCS031VAsync(FqcDto model)
+        {
+            if (string.IsNullOrWhiteSpace(model.InhouseNo))
+            {
+                ModelState.AddModelError("error", "請輸入入庫單號");
+                return View("PCS031V", model);
+            }
+
+            IResultModel<FqcDto> result;
+
+            result = await _fqcApi.GetFqcQuery(model.InhouseNo, model.SeqID);
+
+            if (result.Data.Count() != 0)
+            {
+                model = result.Data.FirstOrDefault();
+                model.h_InhouseNo = model.InhouseNo;
+                model.h_SeqID = model.SeqID.ToString();
+            }
+            else
+            {
+                ModelState.AddModelError("error", "找不到入庫單號【" + model.InhouseNo + "】的資料");
+                model.h_InhouseNo = "";
+                model.h_SeqID = "";
+            }
+
+            return View("PCS031V", model);
+        }
+
+
+        #endregion
+
+        #region PCS031Q入庫單箱號查詢
+        // [HttpGet]
+        public async Task<IActionResult> PCS031Q(string BoxNo)
+        {
+
+
+            var model = new BoxNO_SNDto();
+            model.BoxNo = BoxNo;
+            return View(model);
+
+            //IResultModel<BoxNO_SNDto> result;
+
+            //result = await _pcsApi.GetBarcodeInfoesByBoxNoPCS031Q(boxNo: model.BoxNo);
+
+
+            //if (result.Data.Count() != 0)
+            //{
+            //    model = result.Data.FirstOrDefault();
+
+            //    model.BoxNo = model.BoxNo;
+
+            //}
+            //else
+            //{
+            //    ModelState.AddModelError("error", "找不到箱號單號【" + model.BoxNo + "】的序號資料");
+            //    model.BoxNo = "";
+
+            //}
+            ////// ViewBag.BoxNO = boxNo;
+            //return View("PCS031Q", model);
+        }
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> PCS031QQueryAsync(string id, int page = 0, int limit = 10)
+        {
+
+
+            IResultModel<BoxNO_SNDto> result = await _pcsApi.GetBarcodeInfoesByBoxNoPCS031Q(boxNo: id, page: page, limit: limit);
+            if (result.Data.Count() != 0)
+            {
+
+                return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.Data.Count() });
+            }
+            return Json(new Table() { count = 0, data = null });
+        }
+
+
+        #endregion
+        
+        //YIRU End  -------------------------------------------------------------------------------------------------------------------------------
+
         /// <summary>
         /// 登入UserID
         /// </summary>

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -1227,5 +1227,62 @@ namespace AMESCoreStudio.Web
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipStation")]
         ITask<List<WipStation>> GetWipStation();
+
+        // YIRU ADD  ----------------------------------------------------------------------------------------
+
+        #region PTD101AMES 完工入庫序號轉檔
+        [WebApiClient.Attributes.HttpGet("http://nportal.avalue.com.tw/PTD_Batch/api/PTD101AMES")]
+        ITask<List<PTD101AMESModel>> PostPTD101AMES([FromBody, RawJsonContent] string model);
+
+        #endregion
+
+        /// <summary>
+        /// 用入庫單號與序號取完工入庫明细資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/WareHouseing/{inhouseNo}/{seq}")]
+        ITask<List<FqcInhouseDetail>> GetWareHouseing(string inhouseNo, int seq);
+
+        /// <summary>
+        ///新增完工入庫明细資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/WareHouseing")]
+        ITask<ResultModel<WareHouseing>> PostWareHouseing([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        ///修改完工入庫明细資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPut("api/WareHouseing")]
+        ITask<List<WareHouseing>> PutWareHouseing([FromBody, RawJsonContent] string model);
+
+
+        #region PCS031 FQC查詢
+        /// <summary>
+        /// FQC查詢
+        /// </summary>
+        /// <param name="barcodeNo">內部序號</param>
+        /// <param name="wipNo">工單號碼</param>
+        /// <param name="boxNo">外箱號碼</param>
+        /// <param name="inhouseNo">入庫單號碼</param>
+        /// <param name="date_str">入庫時間起</param>
+        /// <param name="date_end">入庫時間迄</param>
+        /// <param name="status">抽驗結果</param>
+        /// <param name="page">頁數</param>
+        /// <param name="limit">筆數</param>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcInhouseMaster/FqcInhouseMasterMultiQuery/")]
+        ITask<ResultModel<FqcInhouseMaster_WareDto>> GetFqcInhouseMasterMultiQuery(string barcodeNo = null, string wipNo = null
+          , string boxNo = null, string inhouseNo = null, string date_str = null, string date_end = null
+            , string status = null, int page = 0, int limit = 10);
+
+
+        [WebApiClient.Attributes.HttpGet("api/BarcodeInfoes/ByBoxNoPCS031Q/")]
+        ITask<ResultModel<BoxNO_SNDto>> GetBarcodeInfoesByBoxNoPCS031Q(string boxNo, int page = 0, int limit = 10);
+
+        #endregion
+
+        //YIRU End  ----------------------------------------------------------------------------------------
     }
 }

AMESCoreStudio.Web/Views/PCS/PCS031.cshtml

@@ -0,0 +1,331 @@
+
+@{
+    ViewData["Title"] = "完工入庫";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+
+<style type="text/css">
+    .layui-table-main .layui-table-cell {
+        /*height: auto !important;*/
+        white-space: normal;
+    }
+
+    .layui-table img {
+        max-width: 60px;
+        max-height: 28px;
+    }
+
+    .layui-tree-main {
+        cursor: pointer;
+        padding-right: 10px;
+        float: left;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #e6e6e6;
+        margin: 10px 0;
+    }
+</style>
+
+
+<div class="layui-card">
+    <div class="layui-card-header">
+        <div class="layui-form">
+            <div class="layui-form-item">
+                <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-card-body">
+        <div class="layui-form">
+            <div class="layui-row">
+                <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" style="width:150px">
+                                <input id="barcodeNo" name="barcodeNo" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm4">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">工單號碼:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="wipNo" name="wipNo" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm4">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">包裝箱號:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="boxNo" name="boxNo" autocomplete="off" class="layui-input">
+                            </div>
+                        </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">入庫單號:</label>
+                            <div class="layui-input-inline">
+                                <input id="inhouseNo" name="inhouseNo" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm6">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">入庫日期:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="dateStr" name="dateStr" autocomplete="off" class="layui-input" readonly="">
+                            </div>
+                            <div class="layui-form-mid">～</div>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="dateEnd" name="dateEnd" autocomplete="off" class="layui-input" readonly="">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm1">
+                        <div class="layui-inline layui-show-xs-block">
+                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                                <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <table class="layui-hide" id="query" lay-filter="query"></table>
+    </div>
+</div>
+
+@section Scripts{
+    <script type="text/javascript">
+        //var roleId = 0;
+        //var roleName = "";
+
+
+        layui.use(['form', 'layer', 'laydate'], function () {
+            form = layui.form;
+            laydate = layui.laydate;
+            laydate.render({
+                elem: '#dateStr'
+                , trigger: 'click'
+                , format: 'yyyy/MM/dd'
+                , theme: 'grid'
+            });
+
+            laydate.render({
+                elem: '#dateEnd'
+                , trigger: 'click'
+                , format: 'yyyy/MM/dd'
+                , theme: 'grid'
+            });
+        });
+
+
+    //    alert('測試文字1');
+
+        //监听表单提交事件
+        hg.form.onsubmit('querysubmit', function (data) {
+            hg.msghide("重新載入資料..");
+            table && table.reload(data);
+        });
+
+    //    alert('測試文字2');
+
+        var tableCols = [[
+            { type: 'checkbox' },
+            {
+                field: 'serialNo',
+                width: 120,
+                title: '箱號',
+                sort: true
+            },
+            {
+                field: 'inhouseNo',
+                width: 120,
+                title: '送驗單號',
+                sort: true
+            },
+            {
+                field: 'seqID',
+                title: '順序',
+                width: 80,
+                sort: true
+            },
+            {
+                field: 'wipNo',
+                title: '工單號碼',
+                sort: true
+            },
+            {
+                field: 'itemNo',
+                title: '料號',
+                sort: true
+            },
+            {
+                field: 'createDate',
+                title: '入庫時間',
+                sort: true,
+                templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'statusName',
+                title: '檢驗狀態',
+                sort: true,
+                templet: '#statusName'
+
+            },
+            {
+                field: 'endTime',
+                title: '抽驗結束時間',
+                sort: true,
+                templet: '<div>{{ layui.util.toDateString(d.endTime, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'recordNumber',
+                width: 150,
+                title: 'RecordNumber',
+                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>';
+                    if (d.recordNumber != null)
+                        txt = d.recordNumber;
+                    return txt;
+                }
+
+            },
+            {
+                field: 'right',
+                width: 150,
+                title: '操作',
+                fixed: 'right',
+                templet: function (d) {
+                    var btn = '<a class="layui-btn layui-btn-warm layui-icon layui-icon-list layui-btn-xs" lay-event="detail">檢視</a>';
+                    if  (d.recordNumber == null)
+                        btn = btn + '<a class="layui-btn layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">入庫</a>' ;
+                        return btn;
+
+                }
+            }
+            //,
+            //{
+            //    field: 'right',
+            //    width: 80,
+            //    title: '操作',
+            //    align: 'center',
+            //    fixed: 'right',
+            //    templet: function (d) {
+            //        return '<button class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" lay-event="show">預覽</button>'
+            //    }
+            //}
+        ]];
+      //  alert('測試文字3');
+        //通过行tool编辑，lay-event="show"
+        function show(obj) {
+                layui.use('layer', function () {
+                    var layer = layui.layer;
+                    layer.open({
+                        type: 2,
+                        area: ['900px', '650px'],
+                        fixed: false, //不固定
+                        maxmin: true,
+                        content: obj.data.filePath + obj.data.newName
+                    });
+                });
+            };
+    //    alert('測試文字4');
+
+        function detail(obj) {
+            //  if (obj.data.wipID) {
+            hg.open('箱號資料查詢', '/PCS/PCS031V?InhouseNo=' + obj.data.inhouseNo + '&SeqID=' + obj.data.seqID, '', '', true);
+            //  }
+        }
+     //   alert('測試文字5');
+        function edit(obj) {
+            //  if (obj.data.materialSopID) {
+            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: obj.data.recordNumber },
+                    type: 'POST',
+                    success: function (data) {
+                        if (data.success) {
+                            hg.msg("success" + data.msg);
+                            table && table.reload(data);
+                        }
+                        else {
+                            hg.msg(data.msg);
+                        }
+                    },
+                    error: function () {
+                        hg.msg("網路請求失敗！" + data.msg);
+                    }
+                });
+            });
+            // }
+        }
+
+        var toolbar = [{
+            text: '批次入庫',
+            layuiicon: '&#xe63c;',
+            class: 'ayui-btn-warm',
+            handler: function (obj, row) {
+                if (obj.checkstatus && obj.checkstatus.data.length > 0) {
+                    console.log(obj.checkstatus.data.map(function (x) { return x.serialNo }).join(','))
+
+                    hg.confirm("批量入庫所有选中的数据，确定要入庫吗？", function () {
+                        $.ajax({
+                            url: '/PCS/PCS031inhouse_all',
+                            data: { ids: obj.checkstatus.data.map(function (x) { return x.inhouseNo + "," + x.serialNo + "," + x.seqID + "," + x.recordNumber }) },
+                            type: 'POST',
+                            success: function (data) {
+                                if (data.success) {
+                                    hg.msg(data.msg);
+                                    //重载表格数据
+                                    table && table.reload();
+                                }
+                                else {
+                                    //hg.msg(data.msg);
+                                    hg.msg('批量入庫失败！');
+                                }
+                            },
+                            error: function () {
+                                hg.msg("网络请求失败！");
+                            }
+                        });
+
+                    });
+                } else {
+                    hg.msg('請選中一個或多個複選框，再操作！');
+                }
+            }
+        }
+        ];
+       // alert('測試文字6');
+        //基本数据表格
+ 
+        var table = hg.table.datatable('query', 'FQC查詢', '/PCS/PCS031Query', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+       
+       // alert('測試文字7');
+    </script>
+
+    <script type="text/html" id="statusName">
+        {{#  if(d.statusName === '允收'){ }}
+        <span style="color: #07ab2a;">{{ d.statusName }}</span>
+        {{#  } else if(d.statusName === '批退'){ }}
+        <span style="color: #d70841;">{{ d.statusName }}</span>
+        {{#  } else { }}
+        {{ d.statusName }}
+        {{#  } }}
+    </script>
+
+
+   
+}
+

AMESCoreStudio.Web/Views/PCS/PCS031Q.cshtml

@@ -0,0 +1,100 @@
+@model AMESCoreStudio.WebApi.DTO.AMES.BoxNO_SNDto
+
+@{
+    ViewData["Title"] = "箱號序號查詢";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+<div class="layui-card">
+    <div class="layui-card-header">
+        <div class="layui-form">
+            <div class="layui-form-item">
+                <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-card-body">
+        <div class="layui-form">
+            <div class="layui-row">
+              
+            </div>
+            <div class="layui-row">
+                <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">
+                            
+                                <input id="box_no" asp-for="BoxNo" type="text" class="layui-input" />
+                            </div>
+                        </div>
+                    </div>
+                   
+                    <div class="layui-col-sm1">
+                        <div class="layui-inline layui-show-xs-block">
+                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                                <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <table class="layui-hide" id="query" lay-filter="query"></table>
+    </div>
+</div>
+@section Scripts{
+    <script type="text/javascript">
+        //监听表单提交事件
+
+   
+
+        hg.form.onsubmit('querysubmit', function (data) {
+            hg.msghide("重新載入資料..");
+            table && table.reload(data);
+        });
+
+
+
+        var tableCols = [[
+            {
+                field: 'boxNo',
+                width: 200,
+                title: '箱號',
+                sort: true
+            },
+            {
+                field: 'barcodeNo',
+                width: 200,
+                title: '內部序號',
+                sort: true
+            },
+            {
+                field: 'extraBarcodeNo',
+                Width: 200,
+                title: '外部序號',
+                sort: true
+            },
+            {
+                field: 'wipNO',
+                Width: 200,
+                title: '工單',
+                sort: true
+            },
+            {
+                field: 'statusNo',
+                title: '狀態',
+                width: 100,
+                sort: true
+            }]
+        ];
+
+        var no = $("#box_no").val();
+       
+        //基本数据表格
+        /**/
+        var table = hg.table.datatable('query', '箱號條碼資料查詢', '/PCS/PCS031QQuery/' + $("#box_no").val() , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+/**/
+
+
+    </script>
+}

AMESCoreStudio.Web/Views/PCS/PCS031V.cshtml

@@ -0,0 +1,108 @@
+@model AMESCoreStudio.WebApi.DTO.AMES.FqcDto
+@{
+    ViewData["Title"] = "箱號資料查詢";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<div class="layui-card">
+        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+        <div class="layui-card-header">
+            <div class="layui-form">
+                <div class="layui-form-item ">
+                    <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
+                </div>
+                <div class="layui-form-item layui-layout-left">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">入庫單號：</label>
+                        <div class="layui-input-inline">
+                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.h_InhouseNo</label>
+                        </div>
+
+                        <label class="layui-form-label">序號：</label>
+                        <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.h_SeqID</label>
+                    </div>
+                      
+                </div>
+            </div>
+        </div>
+        <div class="layui-card-body">
+            <div class="layui-row">
+                <input type="hidden" id="hInhouseNo" value="@Model.h_InhouseNo" />
+                <input type="hidden" id="hSeqID" value="@Model.h_SeqID" />
+                <input type="hidden" id="hFqcID" value="@Model.FqcID" />
+            </div>
+
+
+            @*<table class="layui-hide" id="test" lay-filter="test"></table>*@
+            <table id="MydataTable" class="layui-table">
+                @{ int i = 0;}
+                <thead>
+                    <tr>
+                        <th>
+                            箱號
+                        </th>
+                        <th>
+                            總數量
+                        </th>
+                        <th>
+                            已抽數量
+                        </th>
+                        <th>
+                            抽驗PASS數量
+                        </th>
+                        <th>
+                            抽驗FAIL數量
+                        </th>
+                       
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var index in Model.fqcDetails)
+                    {
+                        <tr>
+                            <td>
+                                <a href="javascript:void(0)" onclick="view('@index.SerialNo')"> @index.SerialNo</a> 
+                            </td>
+                            <td>
+                                 <a href="javascript:void(0)" onclick="view('@index.SerialNo')"> @index.Qty</a>
+                                
+                            </td>
+                            <td>
+                                @index.HasQty
+                            </td>
+                            <td>
+                                @index.PassQty
+                            </td>
+                            <td>
+                                @index.FailQty
+                            </td>
+                           
+                        </tr>
+                        i++;
+                    }
+                </tbody>
+
+            </table>
+        </div>
+
+</div>
+
+@section Scripts{
+
+    <script type="text/javascript" src="~/js/grids.min.js"></script>
+    <script type="text/javascript">
+        layui.use(['form' ,'layer','laydate'], function () {
+            var form = layui.form;
+
+        });
+
+        function view(boxno) {
+            hg.open('箱號序號查詢', '/PCS/PCS031Q?boxNo=' + boxno, '', '', true);
+          }
+        function querysubmit(obj) {
+           hg.open('箱號資料查詢', '/PCS/PCS031V?InhouseNo=' + obj.data.inhouseNo + '&SeqID=' + obj.data.seqID, '', '', true);
+          }
+
+
+    </script>
+}

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs

@@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore;
 using AMESCoreStudio.WebApi;
 using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.CommonTools.Result;
+using AMESCoreStudio.WebApi.DTO.AMES;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -305,6 +306,57 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return barcodeInfo;
         }
 
+        //YIRU ADD  ------------------------------------------------------------------------------------------
+
+        /// <summary>
+        /// FQC查詢 by Table
+        /// </summary>
+        /// <param name="barcodeNo">內部序號</param>
+        /// <param name="wipNo">工單號碼</param>
+        /// <param name="boxNo">外箱號碼</param>
+        /// <param name="inhouseNo">入庫單號碼</param>
+        /// <param name="date_str">入庫時間起</param>
+        /// <param name="date_end">入庫時間迄</param>
+        /// <param name="status">抽驗結果</param>
+        /// <param name="page">頁數</param>
+        /// <param name="limit">筆數</param>
+        /// <returns></returns>
+        [HttpGet("ByBoxNoPCS031Q")]
+        public async Task<ResultModel<BoxNO_SNDto>> GetBarcodeInfoesByBoxNoPCS031Q(string boxNo, int page = 0, int limit = 10)
+        {
+
+            IQueryable<BoxNO_SNDto> q = from q1 in _context.BarcodeInfoes
+                                        join q2 in _context.WipInfos on q1.WipID equals q2.WipID
+                                        select new BoxNO_SNDto
+                                        {
+                                            BarcodeID = q1.BarcodeID,
+                                            BarcodeNo = q1.BarcodeNo,
+                                            BoxNo = q1.BoxNo,
+                                            ExtraBarcodeNo = q1.ExtraBarcodeNo,
+                                            StatusNo = q1.StatusNo,
+                                            WipNO = q2.WipNO,
+                                            RuleStationID = q1.RuleStationID
+                                        };
+
+            q = q.Where(w => w.BoxNo == boxNo);
+
+
+            ResultModel<BoxNO_SNDto> result = new ResultModel<BoxNO_SNDto>();
+
+            // 紀錄筆數
+            result.DataTotal = q.Count();
+
+            // Table 頁數
+            if (page > 0)
+            {
+                q = q.Skip((page - 1) * limit).Take(limit);
+            }
+            result.Data = await q.ToListAsync();
+            return result;
+        }
+
+        //YIRU End  ------------------------------------------------------------------------------------------
+
         private bool BarcodeInfoesExists(int id)
         {
             return _context.BarcodeInfoes.Any(e => e.BarcodeID == id);

AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs

@@ -364,6 +364,105 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
+        //YIRU ADD  -----------------------------------------------------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// FQC查詢 by Table
+        /// </summary>
+        /// <param name="barcodeNo">內部序號</param>
+        /// <param name="wipNo">工單號碼</param>
+        /// <param name="boxNo">外箱號碼</param>
+        /// <param name="inhouseNo">入庫單號碼</param>
+        /// <param name="date_str">入庫時間起</param>
+        /// <param name="date_end">入庫時間迄</param>
+        /// <param name="status">抽驗結果</param>
+        /// <param name="page">頁數</param>
+        /// <param name="limit">筆數</param>
+        /// <returns></returns>
+        [HttpGet("FqcInhouseMasterMultiQuery")]
+        public async Task<ResultModel<FqcInhouseMaster_WareDto>> GetFqcInhouseMasteMultiQuery(string barcodeNo, string wipNo, string boxNo
+          , string inhouseNo, string date_str, string date_end, string status, int page = 0, int limit = 10)
+        {
+            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 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()
+                                                     select new FqcInhouseMaster_WareDto
+                                                     {
+                                                         InhouseNo = q1.InhouseNo,
+                                                         SeqID = q1.SeqID,
+                                                         WipNo = q1.WipNo,
+                                                         ItemNo = q1.ItemNo,
+                                                         ModelNo = q1.ModelNo,
+                                                         SerialNo = q2.SerialNo,
+                                                         StatusName = q1.Status,
+                                                         ProTypeName = q1.ProType,
+                                                         CreateDate = q1.CreateDate,
+                                                         EndTime = q3.EndTime,
+                                                         RecordNumber = q402.RecordNumber
+                                                     };
+            //q1.Status == "P" ? "允收" : q1.Status == "R" ? "批退" : "未驗收完成",
+            //IQueryable <FqcInhouseDetail> q1 = _context.FqcInhouseDetails;
+            if (!string.IsNullOrWhiteSpace(inhouseNo))
+                q = q.Where(w => w.InhouseNo == inhouseNo);
+
+            if (!string.IsNullOrWhiteSpace(wipNo))
+                q = q.Where(w => w.WipNo == wipNo);
+
+            if (!string.IsNullOrWhiteSpace(status))
+                q = q.Where(w => w.StatusName == status);
+
+            // 優先用內部序號取出包裝序號
+            if (!string.IsNullOrWhiteSpace(barcodeNo))
+            {
+                BarcodeInfoesController barcodeInfoesController = new BarcodeInfoesController(_context);
+                var q1 = await barcodeInfoesController.GetBarcodeInfoesByNo(barcodeNo);
+                if (q1.Value.Count() != 0)
+                {
+                    boxNo = q1.Value.FirstOrDefault().BoxNo;
+                }
+            }
+
+            if (!string.IsNullOrWhiteSpace(boxNo))
+            {
+                q = q.Where(w => w.SerialNo == boxNo);
+            }
+
+            if (DateTime.TryParse(date_str, out _))
+            {
+                q = q.Where(w => w.CreateDate >= DateTime.Parse(date_str));
+            }
+
+            if (DateTime.TryParse(date_end, out _))
+            {
+                q = q.Where(w => w.CreateDate <= DateTime.Parse(date_end));
+            }
+
+            ResultModel<FqcInhouseMaster_WareDto> result = new ResultModel<FqcInhouseMaster_WareDto>();
+
+            // 紀錄筆數
+            result.DataTotal = q.Count();
+
+            // Table 頁數
+            if (page > 0)
+            {
+                q = q.Skip((page - 1) * limit).Take(limit);
+            }
+            result.Data = await q.ToListAsync();
+
+            // 判斷結束時間
+            result.Data = result.Data.Select(s => { s.EndTime = s.StatusName == "A" ? null : s.EndTime; return s; })
+             .ToList();
+
+            // 修改狀態名稱
+            result.Data = result.Data.Select(s => { s.StatusName = s.StatusName == "P" ? "允收" : s.StatusName == "R" ? "批退" : "未驗收完成"; return s; })
+                          .ToList();
+
+            return result;
+        }
+
+        //YIRU End  -----------------------------------------------------------------------------------------------------------------------------------------------
+
         private bool FqcInhouseMasterExists(string id)
         {
             return _context.FqcInhouseMasters.Any(e => e.InhouseNo == id);

AMESCoreStudio.WebApi/DTO/AMES/BoxNO_SNDto.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
+
+namespace AMESCoreStudio.WebApi.DTO.AMES
+{
+    /// <summary>
+    /// BarcodeItemKP Dto
+    /// </summary>
+    /// yiru add
+    /// 
+    public partial class BoxNO_SNDto
+    {
+        /// <summary>
+        /// 序號id
+        /// </summary>
+        [DataMember]
+        public int BarcodeID { get; set; }
+
+        /// <summary>
+        /// 序號
+        /// </summary>
+        [Key]
+        [DataMember]
+        public string BarcodeNo { get; set; }
+
+        /// <summary>
+        /// 箱號
+        /// </summary>
+        [DataMember]
+        [Display(Name = "箱號")]
+        public string BoxNo { get; set; }
+
+        /// <summary>
+        /// 外部序號
+        /// </summary>
+        [DataMember]
+        [Display(Name = "外部序號")]
+        public string ExtraBarcodeNo { get; set; }
+
+        /// <summary>
+        /// 狀態
+        /// </summary>
+        [DataMember]
+        [Display(Name = "狀態")]
+        public string StatusNo { get; set; }
+
+
+        /// <summary>
+        /// 箱號/條碼
+        /// </summary>
+        [DataMember]
+        [Display(Name = "箱號/條碼")]
+        public string SerialNo { get; set; }
+
+        /// <summary>
+        /// 工單號碼
+        /// </summary>
+        [DataMember]
+        [Display(Name = "工單號碼")]
+
+        public string WipNO { get; set; }
+
+        /// <summary>
+        /// 流程
+        /// </summary>
+        [DataMember]
+        [Display(Name = "流程")]
+
+        public int RuleStationID { get; set; }
+
+       
+    }
+
+}

AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMaster_WareDto.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+using System.Runtime.Serialization;
+
+
+#nullable disable
+
+namespace AMESCoreStudio.WebApi.DTO.AMES
+{//yiru add
+    /// <summary>
+    /// 入庫單資料檔 Dto
+    /// </summary>
+    public partial class FqcInhouseMaster_WareDto
+    {
+        /// <summary>
+        /// 入庫單號碼
+        /// </summary>
+        [DataMember]
+        public string InhouseNo { get; set; }
+
+        /// <summary>
+        /// 順序ID
+        /// </summary>
+        [Key]
+        [DataMember]
+        public int SeqID { get; set; } = 1;
+
+        /// <summary>
+        /// 工單號碼
+        /// </summary>
+        [DataMember]
+        [Display(Name = "工單號碼")]
+        public string WipNo { get; set; }
+
+        /// <summary>
+        /// 料號
+        /// </summary>
+        [DataMember]
+        [Display(Name = "料號")]
+        public string ItemNo { get; set; }
+
+        /// <summary>
+        /// 品名/機種
+        /// </summary>
+        [DataMember]
+        [Display(Name = "品名/機種")]
+        public string ModelNo { get; set; }
+
+        /// <summary>
+        /// 箱號/條碼
+        /// </summary>
+        [DataMember]
+        [Display(Name = "箱號/條碼")]
+        public string SerialNo { get; set; }
+
+        /// <summary>
+        /// 抽驗狀態  P-PASS(允收);R-REJECT(批退); A-初始狀態
+        /// </summary>
+        [DataMember]
+        [Display(Name = "抽驗狀態")]
+
+        public string StatusName { get; set; } = "A";
+
+        /// <summary>
+        /// 產品類別 STANDARD(標準品),Order（訂單）
+        /// </summary>
+        [DataMember]
+        [Display(Name = "產品類別")]
+
+        public string ProTypeName { get; set; }
+
+        /// <summary>
+        /// 結束抽驗時間
+        /// </summary>
+        [DataMember]
+        [Display(Name = "結束抽驗時間")]
+
+        public DateTime? EndTime { get; set; }
+
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+        [Column("CREATE_USERID")]
+        [DataMember]
+        public int CreateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+        [Column("CREATE_DATE")]
+        [DataMember]
+        public DateTime CreateDate { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 更新UserID
+        /// </summary>
+        [Column("UPDATE_USERID")]
+        [DataMember]
+        public int UpdateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 更新日期
+        /// </summary>
+        [Column("UPDATE_DATE")]
+        [DataMember]
+        public DateTime? UpdateDate { get; set; } = DateTime.Now;
+
+
+        /// <summary>
+        /// 入庫單號
+        /// </summary>
+        [DataMember]
+        [Display(Name = "入庫單號")]
+        public string RecordNumber { get; set; }
+    }
+}

AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace AMESCoreStudio.WebApi.Models.AMES
+{
+    /// <summary>
+    /// 完工入庫呼叫安勤api轉檔
+    /// </summary>
+    public class PTD101AMESModel
+        {
+        /// <summary>
+        /// AME驗單單號
+        /// </summary>
+        public string FQCID { get; set; } 
+
+        /// <summary>
+        /// 出貨序號
+        /// </summary>
+        /// 
+        public string SSN { get; set; } 
+
+        /// <summary>
+        /// 生產序號
+        /// </summary>
+        public string ISN { get; set; } 
+
+        /// <summary>
+        /// 本次入庫單號
+        /// </summary>
+        public string RecordNumber { get; set; }
+
+        /// <summary>
+        /// 料號
+        /// </summary>
+        public string PN { get; set; }
+
+        /// <summary>
+        /// 成倉人員工號
+        /// </summary>
+        public string EmpID { get; set; } 
+
+        /// <summary>
+        /// 安勤: 9000 昶亨:0S08
+        /// </summary>
+        public string Location { get; set; } 
+
+        /// <summary>
+        /// 101
+        /// </summary>
+        public string RecordTypeID { get; set; } = "101";
+
+        /// <summary>
+        /// 正式資料:Ava.ptdbatch 測試資料 :test-Ava.ptdbatch-test
+        /// </summary>
+        public string Key { get; set; } = "test-Ava.ptdbatch-test";
+
+    }
+}

AMESCoreStudio.WebApi/Models/AMES/WareHouseing.cs

@@ -0,0 +1,80 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Runtime.Serialization;
+using AMESCoreStudio.WebApi;
+namespace AMESCoreStudio.WebApi.Models.AMES
+{   //yiru add
+    /// <summary>
+    /// 工單條碼起迄資料檔
+    /// </summary>
+    [Table("WAREHOUSEING", Schema = "JHAMES")]
+    [DataContract]
+    public class WareHouseing
+    {
+        /// <summary>
+        /// 入庫單號碼
+        /// </summary>
+        [Key]
+        [DataMember]
+        [Display(Name = "入庫單號碼")]
+        [Required]
+        [Column("INHOUSE_NO")]
+        [StringLength(13)]
+        public string InhouseNo { get; set; }
+
+        /// <summary>
+        /// 順序ID
+        /// </summary>
+        [Key]
+        [DataMember]
+        [Display(Name = "順序ID")]
+        [Column("SEQ_ID")]
+        public int SeqID { get; set; }
+
+        /// <summary>
+        /// 箱號/條碼
+        /// </summary>
+        [Key]
+        [DataMember]
+        [Display(Name = "箱號/條碼")]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Column("SERIAL_NO")]
+        [StringLength(30)]
+        public string SerialNo { get; set; }
+
+
+        /// <summary>
+        /// 單號產生類型 B-按箱號產生；A-按條碼產生
+        /// </summary>
+        [DataMember]
+        [Display(Name = "單號產生類型")]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Column("SERIAL_TYPE")]
+        [StringLength(1)]
+        public string Serial_Type { get; set; } = "B";
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [Column("RECORDNUMBER")]
+        [DataMember]
+        [Display(Name = "本次入庫單號")]
+        public string RecordNumber { get; set; }
+
+        [Column("CREATE_USERID")]
+        [DataMember]
+        [Display(Name = "建立者")]
+        public decimal Create_UserID { get; set; }
+       
+        
+        
+        [Column("CREATE_DATE")]
+        [DataMember]
+        [Display(Name = "建立日期")]
+        public DateTime Create_Date { get; set; } = DateTime.Now;
+
+
+    }
+}

AMESCoreStudio.WebApi/Models/AMESContext.cs

@@ -97,6 +97,10 @@ namespace AMESCoreStudio.WebApi
             modelBuilder.Entity<WipClass>().HasKey(c => new { c.WipID, c.RuleStationID, c.RuleStatus, c.ClassID, c.CreateDate });
             modelBuilder.Entity<WipTime>().HasKey(c => new { c.WipID, c.RuleStationID, c.RuleStatus, c.SegmentID, c.CreateDate });
 
+            //Yiru add  ---------------------------------------------------------------------------------------------------------------------------
+            modelBuilder.Entity<WareHouseing>().HasKey(c => new { c.InhouseNo, c.SeqID, c.SerialNo });
+            //Yiru End  ---------------------------------------------------------------------------------------------------------------------------
+
             modelBuilder.Entity<InspectionResultBlob>().HasKey(c => new { c.InspectionItemID, c.InspectionID,c.CreateDate });
 
             modelBuilder.Entity<InspectionResultDetail>().HasKey(c => new { c.InspectionItemID, c.InspectionID });
@@ -807,6 +811,12 @@ namespace AMESCoreStudio.WebApi
         /// 外包機種資料
         /// </summary>
         public DbSet<SNKeyPart> SNKeyParts { get; set; }
+
+        /// <summary> Yiru add  ---------------------------------------------------
+        /// 檢驗單明細資料檔
+        /// </summary>
+        public virtual DbSet<WareHouseing> WareHouseings { get; set; }
+
     }
 
 }