From f1b334ba320250708dcb47a8e2c97015fc07cc27 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 18 八月 2025 16:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBill_Rework.cs | 494 ++++++------------------------------------------------
1 files changed, 55 insertions(+), 439 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
index f270974..45511c3 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
@@ -27,7 +27,7 @@
public const Int16 HMaterIDCol = 6;
public const Int16 HMaterNumberCol = 7;
public const Int16 HMaterNameCol = 8;
- public const Int16 HPinfanCol = 9;
+ public const Int16 HSubjoin2Col = 9;
public const Int16 HMaterModelCol = 10;
public const Int16 HAuxPropIDCol = 11;
public const Int16 HAuxPropNumberCol = 12;
@@ -77,6 +77,8 @@
public const Int16 HInnerBillNoCol = 56;
public const Int16 HEndDateCol = 57;
public const Int16 HSourceBillQtyCol = 58;
+ public const Int16 HPinfanCol = 59;
+
//
public string ModName = "85";
public string ModCaption = "鏉＄爜鐢熸垚";
@@ -259,8 +261,6 @@
this.lblCaption.Text = ModCaption;
//鍔犺浇缁勭粐淇℃伅
Sub_AddOrdList();
- //鍔犺浇婧愬崟绫诲瀷
- Sub_AddHSourceBillTypeList();
//鑾峰彇绯荤粺鍙傛暟
ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
@@ -307,25 +307,7 @@
cmbHOrgID.DisplayMember = "HName";
cmbHOrgID.ValueMember = "HItemID";
}
-
- //鍔犺浇婧愬崟绫诲瀷
- private void Sub_AddHSourceBillTypeList()
- {
- DataSet ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_SourceBillType " + HOrgID.ToString(), "h_p_Gy_BarCodeBill_SourceBillType");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- cmbSourceBillType.DataSource = null;
- cmbSourceBillType.Items.Clear();
- MessageBox.Show("鑾峰彇婧愬崟绫诲瀷澶辫触");
- return;
- }
- cmbSourceBillType.DataSource = null;
- cmbSourceBillType.Items.Clear();
- cmbSourceBillType.DataSource = ds.Tables[0];
- cmbSourceBillType.DisplayMember = "HName";
- cmbSourceBillType.ValueMember = "HItemID";
- }
-
+
//绐椾綋灏哄鍙樺寲鏃�
private void Gy_BarCodeBill_Rework_Resize(object sender, EventArgs e)
{
@@ -567,7 +549,6 @@
int HSumBQty = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
DataSet Ds;
- pb1.Value = 0;
Int64 HEntryID = 0; //瀛怚D
string HBarCode = ""; //鏉″舰鐮�
@@ -622,7 +603,6 @@
if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
{
HSumBQty = HSumBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
- pb1.Maximum = HSumBQty;
}
}
for (int j = 0; j < grdMain.Rows.Count; j++)
@@ -642,39 +622,13 @@
//==================================
if (HBarCodeType == "鍞竴鏉＄爜")
{
- if (CampanyName == "涓帶")
- {
- HSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value);
- sSourceEntryID = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value);
- if (HSourceBillNo == "")
- {
- //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
- Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
- }
- else
- {
- //鏉＄爜 = 婧愬崟鍗曞彿 + 鐗╂枡ID + 琛屽彿
- sTMNumber = HSourceBillNo + sMaterID + sSourceEntryID;
- }
- }
- else //閫氱敤鏂规硶
- {
- //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
- Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
- }
- }
- else if (HBarCodeType == "鍝佺鏉＄爜")
- {
- TM = HOrgNumber + sMaterID;
- }
- else if (HBarCodeType == "鎵规鏉＄爜")
- {
- TM = HOrgNumber + sMaterID + HBatchNo;
- }
+ //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ //sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
+ sTMNumber = sYear + sPeriod + sDay;
+
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo_ReWorkBar '" + sTMNumber + "'", "h_p_WMS_GetMaxNo_ReWorkBar"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
else
{
MessageBox.Show("閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�");
@@ -716,31 +670,11 @@
}
if (HBarCodeType == "鍞竴鏉＄爜")
{
- if (CampanyName == "涓帶")
- {
- if (HSourceBillNo == "")
- {
- //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
- TM = sTMNumber + LSH2;
- }
- else
- {
- if (HBQty > 1)
- {
- MessageBox.Show("鐢熶骇姹囨姤鍗曘�佹敹鏂欓�氱煡鍗曠敓鎴愭潯鐮佹椂锛岀鏁颁笉鑳藉ぇ浜�1锛�");
- bc.Enabled = true;
- oCn.RollBack();
- return;
- }
- //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑
- TM = sTMNumber;
- }
- }
- else
- {
- //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
- TM = sTMNumber + LSH2;
- }
+ Int32 HModelLen = grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString().Length;
+ string HModelLeft = HModelLen >= 4 ? grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString() : "";
+ string HSubjoin2 = grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString();
+ //鏉＄爜缂栧彿 = 宸ュ巶浠ｇ爜锛�1锛� + 杞﹂棿浠ｇ爜锛�060113锛�+ 鏈哄瀷鍙� + 骞� + 鏈� + 鏃� + 娴佹按鍙�
+ TM = "1" + 060113.ToString() + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
}
HEntryID = j + 1;
@@ -815,7 +749,6 @@
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HSeOrderBillNo + "'," + HSeOrderSEQ.ToString() + ",'" + HInnerBillNo + "','" + HWorkLineName + "'"
+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HEndDate.ToShortDateString() + "','" + ClsPub.CurUserName + "',getdate()" +
")");
- pb1.Value = n + 1;
n = n + 1;
nn = nn + 1;
}
@@ -875,7 +808,7 @@
private void initGrid()
{
grdMain.RowCount = 0;
- grdMain.ColumnCount = 59; //鎬诲垪鏁�
+ grdMain.ColumnCount = 60; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -886,6 +819,7 @@
grdMain.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠ｇ爜";
grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain.Columns[HSubjoin2Col].HeaderText = "鏈哄瀷鐮�";
grdMain.Columns[HPinfanCol].HeaderText = "鍝佺暘";
grdMain.Columns[HUnitIDCol].HeaderText = "璁￠噺鍗曚綅ID";
grdMain.Columns[HUnitNumberCol].HeaderText = "璁￠噺鍗曚綅浠ｇ爜";
@@ -936,6 +870,7 @@
grdMain.Columns[HInnerBillNoCol].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
grdMain.Columns[HEndDateCol].HeaderText = "璁″垝瀹屽伐鏃ユ湡";
+
//鏍煎紡鍖� 闅愯棌鍒�
grdMain.Columns[HTagCol].Visible = false;
grdMain.Columns[HMainIDCol].Visible = false;
@@ -977,6 +912,9 @@
grdMain.Columns[HSeOrderSEQCol].Visible = false;
grdMain.Columns[HInnerBillNoCol].Visible = false;
grdMain.Columns[HEndDateCol].Visible = false;
+ grdMain.Columns[HBillNoCol].Visible = false;
+ grdMain.Columns[HAuxPropNumberCol].Visible = false;
+ grdMain.Columns[HAuxPropNameCol].Visible = false;
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -1016,17 +954,9 @@
grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell3;
//缃戞牸涓嬫媺閫夋嫨妗�
DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
- if (CampanyName == "涓帶")
- {
- column.Items.Add("鎵规鏉＄爜");
- column.Items.Add("鍝佺鏉＄爜");
- }
- else
- {
- column.Items.Add("鍞竴鏉＄爜");
- column.Items.Add("鎵规鏉＄爜");
- column.Items.Add("鍝佺鏉＄爜");
- }
+
+ column.Items.Add("鍞竴鏉＄爜");
+
grdMain.Rows[i].Cells[HBarCodeTypeCol] = column;
}
@@ -1125,7 +1055,8 @@
grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oMater.omodel.HAuxPropName;
grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = oMater.omodel.HBatchManager;
grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = oMater.omodel.HISKFPERIOD;
- grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = oMater.omodel.HBarCodeType;
+ grdMain.Rows[sRow].Cells[HSubjoin2Col].Value = oMater.omodel.HSubjoin2;
+ grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "鍞竴鏉＄爜";
//鍚敤鎵规
if (oMater.omodel.HBatchManager)
{
@@ -1150,12 +1081,7 @@
grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
}
-
- if (CampanyName == "涓帶")
- {
- grdMain.Rows[sRow].Cells[HQtyCol].Value = oMater.omodel.HQtyMin;
- grdMain.Rows[sRow].Cells[HBQtyCol].Value = 1;
- }
+
oEdit.Text = oMater.omodel.HNumber;
}
else
@@ -1375,154 +1301,7 @@
}
#endregion
-
-
- #region 閫夋簮鍗曡繑鍥炰俊鎭� 鎸夋斁澶ч暅鍥炬爣杩斿洖
-
- private void cmdSourceBillNo_Click(object sender, EventArgs e)
- {
- if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
- {
- string sWhere = "";
- //绯荤粺鍙傛暟锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
- if (SourceQtyCtl == "N")
- {
- sWhere = " and HOrgID =" + HOrgID.ToString() + " and 浠诲姟鏁伴噺>0";
- }
- else
- {
- sWhere = " and HOrgID =" + HOrgID.ToString();
- }
-
- DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
- if (oIFCLD_ICMOList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
- if (oIF_ICMOReportBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
- if (oIF_POInStockBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POInStockBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
- if (oIF_POOrderBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POOrderBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
- if (oIF_EntrustOrderBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "閲囪喘鍏ュ簱鍗�")
- {
- string sWhere = "";
- DAL.Cls_S_IF_POStockInBillList oIF_POStockInBillList = new DAL.Cls_S_IF_POStockInBillList();
- if (oIF_POStockInBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POStockInBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "閫�璐ч�氱煡鍗�")
- {
- string sWhere = "";
- DAL.Cls_S_IF_SeOutStockBackBillList oIF_SeOutStockBackBillList = new DAL.Cls_S_IF_SeOutStockBackBillList();
- if (oIF_SeOutStockBackBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_SeOutStockBackBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鍏朵粬鍏ュ簱鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_OtherInBillList oIF_OtherInBillList = new DAL.Cls_S_IF_OtherInBillList();
- if (oIF_OtherInBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_OtherInBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鐩存帴璋冩嫧鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_MoveStockBillList oIF_MoveStockBillList = new DAL.Cls_S_IF_MoveStockBillList();
- if (oIF_MoveStockBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_MoveStockBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "閲囪喘閫�鏂欏崟")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_POStockInBackBillList oIF_POStockInBackBillList = new DAL.Cls_S_IF_POStockInBackBillList();
- if (oIF_POStockInBackBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POStockInBackBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鐢熶骇閫�鏂欏崟")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_MateOutBackBillList oIF_MateOutBackBillList = new DAL.Cls_S_IF_MateOutBackBillList();
- if (oIF_MateOutBackBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_MateOutBackBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "缁勮鎷嗗嵏鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_PackageDismantleBillList oIF_PackageDismantleBillList = new DAL.Cls_S_IF_PackageDismantleBillList();
- if (oIF_PackageDismantleBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_PackageDismantleBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "宸ュ簭娴佽浆鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_ProcessExchangeBillList oIF_ProcessExchangeBillList = new DAL.Cls_S_IF_ProcessExchangeBillList();
- if (oIF_ProcessExchangeBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- 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
- {
-
- }
- }
-
+
private void FillSelectData(List<DBUtility.BillSelect> oList)
{
DataSet Ds;
@@ -1838,51 +1617,8 @@
grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
}
- if (CampanyName == "涓帶")
- {
- grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
- }
- else
- {
- grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
- }
- if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�" || cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟"
- || cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟" || cmbSourceBillType.Text.Trim() == "閲囪喘鍏ュ簱鍗�")
- {
- grdMain.Rows[i].Cells[HInnerBillNoCol].Value = oTable.Rows[0]["鍐呴儴閲囪喘璁㈠崟鍙�"].ToString();
- grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["hsupid"].ToString();
- grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString();
- grdMain.Rows[i].Cells[HSupNameCol].Value = oTable.Rows[0]["渚涘簲鍟�"].ToString();
- if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
- {
- if (oTable.Rows[0]["鏄惁璧犲搧"].ToString() == "鏄�")
- {
- grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 1;
- }
- else
- {
- grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 0;
- }
- grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value = oTable.Rows[0]["閿�鍞鍗曞彿"].ToString();
- grdMain.Rows[i].Cells[HSeOrderSEQCol].Value = oTable.Rows[0]["閿�鍞鍗曡鍙�"].ToString();
- }
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
- }
- if (cmbSourceBillType.Text.Trim() == "閫�璐ч�氱煡鍗�")
- {
- grdMain.Rows[i].Cells[HCusIDCol].Value = oTable.Rows[0]["HCusID"].ToString();
- grdMain.Rows[i].Cells[HCusNumberCol].Value = oTable.Rows[0]["瀹㈡埛浠ｇ爜"].ToString();
- grdMain.Rows[i].Cells[HCusNameCol].Value = oTable.Rows[0]["瀹㈡埛"].ToString();
- }
- if (cmbSourceBillType.Text.Trim() == "鍏朵粬鍏ュ簱鍗�")
- {
- grdMain.Rows[i].Cells[HWhIDCol].Value = oTable.Rows[0]["HWhID"].ToString();
- grdMain.Rows[i].Cells[HWhNumberCol].Value = oTable.Rows[0]["浠撳簱浠ｇ爜"].ToString();
- grdMain.Rows[i].Cells[HWhNameCol].Value = oTable.Rows[0]["浠撳簱"].ToString();
- grdMain.Rows[i].Cells[HSPIDCol].Value = oTable.Rows[0]["HSPID"].ToString();
- grdMain.Rows[i].Cells[HSPNumberCol].Value = oTable.Rows[0]["浠撲綅浠ｇ爜"].ToString();
- grdMain.Rows[i].Cells[HSPNameCol].Value = oTable.Rows[0]["浠撲綅"].ToString();
- }
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -1952,10 +1688,6 @@
grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
}
- if (CampanyName == "涓帶")
- {
- grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏁伴噺"]);
- }
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -1972,117 +1704,9 @@
RowCount(i, 0);
}
- #endregion
- #region 閫夋簮鍗曡繑鍥炰俊鎭� 鎸夊洖杞﹂敭杩斿洖
- private void txtHSourceBillNo_KeyPress(object sender, KeyPressEventArgs e)
- {
- if (e.KeyChar == (char)Keys.Return)//鍥炶溅甯﹀嚭婧愬崟淇℃伅
- {
- if (txtHSourceBillNo.Text.Length < 4)
- {
- MessageBox.Show("璇疯緭鍏�4浣嶄互涓婃暟鎹紒");
- return;
- }
- //鏍规嵁婧愬崟绫诲瀷 鍜屾簮鍗曞彿 鑾峰彇淇℃伅
- if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
- {
- DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
- //绯荤粺鍙傛暟锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
- if (SourceQtyCtl == "N")
- {
- if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString() + " and 浠诲姟鏁伴噺>0")) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- else
- {
- if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
- {
- DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
- if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
- {
- DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
- if (oIF_POInStockBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POInStockBillList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟")
- {
- DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
- if (oIF_POOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POOrderBillList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟")
- {
- DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
- if (oIF_EntrustOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- else
- {
- MessageBox.Show("鎵�閫夋簮鍗曠被鍨嬶紝涓嶆敮鎸佹鍔熻兘锛�");
- return;
- }
- }
- }
-
- #endregion
-
+
#region //鎵撳嵃璁剧疆
@@ -2328,28 +1952,28 @@
#region 閫夋嫨鏃ユ湡
private void dtpHDate_ValueChanged(object sender, EventArgs e)
{
- if (chkUpdateSubDate.Checked == true)
- {
- for (int j = 0; j < grdMain.Rows.Count; j++)
- {
- long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
- if (HMaterID != 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value) != "鎸夊簱瀛樼敓鎴�")
- {
- //鑾峰彇鐢熶骇鏃ユ湡銆佹湁鏁堟湡鑷�
- DateTime HProduceDate = dtpHDate.Value; //鐢熶骇鏃ユ湡
- string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
- int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[j].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
- //鐢熶骇鏃ユ湡
- grdMain.Rows[j].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
+ //if (chkUpdateSubDate.Checked == true)
+ //{
+ // for (int j = 0; j < grdMain.Rows.Count; j++)
+ // {
+ // long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
+ // if (HMaterID != 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value) != "鎸夊簱瀛樼敓鎴�")
+ // {
+ // //鑾峰彇鐢熶骇鏃ユ湡銆佹湁鏁堟湡鑷�
+ // DateTime HProduceDate = dtpHDate.Value; //鐢熶骇鏃ユ湡
+ // string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+ // int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[j].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
+ // //鐢熶骇鏃ユ湡
+ // grdMain.Rows[j].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
- if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
- {
- //鏈夋晥鏈熻嚦
- grdMain.Rows[j].Cells[HExpiryDateCol].Value = HExpiryDate;
- }
- }
- }
- }
+ // if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+ // {
+ // //鏈夋晥鏈熻嚦
+ // grdMain.Rows[j].Cells[HExpiryDateCol].Value = HExpiryDate;
+ // }
+ // }
+ // }
+ //}
}
#endregion
@@ -2480,17 +2104,9 @@
grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell3;
//缃戞牸涓嬫媺閫夋嫨妗�
DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
- if (CampanyName == "涓帶")
- {
- column.Items.Add("鎵规鏉＄爜");
- column.Items.Add("鍝佺鏉＄爜");
- }
- else
- {
- column.Items.Add("鍞竴鏉＄爜");
- column.Items.Add("鎵规鏉＄爜");
- column.Items.Add("鍝佺鏉＄爜");
- }
+
+ column.Items.Add("鍞竴鏉＄爜");
+
grdMain.Rows[row + r].Cells[HBarCodeTypeCol] = column;
}
DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
--
Gitblit v1.9.1