From 16acfcf4c656b6fa4398be3aa593fed1ed67f797 Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期五, 03 十一月 2023 20:35:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BLL/系统公用CLS/Cls_S_KF_ICInventoryList_IF.cs | 6 ++
DBUtility/基础资料/BillSelect.cs | 2 +
WarM/条码打印/Gy_BarCodeBill.cs | 93 ++++++++++++++++++++++++----------------------
3 files changed, 56 insertions(+), 45 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 b35bc31..ec60050 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, AuxPropIDCol, MTONoCol;
+ int MainIDCol, SubIDCol, SPIDCol, BatchNoCol, AuxPropIDCol, MTONoCol, HProduceDateCol, HExpiryDateCol;
string stmp;
string tSQL;
try
@@ -46,6 +46,8 @@
BatchNoCol = oFrm.Fun_GetCol("鎵规");
AuxPropIDCol = oFrm.Fun_GetCol("HAuxPropID");
MTONoCol = oFrm.Fun_GetCol("璁″垝璺熻釜鍙�");
+ HProduceDateCol = oFrm.Fun_GetCol("鐢熶骇鏃ユ湡");
+ HExpiryDateCol = oFrm.Fun_GetCol("鏈夋晥鏈熻嚦");
//
//寰幆 閫変腑琛�
if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
@@ -59,6 +61,8 @@
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.HProduceDate = DBUtility.ClsPub.isDate(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[HProduceDateCol].Value);
+ oSelect.HExpiryDate = DBUtility.ClsPub.isDate(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[HExpiryDateCol].Value);
oSelect.BillTitle = mvarReportTitle;
oSelect.BillType = mvarItemKey;
oBillSelectColl.Add(oSelect);
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 ea134df..6090b24 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"
@@ -14,5 +14,7 @@
public Int64 SPID;
public string BatchNo;
public Int64 HAuxPropID;
+ public DateTime HProduceDate; //鐢熶骇鏃ユ湡
+ public DateTime HExpiryDate; //鏈夋晥鏈熻嚦
}
}
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 13cd884..ece3c3e 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"
@@ -44,45 +44,45 @@
public const Int16 HMinQtyCol = 23;
public const Int16 HBQtyCol = 24;
public const Int16 HPackQtyCol = 25;
- public const Int16 HDeptIDCol = 26;
- public const Int16 HDeptNumberCol = 27;
- public const Int16 HDeptNameCol = 28;
- public const Int16 HSourceIDCol = 29;
- public const Int16 HSourceNumberCol = 30;
- public const Int16 HSourceNameCol = 31;
- public const Int16 HDateCol = 32;
- public const Int16 HEndDateCol = 33;
- public const Int16 HSupIDCol = 34;
- public const Int16 HSupNumberCol = 35;
- public const Int16 HSupNameCol = 36;
- public const Int16 HCusIDCol = 37;
- public const Int16 HCusNumberCol = 38;
- public const Int16 HCusNameCol = 39;
- public const Int16 HCusTypeCol = 40;
- public const Int16 HSourceInterIDCol = 41;
- public const Int16 HSourceEntryIDCol = 42;
- public const Int16 HSourceBillNoCol = 43;
- public const Int16 HSourceBillTypeCol = 44;
- public const Int16 HInstructIDCol = 45;
- public const Int16 HInstructNoCol = 46;
- public const Int16 HSeOrderBillIDCol = 47;
- public const Int16 HSeOrderBillNoCol = 48;
- public const Int16 HSeOrderSEQCol = 49;
- public const Int16 HWhIDCol = 50;
- public const Int16 HWhNumberCol = 51;
- public const Int16 HWhNameCol = 52;
- public const Int16 HSPIDCol = 53;
- public const Int16 HSPNumberCol = 54;
- public const Int16 HSPNameCol = 55;
- public const Int16 HinitQtyCol = 56;
- public const Int16 HRemarkCol = 57;
- public const Int16 HPinfanBarCodeCol = 58;
- public const Int16 HMTONoCol = 59;
- public const Int16 HShowDateCol = 60;
- public const Int16 HInnerBillNoCol = 61;
- public const Int16 HMakerCol = 62;
- public const Int16 HProduceDateCol = 63;
- public const Int16 HExpiryDateCol = 64;
+ public const Int16 HProduceDateCol = 26;
+ public const Int16 HExpiryDateCol = 27;
+ public const Int16 HDeptIDCol = 28;
+ public const Int16 HDeptNumberCol = 29;
+ public const Int16 HDeptNameCol = 30;
+ public const Int16 HSourceIDCol = 31;
+ public const Int16 HSourceNumberCol = 32;
+ public const Int16 HSourceNameCol = 33;
+ public const Int16 HDateCol = 34;
+ public const Int16 HEndDateCol = 35;
+ public const Int16 HSupIDCol = 36;
+ public const Int16 HSupNumberCol = 37;
+ public const Int16 HSupNameCol = 38;
+ public const Int16 HCusIDCol = 39;
+ public const Int16 HCusNumberCol = 40;
+ public const Int16 HCusNameCol = 41;
+ public const Int16 HCusTypeCol = 42;
+ public const Int16 HSourceInterIDCol = 43;
+ public const Int16 HSourceEntryIDCol = 44;
+ public const Int16 HSourceBillNoCol = 45;
+ public const Int16 HSourceBillTypeCol = 46;
+ public const Int16 HInstructIDCol = 47;
+ public const Int16 HInstructNoCol = 48;
+ public const Int16 HSeOrderBillIDCol = 49;
+ public const Int16 HSeOrderBillNoCol = 50;
+ public const Int16 HSeOrderSEQCol = 51;
+ public const Int16 HWhIDCol = 52;
+ public const Int16 HWhNumberCol = 53;
+ public const Int16 HWhNameCol = 54;
+ public const Int16 HSPIDCol = 55;
+ public const Int16 HSPNumberCol = 56;
+ public const Int16 HSPNameCol = 57;
+ public const Int16 HinitQtyCol = 58;
+ public const Int16 HRemarkCol = 59;
+ public const Int16 HPinfanBarCodeCol = 60;
+ public const Int16 HMTONoCol = 61;
+ public const Int16 HShowDateCol = 62;
+ public const Int16 HInnerBillNoCol = 63;
+ public const Int16 HMakerCol = 64;
public const Int16 HISKFPERIODCol = 65;
public const Int16 HEXPUNITCol = 66;
public const Int16 HEXPPERIODCol = 67;
@@ -636,8 +636,8 @@
{
sHRemark= sHRemark+DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HRemark"]);
}
- else
- {
+ else if(DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value) == "")
+ {
if (DBUtility.ClsPub.isBool(oDsCheck.Tables[0].Rows[0]["HISKFPERIOD"]))
{
DateTime HProduceDate; //鐢熶骇鏃ユ湡
@@ -1707,8 +1707,8 @@
grdMain.Columns[HSourceIDCol].Visible = false;
grdMain.Columns[HSourceNumberCol].Visible = false;
grdMain.Columns[HSourceNameCol].Visible = false;
- grdMain.Columns[HProduceDateCol].Visible = false;
- grdMain.Columns[HExpiryDateCol].Visible = false;
+ //grdMain.Columns[HProduceDateCol].Visible = false;
+ //grdMain.Columns[HExpiryDateCol].Visible = false;
grdMain.Columns[HISKFPERIODCol].Visible = false;
grdMain.Columns[HEXPUNITCol].Visible = false;
grdMain.Columns[HEXPPERIODCol].Visible = false;
@@ -2493,7 +2493,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 HAuxPropID=" + oSelectRow.HAuxPropID + " 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 + "' and 鐢熶骇鏃ユ湡='" + oSelectRow.HProduceDate + "' and 鏈夋晥鏈熻嚦='" + oSelectRow.HExpiryDate + "'", "h_v_KF_ICInventoryList_IF");
//鍐欏叆淇℃伅
Sub_WriteInForm2(Ds.Tables[0], i);
}
@@ -2717,6 +2717,11 @@
grdMain.Rows[i].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
grdMain.Rows[i].Cells[HRemarkCol].Value = "鎸夊簱瀛樼敓鎴�";
grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["鐢熶骇鏃ユ湡"].ToString();
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["鏈夋晥鏈熻嚦"].ToString();
+ grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = oTable.Rows[0]["HEXPPERIOD"].ToString();
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
--
Gitblit v1.9.1