From 00eb415bd3e41fdbe0ea2f1297fd57010eaaa6df Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 30 十二月 2021 20:52:40 +0800
Subject: [PATCH] 盘点记录
---
WarM/条码打印/Sc_ICMOToBarCode.cs | 1
WebAPI/Controllers/Kf_ICStockBillMainController.cs | 87 ++
WebAPI/WebAPI.csproj.user | 2
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 21
WebAPI/Controllers/ProductInController.cs | 2
WarM/条码打印/Gy_BarCodeBill.cs | 764 ++++++++++++++++++--
WorkM/报表分析/DefectiveDetailedYieldReport.designer.cs | 166 ++--
WorkM/报表分析/DefectiveDetailedYieldReport.resx | 12
WorkM/报表分析/DefectiveDetailedYieldReport.cs | 2
WebAPI/DLL/ClsSc_PackUnionBill.cs | 1
WebAPI/Controllers/Kf_EntrustInBillController.cs | 1
WebAPI/Controllers/博日自动扫码线/ScanlineAPIController.cs | 33
WarM/条码打印/Gy_BarCodeBill.designer.cs | 304 +++++---
WarM/条码打印/Gy_BarCodeBill.resx | 41
WebAPI/WebAPI.csproj | 3
WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs | 68 +
WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs | 86 ++
WebAPI/DLL/ClsKf_SellOutBackBill.cs | 476 +++++++++++++
18 files changed, 1,735 insertions(+), 335 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 7987c2b..64a818b 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"
@@ -27,8 +27,8 @@
public const Int16 HMaterIDCol = 6;
public const Int16 HMaterNumberCol = 7;
public const Int16 HMaterNameCol = 8;
- public const Int16 HPinfanCol = 9;
- public const Int16 HMaterModelCol = 10;
+ public const Int16 HPinfanCol = 9;//
+ public const Int16 HMaterModelCol = 10;//
public const Int16 HModelCol = 11;
public const Int16 HAuxPropIDCol = 12;
public const Int16 HAuxPropNumberCol = 13;
@@ -39,45 +39,46 @@
public const Int16 HBarCodeTypeCol = 18;
public const Int16 HBatchManagerCol = 19;
public const Int16 HBatchNoCol = 20;
- public const Int16 HQtyCol = 21;
- public const Int16 HMinQtyCol = 22;
- public const Int16 HBQtyCol = 23;
- public const Int16 HDeptIDCol = 24;
- public const Int16 HDeptNumberCol = 25;
- public const Int16 HDeptNameCol = 26;
- public const Int16 HSourceIDCol = 27;
- public const Int16 HSourceNumberCol = 28;
- public const Int16 HSourceNameCol = 29;
- public const Int16 HDateCol = 30;
- public const Int16 HEndDateCol = 31;
- public const Int16 HSupIDCol = 32;
- public const Int16 HSupNumberCol = 33;
- public const Int16 HSupNameCol = 34;
- public const Int16 HCusIDCol = 35;
- public const Int16 HCusNumberCol = 36;
- public const Int16 HCusNameCol = 37;
- public const Int16 HCusTypeCol = 38;
- public const Int16 HSourceInterIDCol = 39;
- public const Int16 HSourceEntryIDCol = 40;
- public const Int16 HSourceBillNoCol = 41;
- public const Int16 HSourceBillTypeCol = 42;
- public const Int16 HInstructIDCol = 43;
- public const Int16 HInstructNoCol = 44;
- public const Int16 HSeOrderBillIDCol = 45;
- public const Int16 HSeOrderBillNoCol = 46;
- public const Int16 HWhIDCol = 47;
- public const Int16 HWhNumberCol = 48;
- public const Int16 HWhNameCol = 49;
- public const Int16 HSPIDCol = 50;
- public const Int16 HSPNumberCol = 51;
- public const Int16 HSPNameCol = 52;
- public const Int16 HinitQtyCol = 53;
- public const Int16 HRemarkCol = 54;
- public const Int16 HPinfanBarCodeCol = 55;
- public const Int16 HMTONoCol = 56;
- public const Int16 HShowDateCol = 57;
- public const Int16 HInnerBillNoCol = 58;
- public const Int16 HMakerCol = 59;
+ public const Int16 HGiveAwayFlagCol = 21;
+ 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 Int16 HSelectCol = 0;
public Int16 HSno2Col = 1;
@@ -93,49 +94,50 @@
public Int16 HAuxPropNumber2Col = 11;
public Int16 HAuxPropName2Col = 12;
public Int16 HBatchNo2Col = 13;
- public Int16 HUnitID2Col = 14;
- public Int16 HUnitNumber2Col = 15;
- public Int16 HUnitName2Col = 16;
- public Int16 HQty2Col = 17;
- public Int16 HWeiCol = 18;
- public Int16 HPrintCol = 19;
- public Int16 HDeptID2Col = 20;
- public Int16 HDeptNumber2Col = 21;
- public Int16 HDeptName2Col = 22;
- public Int16 HSourceID2Col = 23;
- public Int16 HSourceNumber2Col = 24;
- public Int16 HSourceName2Col = 25;
- public Int16 HDate2Col = 26;
- public Int16 HEndDate2Col = 27;
- public Int16 HBarcodeNoCol = 28;
- public Int16 HBarcodeQtysCol = 29;
- public Int16 HSupID2Col = 30;
- public Int16 HSupNumber2Col = 31;
- public Int16 HSupName2Col = 32;
- public Int16 HCusID2Col = 33;
- public Int16 HCusNumber2Col = 34;
- public Int16 HCusName2Col = 35;
- public Int16 HCusType2Col = 36;
- public Int16 HSourceInterID2Col = 37;
- public Int16 HSourceEntryID2Col = 38;
- public Int16 HSourceBillNo2Col = 39;
- public Int16 HSourceBillType2Col = 40;
- public Int16 HInstructID2Col = 41;
- public Int16 HInstructNo2Col = 42;
- public Int16 HSeOrderBillID2Col = 43;
- public Int16 HSeOrderBillNo2Col = 44;
- public Int16 HWhID2Col = 45;
- public Int16 HWhNumber2Col = 46;
- public Int16 HWhName2Col = 47;
- public Int16 HSPID2Col = 48;
- public Int16 HSPNumber2Col = 49;
- public Int16 HSPName2Col = 50;
- public Int16 HRemark2Col = 51;
- public Int16 HPinfanBarCode2Col = 52;
- public Int16 HMTONo2Col = 53;
- public Int16 HShowDate2Col = 54;
- public Int16 HInnerBillNo2Col = 55;
- public Int16 HMaker2Col = 56;
+ public Int16 HGiveAwayFlag2Col = 14;
+ public Int16 HUnitID2Col = 15;
+ public Int16 HUnitNumber2Col = 16;
+ public Int16 HUnitName2Col = 17;
+ public Int16 HQty2Col = 18;
+ public Int16 HWeiCol = 19;
+ public Int16 HPrintCol = 20;
+ public Int16 HDeptID2Col = 21;
+ public Int16 HDeptNumber2Col = 22;
+ public Int16 HDeptName2Col = 23;
+ public Int16 HSourceID2Col = 24;
+ public Int16 HSourceNumber2Col = 25;
+ public Int16 HSourceName2Col = 26;
+ public Int16 HDate2Col = 27;
+ public Int16 HEndDate2Col = 28;
+ public Int16 HBarcodeNoCol = 29;
+ public Int16 HBarcodeQtysCol = 30;
+ public Int16 HSupID2Col = 31;
+ public Int16 HSupNumber2Col = 32;
+ public Int16 HSupName2Col = 33;
+ public Int16 HCusID2Col = 34;
+ public Int16 HCusNumber2Col = 35;
+ public Int16 HCusName2Col = 36;
+ public Int16 HCusType2Col = 37;
+ public Int16 HSourceInterID2Col = 38;
+ public Int16 HSourceEntryID2Col = 39;
+ public Int16 HSourceBillNo2Col = 40;
+ public Int16 HSourceBillType2Col = 41;
+ public Int16 HInstructID2Col = 42;
+ 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 string ModName = "85";
public string ModCaption = "鏉＄爜鐢熸垚";
@@ -171,10 +173,31 @@
cmbHBarCodeType.Items.Clear();
cmbSourceBillType.Items.Clear();
- cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
- cmbHBarCodeType.Items.Add("鍝佺鏉＄爜");
- cmbHBarCodeType.Items.Add("鎵规鏉＄爜");
- //cmbHBarCodeType.Items.Add("鎵樼洏鏉＄爜");
+ //鏍规嵁绯荤粺鍙傛暟鑾峰彇瀵瑰簲鐨勬潯鐮佺被鍨嬶紙澶忓疂鐢靛櫒銆佸崥鏃� 浠ュ悗浣跨敤鏉＄爜瑙勫垯琛級
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+ string sCapName = oClsXt_SystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+ if(sCapName=="澶忓疂鐢靛櫒")
+ {
+ cmbHBarCodeType.Items.Add("鍐呴攢鏈烘潯鐮�");
+ cmbHBarCodeType.Items.Add("澶栭攢鏈烘潯鐮�");
+ cmbHBarCodeType.Items.Add("鍗婃垚鍝佹潯鐮�");
+ }
+ else if (sCapName == "鍗氭棩绉戞妧")
+ {
+ cmbHBarCodeType.Items.Add("浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�");
+ cmbHBarCodeType.Items.Add("浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�");
+ cmbHBarCodeType.Items.Add("浠櫒鎴愬搧鏉＄爜瑙勫垯");
+ cmbHBarCodeType.Items.Add("璇曞墏鎴愬搧鏉＄爜瑙勫垯");
+ }
+ else
+ {
+ //
+ cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
+ cmbHBarCodeType.Items.Add("鍝佺鏉＄爜");
+ cmbHBarCodeType.Items.Add("鎵规鏉＄爜");
+ //cmbHBarCodeType.Items.Add("鎵樼洏鏉＄爜");
+ }
+
//
cmbSourceBillType.Items.Add("鐢熶骇璁㈠崟");
cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
@@ -629,7 +652,14 @@
return false;
}
bc.Enabled = false;
- SaveBarCode();
+ if (cmbHBarCodeType.Text == "浠櫒鎴愬搧鏉＄爜瑙勫垯")
+ {
+ SaveBarCode_bori(); //鐗╂枡缂栫爜+搴忓垪鍙�+鐢熶骇鏃ユ湡
+ }
+ else
+ {
+ SaveBarCode();
+ }
return true;
}
@@ -640,7 +670,8 @@
int LSHlen = 6; //娴佹按鍙烽暱搴�
int SumLen = 10; //鎬婚暱搴�
string TM = ""; //鏉＄爜
- string HNumber = ""; //鐗╂枡浠ｇ爜
+ string HNumber = ""; //鐗╂枡鍐呯爜
+ string HMaterNumber = ""; //鐗╂枡浠ｇ爜
double HSumQty = 0; //浜у搧鏁伴噺
double HMinQty = 0; //鏈�灏忓寘瑁呮暟
int HBQty = 0; //绠辨暟
@@ -653,6 +684,10 @@
string sPeriod = ""; //鏈�
string sDay = ""; //鏃�
string HBatchNo = ""; //鎵规
+ string HYasuoji = ""; //鍘嬬缉鏈�
+ string HModelName = ""; //鏈哄瀷
+ string HICMOBillNo = ""; //婧愬崟鍙�
+ string HBarCodeBatchNo = ""; //鏉＄爜鎵规鍙�
int k = 0;
int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
@@ -664,8 +699,28 @@
if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
{
HNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+ HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumberCol].Value);
HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ //鏃ユ湡鑾峰彇鏂瑰紡
sDate = dtpHDate.Value.ToShortDateString();
+ //
+ if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�") //鍗曟嵁鏃ユ湡(鏀舵枡閫氱煡鍗�)
+ {
+ sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HDateCol].Value);
+ }
+ else if (cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")// 澶辨晥鏃ユ湡锛堢敓浜ц鍗曪級
+ {
+ sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEndDateCol].Value);
+ }
+ else if (CompanyName=="澶忓疂鐢靛櫒")// 鏃ユ湡锛氱敓浜ц鍗� 鏉＄爜鏃ユ湡
+ {
+ sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HDateCol].Value);
+ }
+ HYasuoji= DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HPinfanCol].Value); //鍘嬬缉鏈轰唬鐮侊紙澶忓疂鐢靛櫒锛�
+ HModelName= DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterModelCol].Value); //鏈哄瀷锛堝瀹濈數鍣級
+ HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceBillNoCol].Value); //鐢熶骇璁㈠崟鍙凤紙澶忓疂鐢靛櫒锛�
+ HBarCodeBatchNo= DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HPinfanBarCodeCol].Value); //鏉＄爜鎵规鍙凤紙澶忓疂鐢靛櫒锛�
+ //
sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
@@ -720,6 +775,60 @@
else if (cmbHBarCodeType.Text == "鎵规鏉＄爜")
{
TM = HOrgNumber + HNumber + HBatchNo;
+ }//鍗氭棩鐗规畩澶勭悊
+ else if(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]);
+ LSHlen = 4;
+ }
+ else if (cmbHBarCodeType.Text == "浠櫒鎴愬搧鏉＄爜瑙勫垯") //鍙﹀澶勭悊浜�
+ {
+ //鐗╂枡缂栫爜+搴忓垪鍙�+鐢熶骇鏃ユ湡
+ //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]);
+ }
+ else if (cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")
+ {
+ //鐗╂枡缂栫爜+鐢熶骇鎵瑰彿+澶辨晥鏃ユ湡锛圷YMMDD锛�+娴佹按鍙�6浣�-
+ sTMNumber = HMaterNumber + HBatchNo + 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]);
+ LSHlen = 6;
+ }
+ else if (cmbHBarCodeType.Text == "鍐呴攢鏈烘潯鐮�")
+ {
+ //鍒堕�犳湰閮�1浣嶏紙榛樿1锛�+鏈哄瀷浠ｇ爜5浣嶏紙锛�+骞�2浣�+鏈�1浣嶏紙A銆丅銆丆浠ｆ浛10鏈堜唤锛�
+ //+鏃�2浣�+鏉＄爜鎵规鐮�2浣�+鍘嬬缉鏈轰唬鐮�1浣�+00+娴佹按鍙�4浣�+鏍￠獙鐮侊紙榛樿0锛�
+ sTMNumber = "1" + HModelName + sYear + Sub_PeriodChange(sPeriod) + sDay + 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]);
+ LSHlen = 4;
+ }
+ else if (cmbHBarCodeType.Text == "澶栭攢鏈烘潯鐮�")
+ {
+ //鐗╂枡浠ｇ爜11浣�+骞�2浣�+鏈�1浣嶏紙A銆丅銆丆浠ｆ浛10鏈堜唤锛�+鏃�2浣�+鎵规2浣�+娴佹按鍙�4浣�
+ sTMNumber = HMaterNumber + sYear + Sub_PeriodChange(sPeriod) + sDay + 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]);
+ LSHlen = 4;
+ }
+ else if (cmbHBarCodeType.Text == "鍗婃垚鍝佹潯鐮�")
+ {
+ //鐢熶骇璁㈠崟鍙�+4浣嶆祦姘村彿
+ 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;
}
//else if (cmbHBarCodeType.Text == "鎵樼洏鏉＄爜")
//{
@@ -766,6 +875,362 @@
//鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
TM = sTMNumber + LSH2;
}
+ else if(cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉＄爜瑙勫垯"
+ || cmbHBarCodeType.Text == "鍗婃垚鍝佹潯鐮�" || cmbHBarCodeType.Text == "澶栭攢鏈烘潯鐮�")
+ {
+ TM = sTMNumber + LSH2;
+ }
+ else if (cmbHBarCodeType.Text == "鍐呴攢鏈烘潯鐮�")
+ {
+ TM = sTMNumber + LSH2 + "0";
+ }
+ //
+ if (i + 1 > grdSub.Rows.Count)
+ {
+ grdSub.RowCount = grdSub.RowCount + 1;
+ }
+ grdSub.Rows[i].Cells[HSno2Col].Value = ClsPub.isStrNull(i + 1);
+ if (TM.Trim() == "")
+ {
+ MessageBox.Show("鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�");
+ return;
+ }
+ grdSub.Rows[i].Cells[HTMCol].Value = TM;
+ 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;
+ grdSub.Rows[i].Cells[HMaterModel2Col].Value = grdMain.Rows[j].Cells[HMaterModelCol].Value;
+ grdSub.Rows[i].Cells[HPinfan2Col].Value = grdMain.Rows[j].Cells[HPinfanCol].Value;
+ grdSub.Rows[i].Cells[HPinfanBarCode2Col].Value = grdMain.Rows[j].Cells[HPinfanBarCodeCol].Value;
+
+ grdSub.Rows[i].Cells[HAuxPropID2Col].Value = grdMain.Rows[j].Cells[HAuxPropIDCol].Value;
+ grdSub.Rows[i].Cells[HAuxPropNumber2Col].Value = grdMain.Rows[j].Cells[HAuxPropNumberCol].Value;
+ grdSub.Rows[i].Cells[HAuxPropName2Col].Value = grdMain.Rows[j].Cells[HAuxPropNameCol].Value;
+
+ grdSub.Rows[i].Cells[HUnitID2Col].Value = grdMain.Rows[j].Cells[HUnitIDCol].Value;
+ grdSub.Rows[i].Cells[HUnitNumber2Col].Value = grdMain.Rows[j].Cells[HUnitNumberCol].Value;
+ grdSub.Rows[i].Cells[HUnitName2Col].Value = grdMain.Rows[j].Cells[HUnitNameCol].Value;
+
+ grdSub.Rows[i].Cells[HQty2Col].Value = HMinQty;
+ grdSub.Rows[i].Cells[HBatchNo2Col].Value = grdMain.Rows[j].Cells[HBatchNoCol].Value;
+ grdSub.Rows[i].Cells[HSourceInterID2Col].Value = grdMain.Rows[j].Cells[HMainIDCol].Value;
+ grdSub.Rows[i].Cells[HSourceEntryID2Col].Value = grdMain.Rows[j].Cells[HSubIDCol].Value;
+ grdSub.Rows[i].Cells[HSourceBillNo2Col].Value = grdMain.Rows[j].Cells[HBillNoCol].Value;
+ grdSub.Rows[i].Cells[HSourceBillType2Col].Value = grdMain.Rows[j].Cells[HBillTypeCol].Value;
+ grdSub.Rows[i].Cells[HPrintCol].Value = "0";
+ grdSub.Rows[i].Cells[HWeiCol].Value = WeiShu;
+ grdSub.Rows[i].Cells[HBarcodeNoCol].Value = n + 1;
+ grdSub.Rows[i].Cells[HBarcodeQtysCol].Value = grdMain.Rows[j].Cells[HBQtyCol].Value;
+ grdSub.Rows[i].Cells[HSupID2Col].Value = grdMain.Rows[j].Cells[HSupIDCol].Value;
+ grdSub.Rows[i].Cells[HSupNumber2Col].Value = grdMain.Rows[j].Cells[HSupNumberCol].Value;
+ grdSub.Rows[i].Cells[HSupName2Col].Value = grdMain.Rows[j].Cells[HSupNameCol].Value;
+ grdSub.Rows[i].Cells[HDeptID2Col].Value = grdMain.Rows[j].Cells[HDeptIDCol].Value;
+ grdSub.Rows[i].Cells[HDeptNumber2Col].Value = grdMain.Rows[j].Cells[HDeptNumberCol].Value;
+ grdSub.Rows[i].Cells[HDeptName2Col].Value = grdMain.Rows[j].Cells[HDeptNameCol].Value;
+ grdSub.Rows[i].Cells[HRemark2Col].Value = grdMain.Rows[j].Cells[HRemarkCol].Value;
+ grdSub.Rows[i].Cells[HDate2Col].Value = grdMain.Rows[j].Cells[HDateCol].Value;
+ grdSub.Rows[i].Cells[HShowDate2Col].Value = grdMain.Rows[j].Cells[HShowDateCol].Value;
+ grdSub.Rows[i].Cells[HWhID2Col].Value = grdMain.Rows[j].Cells[HWhIDCol].Value;
+ grdSub.Rows[i].Cells[HWhNumber2Col].Value = grdMain.Rows[j].Cells[HWhNumberCol].Value;
+ grdSub.Rows[i].Cells[HWhName2Col].Value = grdMain.Rows[j].Cells[HWhNameCol].Value;
+ grdSub.Rows[i].Cells[HSPID2Col].Value = grdMain.Rows[j].Cells[HSPIDCol].Value;
+ grdSub.Rows[i].Cells[HSPNumber2Col].Value = grdMain.Rows[j].Cells[HSPNumberCol].Value;
+ grdSub.Rows[i].Cells[HSPName2Col].Value = grdMain.Rows[j].Cells[HSPNameCol].Value;
+ grdSub.Rows[i].Cells[HMTONo2Col].Value = grdMain.Rows[j].Cells[HMTONoCol].Value;
+ grdSub.Rows[i].Cells[HCusID2Col].Value = grdMain.Rows[j].Cells[HCusIDCol].Value;
+ grdSub.Rows[i].Cells[HCusNumber2Col].Value = grdMain.Rows[j].Cells[HCusNumberCol].Value;
+ grdSub.Rows[i].Cells[HCusName2Col].Value = grdMain.Rows[j].Cells[HCusNameCol].Value;
+ grdSub.Rows[i].Cells[HCusType2Col].Value = grdMain.Rows[j].Cells[HCusTypeCol].Value;
+ grdSub.Rows[i].Cells[HSourceID2Col].Value = grdMain.Rows[j].Cells[HSourceIDCol].Value;
+ grdSub.Rows[i].Cells[HSourceNumber2Col].Value = grdMain.Rows[j].Cells[HSourceNumberCol].Value;
+ 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[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;
+ //缃戞牸鎵撳嬀
+ 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;
+ k = k + 1;
+ n = n + 1;
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ }
+ }
+ }
+ string HWei = ""; //灏炬暟
+ string HBarCode = "";
+ string HBarCodeType = "";
+ Int64 HMaterID = 0;
+ Int64 HAuxPropID = 0;
+ Int64 HUnitID = 0;
+ double HQty2 = 0;
+ string HBatchNo2 = "";
+ Int64 HSupID = 0;
+ Int64 HGroupID = 0;
+ int HPrintQty = 0;
+ Int64 HSourceInterID = 0;
+ Int64 HSourceEntryID = 0;
+ string HSourceBillNo = "";
+ string HSourceBillType = "";
+ Int64 HBarcodeNo = 0; //鎵樺彿
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HDeptID = 0;
+ Int64 HWhID = 0;
+ Int64 HSPID = 0;
+ string HRemark = "";
+ string HMaterName = "";
+ string HMaterModel = "";
+ string HPinfan = "";
+ string HMTONo = "";
+ Int64 HCusID = 0;
+ string HCusType = "";
+ DateTime HEndDate;
+ string HWorkLineName = "";
+ string HSeOrderBillNo = "";
+ string HInnerBillNo = "";
+ bool HGiveAwayFlag = false;
+ try
+ {
+ oCn.BeginTran();
+ for (int i = 0; i < grdSub.Rows.Count; i++)
+ {
+ if (ClsPub.isLong(grdSub.Rows[i].Cells[HMaterID2Col].Value) != 0)
+ {
+ HWei = ClsPub.isStrNull(grdSub.Rows[i].Cells[HWeiCol].Value);
+ HBarCode = ClsPub.isStrNull(grdSub.Rows[i].Cells[HTMCol].Value);
+ //
+ HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
+ if (CampanyName == "鍗氭棩绉戞妧" || CampanyName == "澶忓疂鐢靛櫒")
+ {
+ HBarCodeType = "鍞竴鏉＄爜";
+ }
+ //
+ HMaterID = ClsPub.isLong(grdSub.Rows[i].Cells[HMaterID2Col].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);
+ HBatchNo2 = ClsPub.isStrNull(grdSub.Rows[i].Cells[HBatchNo2Col].Value);
+ HSourceInterID = ClsPub.isLong(grdSub.Rows[i].Cells[HSourceInterID2Col].Value);
+ HSourceEntryID = ClsPub.isLong(grdSub.Rows[i].Cells[HSourceEntryID2Col].Value);
+ HSourceBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceBillNo2Col].Value);
+ HSourceBillType = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceBillType2Col].Value);
+ HBarcodeQtys = ClsPub.isLong(grdSub.Rows[i].Cells[HBarcodeQtysCol].Value);
+ HBarcodeNo = ClsPub.isLong(grdSub.Rows[i].Cells[HBarcodeNoCol].Value);
+ HSupID = ClsPub.isLong(grdSub.Rows[i].Cells[HSupID2Col].Value);
+ HDeptID = ClsPub.isLong(grdSub.Rows[i].Cells[HDeptID2Col].Value);
+ HWhID = ClsPub.isLong(grdSub.Rows[i].Cells[HWhID2Col].Value);
+ HSPID = ClsPub.isLong(grdSub.Rows[i].Cells[HSPID2Col].Value);
+ HRemark = ClsPub.isStrNull(grdSub.Rows[i].Cells[HRemark2Col].Value);
+ HMaterName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterName2Col].Value);
+ HMaterModel = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterModel2Col].Value);
+ HPinfan = ClsPub.isStrNull(grdSub.Rows[i].Cells[HPinfan2Col].Value);
+ HMTONo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMTONo2Col].Value);
+ HCusID = ClsPub.isLong(grdSub.Rows[i].Cells[HCusID2Col].Value);
+ HCusType = ClsPub.isStrNull(grdSub.Rows[i].Cells[HCusType2Col].Value);
+ 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);
+ HInnerBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HInnerBillNo2Col].Value);
+ HGiveAwayFlag = ClsPub.isBool(grdSub.Rows[i].Cells[HGiveAwayFlag2Col].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 " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ") values ("
+ + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ + ", " + 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)
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+
+
+ //HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value);
+ //if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
+ //{
+ // if (CampanyName == "鍗撳姏") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
+ // {
+ // //鏉＄爜鍓嶇紑 = 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ // sTMNumber = HNumber + sYear + sPeriod + sDay;
+ // }
+ // else if (CampanyName == "椋為緳")
+ // {
+ // string HWorksNumber = "";
+ // HWorksNumber = cmbHWorksNumber.Text;
+ // if (HWorksNumber == "")
+ // {
+ // MessageBox.Show("宸ュ巶浠ｇ爜涓嶈兘涓虹┖锛�");
+ // return;
+ // }
+ // //鏉＄爜鍓嶇紑 = 宸ュ巶浠ｇ爜 + 鐗╂枡鍐呯爜 + 鏃ユ湡
+ // sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay;
+ // }
+ // else //閫氱敤鏂规硶
+ // {
+ // //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ // sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+ // }
+ //}
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ }
+ }
+ //澧炲姞 鏉＄爜瓒呰繃鏈敓鎴愬姛鑳芥帶鍒�
+
+ //
+ oCn.Commit();
+ MessageBox.Show("鏉＄爜鐢熸垚瀹屾瘯锛�");
+ //grdSub.RowCount = 0;
+ tabControl1.SelectedIndex = 1;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ MessageBox.Show("鏉＄爜鐢熸垚澶辫触锛�" + e.Message);
+ grdSub.RowCount = 0;
+ }
+ }
+
+ //鏈堜唤杞寲
+ private string Sub_PeriodChange(string sPeriod)
+ {
+ if(sPeriod=="10")
+ {
+ return "A";
+ }
+ else if (sPeriod == "11")
+ {
+ return "B";
+ }
+ else if (sPeriod == "12")
+ {
+ return "C";
+ }
+ else
+ {
+ return sPeriod.Substring(2, 1);
+ }
+ }
+
+
+ //鐢熸垚鏉＄爜 鍗氭棩
+ //鐗╂枡缂栫爜+搴忓垪鍙�+鐢熶骇鏃ユ湡
+ private void SaveBarCode_bori()
+ {
+ grdSub.Rows.Clear();
+ int LSHlen = 6; //娴佹按鍙烽暱搴�
+ int SumLen = 10; //鎬婚暱搴�
+ string TM = ""; //鏉＄爜
+ string HNumber = ""; //鐗╂枡鍐呯爜
+ string HMaterNumber = ""; //鐗╂枡浠ｇ爜
+ double HSumQty = 0; //浜у搧鏁伴噺
+ double HMinQty = 0; //鏈�灏忓寘瑁呮暟
+ int HBQty = 0; //绠辨暟
+ double HQty = 0; //鏁伴噺
+ string WeiShu = ""; //灏炬暟
+ //int LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ string sDate = ""; //鏃ユ湡
+ string sYear = ""; //骞�
+ string sPeriod = ""; //鏈�
+ string sDay = ""; //鏃�
+ string HBatchNo = ""; //鎵规
+ int k = 0;
+ int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
+ DataSet Ds;
+ //Ds = oCn.RunProcReturn("exec GetLSH '" + ClsPub.GetServerDate(0) + "'", "GetLSH");
+ //LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ HNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+ HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumberCol].Value);
+ HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ sDate = dtpHDate.Value.ToShortDateString();
+ //
+ if (cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")// 澶辨晥鏃ユ湡锛堢敓浜ц鍗曪級
+ {
+ sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEndDateCol].Value);
+ }
+ //
+ sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ //==================================
+ //if (cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")
+ //{
+ // //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ //sTMNumber = HMaterNumber + 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]);
+ //}
+ //else
+ //{
+ // MessageBox.Show("閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�");
+ // return;
+ //}
+
+ HBQty = HBQty + ClsPub.isInt(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;
+ //浠庨噾铦跺簭鍒楀彿琛ㄨ幏鍙栧簭鍒楀彿
+ DataSet DSet = oCn.RunProcReturn("exec h_p_CLD_GetBarCodeSno "+ ClsPub.isStrNull(grdMain.Rows[j].Cells[HMainIDCol].Value) + "," + ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value) + " ", "h_p_CLD_GetBarCodeSno", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,閲戣澏浜戝簭鍒楀彿涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ continue;
+ }
+ //
+
+ for (int i = k; i < DSet.Tables[0].Rows.Count; i++)
+ //for (int i = k; i < HBQty; i++)
+ {
+ if (HSumQty - HMinQty > 0)
+ {
+ WeiShu = "";
+ HSumQty = HSumQty - HMinQty;
+ }
+ else
+ {
+ if (HSumQty == HMinQty)
+ {
+ WeiShu = "";
+ }
+ else
+ {
+ WeiShu = "灏炬暟";
+ }
+ HMinQty = HSumQty;
+ }
+ //
+ //LSH = LSH + 1;
+ LSH2 =DBUtility.ClsPub.isStrNull(DSet.Tables[0].Rows[n]["SHNO"]);
+ //while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ //{
+ // LSH2 = "0" + LSH2;
+ //}
+ //if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
+ //{
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = HMaterNumber + LSH2 + sYear + sPeriod + sDay ;
+ //}
if (i + 1 > grdSub.Rows.Count)
{
@@ -830,9 +1295,16 @@
grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value = grdMain.Rows[j].Cells[HSeOrderBillNoCol].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;
+ //缃戞牸鎵撳嬀
+ 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;
k = k + 1;
n = n + 1;
- oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
}
}
}
@@ -867,6 +1339,7 @@
string HWorkLineName = "";
string HSeOrderBillNo = "";
string HInnerBillNo = "";
+ bool HGiveAwayFlag = false;
try
{
oCn.BeginTran();
@@ -876,7 +1349,13 @@
{
HWei = ClsPub.isStrNull(grdSub.Rows[i].Cells[HWeiCol].Value);
HBarCode = ClsPub.isStrNull(grdSub.Rows[i].Cells[HTMCol].Value);
+ //
HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
+ if (CampanyName == "鍗氭棩绉戞妧" || CampanyName == "澶忓疂鐢靛櫒")
+ {
+ HBarCodeType = "鍞竴鏉＄爜";
+ }
+ //
HMaterID = ClsPub.isLong(grdSub.Rows[i].Cells[HMaterID2Col].Value);
HAuxPropID = ClsPub.isLong(grdSub.Rows[i].Cells[HAuxPropID2Col].Value);
HUnitID = ClsPub.isLong(grdSub.Rows[i].Cells[HUnitID2Col].Value);
@@ -903,12 +1382,14 @@
HWorkLineName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceName2Col].Value);
HSeOrderBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value);
HInnerBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HInnerBillNo2Col].Value);
+ HGiveAwayFlag = ClsPub.isBool(grdSub.Rows[i].Cells[HGiveAwayFlag2Col].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 " +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
@@ -917,6 +1398,7 @@
+ ", " + 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)
+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
@@ -975,7 +1457,7 @@
//
grdMain.RowCount = 0;
grdSub.RowCount = 0;
- grdMain.ColumnCount = 60; //鎬诲垪鏁�
+ grdMain.ColumnCount = 61; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -998,6 +1480,7 @@
grdMain.Columns[HBarCodeTypeCol].HeaderText = "鏉＄爜绫诲瀷";
grdMain.Columns[HBatchManagerCol].HeaderText = "鏄惁鍚敤鎵规";
grdMain.Columns[HBatchNoCol].HeaderText = "鎵瑰彿";
+ grdMain.Columns[HGiveAwayFlagCol].HeaderText = "鏄惁璧犲搧";
grdMain.Columns[HQtyCol].HeaderText = "鏁伴噺";
grdMain.Columns[HMinQtyCol].HeaderText = "鏈�灏忓寘瑁呮暟";
grdMain.Columns[HBQtyCol].HeaderText = "绠辨暟";
@@ -1089,12 +1572,23 @@
"," + HRemarkCol.ToString();
//璁剧疆鍚堣鍒�
string sTotalCol = HQtyCol.ToString();
+
+ //璁剧疆鐗规畩鍒�
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ //缃戞牸鎵撳嬀
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = 0;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell;
+ }
//
DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol,oSumGrid);
//----------------------------
- grdSub.ColumnCount = 57; //鎬诲垪鏁�
+ grdSub.ColumnCount = 58; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdSub, this.Name);
grdSub.Columns[HSelectCol].HeaderText = "閫夋嫨";
grdSub.Columns[HTMCol].HeaderText = "鏉＄爜缂栧彿";
@@ -1111,6 +1605,7 @@
grdSub.Columns[HPinfan2Col].HeaderText = "鍝佺暘";
grdSub.Columns[HPinfanBarCode2Col].HeaderText = "HPinfanBarCode";
grdSub.Columns[HBatchNo2Col].HeaderText = "鎵瑰彿";
+ grdSub.Columns[HGiveAwayFlag2Col].HeaderText = "鏄惁璧犲搧";
grdSub.Columns[HUnitID2Col].HeaderText = "璁￠噺鍗曚綅ID";
grdSub.Columns[HUnitNumber2Col].HeaderText = "璁￠噺鍗曚綅浠ｇ爜";
grdSub.Columns[HUnitName2Col].HeaderText = "璁￠噺鍗曚綅";
@@ -1194,6 +1689,17 @@
grdSub.Columns[HSourceID2Col].Visible = false;
grdSub.Columns[HSourceNumber2Col].Visible = false;
grdSub.Columns[HSourceName2Col].Visible = false;
+
+ //璁剧疆鐗规畩鍒�
+ 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;
+ }
DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
DBUtility.Xt_BaseBillFun.GetGrid(grdSub, this.Name + "grdSub");
@@ -1805,7 +2311,7 @@
grdMain.Rows[i].Cells[HSubIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
- grdMain.Rows[i].Cells[HDateCol].Value = oTable.Rows[0]["鏃ユ湡"].ToString();
+ grdMain.Rows[i].Cells[HDateCol].Value = oTable.Rows[0]["鏃ユ湡"].ToString(); //鍗氭棩 鏀舵枡鍗曟嵁鏃ユ湡
grdMain.Rows[i].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["hsupid"].ToString();
grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString();
@@ -1831,10 +2337,14 @@
//grdMain.Rows[i].Cells[HSourceIDCol].Value = oTable.Rows[0]["HSourceID"].ToString();
//grdMain.Rows[i].Cells[HSourceNumberCol].Value = oTable.Rows[0]["鐢熶骇绾夸唬鐮�"].ToString();
grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["鐢熶骇绾�"].ToString();
- grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["璁″垝瀹屽伐鏃ユ湡"].ToString();
- if (cmbHBarCodeType.Text == "鎵规鏉＄爜" && CampanyName == "鍗氭棩绉戞妧")
+ grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["璁″垝瀹屽伐鏃ユ湡"].ToString();//鍗氭棩 鐢熶骇璁㈠崟 澶辨晥鏃ユ湡
+ if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�" && CampanyName == "鍗氭棩绉戞妧")
{
grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ }
+ else if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" && CampanyName == "鍗氭棩绉戞妧")
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = "1";
}
else
{
@@ -1873,7 +2383,7 @@
grdMain.Rows[i].Cells[HSubIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
- grdMain.Rows[i].Cells[HDateCol].Value = oTable.Rows[0]["鏃ユ湡"].ToString();
+ grdMain.Rows[i].Cells[HDateCol].Value = oTable.Rows[0]["鏃ユ湡"].ToString(); //鍗氭棩 鍗曟嵁鏃ユ湡
grdMain.Rows[i].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
grdMain.Rows[i].Cells[HDeptIDCol].Value = oTable.Rows[0]["HDeptID"].ToString();
grdMain.Rows[i].Cells[HDeptNumberCol].Value = oTable.Rows[0]["閮ㄩ棬浠ｇ爜"].ToString();
@@ -1905,6 +2415,18 @@
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;
+ }
+ }
+
}
if (cmbSourceBillType.Text.Trim() == "閫�璐ч�氱煡鍗�")
{
@@ -2208,6 +2730,26 @@
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();
@@ -2615,10 +3157,32 @@
}
}
+ private void sdy_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_SetReportView(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
+ Thread.Sleep(1000);
+ }
+ }
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index 167abf2..3a12b1c 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -106,6 +106,7 @@
this.grdSub = new System.Windows.Forms.DataGridView();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.grdList = new System.Windows.Forms.DataGridView();
+ this.sdy = new System.Windows.Forms.ToolStripButton();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -130,6 +131,7 @@
this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.dy,
+ this.sdy,
this.yl,
this.toolStripSeparator2,
this.AddRow,
@@ -156,7 +158,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1017, 50);
+ this.Tool.Size = new System.Drawing.Size(1356, 62);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -192,7 +194,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
//
// AddRow
//
@@ -240,7 +242,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
//
// bc
//
@@ -273,7 +275,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
//
// kc
//
@@ -292,13 +294,13 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator12.Name = "toolStripSeparator12";
- this.toolStripSeparator12.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -308,7 +310,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -318,7 +320,7 @@
//
this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
//
// bclk
//
@@ -328,7 +330,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Size = new System.Drawing.Size(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -338,7 +340,7 @@
//
this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
//
// tb
//
@@ -358,7 +360,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
//
// gl
//
@@ -377,7 +379,7 @@
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// BatchNo
//
@@ -396,7 +398,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
// tc
//
@@ -416,9 +418,10 @@
//
this.lblCaption.AutoSize = true;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(501, 12);
+ this.lblCaption.Location = new System.Drawing.Point(668, 15);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(89, 19);
+ this.lblCaption.Size = new System.Drawing.Size(110, 24);
this.lblCaption.TabIndex = 18;
this.lblCaption.Text = "鍗曟嵁缂栬緫";
//
@@ -429,16 +432,18 @@
this.P1.Controls.Add(this.lblCaption);
this.P1.Controls.Add(this.gbUp);
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
- this.P1.Location = new System.Drawing.Point(41, 50);
+ this.P1.Location = new System.Drawing.Point(55, 62);
+ this.P1.Margin = new System.Windows.Forms.Padding(4);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(937, 123);
+ this.P1.Size = new System.Drawing.Size(1249, 171);
this.P1.TabIndex = 31;
//
// pic1
//
- this.pic1.Location = new System.Drawing.Point(313, 3);
+ this.pic1.Location = new System.Drawing.Point(417, 4);
+ this.pic1.Margin = new System.Windows.Forms.Padding(4);
this.pic1.Name = "pic1";
- this.pic1.Size = new System.Drawing.Size(78, 41);
+ this.pic1.Size = new System.Drawing.Size(104, 51);
this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pic1.TabIndex = 36;
this.pic1.TabStop = false;
@@ -461,9 +466,11 @@
this.gbUp.Controls.Add(this.label14);
this.gbUp.Controls.Add(this.cmbSourceBillType);
this.gbUp.Controls.Add(this.label10);
- this.gbUp.Location = new System.Drawing.Point(14, 39);
+ this.gbUp.Location = new System.Drawing.Point(19, 49);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(892, 75);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4);
+ this.gbUp.Size = new System.Drawing.Size(1189, 100);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
//
@@ -471,37 +478,38 @@
//
this.cmbHWorksNumber.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHWorksNumber.FormattingEnabled = true;
- this.cmbHWorksNumber.Location = new System.Drawing.Point(394, 17);
+ this.cmbHWorksNumber.Location = new System.Drawing.Point(525, 21);
+ this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4);
this.cmbHWorksNumber.Name = "cmbHWorksNumber";
- this.cmbHWorksNumber.Size = new System.Drawing.Size(188, 20);
+ this.cmbHWorksNumber.Size = new System.Drawing.Size(249, 23);
this.cmbHWorksNumber.TabIndex = 98;
//
// label4
//
this.label4.AutoSize = true;
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(327, 21);
+ this.label4.Location = new System.Drawing.Point(436, 26);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.Size = new System.Drawing.Size(67, 15);
this.label4.TabIndex = 97;
this.label4.Text = "宸ュ巶浠ｇ爜";
//
// dtpHDate
//
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHDate.Location = new System.Drawing.Point(676, 17);
- this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHDate.Location = new System.Drawing.Point(901, 21);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(188, 21);
+ this.dtpHDate.Size = new System.Drawing.Size(249, 25);
this.dtpHDate.TabIndex = 96;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(609, 21);
- this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label2.Location = new System.Drawing.Point(812, 26);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.Size = new System.Drawing.Size(69, 15);
this.label2.TabIndex = 95;
this.label2.Text = "鏃� 鏈�";
//
@@ -509,18 +517,20 @@
//
this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHOrgID.FormattingEnabled = true;
- this.cmbHOrgID.Location = new System.Drawing.Point(101, 17);
+ this.cmbHOrgID.Location = new System.Drawing.Point(135, 21);
+ this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4);
this.cmbHOrgID.Name = "cmbHOrgID";
- this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
+ this.cmbHOrgID.Size = new System.Drawing.Size(249, 23);
this.cmbHOrgID.TabIndex = 85;
//
// label3
//
this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(35, 21);
+ this.label3.Location = new System.Drawing.Point(47, 26);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(53, 12);
+ this.label3.Size = new System.Drawing.Size(69, 15);
this.label3.TabIndex = 84;
this.label3.Text = "缁� 缁�";
//
@@ -528,18 +538,20 @@
//
this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHBarCodeType.FormattingEnabled = true;
- this.cmbHBarCodeType.Location = new System.Drawing.Point(676, 46);
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(901, 58);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(188, 20);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(249, 23);
this.cmbHBarCodeType.TabIndex = 81;
//
// label1
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(609, 50);
+ this.label1.Location = new System.Drawing.Point(812, 62);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.Size = new System.Drawing.Size(67, 15);
this.label1.TabIndex = 80;
this.label1.Text = "鏉＄爜绫诲瀷";
//
@@ -548,9 +560,10 @@
this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
this.cmdHEmpID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHEmpID.Location = new System.Drawing.Point(892, -7);
+ this.cmdHEmpID.Location = new System.Drawing.Point(1189, -9);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHEmpID.Size = new System.Drawing.Size(29, 28);
this.cmdHEmpID.TabIndex = 79;
this.cmdHEmpID.UseVisualStyleBackColor = false;
this.cmdHEmpID.Visible = false;
@@ -559,9 +572,10 @@
//
this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdSourceBillNo.Location = new System.Drawing.Point(560, 45);
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(747, 56);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
- this.cmdSourceBillNo.Size = new System.Drawing.Size(22, 22);
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
this.cmdSourceBillNo.TabIndex = 42;
this.cmdSourceBillNo.UseVisualStyleBackColor = true;
this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
@@ -569,9 +583,10 @@
// txtHSourceBillNo
//
this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 46);
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(525, 58);
+ this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceBillNo.Name = "txtHSourceBillNo";
- this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21);
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(220, 25);
this.txtHSourceBillNo.TabIndex = 41;
this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
//
@@ -579,9 +594,10 @@
//
this.label14.AutoSize = true;
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(327, 50);
+ this.label14.Location = new System.Drawing.Point(436, 62);
+ this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(53, 12);
+ this.label14.Size = new System.Drawing.Size(68, 15);
this.label14.TabIndex = 40;
this.label14.Text = "閫� 鍗� 鍙�";
//
@@ -590,18 +606,20 @@
this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSourceBillType.FormattingEnabled = true;
this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.cmbSourceBillType.Location = new System.Drawing.Point(101, 46);
+ this.cmbSourceBillType.Location = new System.Drawing.Point(135, 58);
+ this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4);
this.cmbSourceBillType.Name = "cmbSourceBillType";
- this.cmbSourceBillType.Size = new System.Drawing.Size(188, 20);
+ this.cmbSourceBillType.Size = new System.Drawing.Size(249, 23);
this.cmbSourceBillType.TabIndex = 36;
//
// label10
//
this.label10.AutoSize = true;
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(35, 50);
+ this.label10.Location = new System.Drawing.Point(47, 62);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(53, 12);
+ this.label10.Size = new System.Drawing.Size(67, 15);
this.label10.TabIndex = 35;
this.label10.Text = "婧愬崟绫诲瀷";
//
@@ -629,18 +647,20 @@
this.panel2.Controls.Add(this.txtHMaker);
this.panel2.Controls.Add(this.label8);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(41, 506);
+ this.panel2.Location = new System.Drawing.Point(55, 633);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(937, 93);
+ this.panel2.Size = new System.Drawing.Size(1249, 116);
this.panel2.TabIndex = 32;
//
// txtHDeleteDate
//
this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteDate.Location = new System.Drawing.Point(725, 47);
+ this.txtHDeleteDate.Location = new System.Drawing.Point(967, 59);
+ this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHDeleteDate.Name = "txtHDeleteDate";
- this.txtHDeleteDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHDeleteDate.Size = new System.Drawing.Size(131, 19);
this.txtHDeleteDate.TabIndex = 19;
//
// label25
@@ -648,9 +668,10 @@
this.label25.AutoSize = true;
this.label25.BackColor = System.Drawing.Color.Transparent;
this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label25.Location = new System.Drawing.Point(666, 50);
+ this.label25.Location = new System.Drawing.Point(888, 62);
+ this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(53, 12);
+ this.label25.Size = new System.Drawing.Size(67, 15);
this.label25.TabIndex = 18;
this.label25.Text = "浣滃簾鏃ユ湡";
//
@@ -658,9 +679,10 @@
//
this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteMan.Location = new System.Drawing.Point(725, 12);
+ this.txtHDeleteMan.Location = new System.Drawing.Point(967, 15);
+ this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHDeleteMan.Name = "txtHDeleteMan";
- this.txtHDeleteMan.Size = new System.Drawing.Size(98, 15);
+ this.txtHDeleteMan.Size = new System.Drawing.Size(131, 19);
this.txtHDeleteMan.TabIndex = 17;
//
// label27
@@ -668,9 +690,10 @@
this.label27.AutoSize = true;
this.label27.BackColor = System.Drawing.Color.Transparent;
this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label27.Location = new System.Drawing.Point(666, 12);
+ this.label27.Location = new System.Drawing.Point(888, 15);
+ this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(41, 12);
+ this.label27.Size = new System.Drawing.Size(52, 15);
this.label27.TabIndex = 16;
this.label27.Text = "浣滃簾浜�";
//
@@ -678,9 +701,10 @@
//
this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDateDate.Location = new System.Drawing.Point(562, 47);
+ this.txtHUpDateDate.Location = new System.Drawing.Point(749, 59);
+ this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHUpDateDate.Name = "txtHUpDateDate";
- this.txtHUpDateDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHUpDateDate.Size = new System.Drawing.Size(131, 19);
this.txtHUpDateDate.TabIndex = 15;
//
// label23
@@ -688,9 +712,10 @@
this.label23.AutoSize = true;
this.label23.BackColor = System.Drawing.Color.Transparent;
this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label23.Location = new System.Drawing.Point(503, 47);
+ this.label23.Location = new System.Drawing.Point(671, 59);
+ this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(53, 12);
+ this.label23.Size = new System.Drawing.Size(67, 15);
this.label23.TabIndex = 14;
this.label23.Text = "淇敼鏃ユ湡";
//
@@ -698,9 +723,10 @@
//
this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDater.Location = new System.Drawing.Point(562, 12);
+ this.txtHUpDater.Location = new System.Drawing.Point(749, 15);
+ this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHUpDater.Name = "txtHUpDater";
- this.txtHUpDater.Size = new System.Drawing.Size(98, 15);
+ this.txtHUpDater.Size = new System.Drawing.Size(131, 19);
this.txtHUpDater.TabIndex = 13;
//
// label21
@@ -708,9 +734,10 @@
this.label21.AutoSize = true;
this.label21.BackColor = System.Drawing.Color.Transparent;
this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label21.Location = new System.Drawing.Point(503, 12);
+ this.label21.Location = new System.Drawing.Point(671, 15);
+ this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(41, 12);
+ this.label21.Size = new System.Drawing.Size(52, 15);
this.label21.TabIndex = 12;
this.label21.Text = "淇敼浜�";
//
@@ -718,9 +745,10 @@
//
this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseDate.Location = new System.Drawing.Point(397, 47);
+ this.txtHCloseDate.Location = new System.Drawing.Point(529, 59);
+ this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCloseDate.Name = "txtHCloseDate";
- this.txtHCloseDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHCloseDate.Size = new System.Drawing.Size(131, 19);
this.txtHCloseDate.TabIndex = 11;
//
// label19
@@ -728,9 +756,10 @@
this.label19.AutoSize = true;
this.label19.BackColor = System.Drawing.Color.Transparent;
this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label19.Location = new System.Drawing.Point(338, 50);
+ this.label19.Location = new System.Drawing.Point(451, 62);
+ this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(53, 12);
+ this.label19.Size = new System.Drawing.Size(67, 15);
this.label19.TabIndex = 10;
this.label19.Text = "鍏抽棴鏃ユ湡";
//
@@ -738,9 +767,10 @@
//
this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseMan.Location = new System.Drawing.Point(396, 13);
+ this.txtHCloseMan.Location = new System.Drawing.Point(528, 16);
+ this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCloseMan.Name = "txtHCloseMan";
- this.txtHCloseMan.Size = new System.Drawing.Size(98, 15);
+ this.txtHCloseMan.Size = new System.Drawing.Size(131, 19);
this.txtHCloseMan.TabIndex = 9;
//
// label17
@@ -748,9 +778,10 @@
this.label17.AutoSize = true;
this.label17.BackColor = System.Drawing.Color.Transparent;
this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label17.Location = new System.Drawing.Point(338, 16);
+ this.label17.Location = new System.Drawing.Point(451, 20);
+ this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(41, 12);
+ this.label17.Size = new System.Drawing.Size(52, 15);
this.label17.TabIndex = 8;
this.label17.Text = "鍏抽棴浜�";
//
@@ -758,9 +789,10 @@
//
this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCheckDate.Location = new System.Drawing.Point(234, 47);
+ this.txtHCheckDate.Location = new System.Drawing.Point(312, 59);
+ this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCheckDate.Name = "txtHCheckDate";
- this.txtHCheckDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHCheckDate.Size = new System.Drawing.Size(131, 19);
this.txtHCheckDate.TabIndex = 7;
//
// label15
@@ -768,9 +800,10 @@
this.label15.AutoSize = true;
this.label15.BackColor = System.Drawing.Color.Transparent;
this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label15.Location = new System.Drawing.Point(175, 50);
+ this.label15.Location = new System.Drawing.Point(233, 62);
+ this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(53, 12);
+ this.label15.Size = new System.Drawing.Size(67, 15);
this.label15.TabIndex = 6;
this.label15.Text = "瀹℃牳鏃ユ湡";
//
@@ -778,9 +811,10 @@
//
this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHChecker.Location = new System.Drawing.Point(234, 13);
+ this.txtHChecker.Location = new System.Drawing.Point(312, 16);
+ this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHChecker.Name = "txtHChecker";
- this.txtHChecker.Size = new System.Drawing.Size(98, 15);
+ this.txtHChecker.Size = new System.Drawing.Size(131, 19);
this.txtHChecker.TabIndex = 5;
//
// label13
@@ -788,9 +822,10 @@
this.label13.AutoSize = true;
this.label13.BackColor = System.Drawing.Color.Transparent;
this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label13.Location = new System.Drawing.Point(175, 16);
+ this.label13.Location = new System.Drawing.Point(233, 20);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(41, 12);
+ this.label13.Size = new System.Drawing.Size(52, 15);
this.label13.TabIndex = 4;
this.label13.Text = "瀹℃牳浜�";
//
@@ -798,9 +833,10 @@
//
this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMakeDate.Location = new System.Drawing.Point(71, 47);
+ this.txtHMakeDate.Location = new System.Drawing.Point(95, 59);
+ this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHMakeDate.Name = "txtHMakeDate";
- this.txtHMakeDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHMakeDate.Size = new System.Drawing.Size(131, 19);
this.txtHMakeDate.TabIndex = 3;
//
// label11
@@ -808,9 +844,10 @@
this.label11.AutoSize = true;
this.label11.BackColor = System.Drawing.Color.Transparent;
this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label11.Location = new System.Drawing.Point(12, 50);
+ this.label11.Location = new System.Drawing.Point(16, 62);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(53, 12);
+ this.label11.Size = new System.Drawing.Size(67, 15);
this.label11.TabIndex = 2;
this.label11.Text = "鍒跺崟鏃ユ湡";
//
@@ -818,9 +855,10 @@
//
this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMaker.Location = new System.Drawing.Point(71, 13);
+ this.txtHMaker.Location = new System.Drawing.Point(95, 16);
+ this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHMaker.Name = "txtHMaker";
- this.txtHMaker.Size = new System.Drawing.Size(98, 15);
+ this.txtHMaker.Size = new System.Drawing.Size(131, 19);
this.txtHMaker.TabIndex = 1;
//
// label8
@@ -828,9 +866,10 @@
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label8.Location = new System.Drawing.Point(12, 16);
+ this.label8.Location = new System.Drawing.Point(16, 20);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(41, 12);
+ this.label8.Size = new System.Drawing.Size(52, 15);
this.label8.TabIndex = 0;
this.label8.Text = "鍒跺崟浜�";
//
@@ -842,17 +881,19 @@
// panel1
//
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(0, 50);
+ this.panel1.Location = new System.Drawing.Point(0, 62);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(41, 549);
+ this.panel1.Size = new System.Drawing.Size(55, 687);
this.panel1.TabIndex = 33;
//
// panel3
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(978, 50);
+ this.panel3.Location = new System.Drawing.Point(1304, 62);
+ this.panel3.Margin = new System.Windows.Forms.Padding(4);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(39, 549);
+ this.panel3.Size = new System.Drawing.Size(52, 687);
this.panel3.TabIndex = 34;
//
// grdMain
@@ -864,12 +905,13 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdMain.Location = new System.Drawing.Point(3, 3);
+ this.grdMain.Location = new System.Drawing.Point(4, 4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(923, 282);
+ this.grdMain.Size = new System.Drawing.Size(1233, 339);
this.grdMain.TabIndex = 44;
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -886,21 +928,25 @@
this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(41, 487);
+ this.grdSum.Location = new System.Drawing.Point(55, 609);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(937, 19);
+ this.grdSum.Size = new System.Drawing.Size(1249, 24);
this.grdSum.TabIndex = 45;
//
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(809, 543);
+ this.grdPrint.Location = new System.Drawing.Point(1079, 679);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.Size = new System.Drawing.Size(33, 30);
this.grdPrint.TabIndex = 46;
this.grdPrint.Visible = false;
//
@@ -910,19 +956,21 @@
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(41, 173);
+ this.tabControl1.Location = new System.Drawing.Point(55, 233);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(937, 314);
+ this.tabControl1.Size = new System.Drawing.Size(1249, 376);
this.tabControl1.TabIndex = 47;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(929, 288);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Size = new System.Drawing.Size(1241, 347);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -930,10 +978,11 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.grdSub);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(929, 288);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage2.Size = new System.Drawing.Size(1241, 347);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -947,12 +996,13 @@
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdSub.Location = new System.Drawing.Point(3, 3);
+ this.grdSub.Location = new System.Drawing.Point(4, 4);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(4);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersWidth = 30;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(923, 282);
+ this.grdSub.Size = new System.Drawing.Size(1233, 339);
this.grdSub.TabIndex = 45;
this.grdSub.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSub_CellBeginEdit);
this.grdSub.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellContentClick);
@@ -961,9 +1011,10 @@
// tabPage3
//
this.tabPage3.Controls.Add(this.grdList);
- this.tabPage3.Location = new System.Drawing.Point(4, 22);
+ this.tabPage3.Location = new System.Drawing.Point(4, 25);
+ this.tabPage3.Margin = new System.Windows.Forms.Padding(4);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Size = new System.Drawing.Size(929, 288);
+ this.tabPage3.Size = new System.Drawing.Size(1241, 347);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "妗ｆ鍒楄〃";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -978,19 +1029,34 @@
this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.grdList.Location = new System.Drawing.Point(0, 0);
+ this.grdList.Margin = new System.Windows.Forms.Padding(4);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 30;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(929, 288);
+ this.grdList.Size = new System.Drawing.Size(1241, 347);
this.grdList.TabIndex = 46;
+ //
+ // sdy
+ //
+ this.sdy.AutoSize = false;
+ this.sdy.Image = ((System.Drawing.Image)(resources.GetObject("sdy.Image")));
+ this.sdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.sdy.Name = "sdy";
+ this.sdy.Size = new System.Drawing.Size(35, 47);
+ this.sdy.Text = "娴忚";
+ this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sdy.Click += new System.EventHandler(this.sdy_Click);
//
// Gy_BarCodeBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1017, 599);
+ this.ClientSize = new System.Drawing.Size(1356, 749);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.panel2);
@@ -1001,6 +1067,7 @@
this.Controls.Add(this.grdPrint);
this.ForeColor = System.Drawing.Color.Black;
this.KeyPreview = true;
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Gy_BarCodeBill";
this.Text = "鍗曟嵁缂栬緫";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -1108,5 +1175,6 @@
private System.Windows.Forms.DataGridView grdList;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ToolStripButton BatchNo;
+ private System.Windows.Forms.ToolStripButton sdy;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
index c42cb23..b1f4011 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
@@ -360,17 +360,30 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
</value>
</data>
+ <data name="sdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -383,7 +396,7 @@
<data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -394,7 +407,7 @@
<data name="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -405,7 +418,7 @@
<data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
@@ -415,7 +428,7 @@
<data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
/gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -430,7 +443,7 @@
<data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
@@ -439,7 +452,7 @@
<data name="kc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
@@ -450,7 +463,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -465,7 +478,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -480,7 +493,7 @@
<data name="tb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -495,7 +508,7 @@
<data name="gl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -509,7 +522,7 @@
<data name="BatchNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -519,7 +532,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 29ed5b8..7e1192c 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -806,6 +806,7 @@
HZXQty = HZXQty - HDDQty;
this.Sub_SaveBill();
Mul = Mul + 1;
+ continue;
}
}
}
diff --git a/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs b/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs
index 677deb8..29bec74 100644
--- a/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs
@@ -16,7 +16,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
+ #region 閲囪喘閫�鏂欏崟 鏌ヨ鍒楄〃
[Route("Cg_PurchaseReturn/list")]
[HttpGet]
public object list(string sWhere)
@@ -58,5 +58,89 @@
return objJsonResult;
}
}
+ #endregion
+ #region 閲囪喘閫�鏂欏崟 瀹℃牳 鍙嶅鏍�
+ [Route("Cg_PurchaseReturn/AuditProcessReportList")]
+ [HttpGet]
+ public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
+ {
+ //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, true, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲鏍告潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DLL.ClsKf_SellOutBackBill oBill = new DLL.ClsKf_SellOutBackBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (IsAudit == 1)
+ {
+ if (oBill.omodel.HBillStatus == 2)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍革紝鏃犻渶鍐嶆瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCN.RunProc(" Update Kf_ICStockBillMain set HChecker='" + CurUserName + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='1239' and HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HBillStatus == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍革紝鏃犻渶鍙嶅鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCN.RunProc(" Update Kf_ICStockBillMain set HChecker=' ',HCheckDate=null,HBillStatus=1 Where HBillType='1239' and HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Kf_EntrustInBillController.cs b/WebAPI/Controllers/Kf_EntrustInBillController.cs
index 3706112..a3059f5 100644
--- a/WebAPI/Controllers/Kf_EntrustInBillController.cs
+++ b/WebAPI/Controllers/Kf_EntrustInBillController.cs
@@ -165,6 +165,7 @@
return objJsonResult;
}
}
+
/// <summary>
/// 鐢熸垚濮斿鍏ュ簱鍗�
/// </summary>
diff --git a/WebAPI/Controllers/Kf_ICStockBillMainController.cs b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
index 4a81141..4a03746 100644
--- a/WebAPI/Controllers/Kf_ICStockBillMainController.cs
+++ b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
@@ -17,7 +17,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
+ #region 閿�鍞��璐у崟鏌ヨ
[Route("Kf_ICStockBillMain/GetCStockBillList")]
[HttpGet]
public object GetCStockBillList(string sWhere)
@@ -59,5 +59,90 @@
return objJsonResult;
}
}
+ #endregion
+
+ #region 瀹℃牳鍙婂弽瀹℃牳
+ [Route("Kf_ICStockBillMain/AuditProcessReportList")]
+ [HttpGet]
+ public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
+ {
+ //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, true, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲鏍告潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DLL.ClsKf_SellOutBackBill oBill = new DLL.ClsKf_SellOutBackBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (IsAudit == 1)
+ {
+ if (oBill.omodel.HBillStatus == 2)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍革紝鏃犻渶鍐嶆瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCN.RunProc(" Update Kf_ICStockBillMain set HChecker='" + CurUserName + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='1247' and HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HBillStatus == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍革紝鏃犻渶鍙嶅鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCN.RunProc(" Update Kf_ICStockBillMain set HChecker=' ',HCheckDate=null,HBillStatus=1 Where HBillType='1247' and HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 44f87b5..3269a5b 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -309,7 +309,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[3];
+ objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
}
diff --git a/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs b/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
new file mode 100644
index 0000000..0c10e5a
--- /dev/null
+++ b/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
@@ -0,0 +1,68 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.SCGL
+{
+ public class Sc_ProductionReturnBillController : ApiController
+ {
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ /// <summary>
+ /// 鐢熶骇閫�搴撳崟鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_ProductionReturnBill/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_GetProductInBill(sWhere);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_GetProductInBill(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductionReturnList order by 鏃ユ湡 desc", "h_v_IF_ProductionReturnList");
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 738a9a5..bafeb07 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -1156,11 +1156,22 @@
try
{
ds = Sc_GetEntrustInBill(sWhere);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
}
catch (Exception ex)
{
diff --git "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs" "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
index 705ef1a..0e1a8c2 100644
--- "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
+++ "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
@@ -108,6 +108,14 @@
objJsonResult.data = null;
return objJsonResult;
}
+ ds = oCN.RunProcReturn("Select * from Gy_BarCodeBill where HBarCode='" + list.packagebarcode.ToString().Trim() + "' and HStopflag='1'", "Gy_BarCodeBill");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.status = -1;
+ objJsonResult.msg = "姝ょ鏉＄爜宸蹭綔搴�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Models.ClsSc_PackUnionBillMain oItem = new ClsSc_PackUnionBillMain();
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
@@ -120,7 +128,7 @@
oItem.HCheckItemNowID = 0;
oItem.HCheckItemNextID = 0;
oItem.HCheckFlowID = 0;
- oItem.HRemark = "鑷姩鍖呰绾跨敓杈扮鏉＄爜";
+ oItem.HRemark = "鑷姩鍖呰绾跨敓鎴愮鏉＄爜";
oItem.HBacker = "";
oItem.HBackDate = "";
oItem.HMaker = "";
@@ -219,14 +227,31 @@
{
try
{
+ ds = oCN.RunProcReturn("Select * from Gy_BarCodeBill where HBarCode='" + packagebarcode.ToString().Trim() + "'", "Gy_BarCodeBill");
+ if (ds == null && ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.status = -1;
+ objJsonResult.msg = "鏃犳晥绠辨潯鐮�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("Select * from Gy_BarCodeBill where HBarCode='" + packagebarcode.ToString().Trim() + "' and HStopflag='1'", "Gy_BarCodeBill");
+ if (ds != null && ds.Tables[0].Rows.Count>0)
+ {
+ objJsonResult.status = -1;
+ objJsonResult.msg = "姝ょ鏉＄爜宸蹭綔搴�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//
oCN.BeginTran();
//鍒犻櫎瀛愯〃
- oCN.RunProc("Delete From Sc_PackUnionBillSub where HBarCode_Pack=" + packagebarcode.ToString());
+ oCN.RunProc("Delete From Sc_PackUnionBillSub where HBarCode_Pack='"+ packagebarcode.ToString() + "'");
//鍒犻櫎涓昏〃
- oCN.RunProc("Delete From Sc_PackUnionBillMain where HBarCode_Pack=" + packagebarcode.ToString());
+ oCN.RunProc("Delete From Sc_PackUnionBillMain where HBarCode_Pack='" + packagebarcode.ToString() + "'");
//浣滃簾鏉＄爜妗ｆ琛�
- oCN.RunProc("Update Gy_BarCodeBill set HStopflag='1' where HBarCode=" + packagebarcode.ToString());
+ oCN.RunProc("Update Gy_BarCodeBill set HStopflag='1' where HBarCode='"+ packagebarcode .ToString()+ "'");
oCN.Commit();
diff --git a/WebAPI/DLL/ClsKf_SellOutBackBill.cs b/WebAPI/DLL/ClsKf_SellOutBackBill.cs
new file mode 100644
index 0000000..e5dcc15
--- /dev/null
+++ b/WebAPI/DLL/ClsKf_SellOutBackBill.cs
@@ -0,0 +1,476 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsKf_SellOutBackBill:DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsKf_ICStockBillMain omodel = new Model.ClsKf_ICStockBillMain();
+ public List<Model.ClsKf_ICStockBillSub> DetailColl = new List<Model.ClsKf_ICStockBillSub>();
+ public List<Model.ClsKf_ICStockBillScheme> DetailSubColl = new List<Model.ClsKf_ICStockBillScheme>();
+
+ public ClsKf_SellOutBackBill()
+ {
+ base.MvarItemKeySub = "Kf_ICStockBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey="Kf_ICStockBillMain";
+ base.MvarReportTitle="閿�鍞��搴撳崟";
+ base.BillType="1247";
+ base.HBillSubType = "1247";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsKf_SellOutBackBill()
+ {
+ DetailColl = null;
+ }
+
+
+ #endregion 鑷畾涔夋柟娉�
+
+ //鍒犻櫎鍏宠仈
+ public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ //閫�璐ч�氱煡鍗� 鍏宠仈鏁伴噺
+ try
+ {
+ if (omodel.HMainSourceBillType == "閫�璐ч�氱煡鍗�")
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Back_Del " + lngBillKey.ToString());
+ }
+ else
+ {
+
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //鏂板鍏宠仈
+ public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ //閫�璐ч�氱煡鍗� 鍏宠仈鏁伴噺
+ try
+ {
+ if (omodel.HMainSourceBillType == "閫�璐ч�氱煡鍗�")
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Back_Add " + lngBillKey.ToString());
+ }
+ else
+ {
+
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Kf_ICStockBillMain set " +
+ //鍥哄畾璧嬪��===============
+ " HBillNo='" + omodel.HBillNo + "'" +
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HSellSID=" + omodel.HSellSID.ToString() +
+ ",HCurID=" + omodel.HCurID.ToString() +
+ ",HSupID=" + omodel.HSupID.ToString() +
+ ",HWHID=" + omodel.HWHID.ToString() +
+ ",HSCWHID=" + omodel.HSCWHID.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID.ToString() +
+ ",HSecManagerID=" + omodel.HSecManagerID.ToString() +
+ ",HKeeperID=" + omodel.HKeeperID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HLinkPhone='" + omodel.HLinkPhone + "'" +
+ ",HLinkMan='" + omodel.HLinkMan + "'" +
+ ",HSeOrderBillNo='" + omodel.HSeOrderBillNo + "'" +
+ ",HConveyMoney=" + omodel.HConveyMoney.ToString() +
+ ",HConveyCompID=" + omodel.HConveyCompID.ToString() +
+ ",HConveyTypeID=" + omodel.HConveyTypeID.ToString() +
+ ",HRedBlueFlag=" + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsKf_ICStockBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Kf_ICStockBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
+ ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
+ ",HCostPrice,HCostMoney,HSalePrice" +
+ ",HEngineNum,HUnderPanNum,HLeaveFactCard" +
+ ",HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
+ ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
+ "," + oSub.HCostPrice.ToString() + "," + oSub.HCostMoney.ToString() + "," + oSub.HSalePrice.ToString() +
+ ",'" + oSub.HEngineNum + "','" + oSub.HUnderPanNum + "','" + oSub.HLeaveFactCard + "'" +
+ "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
+ "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
+ ") ");
+ }
+ //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ AddNewRelation(ref sReturn, omodel.HInterID);
+ //鎺у埗鍏宠仈鏁伴噺
+
+ //
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
+ {
+ omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ }
+ if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ //
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Kf_ICStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID" +
+ ",HSecManagerID,HSellSID,HCurID" +
+ ",HLinkMan,HLinkPhone" +
+ ",HSeOrderBillNo,HConveyCompID,HConveyTypeID,HConveyMoney" +
+ ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMainSourceBillType + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() +
+ "," + omodel.HSecManagerID.ToString() + "," + omodel.HSellSID.ToString() + "," + omodel.HCurID.ToString() +
+ ",'" + omodel.HLinkMan + "','" + omodel.HLinkPhone + "'" +
+ ",'" + omodel.HSeOrderBillNo + "'," + omodel.HConveyCompID.ToString() + "," + omodel.HConveyTypeID.ToString() + "," + omodel.HConveyMoney.ToString() +
+ ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsKf_ICStockBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Kf_ICStockBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
+ ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
+ ",HCostPrice,HCostMoney,HSalePrice" +
+ ",HEngineNum,HUnderPanNum,HLeaveFactCard" +
+ ",HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
+ ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
+ "," + oSub.HCostPrice.ToString() + "," + oSub.HCostMoney.ToString() + "," + oSub.HSalePrice.ToString() +
+ ",'" + oSub.HEngineNum + "','" + oSub.HUnderPanNum + "','" + oSub.HLeaveFactCard + "'" +
+ "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
+ "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
+ ") ");
+ }
+ //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ AddNewRelation(ref sReturn, omodel.HInterID);
+ //鎺у埗鍏宠仈鏁伴噺
+
+ //
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("Select * from Kf_ICStockBillMain Where HInterID=" + lngBillKey.ToString(), "Kf_ICStockBillMain");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+ omodel.HSellSID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSellSID"]);
+ omodel.HCurID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCurID"]);
+ omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
+ omodel.HWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWHID"]);
+ omodel.HSCWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSCWHID"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
+ omodel.HSecManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSecManagerID"]);
+ omodel.HKeeperID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HKeeperID"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
+ omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
+ omodel.HRedBlueFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HRedBlueFlag"]);
+ omodel.HLinkMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLinkMan"]);
+ omodel.HLinkPhone = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLinkPhone"]);
+ //
+ omodel.HConveyCompID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HConveyCompID"]);
+ omodel.HConveyTypeID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HConveyTypeID"]);
+ omodel.HConveyMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HConveyMoney"]);
+ omodel.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSeOrderBillNo"]);
+
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Kf_ICStockBillSub Where HInterID=" + lngBillKey.ToString(), "Kf_ICStockBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsKf_ICStockBillSub oSub = new Model.ClsKf_ICStockBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
+ oSub.HPropertyID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPropertyID"]);
+ oSub.HSecUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSecUnitID"]);
+ oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HSecUnitRate"]);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]);
+ oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
+ oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]);
+ oSub.HSalePrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HSalePrice"]);
+ oSub.HCostMoney = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HCostMoney"]);
+ oSub.HCostPrice = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HCostPrice"]);
+ oSub.HWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWHID"]);
+ oSub.HSCWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCWHID"]);
+ oSub.HSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPID"]);
+ oSub.HSCSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCSPID"]);
+ oSub.HSPGroupID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPGroupID"]);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
+ oSub.HEngineNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HEngineNum"]);
+ oSub.HUnderPanNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HUnderPanNum"]);
+ oSub.HLeaveFactCard = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HLeaveFactCard"]);
+ oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderInterID"]);
+ oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderEntryID"]);
+ oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPOOrderBillNo"]);
+ oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
+ oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ //鏄剧ず鍗曟嵁鏉＄爜淇℃伅
+ public bool ShowBill_Scheme(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //寰幆瀛愯〃2
+ DataSet DsSubSec;
+ DsSubSec = oCn.RunProcReturn("Select * from Kf_ICStockBillSub_WMS with (nolock) Where HInterID=" + lngBillKey.ToString() + " and HBillType='" + this.BillType + "'", "Kf_ICStockBillSub_WMS");
+ DetailSubColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSubSec.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsKf_ICStockBillScheme oSubSec = new Model.ClsKf_ICStockBillScheme();
+ oSubSec.HInterID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HInterID"].ToString());
+ oSubSec.HEntryID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HEntryID"].ToString());
+ oSubSec.HItemID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HItemID"].ToString());
+ oSubSec.HBillType = DsSubSec.Tables[0].Rows[i]["HBillType"].ToString();
+ oSubSec.HMaterID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HMaterID"].ToString());
+ oSubSec.HProcID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HProcID"].ToString());
+ oSubSec.HWhID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HWhID"].ToString());
+ oSubSec.HGroupID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HGroupID"].ToString());
+ oSubSec.HQty = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HQty"].ToString());
+ oSubSec.HBarCode = DsSubSec.Tables[0].Rows[i]["HBarCode"].ToString();
+ oSubSec.HAddr = DsSubSec.Tables[0].Rows[i]["HAddr"].ToString();
+ oSubSec.HMaker = DsSubSec.Tables[0].Rows[i]["HMaker"].ToString();
+ oSubSec.HMakeDate = DBUtility.ClsPub.isDate(DsSubSec.Tables[0].Rows[i]["HMakeDate"].ToString());
+ oSubSec.HSourceInterID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HSourceInterID"].ToString());
+ oSubSec.HSourceEntryID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HSourceEntryID"].ToString());
+ oSubSec.HSourceBillType = DsSubSec.Tables[0].Rows[i]["HSourceBillType"].ToString();
+ oSubSec.HSourceBillNo = DsSubSec.Tables[0].Rows[i]["HSourceBillNo"].ToString();
+ oSubSec.HSourceItemID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HSourceItemID"].ToString());
+ //
+ DetailSubColl.Add(oSubSec);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ #region WMS鏉＄爜绋嬪簭
+
+ //鏉＄爜鎵弿璁板綍锛屾柊澧炲埌閿�鍞��搴撳崟 鏃犳簮鍗�
+ public bool AddBill_PDA_NoSource(ref string sReturn)
+ {
+ try
+ {
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(omodel.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ sReturn = s;
+ return false;
+ }
+ omodel.HYear = sYear;
+ omodel.HPeriod = sPeriod;
+
+ DataSet Ds;
+ oCn.BeginTran();
+ //鍒犻櫎涓昏〃
+ oCn.RunProc("Delete From Kf_ICStockBillMain where HInterID=" + omodel.HInterID.ToString());
+ //鎻掑叆瀛愯〃
+ oCn.RunProc("EXEC h_p_Kf_SellOutBackBillSub_Insert_NoSource " + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'");
+ //鎻掑叆涓昏〃
+ oCn.RunProc("Insert Into Kf_ICStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "',convert(varchar(10),getdate(),120),'" + omodel.HMainSourceBillType + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',convert(varchar(10),getdate(),120)" +
+ ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
+ ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+ ") ");
+ //鏇存柊鍏宠仈鏁伴噺
+
+ //瀹℃牳鍗曟嵁
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + omodel.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120),HBillStatus=2 where HInterID= " + omodel.HInterID.ToString());
+
+ //鐢熸垚K3鍗曟嵁
+ //鏂板瀛愯〃銆佷富琛�
+ oCn.RunProc("exec h_p_IFK3_ToERP_SellOutBackBill_Insert " + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillerID.ToString());
+ //鍥炲～鍏宠仈鏁伴噺
+ oCn.RunProc("exec h_p_IFK3_ToERP_SellOutBackBill_UpdateBillRelateData " + omodel.HInterID.ToString());
+ //瀹℃牳鍗曟嵁
+ oCn.RunProc("exec h_p_IFK3_ToERP_SellOutBackBill_Check " + omodel.HInterID.ToString() + "," + omodel.HBillerID.ToString());
+ ////鏇存柊搴撳瓨
+ oCn.RunProc("exec h_p_IFK3_ToERP_SellOutBackBill_UpdateStock " + omodel.HInterID.ToString());
+ oCn.RunProc("exec h_p_IFK3_ToERP_SellOutBackBill_UpdateOrderStock " + omodel.HInterID.ToString());
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+
+
+ #endregion
+
+
+
+
+ }
+}
diff --git a/WebAPI/DLL/ClsSc_PackUnionBill.cs b/WebAPI/DLL/ClsSc_PackUnionBill.cs
index e9b08f8..2fcf05d 100644
--- a/WebAPI/DLL/ClsSc_PackUnionBill.cs
+++ b/WebAPI/DLL/ClsSc_PackUnionBill.cs
@@ -132,6 +132,7 @@
HQty += oSub.HQty;
}
//绠辩爜鎻掑叆鏉＄爜妗ｆ琛�
+ //Int64 ZHInterID = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
oCn.RunProc("insert into Gy_BarCodeBill(HInterID,HEntryID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HBatchNo,HMakeDate " +
",HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HUseFlag, HStopflag, HSupID, HGroupID, HPrintQty)" +
"values('" + HSourceInterID + "', 1, '" + omodel.HBarCode_Pack + "', '绠卞彿鏉＄爜', '" + HMaterID + "', '" + HUnitID + "','" + HQty + "', '', getdate()" +
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 292d00b..0cf6b76 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -348,6 +348,7 @@
<Compile Include="Controllers\MoveStockBillController.cs" />
<Compile Include="Controllers\Open_PrintTemController.cs" />
<Compile Include="Controllers\ReportStepPlatFormController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_ProductionReturnBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_PackUnionBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
@@ -432,6 +433,7 @@
<Compile Include="DLL\ClsGy_WorkTypeBill.cs" />
<Compile Include="DLL\ClsKf_MateOutBackBill.cs" />
<Compile Include="DLL\ClsKf_MateOutBill.cs" />
+ <Compile Include="DLL\ClsKf_SellOutBackBill.cs" />
<Compile Include="DLL\ClsOA_ErrMsgBackBill.cs" />
<Compile Include="DLL\ClsOA_InformBill.cs" />
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
@@ -717,6 +719,7 @@
<Folder Include="Views\Gy_EquipType\" />
<Folder Include="Views\Kf_ICStockBillMain\" />
<Folder Include="Views\MoveStockBill\" />
+ <Folder Include="Views\ProductionReturnBill\" />
<Folder Include="Views\QC_Management\" />
<Folder Include="Views\Sc_MouldRepairOutBill\" />
</ItemGroup>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index ff2fea1..6af1cc0 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -18,7 +18,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
index 2c7e933..673d207 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
@@ -175,7 +175,7 @@
"MAX(a.HMakeDate) 姹囨姤鏃ユ湡, a.HICMOBillNo 浠诲姟鍗曞彿, c.HProcExchBillNo 娴佽浆鍗″彿, c.HProcID, d.HName 宸ュ簭鍚嶇О" +
", sum(a.HWorkTimes) 宸ユ椂, b.HName 鐗╂枡鍚嶇О, a.HICMOQty 鐢熶骇璁㈠崟鏁伴噺, a.HPlanQty 璁″垝鏁伴噺, c.HQty 杩涚珯鏁伴噺" +
", co.HQty 鍑虹珯鍚堟牸鏁伴噺, c.HQty - co.HQty - co.HWasterQty 鏈繘绔欐暟閲�" +
- ", co.HWasterQty 涓嶅悎鏍兼暟閲�, co.HQty / (co.HQty + co.HWasterQty) 鍑虹珯鑹巼, co.HName 涓嶈壇鏄庣粏, co.HBadQty 涓嶈壇鏁伴噺 " +
+ ", co.HWasterQty 涓嶅悎鏍兼暟閲�, co.HQty / nullif((co.HQty+co.HWasterQty),0) 鍑虹珯鑹巼, co.HName 涓嶈壇鏄庣粏, co.HBadQty 涓嶈壇鏁伴噺 " +
" FROM Sc_StationOutBillMain a " +
"left join Gy_Material b on a.HMaterID = b.HItemID " +
"left join( " +
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs"
index 39b4f7d..2040c36 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs"
@@ -47,6 +47,10 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
+ this.label4 = new System.Windows.Forms.Label();
+ this.textHprocName = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.textHmaterName = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.txtHProcessExchangeBillNo = new System.Windows.Forms.TextBox();
this.txtHICMOBillNo = new System.Windows.Forms.TextBox();
@@ -57,10 +61,6 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.label2 = new System.Windows.Forms.Label();
- this.textHmaterName = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
- this.textHprocName = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -94,7 +94,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1587, 59);
+ this.Tool.Size = new System.Drawing.Size(1785, 71);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -108,7 +108,7 @@
this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(53, 56);
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(64, 66);
this.toolStripDropDownButton1.Text = "寮曞嚭";
this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -116,14 +116,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(223, 26);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(163, 34);
this.eXCELToolStripMenuItem.Text = "EXCEL";
this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
//
// cSVToolStripMenuItem
//
this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(223, 26);
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(163, 34);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -145,7 +145,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 71);
//
// cx
//
@@ -164,7 +164,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 71);
//
// tc
//
@@ -183,13 +183,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 71);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 71);
//
// mrlk
//
@@ -199,7 +199,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(73, 56);
+ this.mrlk.Size = new System.Drawing.Size(86, 66);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -209,7 +209,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 71);
//
// bclk
//
@@ -219,7 +219,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(73, 56);
+ this.bclk.Size = new System.Drawing.Size(86, 66);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -229,7 +229,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 71);
//
// pPic
//
@@ -248,47 +248,85 @@
this.pPic.Controls.Add(this.dtpHBDate);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 59);
- this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pPic.Location = new System.Drawing.Point(0, 71);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1587, 69);
+ this.pPic.Size = new System.Drawing.Size(1785, 83);
this.pPic.TabIndex = 17;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.BackColor = System.Drawing.Color.Transparent;
+ this.label4.Location = new System.Drawing.Point(636, 50);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(80, 18);
+ this.label4.TabIndex = 116;
+ this.label4.Text = "宸ュ簭鍚嶇О";
+ //
+ // textHprocName
+ //
+ this.textHprocName.Location = new System.Drawing.Point(739, 44);
+ this.textHprocName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.textHprocName.Name = "textHprocName";
+ this.textHprocName.Size = new System.Drawing.Size(212, 28);
+ this.textHprocName.TabIndex = 115;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.BackColor = System.Drawing.Color.Transparent;
+ this.label2.Location = new System.Drawing.Point(298, 50);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(80, 18);
+ this.label2.TabIndex = 114;
+ this.label2.Text = "鐗╂枡鍚嶇О";
+ //
+ // textHmaterName
+ //
+ this.textHmaterName.Location = new System.Drawing.Point(402, 44);
+ this.textHmaterName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.textHmaterName.Name = "textHmaterName";
+ this.textHmaterName.Size = new System.Drawing.Size(212, 28);
+ this.textHmaterName.TabIndex = 113;
//
// label6
//
this.label6.AutoSize = true;
this.label6.BackColor = System.Drawing.Color.Transparent;
- this.label6.Location = new System.Drawing.Point(871, 11);
+ this.label6.Location = new System.Drawing.Point(980, 13);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(67, 15);
+ this.label6.Size = new System.Drawing.Size(80, 18);
this.label6.TabIndex = 112;
this.label6.Text = "娴佽浆鍗″彿";
//
// txtHProcessExchangeBillNo
//
- this.txtHProcessExchangeBillNo.Location = new System.Drawing.Point(966, 4);
- this.txtHProcessExchangeBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHProcessExchangeBillNo.Location = new System.Drawing.Point(1087, 5);
+ this.txtHProcessExchangeBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHProcessExchangeBillNo.Name = "txtHProcessExchangeBillNo";
- this.txtHProcessExchangeBillNo.Size = new System.Drawing.Size(189, 25);
+ this.txtHProcessExchangeBillNo.Size = new System.Drawing.Size(212, 28);
this.txtHProcessExchangeBillNo.TabIndex = 109;
//
// txtHICMOBillNo
//
- this.txtHICMOBillNo.Location = new System.Drawing.Point(657, 4);
- this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(739, 5);
+ this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
- this.txtHICMOBillNo.Size = new System.Drawing.Size(189, 25);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(212, 28);
this.txtHICMOBillNo.TabIndex = 35;
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(571, 9);
+ this.label3.Location = new System.Drawing.Point(642, 11);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(52, 15);
+ this.label3.Size = new System.Drawing.Size(62, 18);
this.label3.TabIndex = 34;
this.label3.Text = "宸ュ崟鍙�";
//
@@ -296,20 +334,20 @@
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Location = new System.Drawing.Point(279, 9);
+ this.label1.Location = new System.Drawing.Point(314, 11);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(37, 15);
+ this.label1.Size = new System.Drawing.Size(44, 18);
this.label1.TabIndex = 7;
this.label1.Text = "鏃ユ湡";
//
// dtpHBDate
//
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(357, 4);
- this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.dtpHBDate.Location = new System.Drawing.Point(402, 5);
+ this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dtpHBDate.Name = "dtpHBDate";
- this.dtpHBDate.Size = new System.Drawing.Size(141, 25);
+ this.dtpHBDate.Size = new System.Drawing.Size(158, 28);
this.dtpHBDate.TabIndex = 9;
//
// lblCaption
@@ -318,10 +356,10 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(16, 20);
+ this.lblCaption.Location = new System.Drawing.Point(18, 24);
this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(210, 24);
+ this.lblCaption.Size = new System.Drawing.Size(253, 29);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "涓嶈壇鏄庣粏鑹巼鎶ヨ〃";
//
@@ -337,13 +375,13 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdMain.Location = new System.Drawing.Point(0, 154);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1587, 414);
+ this.grdMain.Size = new System.Drawing.Size(1785, 496);
this.grdMain.TabIndex = 48;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -356,65 +394,27 @@
this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(0, 542);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdSum.Location = new System.Drawing.Point(0, 650);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1587, 24);
+ this.grdSum.Size = new System.Drawing.Size(1785, 29);
this.grdSum.TabIndex = 49;
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(265, 42);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(67, 15);
- this.label2.TabIndex = 114;
- this.label2.Text = "鐗╂枡鍚嶇О";
- //
- // textHmaterName
- //
- this.textHmaterName.Location = new System.Drawing.Point(357, 37);
- this.textHmaterName.Margin = new System.Windows.Forms.Padding(4);
- this.textHmaterName.Name = "textHmaterName";
- this.textHmaterName.Size = new System.Drawing.Size(189, 25);
- this.textHmaterName.TabIndex = 113;
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(565, 42);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(67, 15);
- this.label4.TabIndex = 116;
- this.label4.Text = "宸ュ簭鍚嶇О";
- //
- // textHprocName
- //
- this.textHprocName.Location = new System.Drawing.Point(657, 37);
- this.textHprocName.Margin = new System.Windows.Forms.Padding(4);
- this.textHprocName.Name = "textHprocName";
- this.textHprocName.Size = new System.Drawing.Size(189, 25);
- this.textHprocName.TabIndex = 115;
//
// DefectiveDetailedYieldReport
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1587, 566);
+ this.ClientSize = new System.Drawing.Size(1785, 679);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "DefectiveDetailedYieldReport";
this.Text = "涓嶈壇鏄庣粏鑹巼鎶ヨ〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.resx" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.resx"
index f01ab55..6a1e7e6 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.resx"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.resx"
@@ -256,7 +256,7 @@
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEk0AABJNAfOXxKcAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -268,7 +268,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEk0AABJNAfOXxKcAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -282,7 +282,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEk0AABJNAfOXxKcAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -294,7 +294,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEk0AABJNAfOXxKcAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -304,7 +304,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEk0AABJNAfOXxKcAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -319,7 +319,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEk0AABJNAfOXxKcAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
--
Gitblit v1.9.1