From a4fdeb339face6411c0974a8940c08020766528a Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 30 六月 2022 22:45:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/报表分析/Pt_RadiumCarvingCodeBillList.cs | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.cs"
index 5b0045e..fb749ff 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Pt_RadiumCarvingCodeBillList.cs"
@@ -194,6 +194,21 @@
{
sFastSQL = sFastSQL + " and a.CarveTime<='" + dtpHEDate.Value.ToString("yyyy-MM-dd") + " 23:59:59" + "'";
}
+ //鍒ゆ柇娴佷紶鍗曞彿
+ if (SpreadNo.Text.ToString().Trim() != "")
+ {
+ sFastSQL = sFastSQL + " and b.spreadno like '%"+ SpreadNo.Text.ToString().Trim() + "%'";
+ }
+ //鍒ゆ柇闀洉鐮�
+ if (SpreadCar.Text.ToString().Trim() != "")
+ {
+ sFastSQL = sFastSQL + " and a.SerialNo like '%" + SpreadCar.Text.ToString().Trim() + "%'";
+ }
+ //鍒ゆ柇鏈哄彴缂栧彿
+ if (SpreadNo.Text.ToString().Trim() != "")
+ {
+ sFastSQL = sFastSQL + " and b.DeviceSerialNum='" + SpreadNo.Text.ToString().Trim() + "'";
+ }
if (sFastSQL.Trim() == "")
{
MessageBox.Show("娌℃湁杈撳叆鏉′欢!");
--
Gitblit v1.9.1