From 99f3706cbbb4194955dfa1135e41c0b031c727ae Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 27 十一月 2025 13:59:38 +0800
Subject: [PATCH] 来料检验单合并

---
 WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index 0edbb7d..79f5fd5 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -59,6 +59,13 @@
                                             </select>
                                         </div>
                                     </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMatrerNumber" id="HMatrerNumber" style="width:190px;">
+                                            <input type="hidden" class="layui-input ForFilteringSchemes" name="HMatrerID" id="HMatrerID" style="width:190px;">
+                                        </div>
+                                    </div>
                                     <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                     </button>
@@ -565,6 +572,8 @@
                 var HProject = $("#HProject").val();//椤圭洰鍙�
                 var HQCCheckProjectName = $("#HQCCheckProjectName").val();
                 var HOrgID = $("#HOrgID").val(); //缁勭粐
+                var HMatrerNumber = $("#HMatrerNumber").val(); //鐗╂枡
+                var HMatrerID = $("#HMatrerID").val(); //鐗╂枡
                 //浠绘剰瀛楁杩囨护
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
@@ -661,6 +670,9 @@
                     sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
                     sWhere += " and 宸ュ簭鍚嶇О = '" + HProcName + "'";
                 }
+                if (HMatrerNumber != "") {
+                    sWhere += " and 鐗╂枡浠g爜 ='" + HMatrerNumber + "'";
+                }
                 addSWhereByOpenType();
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -671,6 +683,7 @@
             function set_ClearQuery() {
                 $("#HBillNo").val("");
                 $("#HProject").val("");
+                $("#HMatrerNumber").val("");
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                 $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                 $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));

--
Gitblit v1.9.1