From b3bce2c5a8f0316829faf0cbc4284e49d6eee6b5 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 23 一月 2026 16:48:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/PublicPage/HSourceReportHtml.html |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 4bf2bc9..0dc9a55 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -380,7 +380,7 @@
                         $("#HProcExchBillNoHidden").show();
                         HModName = "ProductInBill_1202";
                         break;
-                    case '閲囪喘鍏ュ簱':
+                    case '閲囪喘鍏ュ簱鍗�':
                         HModName = "POStockInBill_1201";
                         break;
                     case '閿�鍞��璐�':
@@ -393,7 +393,10 @@
                         HModName = "ProcessExchangeBill_3772";
                         break;
                     case '閿�鍞嚭搴撳崟':
-                        HModName = "";
+                        HModName = "SellOutBill_1205";
+                        break;
+                    case '棰嗘枡鍑哄簱鍗�':
+                        HModName = "MateOutBill_1204";
                         break;
                 }
                 //鍒濆鏌ヨ
@@ -622,6 +625,21 @@
                         }
                         return sWhere;
                         break;
+                    case "閲囪喘鍏ュ簱鍗�":
+                        if (HBillNo) {
+                            sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                        }
+                        if (PartNumber) {
+                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        }
+                        if (PartName) {
+                            sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+                        }
+                        if (HDeptName && HDeptName != 0) {
+                            sWhere += " and HDeptID = '" + HDeptName + "'";
+                        }
+                        return sWhere;
+                        break;
                     case '閫�璐ч�氱煡鍗�':
                         return sWhere;
                         break;
@@ -654,6 +672,36 @@
                         }
                         return sWhere;
                         break;
+                    case "閿�鍞嚭搴撳崟":
+                        if (HBillNo) {
+                            sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                        }
+                        if (PartNumber) {
+                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        }
+                        if (PartName) {
+                            sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+                        }
+                        if (HDeptName && HDeptName != 0) {
+                            sWhere += " and HDeptID = '" + HDeptName + "'";
+                        }
+                        return sWhere;
+                        break;
+                    case "棰嗘枡鍑哄簱鍗�":
+                        if (HBillNo) {
+                            sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                        }
+                        if (PartNumber) {
+                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        }
+                        if (PartName) {
+                            sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+                        }
+                        if (HDeptName && HDeptName != 0) {
+                            sWhere += " and HDeptID = '" + HDeptName + "'";
+                        }
+                        return sWhere;
+                        break;
                 }
 
             }

--
Gitblit v1.9.1