From 2095d4d4920f16a8b493c80bada80db5cedc8c31 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 23 一月 2024 14:45:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBill.cs | 834 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 668 insertions(+), 166 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 5dfefdc..f85a342 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"
@@ -43,42 +43,49 @@
public const Int16 HQtyCol = 22;
public const Int16 HMinQtyCol = 23;
public const Int16 HBQtyCol = 24;
- public const Int16 HDeptIDCol = 25;
- public const Int16 HDeptNumberCol = 26;
- public const Int16 HDeptNameCol = 27;
- public const Int16 HSourceIDCol = 28;
- public const Int16 HSourceNumberCol = 29;
- public const Int16 HSourceNameCol = 30;
- public const Int16 HDateCol = 31;
- public const Int16 HEndDateCol = 32;
- public const Int16 HSupIDCol = 33;
- public const Int16 HSupNumberCol = 34;
- public const Int16 HSupNameCol = 35;
- public const Int16 HCusIDCol = 36;
- public const Int16 HCusNumberCol = 37;
- public const Int16 HCusNameCol = 38;
- public const Int16 HCusTypeCol = 39;
- public const Int16 HSourceInterIDCol = 40;
- public const Int16 HSourceEntryIDCol = 41;
- public const Int16 HSourceBillNoCol = 42;
- public const Int16 HSourceBillTypeCol = 43;
- public const Int16 HInstructIDCol = 44;
- public const Int16 HInstructNoCol = 45;
- public const Int16 HSeOrderBillIDCol = 46;
- public const Int16 HSeOrderBillNoCol = 47;
- public const Int16 HWhIDCol = 48;
- public const Int16 HWhNumberCol = 49;
- public const Int16 HWhNameCol = 50;
- public const Int16 HSPIDCol = 51;
- public const Int16 HSPNumberCol = 52;
- public const Int16 HSPNameCol = 53;
- public const Int16 HinitQtyCol = 54;
- public const Int16 HRemarkCol = 55;
- public const Int16 HPinfanBarCodeCol = 56;
- public const Int16 HMTONoCol = 57;
- public const Int16 HShowDateCol = 58;
- public const Int16 HInnerBillNoCol = 59;
- public const Int16 HMakerCol = 60;
+ public const Int16 HPackQtyCol = 25;
+ 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;
public Int16 HSelectCol = 0;
public Int16 HSno2Col = 1;
@@ -126,18 +133,25 @@
public Int16 HInstructNo2Col = 43;
public Int16 HSeOrderBillID2Col = 44;
public Int16 HSeOrderBillNo2Col = 45;
- public Int16 HWhID2Col = 46;
- public Int16 HWhNumber2Col = 47;
- public Int16 HWhName2Col = 48;
- public Int16 HSPID2Col = 49;
- public Int16 HSPNumber2Col = 50;
- public Int16 HSPName2Col = 51;
- public Int16 HRemark2Col = 52;
- public Int16 HPinfanBarCode2Col = 53;
- public Int16 HMTONo2Col = 54;
- public Int16 HShowDate2Col = 55;
- public Int16 HInnerBillNo2Col = 56;
- public Int16 HMaker2Col = 57;
+ public Int16 HSeOrderSEQ2Col = 46;
+ public Int16 HWhID2Col = 47;
+ public Int16 HWhNumber2Col = 48;
+ public Int16 HWhName2Col = 49;
+ public Int16 HSPID2Col = 50;
+ public Int16 HSPNumber2Col = 51;
+ public Int16 HSPName2Col = 52;
+ public Int16 HRemark2Col = 53;
+ public Int16 HPinfanBarCode2Col = 54;
+ public Int16 HMTONo2Col = 55;
+ public Int16 HShowDate2Col = 56;
+ public Int16 HInnerBillNo2Col = 57;
+ public Int16 HMaker2Col = 58;
+ public Int16 HEntryID2Col = 59;
+ public Int16 HProduceDate2Col = 60;
+ public Int16 HExpiryDate2Col = 61;
+ public Int16 HISKFPERIOD2Col = 62;
+ public Int16 HEXPUNIT2Col = 63;
+ public Int16 HEXPPERIOD2Col = 64;
//
public string ModName = "85";
public string ModCaption = "鏉＄爜鐢熸垚";
@@ -161,7 +175,10 @@
public string ERPMode = ""; //ERP妯″紡锛圵ISE銆丆LOUD锛�
public string CampanyName = ""; //瀹㈡埛瀹氬埗鍖栧悕绉�
public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
- //-------------------------------------------------------------------------
+ public long PrintQty = 0; //鍏佽鏉＄爜鎵撳嵃娆℃暟
+ public string PrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鎺у埗
+ public string UpdatePrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
+ //-------------------------------------------------------------------------
#region 鍥哄畾浠ｇ爜
//娓呯┖鐣岄潰
@@ -189,6 +206,10 @@
cmbHBarCodeType.Items.Add("浠櫒鎴愬搧鏉＄爜瑙勫垯");
cmbHBarCodeType.Items.Add("璇曞墏鎴愬搧鏉＄爜瑙勫垯");
}
+ else if (sCapName == "涓帶")
+ {
+ cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
+ }
else
{
//
@@ -198,18 +219,28 @@
//cmbHBarCodeType.Items.Add("鎵樼洏鏉＄爜");
}
- //
- cmbSourceBillType.Items.Add("鐢熶骇璁㈠崟");
- cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
- cmbSourceBillType.Items.Add("閲囪喘璁㈠崟");
- cmbSourceBillType.Items.Add("鏀舵枡閫氱煡鍗�");
- cmbSourceBillType.Items.Add("濮斿璁㈠崟");
- cmbSourceBillType.Items.Add("閫�璐ч�氱煡鍗�");
- cmbSourceBillType.Items.Add("鍏朵粬鍏ュ簱鍗�");
- cmbSourceBillType.Items.Add("鐩存帴璋冩嫧鍗�");
- cmbSourceBillType.Items.Add("閲囪喘閫�鏂欏崟");
- cmbSourceBillType.Items.Add("鐢熶骇閫�鏂欏崟");
- cmbSourceBillType.Items.Add("缁勮鎷嗗嵏鍗�");
+ //婧愬崟绫诲瀷
+ if (sCapName == "涓帶")
+ {
+ cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
+ cmbSourceBillType.Items.Add("鏀舵枡閫氱煡鍗�");
+ }
+ else
+ {
+ cmbSourceBillType.Items.Add("鐢熶骇璁㈠崟");
+ cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
+ cmbSourceBillType.Items.Add("閲囪喘璁㈠崟");
+ cmbSourceBillType.Items.Add("鏀舵枡閫氱煡鍗�");
+ cmbSourceBillType.Items.Add("濮斿璁㈠崟");
+ cmbSourceBillType.Items.Add("宸ュ簭姹囨姤鍗�");
+ cmbSourceBillType.Items.Add("宸ュ簭娴佽浆鍗�");
+ cmbSourceBillType.Items.Add("閫�璐ч�氱煡鍗�");
+ cmbSourceBillType.Items.Add("鍏朵粬鍏ュ簱鍗�");
+ cmbSourceBillType.Items.Add("鐩存帴璋冩嫧鍗�");
+ cmbSourceBillType.Items.Add("閲囪喘閫�鏂欏崟");
+ cmbSourceBillType.Items.Add("鐢熶骇閫�鏂欏崟");
+ cmbSourceBillType.Items.Add("缁勮鎷嗗嵏鍗�");
+ }
//
DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
//
@@ -266,6 +297,7 @@
{
this.Sub_SaveBill();
Display();
+
}
//閲嶇疆鎸夌航
@@ -400,6 +432,9 @@
ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
CampanyName = oSystemParameter.omodel.WMS_CampanyName;
SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
+ PrintQty = oSystemParameter.omodel.BarCode_PrintQty;
+ PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
+ UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
}
cmbHWorksNumber.Items.Clear();
@@ -613,6 +648,45 @@
{
sHRemark= sHRemark+DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HRemark"]);
}
+ else if(DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value) == "")
+ {
+ if (DBUtility.ClsPub.isBool(oDsCheck.Tables[0].Rows[0]["HISKFPERIOD"]))
+ {
+ DateTime HProduceDate; //鐢熶骇鏃ユ湡
+ string HEXPUNIT; //淇濊川鏈熷崟浣�
+ int HEXPPERIOD; //淇濊川鏈�
+
+ HProduceDate = dtpHDate.Value;
+ HEXPUNIT = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HEXPUNIT"]);
+ HEXPPERIOD = DBUtility.ClsPub.isInt(oDsCheck.Tables[0].Rows[0]["HEXPPERIOD"]);
+
+ grdMain.Rows[j].Cells[HISKFPERIODCol].Value = 1;
+ grdMain.Rows[j].Cells[HEXPUNITCol].Value = HEXPUNIT;
+ grdMain.Rows[j].Cells[HEXPPERIODCol].Value = HEXPPERIOD.ToString();
+ grdMain.Rows[j].Cells[HProduceDateCol].Value = HProduceDate.ToShortDateString();
+
+ if (HEXPUNIT == "Y")
+ {
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddYears(HEXPPERIOD).ToShortDateString();
+ }
+ else if (HEXPUNIT == "M")
+ {
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddMonths(HEXPPERIOD).ToShortDateString();
+ }
+ else
+ {
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddDays(HEXPPERIOD).ToShortDateString();
+ }
+ }
+ else
+ {
+ grdMain.Rows[j].Cells[HISKFPERIODCol].Value = 0;
+ grdMain.Rows[j].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[j].Cells[HEXPPERIODCol].Value = 0;
+ grdMain.Rows[j].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = "";
+ }
+ }
}
}
if(sHRemark!="")
@@ -674,10 +748,10 @@
string HMaterNumber = ""; //鐗╂枡浠ｇ爜
double HSumQty = 0; //浜у搧鏁伴噺
double HMinQty = 0; //鏈�灏忓寘瑁呮暟
- int HBQty = 0; //绠辨暟
+ Int64 HBQty = 0; //绠辨暟
double HQty = 0; //鏁伴噺
string WeiShu = ""; //灏炬暟
- int LSH = 0; //娴佹按鍙�
+ Int64 LSH = 0; //娴佹按鍙�
string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
string sDate = ""; //鏃ユ湡
string sYear = ""; //骞�
@@ -690,8 +764,10 @@
string HBarCodeBatchNo = ""; //鏉＄爜鎵规鍙�
string HBarCodeDate = ""; //鏉＄爜鏃ユ湡
int k = 0;
- int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ Int64 n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
+ string sSourceBillNo = ""; //婧愬崟鍙�
+ string sSourceEntryID = ""; //琛屽彿锛堟簮鍗曞瓙ID锛�
DataSet Ds;
//Ds = oCn.RunProcReturn("exec GetLSH '" + ClsPub.GetServerDate(0) + "'", "GetLSH");
//LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
@@ -737,7 +813,7 @@
sTMNumber = HNumber + sYear + sPeriod + sDay;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
else if (CampanyName == "椋為緳")
{
@@ -752,7 +828,24 @@
sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
+ else if (CampanyName == "涓帶")
+ {
+ sSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value);
+ sSourceEntryID = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value);
+ if (sSourceBillNo == "")
+ {
+ //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HOrgNumber + HNumber + 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 = sSourceBillNo + HNumber + sSourceEntryID;
+ }
}
else //閫氱敤鏂规硶
{
@@ -760,7 +853,7 @@
sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
}
else if (cmbHBarCodeType.Text == "鍝佺鏉＄爜")
@@ -778,13 +871,22 @@
{
TM = HOrgNumber + HNumber + HBatchNo;
}//鍗氭棩鐗规畩澶勭悊
+ else if (cmbHBarCodeType.Text == "搴忓垪鐮�")
+ {
+ //鏉＄爜瑙勫垯锛� GX+鐗╂枡鍐呯爜+骞村勾鏈堟湀鏃ユ棩+5浣嶆祦姘村彿
+ LSHlen = 5;
+ //鏉＄爜鍓嶇紑 = GX+鐗╂枡鍐呯爜+骞村勾鏈堟湀鏃ユ棩
+ sTMNumber = "GX" + HNumber + 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(cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
{
//鐗╂枡缂栫爜+鍗曟嵁鏃ユ湡锛圷YMMDD锛�+娴佹按4浣�
sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
LSHlen = 4;
}
else if (cmbHBarCodeType.Text == "浠櫒鎴愬搧鏉＄爜瑙勫垯") //鍙﹀澶勭悊浜�
@@ -793,15 +895,15 @@
//sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
//Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
// //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- //LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ //LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
else if (cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")
{
- //鐗╂枡缂栫爜+鐢熶骇鎵瑰彿+澶辨晥鏃ユ湡锛圷YMMDD锛�+娴佹按鍙�6浣�-
- sTMNumber = HMaterNumber + HBatchNo + sYear + sPeriod + sDay;
+ //鐗╂枡缂栫爜+鐢熶骇鎵瑰彿+娴佹按鍙�6浣�-
+ sTMNumber = HMaterNumber + HBatchNo ;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
LSHlen = 6;
}
else if (cmbHBarCodeType.Text == "鍐呴攢鏈烘潯鐮�")
@@ -811,11 +913,11 @@
sTMNumber = "1" + HModelName + HBarCodeDate + HBarCodeBatchNo + HYasuoji + "00" ;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
LSHlen = 4;
- if (sTMNumber.Length != 16)
+ if (sTMNumber.Length != 16 && sTMNumber.Length != 15)
{
- MessageBox.Show("鏉＄爜闀垮害涓嶅16浣嶏紝鏄惁鏁版嵁涓嶅叏锛佸埗閫犳湰閮�1浣�:[0] + 鏈哄瀷浠ｇ爜5浣�:[" + HModelName + "] + 骞存湀鏃�5浣�:["+ HBarCodeDate + "] + 鎵规鍙�2浣�:[" + HBarCodeBatchNo + "]+ 鍘嬬缉鏈�1浣�:["+ HYasuoji + "]+00 ; ");
+ MessageBox.Show("鏉＄爜闀垮害涓嶅15鎴�16浣嶏紝鏄惁鏁版嵁涓嶅叏锛佸埗閫犳湰閮�1浣�:[0] + 鏈哄瀷浠ｇ爜5浣�:[" + HModelName + "] + 骞存湀鏃�4鎴�5浣�:["+ HBarCodeDate + "] + 鎵规鍙�2浣�:[" + HBarCodeBatchNo + "]+ 鍘嬬缉鏈�1浣�:["+ HYasuoji + "]+00 ; ");
return;
}
}
@@ -826,11 +928,11 @@
sTMNumber = HMaterNumber.Replace( "." , "" ) + HBarCodeDate + HBarCodeBatchNo;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
LSHlen = 4;
- if (sTMNumber.Length != 18)
+ if (sTMNumber.Length != 18 && sTMNumber.Length != 17)
{
- MessageBox.Show("鏉＄爜闀垮害涓嶅18浣嶏紝鏄惁鏁版嵁涓嶅叏锛佺墿鏂欎唬鐮�11浣�:["+ HMaterNumber.Replace(".", "") + "]+骞存湀鏃�5浣�:["+ HBarCodeDate + "]+鎵规鍙�2浣�:[" + HBarCodeBatchNo + "];");
+ MessageBox.Show("鏉＄爜闀垮害涓嶅17鎴�18浣嶏紝鏄惁鏁版嵁涓嶅叏锛佺墿鏂欎唬鐮�11浣�:["+ HMaterNumber.Replace(".", "") + "]+骞存湀鏃�4鎴�5浣�:["+ HBarCodeDate + "]+鎵规鍙�2浣�:[" + HBarCodeBatchNo + "];");
return;
}
}
@@ -840,8 +942,8 @@
sTMNumber = HICMOBillNo;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
- LSHlen = 4;
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ LSHlen = 5;
}
//else if (cmbHBarCodeType.Text == "鎵樼洏鏉＄爜")
//{
@@ -853,10 +955,13 @@
return;
}
- HBQty = HBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ Int64 HBQty2 = 0; //绠辨暟
+ HBQty2 =ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ HBQty = HBQty + ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
n = 0;
+ int nn = 0;
for (int i = k; i < HBQty; i++)
{
if (HSumQty - HMinQty > 0)
@@ -885,6 +990,33 @@
}
if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
{
+ if (CampanyName == "涓帶")
+ {
+ if (sSourceBillNo == "")
+ {
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sTMNumber + LSH2;
+ }
+ else
+ {
+ if (HBQty2 > 1)
+ {
+ MessageBox.Show("鐢熶骇姹囨姤鍗曘�佹敹鏂欓�氱煡鍗曠敓鎴愭潯鐮佹椂锛岀鏁颁笉鑳藉ぇ浜�1锛�");
+ bc.Enabled = true;
+ return;
+ }
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑
+ TM = sTMNumber;
+ }
+ }
+ else
+ {
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sTMNumber + LSH2;
+ }
+ }
+ else if (cmbHBarCodeType.Text == "搴忓垪鐮�")
+ {
//鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
TM = sTMNumber + LSH2;
}
@@ -910,6 +1042,7 @@
return;
}
grdSub.Rows[i].Cells[HTMCol].Value = TM;
+ grdSub.Rows[i].Cells[HEntryID2Col].Value = j + 1;
grdSub.Rows[i].Cells[HMaterID2Col].Value = grdMain.Rows[j].Cells[HMaterIDCol].Value;
grdSub.Rows[i].Cells[HMaterNumber2Col].Value = grdMain.Rows[j].Cells[HMaterNumberCol].Value;
grdSub.Rows[i].Cells[HMaterName2Col].Value = grdMain.Rows[j].Cells[HMaterNameCol].Value;
@@ -960,19 +1093,35 @@
grdSub.Rows[i].Cells[HSourceName2Col].Value = grdMain.Rows[j].Cells[HSourceNameCol].Value;
grdSub.Rows[i].Cells[HEndDate2Col].Value = grdMain.Rows[j].Cells[HEndDateCol].Value;
grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value = grdMain.Rows[j].Cells[HSeOrderBillNoCol].Value;
+ grdSub.Rows[i].Cells[HSeOrderSEQ2Col].Value = grdMain.Rows[j].Cells[HSeOrderSEQCol].Value;
grdSub.Rows[i].Cells[HInnerBillNo2Col].Value = grdMain.Rows[j].Cells[HInnerBillNoCol].Value;
grdSub.Rows[i].Cells[HMaker2Col].Value = grdMain.Rows[j].Cells[HMakerCol].Value;
grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value = grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value;
+ grdSub.Rows[i].Cells[HProduceDate2Col].Value = grdMain.Rows[j].Cells[HProduceDateCol].Value;
+ grdSub.Rows[i].Cells[HExpiryDate2Col].Value = grdMain.Rows[j].Cells[HExpiryDateCol].Value;
+ grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value = grdMain.Rows[j].Cells[HISKFPERIODCol].Value;
+ grdSub.Rows[i].Cells[HEXPUNIT2Col].Value = grdMain.Rows[j].Cells[HEXPUNITCol].Value;
+ grdSub.Rows[i].Cells[HEXPPERIOD2Col].Value = grdMain.Rows[j].Cells[HEXPPERIODCol].Value;
//缃戞牸鎵撳嬀
+ //鏄惁璧犲搧
DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
oCell.ThreeState = false;
oCell.Value = grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value;
oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell;
+ //鏄惁鍚敤淇濊川鏈�
+ DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+ oCell2.ThreeState = false;
+ oCell2.Value = grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value;
+ oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdSub.Rows[i].Cells[HISKFPERIOD2Col] = oCell2;
k = k + 1;
n = n + 1;
- oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ nn = nn + 1;
}
+ //鍚庡彴鎵归噺鎵ц璇彞
+ oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
}
}
string HWei = ""; //灏炬暟
@@ -1005,8 +1154,15 @@
DateTime HEndDate;
string HWorkLineName = "";
string HSeOrderBillNo = "";
+ Int64 HSeOrderSEQ = 0;
string HInnerBillNo = "";
bool HGiveAwayFlag = false;
+ Int64 HEntryID = 0;
+ string HProduceDate;
+ string HExpiryDate;
+ bool HISKFPERIOD = false;
+ string HEXPUNIT = "";
+ double HEXPPERIOD = 0;
try
{
oCn.BeginTran();
@@ -1024,6 +1180,7 @@
}
//
HMaterID = ClsPub.isLong(grdSub.Rows[i].Cells[HMaterID2Col].Value);
+ HEntryID = ClsPub.isLong(grdSub.Rows[i].Cells[HEntryID2Col].Value);
HAuxPropID = ClsPub.isLong(grdSub.Rows[i].Cells[HAuxPropID2Col].Value);
HUnitID = ClsPub.isLong(grdSub.Rows[i].Cells[HUnitID2Col].Value);
HQty2 = ClsPub.isDoule(grdSub.Rows[i].Cells[HQty2Col].Value);
@@ -1048,15 +1205,37 @@
HEndDate = ClsPub.isDate(grdSub.Rows[i].Cells[HEndDate2Col].Value);
HWorkLineName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceName2Col].Value);
HSeOrderBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value);
+ HSeOrderSEQ = ClsPub.isLong(grdSub.Rows[i].Cells[HSeOrderSEQ2Col].Value);
HInnerBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HInnerBillNo2Col].Value);
HGiveAwayFlag = ClsPub.isBool(grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value);
+ if (ClsPub.isDate(grdSub.Rows[i].Cells[HProduceDate2Col].Value) < Convert.ToDateTime("1950-01-01"))
+ {
+ HProduceDate = "";
+ }
+ else
+ {
+ HProduceDate = ClsPub.isStrNull(grdSub.Rows[i].Cells[HProduceDate2Col].Value);
+ }
+ if (ClsPub.isDate(grdSub.Rows[i].Cells[HExpiryDate2Col].Value) < Convert.ToDateTime("1950-01-01"))
+ {
+ HExpiryDate = "";
+ }
+ else
+ {
+ HExpiryDate = ClsPub.isStrNull(grdSub.Rows[i].Cells[HExpiryDate2Col].Value);
+ }
+ HISKFPERIOD = ClsPub.isBool(grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value);
+ HEXPUNIT = ClsPub.isStrNull(grdSub.Rows[i].Cells[HEXPUNIT2Col].Value);
+ HEXPPERIOD = ClsPub.isDoule(grdSub.Rows[i].Cells[HEXPPERIOD2Col].Value);
oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
- ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
- ",HGiveAwayFlag " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+ ",HProduceDate,HExpiryDate " +
+ ",HISKFPERIOD,HEXPUNIT,HEXPPERIOD " +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
@@ -1064,8 +1243,10 @@
+ ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
- + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString()
- + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString()
+ + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + HSeOrderSEQ.ToString() + "," + HSourceEntryID.ToString()
+ + ", " + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+ + ", " + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",'" + HEXPUNIT + "'," + HEXPPERIOD.ToString()
+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
@@ -1148,7 +1329,7 @@
string HMaterNumber = ""; //鐗╂枡浠ｇ爜
double HSumQty = 0; //浜у搧鏁伴噺
double HMinQty = 0; //鏈�灏忓寘瑁呮暟
- int HBQty = 0; //绠辨暟
+ Int64 HBQty = 0; //绠辨暟
double HQty = 0; //鏁伴噺
string WeiShu = ""; //灏炬暟
//int LSH = 0; //娴佹按鍙�
@@ -1199,7 +1380,7 @@
// return;
//}
- HBQty = HBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ HBQty = HBQty + ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
n = 0;
@@ -1472,7 +1653,7 @@
//
grdMain.RowCount = 0;
grdSub.RowCount = 0;
- grdMain.ColumnCount = 61; //鎬诲垪鏁�
+ grdMain.ColumnCount = 68; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -1498,6 +1679,7 @@
grdMain.Columns[HGiveAwayFlagCol].HeaderText = "鏄惁璧犲搧";
grdMain.Columns[HQtyCol].HeaderText = "鏁伴噺";
grdMain.Columns[HMinQtyCol].HeaderText = "鏈�灏忓寘瑁呮暟";
+ grdMain.Columns[HPackQtyCol].HeaderText = "澶栫鏁�";
grdMain.Columns[HBQtyCol].HeaderText = "绠辨暟";
grdMain.Columns[HSupIDCol].HeaderText = "渚涘簲鍟咺D";
grdMain.Columns[HSupNumberCol].HeaderText = "渚涘簲鍟嗕唬鐮�";
@@ -1513,6 +1695,7 @@
grdMain.Columns[HSPNameCol].HeaderText = "浠撲綅";
grdMain.Columns[HInstructNoCol].HeaderText = "鎸囦护鍗曞彿";
grdMain.Columns[HSeOrderBillNoCol].HeaderText = "閿�鍞鍗曞彿";
+ grdMain.Columns[HSeOrderSEQCol].HeaderText = "閿�鍞鍗曡鍙�";
grdMain.Columns[HDateCol].HeaderText = "杩涙枡鏃ユ湡";
grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
grdMain.Columns[HMTONoCol].HeaderText = "璁″垝璺熻釜鍙�";
@@ -1527,6 +1710,11 @@
grdMain.Columns[HShowDateCol].HeaderText = "鏃ユ湡";
grdMain.Columns[HInnerBillNoCol].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
grdMain.Columns[HMakerCol].HeaderText = "鍒跺崟浜�";
+ grdMain.Columns[HProduceDateCol].HeaderText = "鐢熶骇鏃ユ湡";
+ grdMain.Columns[HExpiryDateCol].HeaderText = "鏈夋晥鏈熻嚦";
+ grdMain.Columns[HISKFPERIODCol].HeaderText = "鏄惁鍚敤淇濊川鏈�";
+ grdMain.Columns[HEXPUNITCol].HeaderText = "淇濊川鏈熷崟浣�";
+ grdMain.Columns[HEXPPERIODCol].HeaderText = "淇濊川鏈�";
////
//鏍煎紡鍖�
grdMain.Columns[HTagCol].Visible = false; //闅愯棌鍒�
@@ -1574,7 +1762,12 @@
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[HISKFPERIODCol].Visible = false;
+ grdMain.Columns[HEXPUNITCol].Visible = false;
+ grdMain.Columns[HEXPPERIODCol].Visible = false;
+
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString()+
"," + HMinQtyCol.ToString() +
@@ -1584,6 +1777,7 @@
"," + HSeOrderBillNoCol.ToString() +
"," + HBatchNoCol.ToString() +
"," + HCusNumberCol.ToString() +
+ "," + HPackQtyCol.ToString() +
"," + HRemarkCol.ToString();
//璁剧疆鍚堣鍒�
string sTotalCol = HQtyCol.ToString();
@@ -1603,7 +1797,7 @@
DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol,oSumGrid);
//----------------------------
- grdSub.ColumnCount = 58; //鎬诲垪鏁�
+ grdSub.ColumnCount = 65; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdSub, this.Name);
grdSub.Columns[HSelectCol].HeaderText = "閫夋嫨";
grdSub.Columns[HTMCol].HeaderText = "鏉＄爜缂栧彿";
@@ -1632,6 +1826,7 @@
grdSub.Columns[HSourceBillNo2Col].HeaderText = "婧愬崟鍗曞彿";
grdSub.Columns[HSourceBillType2Col].HeaderText = "婧愬崟绫诲瀷";
grdSub.Columns[HSeOrderBillNo2Col].HeaderText = "閿�鍞鍗曞彿";
+ grdSub.Columns[HSeOrderSEQ2Col].HeaderText = "閿�鍞鍗曡鍙�";
grdSub.Columns[HBarcodeNoCol].HeaderText = "鎵樺彿";
grdSub.Columns[HBarcodeQtysCol].HeaderText = "鎬绘墭鏁�";
grdSub.Columns[HSupID2Col].HeaderText = "渚涘簲鍟咺D";
@@ -1661,6 +1856,12 @@
grdSub.Columns[HShowDate2Col].HeaderText = "鏃ユ湡";
grdSub.Columns[HInnerBillNo2Col].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
grdSub.Columns[HMaker2Col].HeaderText = "鍒跺崟浜�";
+ grdSub.Columns[HEntryID2Col].HeaderText = "琛屽彿";
+ grdSub.Columns[HProduceDate2Col].HeaderText = "鐢熶骇鏃ユ湡";
+ grdSub.Columns[HExpiryDate2Col].HeaderText = "鏈夋晥鏈熻嚦";
+ grdSub.Columns[HISKFPERIOD2Col].HeaderText = "鏄惁鍚敤淇濊川鏈�";
+ grdSub.Columns[HEXPUNIT2Col].HeaderText = "淇濊川鏈熷崟浣�";
+ grdSub.Columns[HEXPPERIOD2Col].HeaderText = "淇濊川鏈�";
//鏍煎紡鍖�
grdSub.Columns[HMaterID2Col].Visible = false;
grdSub.Columns[HModel2Col].Visible = false;
@@ -1709,11 +1910,18 @@
for (int i = 0; i < grdSub.Rows.Count; i++)
{
//缃戞牸鎵撳嬀
+ //鏄惁璧犲搧
DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
oCell.ThreeState = false;
oCell.Value = 0;
oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell;
+ //鏄惁鍚敤淇濊川鏈�
+ DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+ oCell2.ThreeState = false;
+ oCell2.Value = 0;
+ oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdSub.Rows[i].Cells[HISKFPERIOD2Col] = oCell2;
}
DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
@@ -1906,6 +2114,11 @@
grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+ }
+ if (CampanyName == "涓帶")
+ {
+ grdMain.Rows[sRow].Cells[HQtyCol].Value = oMater.omodel.HQtyMin;
+ grdMain.Rows[sRow].Cells[HBQtyCol].Value = 1;
}
oEdit.Text = oMater.omodel.HNumber;
}
@@ -2151,6 +2364,24 @@
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
{
@@ -2222,7 +2453,7 @@
grdMain.Rows.Add();
grdMain.Rows[i].Cells[HTagCol].Value = "*";
//寰楀埌淇℃伅
- Ds = oCn.RunProcReturn("select * from h_v_IF_POStockInList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POStockInList");
+ Ds = oCn.RunProcReturn("select * from h_v_IF_POStockInBillList_Source where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POStockInBillList_Source");
//鍐欏叆淇℃伅
Sub_WriteInForm1(Ds.Tables[0], i);
}
@@ -2296,13 +2527,33 @@
//鍐欏叆淇℃伅
Sub_WriteInForm1(Ds.Tables[0], i);
}
+ //宸ュ簭娴佽浆鍗�
+ if (oSelectRow.BillType == "3772")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_ProcessExchangeList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ProcessExchangeList");
+ //鍐欏叆淇℃伅
+ 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")
{
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);
}
@@ -2370,12 +2621,18 @@
{
grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
}
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["HProduceDate"].ToString();
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["HExpiryDate"].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() +
"," + HMinQtyCol.ToString() +
"," + HAuxPropNumberCol.ToString() +
"," + HBatchNoCol.ToString() +
+ "," + HPackQtyCol.ToString() +
"," + HRemarkCol.ToString();
grdMain.Columns[HBillNoCol].ReadOnly = true;
//璁剧疆鍚堣鍒�
@@ -2419,6 +2676,11 @@
grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
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();
if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
{
grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
@@ -2429,7 +2691,14 @@
}
else
{
- grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ if (CampanyName == "涓帶")
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
}
grdMain.Rows[i].Cells[HMakerCol].Value = ClsPub.CurUserName;
if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�"|| cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟"
@@ -2449,6 +2718,8 @@
{
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();
}
}
@@ -2523,6 +2794,15 @@
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();
+ if (CampanyName == "涓帶")
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏁伴噺"]);
+ }
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -2688,9 +2968,10 @@
#region //鎵撳嵃璁剧疆
GridppReport Report;
+ int CurRows = 0;
+ string sBarCodeItemID = ""; //鏉＄爜鑷鍒�
//棰勮
- int CurRows = 0;
private void yl_Click(object sender, EventArgs e)
{
//鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
@@ -2719,32 +3000,68 @@
}
}
- //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ //鎵撳嵃
+ private void dy_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
+ {
+ MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀鎵撳嵃锛�");
+ return;
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ if (ReportPrintBegin())
+ {
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //寰幆閫変腑琛�
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.Print(true);
+ Thread.Sleep(1000);
+ }
+ }
+
+ ////鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ //private bool ReportPrintBegin()
+ //{
+ // string sRelQty = "";
+
+ // if (oBar.Set_BPrintQty(DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value), ref sRelQty))
+ // {
+ // MessageBox.Show("鏉＄爜宸茬粡鎵撳嵃杩囷紝涓嶅彲閲嶅鎵撳嵃锛�");
+ // return true;
+ // }
+ // else
+ // {
+ // return false;
+ // }
+ //}
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
private bool ReportPrintBegin()
{
- string sRelQty = "";
-
- if (oBar.Set_BPrintQty(DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value), ref sRelQty))
+ string sHRemark = "";
+ if (PrintQtyCtl == "Y")
{
- MessageBox.Show("鏉＄爜宸茬粡鎵撳嵃杩囷紝涓嶅彲閲嶅鎵撳嵃锛�");
- return true;
+ if (oBar.Set_CheckPrintQty_SD(HInterID, PrintQty, ref sHRemark))
+ {
+ MessageBox.Show(sHRemark);
+ return true;
+ }
+ return false;
}
else
{
return false;
- }
- }
-
- //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
- private void ReportPrintEnd()
- {
- try
- {
- oCn.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- }
- catch (Exception e)
- {
- MessageBox.Show("鎵撳嵃澶辫触!鎵撳嵃缁撴潫 锛�" + e.Message);
}
}
@@ -2754,26 +3071,6 @@
for (int i = 0; i < grdList.Rows.Count; i++)
{
grdList.Rows[i].Cells[0].Value = "*";
- }
- //
- Report = new GridppReport();
- Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
- Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
- Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
- Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
- }
-
-
- private void Sub_SetReportView(string sOpenTmp)
- {
- //鍒ゆ柇琛屾暟
- for (int i = 0; i < grdList.Rows.Count; i++)
- {
- grdList.Rows[i].Cells[0].Value = "";
- }
- for (int i = 0; i < grdList.SelectedRows.Count; i++)
- {
- grdList.Rows[grdList.SelectedRows[i].Index].Cells[0].Value = "*";
}
//
Report = new GridppReport();
@@ -2805,11 +3102,7 @@
}
}
- private Int32 Fun_GetCol(string sCol)
- {
- return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
- }
-
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
private void ReportFetchRecordByDataTable()
{
try
@@ -2823,17 +3116,40 @@
}
}
- private void dy_Click(object sender, EventArgs e)
+ ////鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ //private void ReportPrintEnd()
+ //{
+ // try
+ // {
+ // oCn.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ // }
+ // catch (Exception e)
+ // {
+ // MessageBox.Show("鎵撳嵃澶辫触!鎵撳嵃缁撴潫 锛�" + e.Message);
+ // }
+ //}
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd()
+ {
+ if (UpdatePrintQtyCtl == "Y")
+ {
+ oBar.Set_UpdatePrintQty_SD(HInterID);
+ }
+ }
+
+ //璇曟墦鍗�
+ private void sdy_Click(object sender, EventArgs e)
{
//鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
{
- MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀鎵撳嵃锛�");
+ MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀棰勮锛�");
return;
}
//鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
- if (ReportPrintBegin())
+ if (ReportPrintBegin_SDY())
{
return;
}
@@ -2845,12 +3161,71 @@
oFrm.ShowDialog();
if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
{
- //寰幆閫変腑琛�
- Sub_SetReport(oFrm.sOpenTmp);
- Report.Print(true);
+ Sub_SetReportView(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
Thread.Sleep(1000);
}
}
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+ private bool ReportPrintBegin_SDY()
+ {
+ string sHRemark = "";
+ sBarCodeItemID = "";
+ for (int i = 0; i < grdList.SelectedRows.Count; i++)
+ {
+ sBarCodeItemID = sBarCodeItemID + "," + DBUtility.ClsPub.isLong(grdList.Rows[grdList.SelectedRows[i].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
+ }
+ sBarCodeItemID = sBarCodeItemID.Remove(0, 1);
+
+ if (PrintQtyCtl == "Y")
+ {
+ if (oBar.Set_CheckPrintQty(sBarCodeItemID, PrintQty, ref sHRemark))
+ {
+ MessageBox.Show(sHRemark);
+ return true;
+ }
+ return false;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ private void Sub_SetReportView(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ for (int i = 0; i < grdList.Rows.Count; i++)
+ {
+ grdList.Rows[i].Cells[0].Value = "";
+ }
+ for (int i = 0; i < grdList.SelectedRows.Count; i++)
+ {
+ grdList.Rows[grdList.SelectedRows[i].Index].Cells[0].Value = "*";
+ }
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd_SDY);
+ }
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd_SDY()
+ {
+ if (UpdatePrintQtyCtl == "Y")
+ {
+ oBar.Set_UpdatePrintQty(sBarCodeItemID);
+ }
+ }
+
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
+ }
+
#endregion
@@ -2894,7 +3269,7 @@
}
sWhere = " and HOrgID =" + sHOrgID.ToString();
BLL.Cls_S_KF_ICInventoryList_IF oadd = new BLL.Cls_S_KF_ICInventoryList_IF();
- if (oadd.Refresh("")) //閫夋嫨鍘熷崟
+ if (oadd.Refresh(sWhere)) //閫夋嫨鍘熷崟
//if (oadd.Refresh(" and HErpClsID in (1,2,3) ")) //閫夋嫨鍘熷崟
{
FillSelectData(oadd.oBillSelectColl);
@@ -2993,6 +3368,12 @@
grdMain.Rows[row + r].Cells[HMTONoCol].Value = grdMain.Rows[row].Cells[HMTONoCol].Value;
grdMain.Rows[row + r].Cells[HInnerBillNoCol].Value = grdMain.Rows[row].Cells[HInnerBillNoCol].Value;
grdMain.Rows[row + r].Cells[HMakerCol].Value = grdMain.Rows[row].Cells[HMakerCol].Value;
+ //缃戞牸鎵撳嬀
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = grdMain.Rows[row].Cells[HGiveAwayFlagCol].Value;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell;
}
DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
@@ -3181,31 +3562,152 @@
}
}
- private void sdy_Click(object sender, EventArgs e)
+
+ //鐢熸垚澶栫鐮�
+ private void wxm_Click(object sender, EventArgs e)
{
- //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
- if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
+ try
{
- MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀棰勮锛�");
- return;
- }
+ Int64 iInterID = 0;
+ Int64 dPackQty = 0; //澶栫鏁伴噺
+ Int64 dPackLeftQty = 0; //澶栫鍓╀綑鏁伴噺
+ Int64 dLabelQty = 0; //灏忕鏁伴噺
+ Int64 dQty = 0; //鎬绘暟閲�
+ Int64 dEntryID = 0; //琛屽彿
+ string sPackBarCode = ""; //澶栫鐮�
+ string sBarCode = ""; //鍞竴鐮�
+ Int64 LSH = 0;
+ DataSet Ds;
+ string sYear = DateTime.Today.Year.ToString().Substring(2, 2);
+ string sPeriod = "0" + DateTime.Today.Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ string sDay = "0" + DateTime.Today.Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ //
+ string sPackStr = "ZXM" + sYear + sPeriod + sDay; //澶栫鐮� 鍓嶇紑
- //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
- if (ReportPrintBegin())
- {
- return;
+ //蹇呴』鏉＄爜鐢熸垚鎸夐挳鏄伆搴︽墠鍙互鐢熸垚绠辨潯鐮�
+ if (bc.Enabled != false)
+ {
+ MessageBox.Show("璇峰厛鐢熸垚鏉″舰鐮侊紝鍐嶇敓鎴愮鏉＄爜");
+ return;
+ }
+ //-------------------鏍规嵁HINTERID鐢熸垚绠辨潯鐮�
+ //鐢熸垚鍓嶅垽鏂紝寰幆鐗╂枡缃戞牸锛屽垽鏂� 鏄惁璁剧疆浜嗗悎鐞嗙殑 澶栫鏁伴噺銆� 澶栫鏁伴噺 蹇呴』鏄� 鏈�灏忓寘瑁呮暟鐨� 鍊嶆暟 骞跺繀椤诲ぇ浜�0鍜屽ぇ浜庣瓑浜庢渶灏忓寘瑁呮暟閲忋��
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)
+ {
+ if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value) <= 0)
+ {
+ MessageBox.Show("璇峰綍鍏ュ悎鐞嗙殑澶栫鏁伴噺锛岀" + Convert.ToString(i + 1) + "琛�");
+ return;
+ }
+ if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value)
+ % DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMinQtyCol].Value) != 0
+ || DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value)
+ < DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMinQtyCol].Value))
+ {
+ MessageBox.Show("澶栫鏁伴噺蹇呴』鏄渶灏忓寘瑁呮暟鐨勫�嶆暟锛屼笖澶т簬绛変簬鏈�灏忓寘瑁呮暟锛岀" + Convert.ToString(i + 1) + "琛�");
+ return;
+ }
+ }
+ }
+ //oCn.BeginTran();
+ //浠�0琛岃繘琛屽惊鐜� 鐗╂枡缃戞牸锛岃幏鍙栧绠辨暟閲�
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)
+ {
+ //鑾峰彇鎬绘暟閲忋�佸绠辨暟閲�
+ dPackQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value);
+ dQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HQtyCol].Value);
+ dEntryID = i + 1;
+ dPackLeftQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value);
+ //鐢熸垚涓�涓绠辩爜
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1;
+ sPackBarCode = sPackStr + LSH.ToString();
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+ //瀛愬惊鐜� 鏉＄爜缃戞牸
+ for (int j = 0; j < grdSub.Rows.Count; j++)
+ {
+ if (dEntryID == DBUtility.ClsPub.isLong(grdSub.Rows[j].Cells[HEntryID2Col].Value))
+ {
+ if (dQty <= 0)
+ {
+ continue;
+ }
+ if (dPackLeftQty > 0) //褰撳墿浣欏绠辨暟閲忓皬浜庣瓑浜�0鏃讹紝閲嶆柊鐢熸垚澶栫鐮�
+ {
+ }
+ else
+ {
+ //鐢熸垚涓�涓绠辩爜
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1;
+ sPackBarCode = sPackStr + LSH.ToString();
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+ dPackLeftQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value);
+ }
+ sBarCode = DBUtility.ClsPub.isStrNull(grdSub.Rows[j].Cells[HTMCol].Value); // 鏉＄爜
+ dLabelQty = DBUtility.ClsPub.isLong(grdSub.Rows[j].Cells[HQty2Col].Value); // 灏忕鏁伴噺
+ oCn.RunProc("update Gy_BarCodebill set HInnerBillNo= '" + sPackBarCode + "' Where HbarCode='" + sBarCode + "'");
+ dPackLeftQty = dPackLeftQty - dLabelQty;
+ dQty = dQty - dLabelQty;
+ if (dPackLeftQty <= 0)//褰撶鍓╀綑鏁伴噺灏忎簬绛変簬0鏃� 鎵ц 缁勬墭鍗�
+ {
+ //鑾峰彇缁勬墭鍗曞唴鐮�
+ iInterID = DBUtility.ClsPub.CreateBillID("3783", ref DBUtility.ClsPub.sExeReturnInfo); ;//寰楀埌鏂板崟鍙�;
+ //鏍规嵁澶栫鐮� 鍐欏叆 缁勬墭鍗曚富琛紝缁勬墭鍗曞瓙琛紝SUM锛屽绠辩爜妗ｆ锛孲UM妗ｆ
+ oCn.RunProc("exec h_p_WMS_PackUnionBill_AddNew '" + sPackBarCode + "'," + iInterID.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 涓昏〃锛屽瓙琛� 锛岀鏉＄爜妗ｆ
+ oCn.RunProc("exec h_p_WMS_PackUnionBill_SumSubBill " + iInterID.ToString() + ",'" + sPackBarCode + "','3783','" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 SUM琛紝SUM鏉＄爜妗ｆ
+ }
+ }
+ else
+ {
+ continue;
+ }
+ }
+ }
+ }
+ wxm.Enabled = false;
+ //oCn.Commit();
+ MessageBox.Show("鐢熸垚绠辩爜瀹屾瘯锛�");
+ //鍒锋柊鏁版嵁
+ Display();
}
-
- //閫夋嫨鎵撳嵃妯℃澘
- BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
- oFrm.sBillName = ModName;
- oFrm.sBillModel = ModCaption;
- oFrm.ShowDialog();
- if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ catch(Exception e1)
{
- Sub_SetReportView(oFrm.sOpenTmp);
- Report.PrintPreview(false);
- Thread.Sleep(1000);
+ //oCn.RollBack();
+ MessageBox.Show("鐢熸垚绠辩爜澶辫触锛�" + e1.Message );
+ }
+ }
+
+ private void cmbSourceBillType_TextChanged(object sender, EventArgs e)
+ {
+ if (cmbSourceBillType.Text == "宸ュ簭娴佽浆鍗�")
+ {
+ cmbHBarCodeType.Items.Clear();
+ cmbHBarCodeType.Items.Add("搴忓垪鐮�");
+ this.cmbHBarCodeType.SelectedIndex = 0;
+ }
+ else
+ {
+ if (CampanyName == "涓帶")
+ {
+ cmbHBarCodeType.Items.Clear();
+ cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
+ this.cmbHBarCodeType.SelectedIndex = 0;
+ }
+ else
+ {
+ cmbHBarCodeType.Items.Clear();
+ cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
+ cmbHBarCodeType.Items.Add("鍝佺鏉＄爜");
+ cmbHBarCodeType.Items.Add("鎵规鏉＄爜");
+ this.cmbHBarCodeType.SelectedIndex = 0;
+ }
}
}
}
--
Gitblit v1.9.1