From b821703f9879a957937d730e46ed1305b404094e Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 17 十一月 2022 20:03:37 +0800
Subject: [PATCH] 合并
---
WarM/条码打印/Gy_BarCodeBill.cs | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 11e1719..92c9009 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -211,6 +211,7 @@
cmbSourceBillType.Items.Add("閲囪喘璁㈠崟");
cmbSourceBillType.Items.Add("鏀舵枡閫氱煡鍗�");
cmbSourceBillType.Items.Add("濮斿璁㈠崟");
+ cmbSourceBillType.Items.Add("宸ュ簭姹囨姤鍗�");
cmbSourceBillType.Items.Add("宸ュ簭娴佽浆鍗�");
cmbSourceBillType.Items.Add("閫�璐ч�氱煡鍗�");
cmbSourceBillType.Items.Add("鍏朵粬鍏ュ簱鍗�");
@@ -2201,6 +2202,15 @@
FillSelectData(oIF_ProcessExchangeBillList.oBillSelectColl);
}
}
+ else if (cmbSourceBillType.Text.Trim() == "宸ュ簭姹囨姤鍗�")
+ {
+ string sWhere = " and HOrgID =" + HOrgID.ToString();
+ DAL.Cls_S_IF_ProcessReportBillList oIF_ProcessReportBillList = new DAL.Cls_S_IF_ProcessReportBillList();
+ if (oIF_ProcessReportBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_ProcessReportBillList.oBillSelectColl);
+ }
+ }
else
{
@@ -2356,6 +2366,16 @@
//鍐欏叆淇℃伅
Sub_WriteInForm1(Ds.Tables[0], i);
}
+ //鐢熶骇姹囨姤鍗�
+ if (oSelectRow.BillType == "3714")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_ProcessReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ProcessReportList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
//鍗虫椂搴撳瓨
if (oSelectRow.BillType == "JSKC")
{
--
Gitblit v1.9.1