From f878072835adb0f0a7365d8ee73dfde7b3d0e08f Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期三, 01 九月 2021 13:26:25 +0800
Subject: [PATCH] 条码生成模块，按库存返回生成条码时过滤条件增加：辅助属性过滤
---
BLL/系统公用CLS/Cls_S_KF_ICInventoryList_IF.cs | 4 +++-
DBUtility/基础资料/BillSelect.cs | 1 +
WarM/条码打印/Gy_BarCodeBill.cs | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git "a/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs" "b/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs"
index 1b5c55b..b35bc31 100644
--- "a/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs"
+++ "b/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs"
@@ -31,7 +31,7 @@
public bool Refresh(string sWhere)
{
string sErr = "";
- int MainIDCol, SubIDCol, SPIDCol, BatchNoCol, MTONoCol;
+ int MainIDCol, SubIDCol, SPIDCol, BatchNoCol, AuxPropIDCol, MTONoCol;
string stmp;
string tSQL;
try
@@ -44,6 +44,7 @@
SubIDCol = oFrm.Fun_GetCol("hwhid");
SPIDCol = oFrm.Fun_GetCol("hspid");
BatchNoCol = oFrm.Fun_GetCol("鎵规");
+ AuxPropIDCol = oFrm.Fun_GetCol("HAuxPropID");
MTONoCol = oFrm.Fun_GetCol("璁″垝璺熻釜鍙�");
//
//寰幆 閫変腑琛�
@@ -56,6 +57,7 @@
oSelect.BillSubID = DBUtility.ClsPub.isLong(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[SubIDCol].Value);
oSelect.SPID = DBUtility.ClsPub.isLong(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[SPIDCol].Value);
oSelect.BatchNo = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[BatchNoCol].Value);
+ oSelect.HAuxPropID = DBUtility.ClsPub.isLong(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[AuxPropIDCol].Value);
oSelect.BillNo = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[MTONoCol].Value);
oSelect.BillTitle = mvarReportTitle;
oSelect.BillType = mvarItemKey;
diff --git "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs" "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs"
index 47f514f..ea134df 100644
--- "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs"
+++ "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs"
@@ -13,5 +13,6 @@
public Int64 BillSubID;
public Int64 SPID;
public string BatchNo;
+ public Int64 HAuxPropID;
}
}
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 5a95409..580f92b 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"
@@ -1781,7 +1781,7 @@
grdMain.Rows.Add();
Application.DoEvents();
//寰楀埌淇℃伅
- Ds = oCn.RunProcReturn("select * from h_v_KF_ICInventoryList_IF where hmaterid=" + oSelectRow.BillMainID + " and hwhid=" + oSelectRow.BillSubID + " and hspid=" + oSelectRow.SPID + " and 鎵规='" + oSelectRow.BatchNo + "' and 璁″垝璺熻釜鍙�='" + oSelectRow.BillNo + "'", "h_v_KF_ICInventoryList_IF");
+ Ds = oCn.RunProcReturn("select * from h_v_KF_ICInventoryList_IF where hmaterid=" + oSelectRow.BillMainID + " and hwhid=" + oSelectRow.BillSubID + " and hspid=" + oSelectRow.SPID + " and HAuxPropID=" + oSelectRow.HAuxPropID + " and 鎵规='" + oSelectRow.BatchNo + "' and 璁″垝璺熻釜鍙�='" + oSelectRow.BillNo + "'", "h_v_KF_ICInventoryList_IF");
//鍐欏叆淇℃伅
Sub_WriteInForm2(Ds.Tables[0], i);
}
--
Gitblit v1.9.1