From d7fa3ba14d4dba7bd65d28eec14361b72f0b22c0 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 16 七月 2025 09:12:51 +0800
Subject: [PATCH] 模具上模,下模校验修改;添康三周排产;

---
 WebTM/views/生产管理/添康三周排产/JIT_MaterialLevelShorAnalysisReport_TK.html |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_MaterialLevelShorAnalysisReport_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_MaterialLevelShorAnalysisReport_TK.html"
index aff4e9c..fb534ee 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_MaterialLevelShorAnalysisReport_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_MaterialLevelShorAnalysisReport_TK.html"
@@ -75,6 +75,12 @@
                                     <div class="layui-inline">
                                         <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧缂栫爜</label>
                                         <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍚嶇О</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
                                             <input type="hidden" class="layui-input" lay-verify="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                             <input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                             <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMATERIALID" id="btnHMATERIALID" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -91,6 +97,18 @@
                                                 <option value="2">鑷埗</option>
                                                 <option value="3">濮斿</option>
                                             </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璁㈠崟</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" value="" style="width: 60%;display: inline-block;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閿�鍞鍗�</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" value="" style="width: 60%;display: inline-block;">
                                         </div>
                                     </div>
                                     <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
@@ -599,6 +617,9 @@
             var HWorkShopID = $("#HWorkShopID").val();//鐗╂枡/浜у搧
             var HWorkShopID2 = $("#HWorkShopID2").val();//鐗╂枡/浜у搧闇�姹傝溅闂�
             var HMaterClsID = $("#HMaterClsID").val();//鐗╂枡灞炴��
+            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗�
+            var HMaterNumber = $("#HMaterNumber").val();//浜у搧缂栫爜
+            var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟
             if (HBEGINDATE > HENDDATE) {
                 return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
             }
@@ -622,8 +643,17 @@
                 sWhere += " and T1.HMaterID= " + HMATERIALID + " ";
             } else {
                 if (HMATERIALNAME != "") {
-                    sWhere += " and (T2.HName like ''%" + HMATERIALNAME + "%'' or T2.HNumber like ''%" + HMATERIALNAME + "%'') ";
+                    sWhere += " and T2.HName like ''%" + HMATERIALNAME + "%''";
                 }
+            }
+            if (HSeOrderBillNo != "") {
+                sWhere += " and T1.HSeOrderBillNo like''%" + HSeOrderBillNo + "%''";
+            }
+            if (HMaterNumber != "") {
+                sWhere += " and T2.HNumber like''%" + HMaterNumber + "%''";
+            }
+            if (HICMOBillNo != "") {
+                sWhere += " and T1.HICMOBillNo like''%" + HICMOBillNo + "%''";
             }
             get_Display(sWhere);
             sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -640,6 +670,9 @@
             $("#HWorkShopID").val("0");
             $("#HWorkShopID2").val("0");
             $("#HMaterClsID").val("0");
+            $("#HSeOrderBillNo").val("");//閿�鍞鍗�
+            $("#HMaterNumber").val("");//浜у搧缂栫爜
+            $("#HICMOBillNo").val("");//鐢熶骇璁㈠崟
             form.render('select');
             sWhere = "";
         }

--
Gitblit v1.9.1