From 70e0952a3a7722904a21a5b514f18c7899359ef7 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 29 十月 2021 17:22:32 +0800
Subject: [PATCH] 合并

---
 WarM/条码打印/Gy_BarCodeBill.cs |    2 +-
 1 files changed, 1 insertions(+), 1 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 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