From a24146dbb442e09daca1d0a901c55632a176ec6d Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 30 五月 2022 13:36:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBillList.resx | 656 +++------
Model/车间管理/ClsSc_ProcessExchangeBillSub.cs | 2
WarM/条码打印/Sc_ICMOToBarCode.cs | 56
WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs | 19
Model/车间管理/ClsSc_ProcessExchangeBillMain.cs | 2
WorkM/流转卡管理/Sc_ProcessExchangeBill.cs | 5
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 27
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 655 ++++++---
DAL/WMS/ClsGy_BarCodeBill_Ctl.cs | 184 +-
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 122 -
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 24
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 76
WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs | 33
WebAPI/ListModels.cs | 23
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 2
WorkM/流转卡管理/Sc_ProcessExchangeBill.designer.cs | 894 +++++++-----
WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs | 8
WebAPI/Controllers/SCGL/日计划管理/Sc_WorkBillSortBillController.cs | 16
WarM/条码打印/Gy_BarCodeBillList.cs | 866 +++++-------
WarM/条码打印/Gy_BarCodeBillList.designer.cs | 170 -
WorkM/流转卡管理/Sc_ProcessExchangeBill.resx | 82
21 files changed, 1,975 insertions(+), 1,947 deletions(-)
diff --git a/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs b/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs
index 260ac0b..d03c159 100644
--- a/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs
+++ b/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs
@@ -167,42 +167,6 @@
}
}
- //浣滃簾鏉＄爜
- public bool Cancelltion(string sBarCode)
- {
- try
- {
- oCn.BeginTran();
- //浣滃簾鏉＄爜
- oCn.RunProc("update Gy_BarCodeBill set HStopflag=1 where HBarCode='" + sBarCode + "'", ref DBUtility.ClsPub.sExeReturnInfo);
- oCn.Commit();
- return true;
- }
- catch (Exception e)
- {
- oCn.RollBack();
- throw (e);
- }
- }
-
- //鍙嶄綔搴熸潯鐮�
- public bool UnCancelltion(string sBarCode)
- {
- try
- {
- oCn.BeginTran();
- //鍙嶄綔搴熸潯鐮�
- oCn.RunProc("update Gy_BarCodeBill set HStopflag=0 where HBarCode='" + sBarCode + "'", ref DBUtility.ClsPub.sExeReturnInfo);
- oCn.Commit();
- return true;
- }
- catch (Exception e)
- {
- oCn.RollBack();
- throw (e);
- }
- }
-
public bool DeleteByMul(string[] sSQL, ref string sReturn)
{
try
@@ -225,42 +189,115 @@
}
- //鍒犻櫎鏉＄爜
- public bool DeleteBill(long sHItemID, string sHBarCode, string CurUserName, ref string sReturn)
+
+ //---------------------------------------------------------
+ //New
+
+ //浣滃簾鏉＄爜
+ public bool Cancelltion(string sHItemID, string sHBarCode, string sHDeleteMan)
{
- //缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, CurUserName))
- {
- sReturn = "鎮ㄦ病鏈夊垹闄ゆ潈闄愶紒";
- return true;
- }
try
{
- DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_Delete " + sHItemID + ",'" + sHBarCode + "','" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','" + DBUtility.ClsPub.IPAddress + "'", "h_p_Gy_BarCodeBill_Delete", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.BeginTran();
+ string[] NewBarCode;
+ NewBarCode = sHBarCode.Split(Convert.ToChar("#"));
+
+ //浣滃簾鏉＄爜
+ oCn.RunProc("update Gy_BarCodeBill set HStopflag=1,HDeleteMan='" + sHDeleteMan + "',HDeleteDate=getdate() where HItemID in (" + sHItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆绯荤粺鏃ュ織
+ for (int i = 0; i <= NewBarCode.Length - 1; i++)
+ {
+ oCn.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','浣滃簾鏉＄爜锛�" + NewBarCode[i] + "','WMS绯荤粺-鏉＄爜妗ｆ鍒楄〃妯″潡','" + DBUtility.ClsPub.IPAddress + "','浣滃簾'", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鍙嶄綔搴熸潯鐮�
+ public bool UnCancelltion(string sHItemID, string sHBarCode, string sSourceQtyCtl, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ string[] NewBarCode;
+ NewBarCode = sHBarCode.Split(Convert.ToChar("#"));
+ //鍙嶄綔搴熸潯鐮佸墠杩涜鍒ゆ柇
+ DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_UnCancelltion '" + sHItemID + "','" + sSourceQtyCtl + "'", "h_p_Gy_BarCodeBill_UnCancelltion", ref DBUtility.ClsPub.sExeReturnInfo);
if (DS == null || DS.Tables[0].Rows.Count <= 0)
{
oCn.CnClose();
oCn.CnDispose();
- sReturn = "鍒犻櫎鏉＄爜鏃跺彂鐢熼敊璇紒";
- return true;
+ sReturn = "鍙嶄綔搴熸潯鐮佸墠鍒ゆ柇鍙戠敓閿欒锛�";
+ return false;
}
else
{
- //鍒犻櫎澶辫触
if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
{
oCn.CnClose();
oCn.CnDispose();
sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
- return true;
+ return false;
}
else
- //鍒犻櫎鎴愬姛
+ {
+ //鍙嶄綔搴熸潯鐮�
+ oCn.RunProc("update Gy_BarCodeBill set HStopflag=0,HDeleteMan='',HDeleteDate=null where HItemID in (" + sHItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆绯荤粺鏃ュ織
+ for (int i = 0; i <= NewBarCode.Length - 1; i++)
+ {
+ oCn.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','鍙嶄綔搴熸潯鐮侊細" + NewBarCode[i] + "','WMS绯荤粺-鏉＄爜妗ｆ鍒楄〃妯″潡','" + DBUtility.ClsPub.IPAddress + "','鍙嶄綔搴�'", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ oCn.Commit();
+ return true;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鍗曟潯鍒犻櫎鏉＄爜
+ public bool DeleteBill(long sHItemID, string sHBarCode, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鍒犻櫎鏉＄爜鍓嶈繘琛屽垽鏂�
+ DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_Delete_Before " + sHItemID + ",'" + sHBarCode + "'", "h_p_Gy_BarCodeBill_Delete_Before", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DS == null || DS.Tables[0].Rows.Count <= 0)
+ {
+ oCn.CnClose();
+ oCn.CnDispose();
+ sReturn = "鍒犻櫎鏉＄爜鍓嶅垽鏂彂鐢熼敊璇紒";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
{
oCn.CnClose();
oCn.CnDispose();
sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
return false;
+ }
+ else
+ {
+ //鍒犻櫎鏉＄爜
+ oCn.RunProc("Delete from Gy_BarCodeBill where HItemID = " + sHItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆绯荤粺鏃ュ織
+ oCn.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','鍒犻櫎鏉＄爜锛�" + sHBarCode + "','WMS绯荤粺-鏉＄爜妗ｆ鍒楄〃妯″潡','" + DBUtility.ClsPub.IPAddress + "','鍒犻櫎'", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
}
}
}
@@ -272,41 +309,42 @@
}
//鎵归噺鍒犻櫎鏉＄爜
- public bool MulDeleteBill(string sHItemID, string sHBarCode, string CurUserName, ref string sReturn)
+ public bool MulDeleteBill(string sHItemID, string sHBarCode, ref string sReturn)
{
- //缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, CurUserName))
- {
- sReturn = "鎮ㄦ病鏈夊垹闄ゆ潈闄愶紒";
- return true;
- }
try
{
- DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_MulDelete '" + sHItemID + "','" + sHBarCode + "','" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','" + DBUtility.ClsPub.IPAddress + "'", "h_p_Gy_BarCodeBill_MulDelete", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.BeginTran();
+ string[] NewBarCode;
+ NewBarCode = sHBarCode.Split(Convert.ToChar("#"));
+ //鎵归噺鍒犻櫎鏉＄爜鍓嶈繘琛屽垽鏂�
+ DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_MulDelete_Before '" + sHItemID + "','" + sHBarCode + "'", "h_p_Gy_BarCodeBill_MulDelete_Before", ref DBUtility.ClsPub.sExeReturnInfo);
if (DS == null || DS.Tables[0].Rows.Count <= 0)
{
oCn.CnClose();
oCn.CnDispose();
- sReturn = "鎵归噺鍒犻櫎鏉＄爜鏃跺彂鐢熼敊璇紒";
- return true;
+ sReturn = "鎵归噺鍒犻櫎鏉＄爜鍓嶅垽鏂彂鐢熼敊璇紒";
+ return false;
}
else
{
- //鎵归噺鍒犻櫎澶辫触
if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
{
oCn.CnClose();
oCn.CnDispose();
sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
- return true;
+ return false;
}
else
- //鎵归噺鍒犻櫎鎴愬姛
{
- oCn.CnClose();
- oCn.CnDispose();
- sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
- return false;
+ //鎵归噺鍒犻櫎鏉＄爜
+ oCn.RunProc("Delete from Gy_BarCodeBill where HItemID in (" + sHItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆绯荤粺鏃ュ織
+ for (int i = 0; i <= NewBarCode.Length - 1; i++)
+ {
+ oCn.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','鎵归噺鍒犻櫎鏉＄爜锛�" + NewBarCode[i] + "','WMS绯荤粺-鏉＄爜妗ｆ鍒楄〃妯″潡','" + DBUtility.ClsPub.IPAddress + "','鎵归噺鍒犻櫎'", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ oCn.Commit();
+ return true;
}
}
}
@@ -316,10 +354,6 @@
throw (e);
}
}
-
-
-
-
//鏉＄爜鐢熸垚妯″潡璋冪敤 鏉＄爜鎵撳嵃鍓嶏紝鏉＄爜鎵撳嵃娆℃暟鎺у埗锛堟槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟锛�
public bool Set_CheckPrintQty_SD(Int64 HInterID, long PrintQty, ref string sReturn)
@@ -349,7 +383,7 @@
}
//鏉＄爜妗ｆ鍒楄〃妯″潡璋冪敤 鏉＄爜鎵撳嵃鍓嶏紝鏉＄爜鎵撳嵃娆℃暟鎺у埗锛堟槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟锛�
- public bool Set_CheckPrintQty(string sBarCodeItemID,long PrintQty, ref string sReturn)
+ public bool Set_CheckPrintQty(string sBarCodeItemID, long PrintQty, ref string sReturn)
{
DataSet DS;
string sBarCode = "";
@@ -410,12 +444,6 @@
throw (e);
}
}
-
-
-
-
-
-
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index d627869..847bfa4 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -58,8 +58,7 @@
{
//
oCn.BeginTran();
- //鏇存柊涓昏〃
- oCn.RunProc("UpDate Sc_ProcessExchangeBillMain set " +
+ string sql = string.Format(@"UpDate Sc_ProcessExchangeBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + omodel.HDate + "'" +
",HYear='" + omodel.HYear.ToString() + "'" +
@@ -121,6 +120,8 @@
//鍔犲叆鐢熶骇绫诲瀷
",HWorkTypeNum='" + omodel.HWorkTypeNum + "'" +
" where HInterID=" + lngBillKey.ToString());
+ //鏇存柊涓昏〃
+ oCn.RunProc(sql);
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
@@ -129,7 +130,8 @@
omodel.HInterID = lngBillKey;
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
{
- oCn.RunProc("Insert into Sc_ProcessExchangeBillSub " +
+
+ string sql1 = string.Format(@"Insert into Sc_ProcessExchangeBillSub " +
" (HInterID,HEntryID,HBillNo_bak," +
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
"HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType," +
@@ -147,26 +149,27 @@
",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID," +
"HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
- ",HMouldNo,HProcWorkNum" +
+ ",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" +
",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + 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.HRelationQty_In.ToString() + ","
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "',"
+ + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HRelationQty_In.ToString() + ","
+ oSub.HRelationQty_Out.ToString() + "," + oSub.HRelationQty_WWOrder.ToString() + "," + oSub.HRelationQty_Bad.ToString() +
"," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'" +
"," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'," + oSub.HGroupID.ToString() +
",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() +
- ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + oSub.HPlanBeginDate.ToShortDateString() + "'" +
- ",'" + oSub.HPlanEndDate.ToShortDateString() + "','" + oSub.HRelBeginDate.ToShortDateString() + "','" + oSub.HRelEndDate.ToShortDateString() + "'" +
+ ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + omodel.HPlanBeginDate.ToShortDateString() + "'" +
+ ",'" + omodel.HPlanEndDate.ToShortDateString() + "',getdate(),getdate()" +
"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() + "," + oSub.HBeginDayQty.ToString() +
"," + oSub.HBeginFixQty.ToString() + "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() +
"," + oSub.HMyWorkDays.ToString() + "," + oSub.HOutPrice.ToString() + "," + oSub.HOutMoney.ToString() + "," + oSub.HPassRate.ToString() + ",'" + oSub.HLastProc + "'" +
",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
"," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
"," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
- ",'" + oSub.HMouldNo.ToString() + "','" + oSub.HProcWorkNum.ToString() + "'" +
+ ",'" + oSub.HMouldNo?.ToString() + "','" + oSub.HProcWorkNum?.ToString() + "','"+ omodel.HSeOrderInterID.ToString() + "','"+ omodel.HSeOrderEntryID.ToString() + "'"+
") ");
+ oCn.RunProc(sql1);
}
//
oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetRemark " + omodel.HInterID.ToString()); //璁剧疆 澶囨敞 涓� 宸ヨ壓娴�
@@ -305,100 +308,45 @@
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
{
-
- string HInterID = omodel.HInterID.ToString();
- string HEntryID = oSub.HEntryID.ToString();
- string HBillNo = omodel.HBillNo;
- string HCloseMan = oSub.HCloseMan;
- string HEntryCloseDate = oSub.HEntryCloseDate.ToString();
- string HCloseType = Convert.ToString(oSub.HCloseType ? 1 : 0);
- string HRemark = oSub.HRemark;
- string HSourceInterID = oSub.HSourceInterID.ToString();
- string HSourceEntryID = oSub.HSourceEntryID.ToString();
- string HSourceBillNo = oSub.HSourceBillNo;
- string HSourceBillType = oSub.HSourceBillType;
- string HRelationQty = oSub.HRelationQty.ToString();
- string HRelationMoney = oSub.HRelationMoney.ToString();
- string HProcNo = oSub.HProcNo.ToString();
- string HProcID = oSub.HProcID.ToString();
- string HProcNumber = oSub.HProcNumber;
- string HWorkRemark = oSub.HWorkRemark;
- string HCenterID = oSub.HCenterID.ToString();
- string HDeptID = oSub.HDeptID.ToString();
- string HDeptNumber = oSub.HDeptNumber;
- string HGroupID = oSub.HGroupID.ToString();
- string HGroupNumber = oSub.HGroupNumber;
- string HWorkerID = oSub.HWorkerID.ToString();
- string HWorkerNumber = oSub.HWorkerNumber;
- string HSourceID = oSub.HSourceID.ToString();
- string HQty = oSub.HQty.ToString();
- string HTimeUnit = oSub.HTimeUnit;
- string HPlanWorkTimes = oSub.HPlanWorkTimes.ToString();
- string HPlanBeginDate = oSub.HPlanBeginDate.ToShortDateString();
- string HPlanEndDate = oSub.HPlanEndDate.ToShortDateString();
- string HRelBeginDate = oSub.HRelBeginDate.ToShortDateString();
- string HRelEndDate = oSub.HRelEndDate.ToShortDateString();
- string HReadyTime = oSub.HReadyTime.ToString();
- string HQueueTime = oSub.HQueueTime.ToString();
- string HMoveTime = oSub.HMoveTime.ToString();
- string HBeginDayQty = oSub.HBeginDayQty.ToString();
- string HBeginFixQty = oSub.HBeginFixQty.ToString();
- string HFixWorkDays = oSub.HFixWorkDays.ToString();
- string HTrunWorkDays = oSub.HTrunWorkDays.ToString();
- string HReadyTimes = oSub.HReadyTimes.ToString();
- string HMyWorkDays = oSub.HMyWorkDays.ToString();
- string HOutPrice = oSub.HOutPrice.ToString();
- string HOutMoney = oSub.HOutMoney.ToString();
- string HPassRate = oSub.HPassRate.ToString();
- string HLastProc = oSub.HLastProc;
- string HKeyProc = oSub.HKeyProc;
- string HFstProc = oSub.HFstProc;
- string HICMOInterID = oSub.HICMOInterID.ToString();
- string HICMOBillNo = oSub.HICMOBillNo;
- string HWWOrderInterID = oSub.HWWOrderInterID.ToString();
- string HWWOrderEntryID = oSub.HWWOrderEntryID.ToString();
- string HWWOrderBillNo = oSub.HWWOrderBillNo;
- string HReportQty = oSub.HReportQty.ToString();
- string HBackProc = Convert.ToString(oSub.HBackProc ? 1 : 0);
- string HSupID = oSub.HSupID.ToString();
- string HSupFlag = Convert.ToString(oSub.HSupFlag ? 1 : 0);
- string HOverRate = oSub.HOverRate.ToString();
- string HMaxQty = oSub.HMaxQty.ToString();
- string HTechnologyParameter = oSub.HTechnologyParameter;
- string HProcCheckNote = oSub.HProcCheckNote;
- string HPicNum = oSub.HPicNum;
- string HMouldNo = oSub.HMouldNo.ToString();
- string HProcWorkNum = oSub.HProcWorkNum.ToString();
-
- oCn.RunProc("Insert into Sc_ProcessExchangeBillSub " +
+ string sql1 = string.Format(@"Insert into Sc_ProcessExchangeBillSub " +
" (HInterID,HEntryID,HBillNo_bak," +
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
- "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
- "HProcNo,HProcID,HProcNumber,HWorkRemark,HCenterID,HDeptID" +
- ",HDeptNumber,HGroupID,HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
- ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate,HPlanEndDate,HRelBeginDate" +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType," +
+ "HRelationQty,HRelationMoney,HRelationQty_In," +
+ "HRelationQty_Out,HRelationQty_WWOrder,HRelationQty_Bad," +
+ "HProcNo,HProcID,HProcNumber,HWorkRemark," +
+ "HCenterID,HDeptID" +
+ ",HDeptNumber,HGroupID," +
+ "HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
+ ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate," +
+ "HPlanEndDate,HRelBeginDate" +
",HRelEndDate,HReadyTime,HQueueTime,HMoveTime,HBeginDayQty,HBeginFixQty" +
- ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
- ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
+ ",HFixWorkDays,HTrunWorkDays,HReadyTimes," +
+ "HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
+ ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID," +
+ "HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
- ",HMouldNo,HProcWorkNum" +
+ ",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" +
",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + 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.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "',"
+ + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HRelationQty_In.ToString() + ","
+ + oSub.HRelationQty_Out.ToString() + "," + oSub.HRelationQty_WWOrder.ToString() + "," + oSub.HRelationQty_Bad.ToString() +
"," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'" +
"," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'," + oSub.HGroupID.ToString() +
",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() +
- ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + oSub.HPlanBeginDate.ToShortDateString() + "'" +
- ",'" + oSub.HPlanEndDate.ToShortDateString() + "','" + oSub.HRelBeginDate.ToShortDateString() + "','" + oSub.HRelEndDate.ToShortDateString() + "'" +
+ ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + omodel.HPlanBeginDate.ToShortDateString() + "'" +
+ ",'" + omodel.HPlanEndDate.ToShortDateString() + "',getdate(),getdate()" +
"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() + "," + oSub.HBeginDayQty.ToString() +
"," + oSub.HBeginFixQty.ToString() + "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() +
"," + oSub.HMyWorkDays.ToString() + "," + oSub.HOutPrice.ToString() + "," + oSub.HOutMoney.ToString() + "," + oSub.HPassRate.ToString() + ",'" + oSub.HLastProc + "'" +
",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
"," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
- "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','"+ oSub.HPicNum + "'" +
- ",'" + oSub.HMouldNo.ToString() + "','" + oSub.HProcWorkNum.ToString() + "'" +
+ "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
+ ",'" + oSub.HMouldNo?.ToString() + "','" + oSub.HProcWorkNum?.ToString() + "','" + omodel.HSeOrderInterID.ToString() + "','" + omodel.HSeOrderEntryID.ToString() + "'" +
") ");
+ oCn.RunProc(sql1);
//鏇存柊鎵�閫夋祦杞崱鏁伴噺
if (!oSub.HBackProc)
{
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
index 60611bd..4334547 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
@@ -64,5 +64,7 @@
public string HMaterTexture;//材质
public string HProductNum;//成品编号
public string HVerNum;//版本
+ public string HSeOrderEntryID;
+ public string HSeOrderInterID;
}
}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
index 8509e5f..74eb8ad 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
@@ -73,3 +73,5 @@
public string HProcWorkNum;//程序号
}
}
+
+
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
index f9f460f..28c328d 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
@@ -25,123 +25,33 @@
public string ModCaption = "鏉＄爜妗ｆ鍒楄〃";
public const string ModName = "3302";
public const string ModRightName = "Gy_BarCodeBillList";
- public const string ModRightNameEdit = ModRightName + "_Edit";
- public const string ModRightNameCheck = ModRightName + "_Check";
- public const string ModRightNameClose = ModRightName + "_Close";
- public const string ModRightNameDelete = ModRightName + "_Delete";
+ public const string ModRightNameEdit = ModRightName + "_Edit"; //鍒犻櫎
+ public const string ModRightNameDelete = ModRightName + "_Delete"; //浣滃簾
public const string ModRightNamePrint = ModRightName + "_Print"; //鎵撳嵃
- //DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- //public Gy_ICBomBill oFrm;
+
+ DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
public int selectRow = 0;
public int selectRow2 = 0;
public long PrintQty = 0; //鍏佽鏉＄爜鎵撳嵃娆℃暟
public string PrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鎺у埗
public string UpdatePrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
- //
- private void initGrid()
- {
- DBUtility.Xt_BaseBillFun.initGridList(grdMain,this.Name);
- }
- //
+ public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
- private void Display()
- {
- ClsCN SubCn = new ClsCN();
- DataSet DSet;
- string sSql = "";
- string sWhere = "";
- //杩囨护鏉′欢
- if (frmCondition.SqlStr.Trim().Length == 0)
- return;
- sSql = frmCondition.SqlStr + sWhere + " order by 鏉＄爜缂栧彿 ";
- //
- DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
- //鐢熸垚棣栬鏍囬
- if (DSet == null)
- {
- MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
- return;
- }
- //
- grdMain.DataSource = DSet.Tables[0].DefaultView;
- //鍐荤粨
- int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
- string s = frmCondition.cmbHComplete.Text;
- DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s,FrCol);
- //鐢荤嚎
- GraphLine();
-
-
- //
- }
+ #region 鍥哄畾浠ｇ爜
- //
- private void timer1_Tick(object sender, EventArgs e)
- {
- timer1.Enabled=false;
- initGrid();
- Display();
- }
-
- private void tc_Click(object sender, EventArgs e)
- {
- this.Close();
- }
-
- private void sx_Click(object sender, EventArgs e)
- {
- timer1.Enabled = true;
- }
-
- private void dj_Click(object sender, EventArgs e)
- {
- Sub_ShowBill();
- }
- //鏄剧ず鍗曟嵁
- private void Sub_ShowBill()
- {
- //Int64 lngBillKey = 0;
- //if (grdMain.CurrentRow == null)
- // return;
- //lngBillKey =DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- //if (lngBillKey == 0)
- // return;
- //DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- //if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- //{
- // oFrm = new Gy_ICBomBill();
- // oFrm.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
- // oFrm.BillOld = oBill;
- // oFrm.ShowDialog();
- // if (oFrm.BillChange)
- // {
- // if (MessageBox.Show("鍗曟嵁鍒楄〃宸茬粡鍙戠敓鍙樺寲,鏄惁鍒锋柊", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
- // {
- // timer1.Enabled = true;
- // }
- // }
- //}
- //else
- //{
- // MessageBox.Show("鍗曟嵁鏈壘鍒�", "鎻愮ず");
- //}
- //oBill = null;
- }
- //
- private Int32 Fun_GetCol(string sCol)
- {
- return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
- }
- //
private void Gy_BarCodeBillList_Load(object sender, EventArgs e)
{
- //
frmCondition = new frmBillQueryCondition_New();
this.Text = ModCaption;
lblCaption.Text = ModCaption;
initGrid();
Sub_GetSystemParameter();
+ }
+
+ private void initGrid()
+ {
+ DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
}
//鑾峰彇绯荤粺鍙傛暟淇℃伅
@@ -159,119 +69,14 @@
PrintQty = oSystemParameter.omodel.BarCode_PrintQty;
PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
+ SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
}
}
- private void grdMain_DblClick(object sender, EventArgs e)
+ private void timer1_Tick(object sender, EventArgs e)
{
- Sub_ShowBill();
- }
-
- private void cx_Click(object sender, EventArgs e)
- {
- frmCondition = new frmBillQueryCondition_New();
- SetCondition(frmCondition, ViewName, this.Name);
- frmCondition.ShowDialog();
- if (frmCondition.Tag.ToString() == "OK")
- {
- Display();
- }
- }
-
- public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
- {
- frmCondition.Tag = "";
- frmCondition.ViewName = ViewName;
- frmCondition.ModName = Name;
- }
-
- private void xz_Click(object sender, EventArgs e)
- {
- //
- //oFrm = new Gy_ICBomBill();
- //oFrm.ShowDialog();
- }
-
- private void sc_Click(object sender, EventArgs e)
- {
- Sub_DeleteBill();
- }
- //鍒犻櫎
- private void Sub_DeleteBill()
- {
- // //缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
- {
- return;
- }
- //
- //Int64 lngBillKey = 0;
- //if (grdMain.CurrentRow == null)
- // return;
- //lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- //if (lngBillKey == 0)
- // return;
- //DAL.ClsGy_BarCodeBill_View oBill = new DAL.ClsGy_BarCodeBill_View();
- //DAL.ClsGy_BarCodeBill_Ctl oBillC = new DAL.ClsGy_BarCodeBill_Ctl();
- //if (oBill.GetInfoByID(lngBillKey))
- //{
- // if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.OK)
- // {
- // if (!oBillC.DeleteByID(lngBillKey))
- // {
- // MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- // return;
- // }
- // else
- // {
- // Display();
- // }
-
- // }
- //}
- //else
- //{
- // MessageBox.Show("鍗曟嵁鏈壘鍒�", "鎻愮ず");
- //}
-
- Int64 lngBillKey = 0;
- if (grdMain.CurrentRow == null)
- return;
- if (MessageBox.Show("纭畾瑕佸垹闄ゆ墍閫夊崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
- {
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- lngBillKey = DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value);
- if (lngBillKey == 0)
- return;
- DAL.ClsGy_BarCodeBill_View oBill = new DAL.ClsGy_BarCodeBill_View();
- DAL.ClsGy_BarCodeBill_Ctl oBillC = new DAL.ClsGy_BarCodeBill_Ctl();
- if (oBill.GetInfoByID(lngBillKey))
- {
- try
- {
- oBillC.DeleteByID(lngBillKey);
- }
- catch (Exception ex)
- {
- MessageBox.Show("鍒犻櫎澶辫触锛屾潯鐮�" + grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value + "宸茶浣跨敤", "鎻愮ず");
- Display();
- return;
- }
- if (oBillC.DeleteByID(lngBillKey) != true)
- {
- MessageBox.Show("鍒犻櫎澶辫触,鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- }
- else
- {
- MessageBox.Show("鍗曟嵁鏈壘鍒帮紒", "鎻愮ず");
- return;
- }
- }
- }
- MessageBox.Show("鍒犻櫎鎴愬姛锛�", "鎻愮ず");
+ timer1.Enabled = false;
+ initGrid();
Display();
}
@@ -287,124 +92,16 @@
}
}
-
-
- private void bclk_Click(object sender, EventArgs e)
+ public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
{
- //淇濆瓨鍒楀
- DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ frmCondition.Tag = "";
+ frmCondition.ViewName = ViewName;
+ frmCondition.ModName = Name;
}
- private void mrlk_Click(object sender, EventArgs e)
+ private void grdMain_Paint(object sender, PaintEventArgs e)
{
- DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
- }
- //
- private void GraphLine()
- {
- int MainIDCol = Fun_GetCol("hmainid");
- int SubIDCol = Fun_GetCol("hsubid");
- string s = frmCondition.cmbHComplete.Text;
- long n=0;
- DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
- //鏄剧ず
- lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
- lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
- }
- //瀹℃牳
- private void sh_Click(object sender, EventArgs e)
- {
- this.Sub_CheckBill();
- }
-
- //瀹℃牳鍗曟嵁
- private void Sub_CheckBill()
- {
- //瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
- {
- return;
- }
- //
- Int64 lngBillKey = 0;
- if (grdMain.CurrentRow == null)
- return;
- lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- if (lngBillKey == 0)
- return;
- DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- if (oBill.omodel.HChecker.Trim() != "")
- {
- MessageBox.Show("鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳", "鎻愮ず");
- return;
- }
- }
- else
- {
- MessageBox.Show("鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- //瀹℃牳
- if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- {
- MessageBox.Show("瀹℃牳鎴愬姛!", "鎻愮ず");
- return;
- }
- else
- {
- MessageBox.Show("瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- }
- //鍙嶅鍗曟嵁
- private void Sub_AbandonCheck()
- {
- //瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
- {
- return;
- }
- //
- Int64 lngBillKey = 0;
- if (grdMain.CurrentRow == null)
- return;
- lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- if (lngBillKey == 0)
- return;
- DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- if (oBill.omodel.HChecker.Trim() == "")
- {
- MessageBox.Show("鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!", "鎻愮ず");
- return;
- }
- }
- else
- {
- MessageBox.Show("鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- //鍙嶅鏍�
- if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- {
- MessageBox.Show("鍙嶅鏍告垚鍔�!", "鎻愮ず");
- return;
- }
- else
- {
- MessageBox.Show("鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- }
- //鍙嶅鏍�
- private void qsh_Click(object sender, EventArgs e)
- {
- Sub_AbandonCheck();
+ GraphicsGrid();
}
private void GraphicsGrid()
@@ -412,7 +109,320 @@
DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
}
- #region //鎵撳嵃璁剧疆
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ }
+
+ #endregion
+
+
+ #region 鏌ヨ鍔熻兘
+
+ private void cx_Click(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ SetCondition(frmCondition, ViewName, this.Name);
+ frmCondition.ShowDialog();
+ if (frmCondition.Tag.ToString() == "OK")
+ {
+ Display();
+ }
+ }
+
+ private void Display()
+ {
+ ClsCN SubCn = new ClsCN();
+ DataSet DSet;
+ string sSql = "";
+ string sWhere = "";
+ //杩囨护鏉′欢
+ if (frmCondition.SqlStr.Trim().Length == 0)
+ return;
+ sSql = frmCondition.SqlStr + sWhere + " order by HItemID desc ";
+ //
+ DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+ //鍐荤粨
+ int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+ string s = frmCondition.cmbHComplete.Text;
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+ //鐢荤嚎
+ GraphLine();
+ }
+
+ private void GraphLine()
+ {
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ string s = frmCondition.cmbHComplete.Text;
+ long n = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s, ref n);
+ //鏄剧ず
+ lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
+ lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
+ }
+
+ #endregion
+
+
+ #region 鍒锋柊鍔熻兘
+
+ private void sx_Click(object sender, EventArgs e)
+ {
+ timer1.Enabled = true;
+ }
+
+ #endregion
+
+
+ #region 鍒犻櫎鍔熻兘
+
+ //鍗曟潯鍒犻櫎
+ private void sc_Click(object sender, EventArgs e)
+ {
+ Sub_DeleteBill();
+ }
+
+ private void Sub_DeleteBill()
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ if (grdMain.CurrentRow == null)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨闇�瑕佸垹闄ょ殑鏉＄爜锛�", "鎻愮ず");
+ return;
+ }
+ if (grdMain.SelectedRows.Count != 1)
+ {
+ MessageBox.Show("涓嶅厑璁稿琛屽垹闄わ紝璇烽噸鏂伴�夋嫨瑕佸垹闄ょ殑鏉＄爜锛�");
+ return;
+ }
+ else
+ {
+ if (MessageBox.Show("纭畾瑕佸垹闄ゆ墍閫夋潯鐮侊紵鍒犻櫎鍚庝笉鑳芥仮澶嶏紝璇疯皑鎱庢搷浣滐紒", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+ {
+ Int64 HItemID = 0;
+ string HBarCode = "";
+ HItemID = DBUtility.ClsPub.isLong(grdMain.SelectedRows[0].Cells[Fun_GetCol("hmainid")].Value);
+ HBarCode = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[0].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+
+ if (!oBar.DeleteBill(HItemID, HBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ return;
+ }
+ else
+ {
+ MessageBox.Show("鍒犻櫎鎴愬姛锛�", "鎻愮ず");
+ Display();
+ }
+ }
+ }
+ }
+
+ //鎵归噺鍒犻櫎
+ private void ps_Click(object sender, EventArgs e)
+ {
+ Sub_MulDeleteBill();
+ }
+
+ private void Sub_MulDeleteBill()
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ if (grdMain.CurrentRow == null)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨闇�瑕佸垹闄ょ殑鏉＄爜锛�", "鎻愮ず");
+ return;
+ }
+ if (grdMain.SelectedRows.Count > 300)
+ {
+ MessageBox.Show("鎵归噺鍒犻櫎鏉＄爜閫変腑琛屾暟涓嶈兘瓒呰繃300琛岋紒", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ if (MessageBox.Show("纭畾瑕佹壒閲忓垹闄ゆ墍閫夋潯鐮侊紵鍒犻櫎鍚庝笉鑳芥仮澶嶏紝璇疯皑鎱庢搷浣滐紒", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+ {
+ string HItemID = "";
+ string HBarCode = "";
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ HItemID = HItemID + "," + DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+ if (i != 0 && i % 100 == 0)
+ {
+ HBarCode = HBarCode + "#" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ else
+ {
+ HBarCode = HBarCode + "," + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ }
+
+ HItemID = HItemID.Remove(0, 1); //鍘绘帀瀛楃涓茬涓�涓瓧绗�
+ HBarCode = HBarCode.Remove(0, 1);
+ if (!oBar.MulDeleteBill(HItemID, HBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ return;
+ }
+ else
+ {
+ MessageBox.Show("鎵归噺鍒犻櫎鎴愬姛锛�", "鎻愮ず");
+ Display();
+ }
+ }
+ }
+ }
+
+ #endregion
+
+
+ #region 浣滃簾鍔熻兘
+
+ private void zf_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ if (grdMain.CurrentRow == null)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨闇�瑕佷綔搴熺殑鏉＄爜锛�", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ if (MessageBox.Show("纭畾瑕佷綔搴熸墍閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+ {
+ return;
+ }
+ else
+ {
+ string HItemID = "";
+ string HBarCode = "";
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ HItemID = HItemID + "," + DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+ if (i != 0 && i % 100 == 0)
+ {
+ HBarCode = HBarCode + "#" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ else
+ {
+ HBarCode = HBarCode + "," + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ }
+
+ HItemID = HItemID.Remove(0, 1); //鍘绘帀瀛楃涓茬涓�涓瓧绗�
+ HBarCode = HBarCode.Remove(0, 1);
+ if (!oBar.Cancelltion(HItemID, HBarCode, DBUtility.ClsPub.CurUserName))
+ {
+ MessageBox.Show("浣滃簾澶辫触锛�", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ MessageBox.Show("浣滃簾鎴愬姛锛�", "鎻愮ず");
+ Display();
+ }
+ }
+ }
+ }
+
+ #endregion
+
+
+ #region 鍙嶄綔搴熷姛鑳�
+
+ private void fzf_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ if (grdMain.CurrentRow == null)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨闇�瑕佸弽浣滃簾鐨勬潯鐮侊紒", "鎻愮ず");
+ return;
+ }
+ if (grdMain.SelectedRows.Count>300)
+ {
+ MessageBox.Show("鍚屾椂鍙嶄綔搴熸潯鐮侀�変腑琛屾暟涓嶈兘瓒呰繃300琛岋紒", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ if (MessageBox.Show("纭畾瑕佸弽浣滃簾鎵�閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+ {
+ return;
+ }
+ else
+ {
+ string HItemID = "";
+ string HBarCode = "";
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ HItemID = HItemID + "," + DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+ if (i != 0 && i % 100 == 0)
+ {
+ HBarCode = HBarCode + "#" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ else
+ {
+ HBarCode = HBarCode + "," + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ }
+
+ HItemID = HItemID.Remove(0, 1); //鍘绘帀瀛楃涓茬涓�涓瓧绗�
+ HBarCode = HBarCode.Remove(0, 1);
+ if (!oBar.UnCancelltion(HItemID, HBarCode, SourceQtyCtl, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ return;
+ }
+ else
+ {
+ MessageBox.Show("鍙嶄綔搴熸垚鍔燂紒", "鎻愮ず");
+ Display();
+ }
+ }
+ }
+ }
+
+ #endregion
+
+
+ #region 鎵撳嵃璁剧疆
GridppReport Report;
int CurRows = 0;
@@ -484,7 +494,7 @@
}
sBarCodeItemID = sBarCodeItemID.Remove(0, 1);
- if (PrintQtyCtl=="Y")
+ if (PrintQtyCtl == "Y")
{
if (oBar.Set_CheckPrintQty(sBarCodeItemID, PrintQty, ref sHRemark))
{
@@ -526,24 +536,11 @@
//Report.FieldByName("鐗╂枡浠ｇ爜").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鐗╂枡浠ｇ爜")].Value.ToString();
//Report.FieldByName("鐗╂枡鍚嶇О").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value.ToString();
//Report.FieldByName("瑙勬牸鍨嬪彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value.ToString();
- ////Report.FieldByName("鑷畾涔夎鏍�").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鑷畾涔夎鏍�")].Value.ToString();
- //Report.FieldByName("鏉＄爜缂栧彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value.ToString();
- //Report.FieldByName("鏁伴噺").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鏁伴噺")].Value.ToString();
- //Report.FieldByName("鎵规").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鎵瑰彿")].Value.ToString();
- //Report.FieldByName("婧愬崟鍗曞彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("婧愬崟鍗曞彿")].Value.ToString();
- //Report.FieldByName("閿�鍞鍗曞彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("閿�鍞鍗曞彿")].Value.ToString();
- //Report.FieldByName("閲囪喘璁㈠崟鍙�").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("閲囪喘璁㈠崟鍙�")].Value.ToString();
- //Report.FieldByName("渚涘簲鍟�").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("寰�鏉ュ崟浣�")].Value.ToString();
- //Report.FieldByName("鐢熶骇杞﹂棿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鐢熶骇杞﹂棿")].Value.ToString();
- //Report.FieldByName("澶囨敞").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("澶囨敞")].Value.ToString();
- //Report.FieldByName("鎬绘墭鏁�").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鎬绘墭鏁�")].Value.ToString();
- //Report.FieldByName("鎵樺彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鎵樺彿")].Value.ToString();
}
catch (Exception e)
{
MessageBox.Show("鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
}
- //CurRows = CurRows + 1;
}
//濉叆鍗曟嵁琛ㄤ綋淇℃伅
@@ -570,198 +567,39 @@
}
}
+ #endregion
- //杩炴墦
- private void dy2_Click(object sender, EventArgs e)
+ #region 寮曞嚭鍔熻兘
+
+ private void eXCELToolStripMenuItem_Click(object sender, EventArgs e)
{
- //閫夋嫨鎵撳嵃妯℃澘
- BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
- DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- oFrm.sBillName = ModName;
- oFrm.sBillModel = ModCaption;
- oFrm.ShowDialog();
- if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
- {
- //
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- selectRow = i;
- selectRow2 = i + 1;
- Sub_SetReport(oFrm.sOpenTmp);
- Report.Print(false);
- oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value));
- //
- if (selectRow2 > grdMain.SelectedRows.Count - 1)
- {
- }
- else
- {
- oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i + 1].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value));
- }
- Thread.Sleep(1000);
- i++;
- }
- }
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
+
+ private void cSVToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataGridViewToExcel2(grdMain, this.Text, this.Text);
}
#endregion
- //
- private void grdMain_Paint(object sender, PaintEventArgs e)
+ #region 閫�鍑哄姛鑳�
+
+ private void tc_Click(object sender, EventArgs e)
{
- GraphicsGrid();
+ this.Close();
}
- private void yc_Click(object sender, EventArgs e)
- {
- DataGridViewToExcel2(grdMain, this.Text, this.Text);
- }
- /// <summary>
- /// 缃戞牸 瀵煎嚭EXCEL 缃戞牸锛屾枃浠跺悕锛屾爣棰樺悕
- /// </summary>
- public static void DataGridViewToExcel2(DataGridView grdMain, string sText, string sBTText)
- {
- SaveFileDialog saveFileDialog = new SaveFileDialog();
- saveFileDialog.Filter = "Execl鏂囦欢(*.xls)|*.xls";
- saveFileDialog.FilterIndex = 0;
- saveFileDialog.RestoreDirectory = true;
- saveFileDialog.CreatePrompt = true;
- saveFileDialog.Title = "鏁版嵁瑙嗗浘瀵煎嚭EXCEL鏂囦欢";
- saveFileDialog.FileName = sText;
- //saveFileDialog.ShowDialog();
- if (saveFileDialog.ShowDialog() == DialogResult.OK)
- {
- Stream myStream;
- myStream = saveFileDialog.OpenFile();
- StreamWriter sw = new StreamWriter(myStream, System.Text.Encoding.GetEncoding("gb2312"));
- string str = "";
- DateTime start = DateTime.Now;
- try
- {
- if (sBTText != "")
- {
- sw.WriteLine(sBTText);
- }
- //鍐欐爣棰�
- bool sFirstCol = true;
- for (int i = 0; i < grdMain.ColumnCount; i++)
- {
- if (i > 0 && grdMain.Columns[i].HeaderText.Substring(0, 1) != "h" && grdMain.Columns[i].HeaderText.Substring(0, 1) != "H" && sFirstCol != true)
- {
- str += "\t";
- }
- if (grdMain.Columns[i].HeaderText.Substring(0, 1) != "h" && grdMain.Columns[i].HeaderText.Substring(0, 1) != "H")
- {
- sFirstCol = false;
- str += grdMain.Columns[i].HeaderText;
- }
- }
- str = str.Replace("\n", "");
- sw.WriteLine(str);
- //鍐欏唴瀹�
- for (int j = 0; j < grdMain.Rows.Count; j++)
- {
- string tempStr = "";
- sFirstCol = true;
- for (int k = 0; k < grdMain.Columns.Count; k++)
- {
- if (k > 0 && grdMain.Columns[k].HeaderText.Substring(0, 1) != "h" && grdMain.Columns[k].HeaderText.Substring(0, 1) != "H" && sFirstCol != true)
- {
- tempStr += "\t";
- }
- if (grdMain.Columns[k].HeaderText.Substring(0, 1) != "h" && grdMain.Columns[k].HeaderText.Substring(0, 1) != "H")
- {
- sFirstCol = false;
- if (grdMain.Rows[j].Cells[k].Value == null)
- {
- tempStr += string.Empty;
- }
- else
- {
- tempStr += grdMain.Rows[j].Cells[k].Value.ToString();
- }
- }
- }
- tempStr = tempStr.Replace("\n", "");
- sw.WriteLine(tempStr);
- }
- sw.Close();
- myStream.Close();
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- finally
- {
- sw.Close();
- myStream.Close();
- }
- MessageBox.Show("灏嗘宸ヤ綔琛ㄥ鍑轰负excel鍏辫�楁椂锛�" + DateTime.Now.Subtract(start).TotalMilliseconds.ToString() + "姣");
- }
- }
- private void zf_Click(object sender, EventArgs e)
- {
- //Sub_AbandonCheck();
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
- {
- return;
- }
- if (grdMain.CurrentRow == null)
- return;
- DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- if (MessageBox.Show("纭畾瑕佷綔搴熸墍閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
- {
- return;
- }
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
- {
- if (!oBar.Cancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value)))
- {
- MessageBox.Show("浣滃簾澶辫触锛�", "鎻愮ず");
- return;
- }
- }
- }
- MessageBox.Show("浣滃簾鎴愬姛锛�", "鎻愮ず");
- }
- private void fzf_Click(object sender, EventArgs e)
- {
- //this.Sub_CheckBill();
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
- {
- return;
- }
- if (grdMain.CurrentRow == null)
- return;
- DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- if (MessageBox.Show("纭畾瑕佸弽浣滃簾鎵�閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
- {
- return;
- }
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
- {
- if (!oBar.UnCancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value)))
- {
- MessageBox.Show("鍙嶄綔搴熷け璐ワ紒", "鎻愮ず");
- return;
- }
- }
- }
- MessageBox.Show("鍙嶄綔搴熸垚鍔燂紒", "鎻愮ず");
- }
+ #endregion
+
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
index 283100a..95a0fd1 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
@@ -37,23 +37,17 @@
this.lblCaption = new System.Windows.Forms.Label();
this.Tool = new System.Windows.Forms.ToolStrip();
this.dy = new System.Windows.Forms.ToolStripButton();
- this.dy2 = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
- this.yc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.cx = new System.Windows.Forms.ToolStripButton();
this.sx = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.xz = new System.Windows.Forms.ToolStripButton();
- this.dj = new System.Windows.Forms.ToolStripButton();
this.sc = new System.Windows.Forms.ToolStripButton();
+ this.ps = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.zf = new System.Windows.Forms.ToolStripButton();
this.fzf = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
- this.sh = new System.Windows.Forms.ToolStripButton();
- this.qsh = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
@@ -65,6 +59,9 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -132,24 +129,19 @@
this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripDropDownButton1,
this.dy,
- this.dy2,
this.yl,
- this.yc,
this.toolStripSeparator2,
this.cx,
this.sx,
this.toolStripSeparator1,
- this.xz,
- this.dj,
this.sc,
+ this.ps,
this.toolStripSeparator5,
this.zf,
this.fzf,
this.toolStripSeparator6,
- this.sh,
- this.qsh,
- this.toolStripSeparator4,
this.tc,
this.toolStripSeparator3,
this.toolStripSeparator9,
@@ -179,21 +171,6 @@
this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.dy.Click += new System.EventHandler(this.dy_Click);
//
- // dy2
- //
- this.dy2.AutoSize = false;
- this.dy2.Image = ((System.Drawing.Image)(resources.GetObject("dy2.Image")));
- this.dy2.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.dy2.ImageTransparentColor = System.Drawing.Color.White;
- this.dy2.Name = "dy2";
- this.dy2.Size = new System.Drawing.Size(36, 47);
- this.dy2.Text = "杩炴墦";
- this.dy2.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dy2.Visible = false;
- this.dy2.Click += new System.EventHandler(this.dy2_Click);
- //
// yl
//
this.yl.AutoSize = false;
@@ -207,20 +184,6 @@
this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.yl.Click += new System.EventHandler(this.yl_Click);
- //
- // yc
- //
- this.yc.AutoSize = false;
- this.yc.Image = ((System.Drawing.Image)(resources.GetObject("yc.Image")));
- this.yc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.yc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.yc.Name = "yc";
- this.yc.Size = new System.Drawing.Size(36, 47);
- this.yc.Text = "寮曞嚭";
- this.yc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.yc.Click += new System.EventHandler(this.yc_Click);
//
// toolStripSeparator2
//
@@ -259,37 +222,6 @@
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
- this.toolStripSeparator1.Visible = false;
- //
- // xz
- //
- this.xz.AutoSize = false;
- this.xz.Image = ((System.Drawing.Image)(resources.GetObject("xz.Image")));
- this.xz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.xz.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.xz.Name = "xz";
- this.xz.Size = new System.Drawing.Size(36, 47);
- this.xz.Text = "鏂板";
- this.xz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.xz.Visible = false;
- this.xz.Click += new System.EventHandler(this.xz_Click);
- //
- // dj
- //
- this.dj.AutoSize = false;
- this.dj.Image = ((System.Drawing.Image)(resources.GetObject("dj.Image")));
- this.dj.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dj.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.dj.ImageTransparentColor = System.Drawing.Color.White;
- this.dj.Name = "dj";
- this.dj.Size = new System.Drawing.Size(36, 47);
- this.dj.Text = "鍗曟嵁";
- this.dj.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dj.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dj.Visible = false;
- this.dj.Click += new System.EventHandler(this.dj_Click);
//
// sc
//
@@ -304,6 +236,20 @@
this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.sc.Click += new System.EventHandler(this.sc_Click);
+ //
+ // ps
+ //
+ this.ps.AutoSize = false;
+ this.ps.Image = ((System.Drawing.Image)(resources.GetObject("ps.Image")));
+ this.ps.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.ps.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.ps.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.ps.Name = "ps";
+ this.ps.Size = new System.Drawing.Size(36, 47);
+ this.ps.Text = "鎵瑰垹";
+ this.ps.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.ps.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.ps.Click += new System.EventHandler(this.ps_Click);
//
// toolStripSeparator5
//
@@ -342,42 +288,6 @@
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
- //
- // sh
- //
- this.sh.AutoSize = false;
- this.sh.Image = ((System.Drawing.Image)(resources.GetObject("sh.Image")));
- this.sh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sh.Name = "sh";
- this.sh.Size = new System.Drawing.Size(36, 47);
- this.sh.Text = "瀹℃牳";
- this.sh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sh.Visible = false;
- this.sh.Click += new System.EventHandler(this.sh_Click);
- //
- // qsh
- //
- this.qsh.AutoSize = false;
- this.qsh.Image = ((System.Drawing.Image)(resources.GetObject("qsh.Image")));
- this.qsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.qsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.qsh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.qsh.Name = "qsh";
- this.qsh.Size = new System.Drawing.Size(36, 47);
- this.qsh.Text = "鍙嶅";
- this.qsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.qsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.qsh.Visible = false;
- this.qsh.Click += new System.EventHandler(this.qsh_Click);
- //
- // toolStripSeparator4
- //
- this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
- this.toolStripSeparator4.Visible = false;
//
// tc
//
@@ -466,7 +376,6 @@
this.grdMain.RowTemplate.Height = 23;
this.grdMain.Size = new System.Drawing.Size(906, 428);
this.grdMain.TabIndex = 19;
- this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
//
// grdPrint
@@ -478,6 +387,34 @@
this.grdPrint.Size = new System.Drawing.Size(25, 24);
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
+ //
+ // toolStripDropDownButton1
+ //
+ this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.eXCELToolStripMenuItem,
+ this.cSVToolStripMenuItem});
+ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
+ 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(45, 47);
+ this.toolStripDropDownButton1.Text = "寮曞嚭";
+ this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ //
+ // eXCELToolStripMenuItem
+ //
+ this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ 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(180, 22);
+ this.cSVToolStripMenuItem.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// Gy_BarCodeBillList
//
@@ -517,10 +454,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
public System.Windows.Forms.Timer timer1;
private System.Windows.Forms.ToolStripButton sx;
- private System.Windows.Forms.ToolStripButton dj;
- private System.Windows.Forms.ToolStripButton xz;
private System.Windows.Forms.ToolStripButton sc;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.Timer timer2;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
private System.Windows.Forms.ToolStripButton mrlk;
@@ -528,18 +462,18 @@
private System.Windows.Forms.ToolStripButton bclk;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
- private System.Windows.Forms.ToolStripButton sh;
- private System.Windows.Forms.ToolStripButton qsh;
private System.Windows.Forms.DataGridView grdMain;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbljl;
private System.Windows.Forms.Label lbldj;
private System.Windows.Forms.DataGridView grdPrint;
private System.Windows.Forms.ToolStripButton dy;
- private System.Windows.Forms.ToolStripButton dy2;
- private System.Windows.Forms.ToolStripButton yc;
private System.Windows.Forms.ToolStripButton fzf;
private System.Windows.Forms.ToolStripButton zf;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+ private System.Windows.Forms.ToolStripButton ps;
+ private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
+ private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx"
index c8c8bf7..b4b5f1e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx"
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pPic.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Qk22QAMAAAAAADYAAAAoAAAAFQMAAFoAAAABABgAAAAAAAAAAADDDgAAww4AAAAAAAAAAAAA////////
@@ -3675,7 +3675,7 @@
//////////////////////////////////////////////////////////////////////8A
</value>
</data>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3699,350 +3699,234 @@
cUf8IBZf8/lz+lH1n+6HsPMP+EAsv+fy5/Oj/hALL/n8uKPrP90PYeYf8IBZf8/lxR/wgFl/z+XFH1n+
6HsPMP8AhALL/n8uKP8AhX9j/wA/lxR9Z/uh7B9w/wCFf2P/AD+XFH/CAWP/AD+XFH1n+6HsH3D/AIQC
x/5/Lij/AIQCy/5/Lij6z/dD2HmH/CAWX/P5cUf8K/sf+fy4o+tf3Q9h5h/wgFj/AM/lxR/wgFl/z+XF
- H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/tCS5QaG90b3Nob3AgMy4wADhCSU0EJQAA
- AAAAEAAAAAAAAAAAAAAAAAAAAAA4QklNA+0AAAAAABAASAAAAAEAAgBIAAAAAQACOEJJTQQmAAAAAAAO
- AAAAAAAAAAAAAD+AAAA4QklNBA0AAAAAAAQAAAB4OEJJTQQZAAAAAAAEAAAAHjhCSU0D8wAAAAAACQAA
- AAAAAAAAAQA4QklNBAoAAAAAAAEAADhCSU0nEAAAAAAACgABAAAAAAAAAAI4QklNA/UAAAAAAEgAL2Zm
- AAEAbGZmAAYAAAAAAAEAL2ZmAAEAoZmaAAYAAAAAAAEAMgAAAAEAWgAAAAYAAAAAAAEANQAAAAEALQAA
- AAYAAAAAAAE4QklNA/gAAAAAAHAAAP////////////////////////////8D6AAAAAD/////////////
- ////////////////A+gAAAAA/////////////////////////////wPoAAAAAP//////////////////
- //////////8D6AAAOEJJTQQAAAAAAAACAAE4QklNBAIAAAAAAAQAAAAAOEJJTQQIAAAAAAAQAAAAAQAA
- AkAAAAJAAAAAADhCSU0EHgAAAAAABAAAAAA4QklNBBoAAAAAAz8AAAAGAAAAAAAAAAAAAABoAAAEAAAA
- AAVnKmgHmJgALQAxAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAQAAAAAaAAAAAAAAAAA
- AAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAABAAAAABAAAAAAAAbnVsbAAAAAIAAAAGYm91bmRzT2Jq
- YwAAAAEAAAAAAABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21s
- b25nAAAAaAAAAABSZ2h0bG9uZwAABAAAAAAGc2xpY2VzVmxMcwAAAAFPYmpjAAAAAQAAAAAABXNsaWNl
- AAAAEgAAAAdzbGljZUlEbG9uZwAAAAAAAAAHZ3JvdXBJRGxvbmcAAAAAAAAABm9yaWdpbmVudW0AAAAM
- RVNsaWNlT3JpZ2luAAAADWF1dG9HZW5lcmF0ZWQAAAAAVHlwZWVudW0AAAAKRVNsaWNlVHlwZQAAAABJ
- bWcgAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRs
- b25nAAAAAAAAAABCdG9tbG9uZwAAAGgAAAAAUmdodGxvbmcAAAQAAAAAA3VybFRFWFQAAAABAAAAAAAA
- bnVsbFRFWFQAAAABAAAAAAAATXNnZVRFWFQAAAABAAAAAAAGYWx0VGFnVEVYVAAAAAEAAAAAAA5jZWxs
- VGV4dElzSFRNTGJvb2wBAAAACGNlbGxUZXh0VEVYVAAAAAEAAAAAAAlob3J6QWxpZ25lbnVtAAAAD0VT
- bGljZUhvcnpBbGlnbgAAAAdkZWZhdWx0AAAACXZlcnRBbGlnbmVudW0AAAAPRVNsaWNlVmVydEFsaWdu
- AAAAB2RlZmF1bHQAAAALYmdDb2xvclR5cGVlbnVtAAAAEUVTbGljZUJHQ29sb3JUeXBlAAAAAE5vbmUA
- AAAJdG9wT3V0c2V0bG9uZwAAAAAAAAAKbGVmdE91dHNldGxvbmcAAAAAAAAADGJvdHRvbU91dHNldGxv
- bmcAAAAAAAAAC3JpZ2h0T3V0c2V0bG9uZwAAAAAAOEJJTQQRAAAAAAABAQA4QklNBBQAAAAAAAQAAAAC
- OEJJTQQMAAAAAANsAAAAAQAAAIAAAAANAAABgAAAE4AAAANQABgAAf/Y/+AAEEpGSUYAAQIBAEgASAAA
- /+0ADEFkb2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMV
- ExMYEQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4O
- FBEMDAwMDBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAANAIADASIAAhEB
- AxEB/90ABAAI/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAAB
- AAIDBAUGBwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0
- coLRQwclklPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZm
- doaWprbG1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRSh
- sUIjwVLR8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU
- 5PSltcXV5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDsv+a+D+5mf9u1/wDkkv8A
- mvg/uZn/AG7X/wCSW+kpeLN4/Yx8OPw+1wP+a+D+5mf9u1/+SS/5r4P7mZ/27X/5Jb6SXFm8fsVWPw+1
- wP8Amvg/uZn/AG7X/wCSS/5r4P7mZ/27V/5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/bt
- X/klvpJcWbx+xXDj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1
- /wDkkv8Amvg/uZn/AG7X/wCSW+klxZvH7FVj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1/wDklvpJcWbx
- +xXDj8PtcD/mvg/uZn/btf8A5JL/AJr4P7mZ/wBu1/8AklvpJcWbx+xXDj8Ptf/ZOEJJTQQhAAAAAABV
- AAAAAQEAAAAPAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwAAAAEwBBAGQAbwBiAGUAIABQAGgA
- bwB0AG8AcwBoAG8AcAAgADcALgAwAAAAAQA4QklNBAYAAAAAAAcACAAAAAEBAP/hEkhodHRwOi8vbnMu
- YWRvYmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0n77u/JyBpZD0nVzVNME1wQ2VoaUh6cmVT
- ek5UY3prYzlkJz8+DQo8P2Fkb2JlLXhhcC1maWx0ZXJzIGVzYz0iQ1IiPz4NCjx4OnhhcG1ldGEgeG1s
- bnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eGFwdGs9IlhNUCB0b29sa2l0IDIuOC4yLTMzLCBmcmFtZXdv
- cmsgMS41Ij4NCgk8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjIt
- cmRmLXN5bnRheC1ucyMiIHhtbG5zOmlYPSJodHRwOi8vbnMuYWRvYmUuY29tL2lYLzEuMC8iPg0KCQk8
- cmRmOkRlc2NyaXB0aW9uIGFib3V0PSIiIHhtbG5zOnhhcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hh
- cC8xLjAvbW0vIj4NCgkJCTx4YXBNTTpEb2N1bWVudElEPmFkb2JlOmRvY2lkOnBob3Rvc2hvcDozOWZj
- MWM4NC0xZGIyLTExZDktYTU2YS1lOGQ1YmIxNTEyYjU8L3hhcE1NOkRvY3VtZW50SUQ+DQoJCTwvcmRm
- OkRlc2NyaXB0aW9uPg0KCTwvcmRmOlJERj4NCjwveDp4YXBtZXRhPg0KICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAog
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- IAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8P3hwYWNrZXQgZW5kPSd3Jz8+/9sAQwACAQECAQEC
- AgICAgICAgMFAwMDAwMGBAQDBQcGBwcHBgcHCAkLCQgICggHBwoNCgoLDAwMDAcJDg8NDA4LDAwM/9sA
- QwECAgIDAwMGAwMGDAgHCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM
- DAwMDAwM/8AAEQgAKgQAAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//E
- ALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYX
- GBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SV
- lpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5
- +v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMR
- BAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJ
- SlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5
- usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9YH7anicf8w3
- RB/3DbT/AOM0v/Da3ig/8w/Rf/Bbaf8AxmuL/wCEOHpR/wAIcPSv1/8As+n/ACn5x9cn3OyP7anig5B0
- 7RT/ANwy0/8AjNH/AA2l4n76boo/7hlp/wDGa43/AIQ4f3cUf8IcPSmsvh/KH1yf8x2X/DaPib/oHaJ/
- 4LLT/wCM0f8ADafiZeum6IR/2DbT/wCM1xv/AAhw9KP+EOH900v7Pp/yoFjJ/wAx2R/bV8S/9A3RP/Bb
- af8Axmj/AIbV8S/9A3RP/BbZ/wDxmuM/4Q0f3KX/AIQ4DopFH1Cn/KP67P8AmZ2X/DaviX/oG6J/4LbP
- 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
+ H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/bAEMAAgEBAgEBAgICAgICAgIDBQMDAwMD
+ BgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwMDAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwI
+ BwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIACoE
+ AAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUE
+ BAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4
+ OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+ srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEB
+ AQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIy
+ gQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
+ aGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV
+ 1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWB+2p4nH/MN0Qf9w20/wDjNL/w2t4o
+ P/MP0X/wW2n/AMZri/8AhDh6Uf8ACHD0r9f/ALPp/wAp+cfXJ9zsj+2p4oOQdO0U/wDcMtP/AIzR/wAN
+ peJ++m6KP+4Zaf8AxmuN/wCEOH93FH/CHD0prL4fyh9cn/Mdl/w2j4m/6B2if+Cy0/8AjNH/AA2n4mXr
+ puiEf9g20/8AjNcb/wAIcPSj/hDh/dNL+z6f8qBYyf8AMdkf21fEv/QN0T/wW2n/AMZo/wCG1fEv/QN0
+ T/wW2f8A8ZrjP+ENH9yl/wCEOA6KRR9Qp/yj+uz/AJmdl/w2r4l/6Buif+C2z/8AjNH/AA2r4l/6Buif
+ +C2z/wDjNcb/AMIcP7po/wCEOH900/7Ph/KL65P+Y7Mftq+JMf8AIO0Uf9w20/8AjNB/bU8S5407RD/3
+ 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
- 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
- /9k=
+ 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
+</value>
+ </data>
+ <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ 7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
+ v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
+ QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
+ DbMv/a+ZfOp/edfB/0WNO/7nlm/4n5kPNACbF6aBDfiMMGDpTagBJ8EGFAMNyAMZULAcezQaG6cRhUFe
+ wGkAWBALnjx5MhiD2CAvUGRAVv5yYBgsgMiRZwBSIII0IyskDTP8BwA/9nl6zExBggAAAABJRU5ErkJg
+ gg==
</value>
</data>
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
- jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
- grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
- FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
- u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="dy2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
@@ -4063,20 +3947,6 @@
NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
AABJRU5ErkJggg==
-</value>
- </data>
- <data name="yc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
- ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
- e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
- 4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
- zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
- RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
- /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
- uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
- GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
</value>
</data>
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -4105,31 +3975,21 @@
GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
</value>
</data>
- <data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
- ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
- BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
- WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
- U5njFPWGMF5qmIOIl3UlCAOTbm5E4yrKv0jTLfPWrcw1hZyXAELfmMAbHzEFJRupxj0QBc4gm681xAr/
- nRXgGp7hgffIJ4aj2VI005zvvMoyg2icvXqTe9AzOMXFq2RcUsSSYlwekee6+dVMQHf/BBfP4Ri+fFgi
- Vhzwt5no6h3lh8e3KD69yyy6dYIC8KI5x3x0cmb9SB3OId68f5Hw/jXCItisPSCqVxzy/c3kSduNgB4z
- 4CeZgPY6YH2HPGk7QGOLA8trG7C8xhJRVlVvhqTZ3t0z+8YseUw3wBfmDAtHelBh/AAAAABJRU5ErkJg
- gg==
-</value>
- </data>
- <data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
- BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
- CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
- tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
- cx82d1+EpURiHmu8817neYkEHQH+BEtZSfYHLCWSdTgI3vBtcjUXOHiVAAAAAElFTkSuQmCC
-</value>
- </data>
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
+ wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
+ GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
+ gwcDBhOOzp0wW+zoGpmG0bxBE1U2tAX/ocWVjQRY27JDenzClUtC39g8Dk4dcFzf0RuXw+nC+uZOMKCg
+ vI4avgPupUfg4wPWaEb2yVeLOGN5JVX08B3ARcFt+SBbAfnVBMgprKDmUIBOJgeaIr4sgr6avxEgK7+U
+ mkOuIIsgxeEBVsJcGblF1PgTgMZODQuwMj5XenYBNa5a9+CWAZe3bvTo5uhO2Zn/xgmLOwWSKSbg8r4D
+ 954XXNxIVNP4IszPVAtIwBrJKWmIjE1AlCoR0aokxMQnYWLGqEAoKIv3+mrGGPsEfOpdAqh7YNYAAAAA
+ SUVORK5CYII=
+</value>
+ </data>
+ <data name="ps.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
@@ -4167,32 +4027,6 @@
gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
- d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
- hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
- M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
- cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
- gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
- SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
- 8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
- C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
- TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
- 4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
- RjjfEubPT+xYiFFjlN6zugecWJq08TevKzWQkoPwiYMgbkzu2dzeO4ztwzNENPYgx3bJSI2IfwA9+QbK
- GO/lHQdYO/uxdRDA3WMUWiyGDncQXZ4g3j8+EiGNuSmYZqlmu0NscIpQ5A0vr1GU9fkZXdc5gNeuzU7B
- XF+qwdrFATdhsYGmgep9jGmWR1mLFeqZGRLfQAbch5/Q4rpF63yIA3h9ZZZn7lVIymtYSiqRzszsghmS
- PJzoib4AQHWvuebaS2wAAAAASUVORK5CYII=
</value>
</data>
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -4235,13 +4069,13 @@
AAAASUVORK5CYII=
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>102, 16</value>
</metadata>
- <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>191, 16</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>37</value>
</metadata>
</root>
\ No newline at end of file
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 b18ec97..23d3fb3 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"
@@ -748,62 +748,6 @@
}
}
- private void zf_Click(object sender, EventArgs e)
- {
- //Sub_AbandonCheck();
- if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
- {
- return;
- }
- if (grdMain.CurrentRow == null)
- return;
- DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- if (MessageBox.Show("纭畾瑕佷綔搴熸墍閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
- {
- return;
- }
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
- {
- if (!oBar.Cancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value)))
- {
- MessageBox.Show("浣滃簾澶辫触锛�", "鎻愮ず");
- return;
- }
- }
- }
- MessageBox.Show("浣滃簾鎴愬姛锛�", "鎻愮ず");
- }
-
- private void fzf_Click(object sender, EventArgs e)
- {
- //this.Sub_CheckBill();
- if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
- {
- return;
- }
- if (grdMain.CurrentRow == null)
- return;
- DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- if (MessageBox.Show("纭畾瑕佸弽浣滃簾鎵�閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
- {
- return;
- }
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
- {
- if (!oBar.UnCancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value)))
- {
- MessageBox.Show("鍙嶄綔搴熷け璐ワ紒", "鎻愮ず");
- return;
- }
- }
- }
- MessageBox.Show("鍙嶄綔搴熸垚鍔燂紒", "鎻愮ず");
- }
-
private void cmdHSaveBill_Click(object sender, EventArgs e)
{
diff --git a/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs b/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
index 35833b8..7e406a4 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
@@ -27,10 +27,10 @@
/// <returns></returns>
[Route("Gy_BarCodeBillList/Sub_DeleteBill")]
[HttpGet]
- public object Sub_DeleteBill(long HInterID, string HBarCode, string CurUserName)
+ public object Sub_DeleteBill(long HInterID, string HBarCode)
{
DAL.ClsGy_BarCodeBill_Ctl oBill = new DAL.ClsGy_BarCodeBill_Ctl();
- if (oBill.DeleteBill(HInterID, HBarCode, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
+ if (oBill.DeleteBill(HInterID, HBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -55,10 +55,10 @@
/// <returns></returns>
[Route("Gy_BarCodeBillList/Sub_MulDeleteBill")]
[HttpGet]
- public object Sub_MulDeleteBill(string sInterID, string sBarCode, string CurUserName)
+ public object Sub_MulDeleteBill(string sInterID, string sBarCode)
{
DAL.ClsGy_BarCodeBill_Ctl oBill = new DAL.ClsGy_BarCodeBill_Ctl();
- if (oBill.MulDeleteBill(sInterID, sBarCode, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
+ if (oBill.MulDeleteBill(sInterID, sBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index f7f8008..11bf5be 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -18,6 +18,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ #region[鏂板鍗曟嵁-淇濆瓨鎸夐挳]
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -29,237 +30,94 @@
{
var _value = sMainSub["sMainSub"].ToString();
string msg1 = _value.ToString();
- //淇濆瓨鍗曟嵁
- return objJsonResult = AddBillMain(msg1);
- }
-
- public json AddBillMain(string msg1)
- {
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
- string user = sArray[2].ToString();//鐢ㄦ埛鍚�
+ string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
- //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
- if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- bool bResult;
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+
try
{
- msg2 = "[" + msg2.ToString() + "]";
- List<Model.ClsSc_ProcessExchangeBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillMain>>(msg2);
- DAL.ClsSc_ProcessExchangeBill BillNew = new DAL.ClsSc_ProcessExchangeBill();
- //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
- string s = "";
- int sYear = 0;
- int sPeriod = 0;
- DateTime HDate = mainList[0].HDate;//鏃ユ湡
- if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = s;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
- BillNew.omodel.HPRDORGID= mainList[0].HPRDORGID;//缁勭粐
- BillNew.omodel.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
- BillNew.omodel.HYear = sYear;
- BillNew.omodel.HPeriod = sPeriod;
- BillNew.omodel.HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
- BillNew.omodel.HDate = HDate;
- BillNew.omodel.HRemark = mainList[0].HRemark;//澶囨敞
- BillNew.omodel.HMaker = mainList[0].HMaker;
- BillNew.omodel.HWWOrderInterID = ClsPub.isLong(mainList[0].HWWOrderInterID);
- BillNew.omodel.HWWOrderEntryID = ClsPub.isLong(mainList[0].HWWOrderEntryID);
- BillNew.omodel.HWWOrderBillNo = ClsPub.isStrNull(mainList[0].HWWOrderBillNo);
- BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
- BillNew.omodel.HICMOEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
- BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
- BillNew.omodel.HMaterID2 = ClsPub.isLong(mainList[0].HMaterID2);
- BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
- BillNew.omodel.HMaterNumber = ClsPub.isStrNull(mainList[0].HMaterNumber);
- BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
- BillNew.omodel.HUnitID = ClsPub.isLong(mainList[0].HUnitID);
- BillNew.omodel.HUnitNumber = ClsPub.isStrNull(mainList[0].HUnitNumber);
- BillNew.omodel.HPlanQty = ClsPub.isDoule(mainList[0].HPlanQty);
- BillNew.omodel.HQty = ClsPub.isDoule(mainList[0].HQty);
- BillNew.omodel.HPlanBeginDate = ClsPub.isDate(mainList[0].HPlanBeginDate);
- BillNew.omodel.HPlanEndDate = ClsPub.isDate(mainList[0].HPlanEndDate);
- BillNew.omodel.HExplanation = ClsPub.isStrNull(mainList[0].HExplanation);
- BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(mainList[0].HInnerBillNo);
- BillNew.omodel.HWorkShopID = ClsPub.isLong(mainList[0].HWorkShopID);
- BillNew.omodel.HSupID = ClsPub.isLong(mainList[0].HSupID);
- BillNew.omodel.HBLFlag = mainList[0].HBLFlag;
- BillNew.omodel.HMainMaterID = ClsPub.isLong(mainList[0].HMainMaterID);
- BillNew.omodel.HKeyMaterID = ClsPub.isLong(mainList[0].HKeyMaterID);
- BillNew.omodel.HOrderProcNO = ClsPub.isStrNull(mainList[0].HOrderProcNO);
- BillNew.omodel.HEquipMentID = ClsPub.isLong(mainList[0].HEquipMentID);
- BillNew.omodel.HMateOutBatchNo = ClsPub.isStrNull(mainList[0].HMateOutBatchNo);
- BillNew.omodel.HProjectNum = ClsPub.isStrNull(mainList[0].HProjectNum);
- BillNew.omodel.HProdMaterCode = ClsPub.isStrNull(mainList[0].HProdMaterCode);
- BillNew.omodel.HSeOrderBillNo = ClsPub.isStrNull(mainList[0].HSeOrderBillNo);
- BillNew.omodel.HCusShortName = ClsPub.isStrNull(mainList[0].HCusShortName);
- BillNew.omodel.HCusNeedMaterial = ClsPub.isStrNull(mainList[0].HCusNeedMaterial);
- BillNew.omodel.HPlanSendGoodsDate = ClsPub.isStrNull(mainList[0].HPlanSendGoodsDate);
- BillNew.omodel.HProdMaterName = ClsPub.isStrNull(mainList[0].HProdMaterName);
- BillNew.omodel.HCusName = ClsPub.isStrNull(mainList[0].HCusName);
- BillNew.omodel.HWorkRemark = ClsPub.isStrNull(mainList[0].HWorkRemark);
- BillNew.omodel.HImportNote = ClsPub.isStrNull(mainList[0].HImportNote);
- BillNew.omodel.HMaterNumber_A = ClsPub.isStrNull(mainList[0].HMaterNumber_A);
- BillNew.omodel.HMaterNumber_B = ClsPub.isStrNull(mainList[0].HMaterNumber_B);
- BillNew.omodel.HMaterNumber_C = ClsPub.isStrNull(mainList[0].HMaterNumber_C);
- BillNew.omodel.HMaterNumber_D = ClsPub.isStrNull(mainList[0].HMaterNumber_D);
- BillNew.omodel.HProdType = ClsPub.isStrNull(mainList[0].HProdType);
- BillNew.omodel.HMaterShortName = ClsPub.isStrNull(mainList[0].HMaterShortName);
- BillNew.omodel.HMaterIDA = ClsPub.isStrNull(mainList[0].HMaterIDA);
- BillNew.omodel.HMaterIDB = ClsPub.isStrNull(mainList[0].HMaterIDB);
- BillNew.omodel.HMaterIDC = ClsPub.isStrNull(mainList[0].HMaterIDC);
- BillNew.omodel.HMaterIDD = ClsPub.isStrNull(mainList[0].HMaterIDD);
- List<Model.ClsSc_ProcessExchangeBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(msg3);
- BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
- if (BillNew.omodel.HICMOInterID == 0)
+
+ DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
+ List<Model.ClsSc_ProcessExchangeBillMain> lsmain = new List<Model.ClsSc_ProcessExchangeBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sc_ProcessExchangeBillMain(msg2);
+ foreach (Model.ClsSc_ProcessExchangeBillMain oItem in lsmain)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "璇烽�夋嫨浠诲姟鍗曪紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- for (int i = 0; i < subList.ToArray().Length; i++)
- {
- if (DBUtility.ClsPub.isInt(subList[i].HProcID) != 0)//HQty
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3772";
+ oItem.HBillSubType = "3772";
+ oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
- Model.ClsSc_ProcessExchangeBillSub oSub = new Model.ClsSc_ProcessExchangeBillSub();
- oSub.HEntryID = i+1;
- oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[i].HRemark);
- oSub.HSourceInterID = ClsPub.isLong(mainList[0].HICMOInterID);
- oSub.HSourceEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
- oSub.HSourceBillType = "85";
- oSub.HSourceBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
- oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty);
- //oSub.HRelationQty_In = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_In);
- //oSub.HRelationQty_Out = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_Out);
- //oSub.HRelationQty_WWOrder = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_WWOrder);
- //oSub.HRelationQty_Bad = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_Bad);
- oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney);
- oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan);
- oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[i].HEntryCloseDate);
- oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType);
- oSub.HQty = DBUtility.ClsPub.isDoule(subList[i].HQty);
- if (oSub.HQty <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oSub.HProcNo = DBUtility.ClsPub.isLong(subList[i].HProcNo);
- if (oSub.HProcNo <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佹按鍙蜂笉鑳戒负0鎴栬�呭皬浜�0";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oSub.HProcID = DBUtility.ClsPub.isLong(subList[i].HProcID);
- oSub.HProcNumber = DBUtility.ClsPub.isStrNull(subList[i].HProcNumber);
- oSub.HWorkRemark = DBUtility.ClsPub.isStrNull(subList[i].HWorkRemark);
- oSub.HCenterID = DBUtility.ClsPub.isLong(subList[i].HCenterID);
- oSub.HDeptID = DBUtility.ClsPub.isLong(subList[i].HDeptID);
- oSub.HDeptNumber = DBUtility.ClsPub.isStrNull(subList[i].HDeptNumber);
- ////oSub.HGroupID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HGroupIDCol].Value);
- oSub.HGroupNumber = DBUtility.ClsPub.isStrNull(subList[i].HGroupNumber);
- oSub.HWorkerID = DBUtility.ClsPub.isLong(subList[i].HWorkerID);
- oSub.HWorkerNumber = DBUtility.ClsPub.isStrNull(subList[i].HWorkerNumber);
- oSub.HSourceID = DBUtility.ClsPub.isLong(subList[i].HSourceID);
- oSub.HTimeUnit = DBUtility.ClsPub.isStrNull(subList[i].HTimeUnit);
- oSub.HPlanWorkTimes = DBUtility.ClsPub.isSingle(subList[i].HPlanWorkTimes);
- oSub.HPlanBeginDate = DBUtility.ClsPub.isDate(subList[i].HPlanBeginDate);
- oSub.HPlanEndDate = DBUtility.ClsPub.isDate(subList[i].HPlanEndDate);
- oSub.HRelBeginDate = DBUtility.ClsPub.isDate(subList[i].HRelBeginDate);
- oSub.HRelEndDate = DBUtility.ClsPub.isDate(subList[i].HRelEndDate);
- oSub.HReadyTime = 0;
- oSub.HQueueTime = 0;
- oSub.HMoveTime = 0;
- oSub.HBeginDayQty = DBUtility.ClsPub.isSingle(subList[i].HBeginDayQty);
- oSub.HBeginFixQty = DBUtility.ClsPub.isSingle(subList[i].HBeginFixQty);
- oSub.HFixWorkDays = DBUtility.ClsPub.isSingle(subList[i].HFixWorkDays);
- oSub.HTrunWorkDays = DBUtility.ClsPub.isSingle(subList[i].HTrunWorkDays);
- oSub.HReadyTimes = DBUtility.ClsPub.isSingle(subList[i].HReadyTimes);
- oSub.HMyWorkDays = DBUtility.ClsPub.isSingle(subList[i].HMyWorkDays);
- oSub.HOutPrice = DBUtility.ClsPub.isSingle(subList[i].HOutPrice);
- oSub.HOutMoney = DBUtility.ClsPub.isSingle(subList[i].HOutMoney);
- oSub.HLastProc = "鍚�";
- oSub.HFstProc = "鍚�";
- oSub.HKeyProc = DBUtility.ClsPub.isStrNull(subList[i].HKeyProc);
- oSub.HSupID = DBUtility.ClsPub.isLong(subList[i].HSupID);
- oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].isEntrust);
- oSub.HBackProc = DBUtility.ClsPub.isBool(subList[i].HBackProc);
- oSub.HEdit = DBUtility.ClsPub.isBool(subList[i].HEdit);
- if (oSub.HCenterID == 0 && oSub.HSupFlag == false)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝宸ヤ綔涓績鎴栧澶栨爣璁颁笉鑳藉悓鏃朵负绌�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(subList[i].HICMOBillNo);
- oSub.HICMOInterID = DBUtility.ClsPub.isLong(subList[i].HICMOInterID);
- oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(subList[i].HSeOrderInterID);
- oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(subList[i].HSeOrderEntryID);
- oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(subList[i].HSeOrderBillNo);
- oSub.HWWOrderInterID = DBUtility.ClsPub.isLong(subList[i].HWWOrderInterID);
- oSub.HWWOrderEntryID = DBUtility.ClsPub.isLong(subList[i].HWWOrderEntryID);
- oSub.HWWOrderBillNo = DBUtility.ClsPub.isStrNull(subList[i].HWWOrderBillNo);
- oSub.HSumPassRate = DBUtility.ClsPub.isSingle(subList[i].HSumPassRate);
- oSub.HPassRate = DBUtility.ClsPub.isSingle(subList[i].HPassRate);
- oSub.HOverRate = DBUtility.ClsPub.isDoule(subList[i].HOverRate);
- oSub.HMaxQty = DBUtility.ClsPub.isDoule(subList[i].HMaxQty);
- oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(subList[i].HTechnologyParameter);
- oSub.HPicNum = DBUtility.ClsPub.isStrNull(subList[i].HPicNum);
- oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(subList[i].HProcCheckNote);
- oSub.HMouldNo = "";
- oSub.HProcWorkNum = "";
- BillNew.DetailColl.Add(oSub);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
}
+ oBill.omodel = oItem;
}
- //淇濆瓨瀹屾瘯鍚庡鐞�
- //if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
- //{
- // bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
- //}
- //else
- //{
- // bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
- //}
- bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
- //鎻愮ず
- if (bResult == true)
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSc_ProcessExchangeBillSub> ls = new List<Model.ClsSc_ProcessExchangeBillSub>();
+ ls = oListModels.getObjectByJson_Sc_ProcessExchangeBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsSc_ProcessExchangeBillSub oItemSub in ls)
{
- objJsonResult.code = "1";
+
+ i++;
+ oItemSub.HEntryID = i;
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (msg5 == "xz")
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
objJsonResult.count = 1;
- //objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
- objJsonResult.Message = ClsPub.sExeReturnInfo+"鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
- objJsonResult.data = null;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
return objJsonResult;
}
else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
return objJsonResult;
}
}
@@ -267,12 +125,254 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
return objJsonResult;
}
}
+ //public json AddBillMain(string msg1)
+ //{
+ // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ // string msg2 = sArray[0].ToString();//琛ㄥご
+ // string msg3 = sArray[1].ToString();//琛ㄤ綋
+ // string user = sArray[2].ToString();//鐢ㄦ埛鍚�
+
+ // //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ // if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, user))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+
+ // bool bResult;
+ // try
+ // {
+ // msg2 = "[" + msg2.ToString() + "]";
+ // List<Model.ClsSc_ProcessExchangeBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillMain>>(msg2);
+ // DAL.ClsSc_ProcessExchangeBill BillNew = new DAL.ClsSc_ProcessExchangeBill();
+ // //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ // string s = "";
+ // int sYear = 0;
+ // int sPeriod = 0;
+ // DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ // if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = s;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // BillNew.omodel.HPRDORGID= mainList[0].HPRDORGID;//缁勭粐
+ // BillNew.omodel.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ // BillNew.omodel.HYear = sYear;
+ // BillNew.omodel.HPeriod = sPeriod;
+ // BillNew.omodel.HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ // BillNew.omodel.HDate = HDate;
+ // BillNew.omodel.HRemark = mainList[0].HRemark;//澶囨敞
+ // BillNew.omodel.HMaker = mainList[0].HMaker;
+ // BillNew.omodel.HWWOrderInterID = ClsPub.isLong(mainList[0].HWWOrderInterID);
+ // BillNew.omodel.HWWOrderEntryID = ClsPub.isLong(mainList[0].HWWOrderEntryID);
+ // BillNew.omodel.HWWOrderBillNo = ClsPub.isStrNull(mainList[0].HWWOrderBillNo);
+ // BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ // BillNew.omodel.HICMOEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
+ // BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+ // BillNew.omodel.HMaterID2 = ClsPub.isLong(mainList[0].HMaterID2);
+ // BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
+ // BillNew.omodel.HMaterNumber = ClsPub.isStrNull(mainList[0].HMaterNumber);
+ // BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
+ // BillNew.omodel.HUnitID = ClsPub.isLong(mainList[0].HUnitID);
+ // BillNew.omodel.HUnitNumber = ClsPub.isStrNull(mainList[0].HUnitNumber);
+ // BillNew.omodel.HPlanQty = ClsPub.isDoule(mainList[0].HPlanQty);
+ // BillNew.omodel.HQty = ClsPub.isDoule(mainList[0].HQty);
+ // BillNew.omodel.HPlanBeginDate = ClsPub.isDate(mainList[0].HPlanBeginDate);
+ // BillNew.omodel.HPlanEndDate = ClsPub.isDate(mainList[0].HPlanEndDate);
+ // BillNew.omodel.HExplanation = ClsPub.isStrNull(mainList[0].HExplanation);
+ // BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(mainList[0].HInnerBillNo);
+ // BillNew.omodel.HWorkShopID = ClsPub.isLong(mainList[0].HWorkShopID);
+ // BillNew.omodel.HSupID = ClsPub.isLong(mainList[0].HSupID);
+ // BillNew.omodel.HBLFlag = mainList[0].HBLFlag;
+ // BillNew.omodel.HMainMaterID = ClsPub.isLong(mainList[0].HMainMaterID);
+ // BillNew.omodel.HKeyMaterID = ClsPub.isLong(mainList[0].HKeyMaterID);
+ // BillNew.omodel.HOrderProcNO = ClsPub.isStrNull(mainList[0].HOrderProcNO);
+ // BillNew.omodel.HEquipMentID = ClsPub.isLong(mainList[0].HEquipMentID);
+ // BillNew.omodel.HMateOutBatchNo = ClsPub.isStrNull(mainList[0].HMateOutBatchNo);
+ // BillNew.omodel.HProjectNum = ClsPub.isStrNull(mainList[0].HProjectNum);
+ // BillNew.omodel.HProdMaterCode = ClsPub.isStrNull(mainList[0].HProdMaterCode);
+ // BillNew.omodel.HSeOrderBillNo = ClsPub.isStrNull(mainList[0].HSeOrderBillNo);
+ // BillNew.omodel.HCusShortName = ClsPub.isStrNull(mainList[0].HCusShortName);
+ // BillNew.omodel.HCusNeedMaterial = ClsPub.isStrNull(mainList[0].HCusNeedMaterial);
+ // BillNew.omodel.HPlanSendGoodsDate = ClsPub.isStrNull(mainList[0].HPlanSendGoodsDate);
+ // BillNew.omodel.HProdMaterName = ClsPub.isStrNull(mainList[0].HProdMaterName);
+ // BillNew.omodel.HCusName = ClsPub.isStrNull(mainList[0].HCusName);
+ // BillNew.omodel.HWorkRemark = ClsPub.isStrNull(mainList[0].HWorkRemark);
+ // BillNew.omodel.HImportNote = ClsPub.isStrNull(mainList[0].HImportNote);
+ // BillNew.omodel.HMaterNumber_A = ClsPub.isStrNull(mainList[0].HMaterNumber_A);
+ // BillNew.omodel.HMaterNumber_B = ClsPub.isStrNull(mainList[0].HMaterNumber_B);
+ // BillNew.omodel.HMaterNumber_C = ClsPub.isStrNull(mainList[0].HMaterNumber_C);
+ // BillNew.omodel.HMaterNumber_D = ClsPub.isStrNull(mainList[0].HMaterNumber_D);
+ // BillNew.omodel.HProdType = ClsPub.isStrNull(mainList[0].HProdType);
+ // BillNew.omodel.HMaterShortName = ClsPub.isStrNull(mainList[0].HMaterShortName);
+ // BillNew.omodel.HMaterIDA = ClsPub.isStrNull(mainList[0].HMaterIDA);
+ // BillNew.omodel.HMaterIDB = ClsPub.isStrNull(mainList[0].HMaterIDB);
+ // BillNew.omodel.HMaterIDC = ClsPub.isStrNull(mainList[0].HMaterIDC);
+ // BillNew.omodel.HMaterIDD = ClsPub.isStrNull(mainList[0].HMaterIDD);
+ // List<Model.ClsSc_ProcessExchangeBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(msg3);
+ // BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
+ // if (BillNew.omodel.HICMOInterID == 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "璇烽�夋嫨浠诲姟鍗曪紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // for (int i = 0; i < subList.ToArray().Length; i++)
+ // {
+ // if (DBUtility.ClsPub.isInt(subList[i].HProcID) != 0)//HQty
+ // {
+ // Model.ClsSc_ProcessExchangeBillSub oSub = new Model.ClsSc_ProcessExchangeBillSub();
+ // oSub.HEntryID = i+1;
+ // oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[i].HRemark);
+ // oSub.HSourceInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ // oSub.HSourceEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
+ // oSub.HSourceBillType = "85";
+ // oSub.HSourceBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+ // oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty);
+ // //oSub.HRelationQty_In = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_In);
+ // //oSub.HRelationQty_Out = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_Out);
+ // //oSub.HRelationQty_WWOrder = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_WWOrder);
+ // //oSub.HRelationQty_Bad = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_Bad);
+ // oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney);
+ // oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan);
+ // oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[i].HEntryCloseDate);
+ // oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType);
+ // oSub.HQty = DBUtility.ClsPub.isDoule(subList[i].HQty);
+ // if (oSub.HQty <= 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // oSub.HProcNo = DBUtility.ClsPub.isLong(subList[i].HProcNo);
+ // if (oSub.HProcNo <= 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佹按鍙蜂笉鑳戒负0鎴栬�呭皬浜�0";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // oSub.HProcID = DBUtility.ClsPub.isLong(subList[i].HProcID);
+ // oSub.HProcNumber = DBUtility.ClsPub.isStrNull(subList[i].HProcNumber);
+ // oSub.HWorkRemark = DBUtility.ClsPub.isStrNull(subList[i].HWorkRemark);
+ // oSub.HCenterID = DBUtility.ClsPub.isLong(subList[i].HCenterID);
+ // oSub.HDeptID = DBUtility.ClsPub.isLong(subList[i].HDeptID);
+ // oSub.HDeptNumber = DBUtility.ClsPub.isStrNull(subList[i].HDeptNumber);
+ // ////oSub.HGroupID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HGroupIDCol].Value);
+ // oSub.HGroupNumber = DBUtility.ClsPub.isStrNull(subList[i].HGroupNumber);
+ // oSub.HWorkerID = DBUtility.ClsPub.isLong(subList[i].HWorkerID);
+ // oSub.HWorkerNumber = DBUtility.ClsPub.isStrNull(subList[i].HWorkerNumber);
+ // oSub.HSourceID = DBUtility.ClsPub.isLong(subList[i].HSourceID);
+ // oSub.HTimeUnit = DBUtility.ClsPub.isStrNull(subList[i].HTimeUnit);
+ // oSub.HPlanWorkTimes = DBUtility.ClsPub.isSingle(subList[i].HPlanWorkTimes);
+ // oSub.HPlanBeginDate = DBUtility.ClsPub.isDate(subList[i].HPlanBeginDate);
+ // oSub.HPlanEndDate = DBUtility.ClsPub.isDate(subList[i].HPlanEndDate);
+ // oSub.HRelBeginDate = DBUtility.ClsPub.isDate(subList[i].HRelBeginDate);
+ // oSub.HRelEndDate = DBUtility.ClsPub.isDate(subList[i].HRelEndDate);
+ // oSub.HReadyTime = 0;
+ // oSub.HQueueTime = 0;
+ // oSub.HMoveTime = 0;
+ // oSub.HBeginDayQty = DBUtility.ClsPub.isSingle(subList[i].HBeginDayQty);
+ // oSub.HBeginFixQty = DBUtility.ClsPub.isSingle(subList[i].HBeginFixQty);
+ // oSub.HFixWorkDays = DBUtility.ClsPub.isSingle(subList[i].HFixWorkDays);
+ // oSub.HTrunWorkDays = DBUtility.ClsPub.isSingle(subList[i].HTrunWorkDays);
+ // oSub.HReadyTimes = DBUtility.ClsPub.isSingle(subList[i].HReadyTimes);
+ // oSub.HMyWorkDays = DBUtility.ClsPub.isSingle(subList[i].HMyWorkDays);
+ // oSub.HOutPrice = DBUtility.ClsPub.isSingle(subList[i].HOutPrice);
+ // oSub.HOutMoney = DBUtility.ClsPub.isSingle(subList[i].HOutMoney);
+ // oSub.HLastProc = "鍚�";
+ // oSub.HFstProc = "鍚�";
+ // oSub.HKeyProc = DBUtility.ClsPub.isStrNull(subList[i].HKeyProc);
+ // oSub.HSupID = DBUtility.ClsPub.isLong(subList[i].HSupID);
+ // oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].isEntrust);
+ // oSub.HBackProc = DBUtility.ClsPub.isBool(subList[i].HBackProc);
+ // oSub.HEdit = DBUtility.ClsPub.isBool(subList[i].HEdit);
+ // if (oSub.HCenterID == 0 && oSub.HSupFlag == false)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝宸ヤ綔涓績鎴栧澶栨爣璁颁笉鑳藉悓鏃朵负绌�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(subList[i].HICMOBillNo);
+ // oSub.HICMOInterID = DBUtility.ClsPub.isLong(subList[i].HICMOInterID);
+ // oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(subList[i].HSeOrderInterID);
+ // oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(subList[i].HSeOrderEntryID);
+ // oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(subList[i].HSeOrderBillNo);
+ // oSub.HWWOrderInterID = DBUtility.ClsPub.isLong(subList[i].HWWOrderInterID);
+ // oSub.HWWOrderEntryID = DBUtility.ClsPub.isLong(subList[i].HWWOrderEntryID);
+ // oSub.HWWOrderBillNo = DBUtility.ClsPub.isStrNull(subList[i].HWWOrderBillNo);
+ // oSub.HSumPassRate = DBUtility.ClsPub.isSingle(subList[i].HSumPassRate);
+ // oSub.HPassRate = DBUtility.ClsPub.isSingle(subList[i].HPassRate);
+ // oSub.HOverRate = DBUtility.ClsPub.isDoule(subList[i].HOverRate);
+ // oSub.HMaxQty = DBUtility.ClsPub.isDoule(subList[i].HMaxQty);
+ // oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(subList[i].HTechnologyParameter);
+ // oSub.HPicNum = DBUtility.ClsPub.isStrNull(subList[i].HPicNum);
+ // oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(subList[i].HProcCheckNote);
+ // oSub.HMouldNo = "";
+ // oSub.HProcWorkNum = "";
+ // BillNew.DetailColl.Add(oSub);
+ // }
+ // }
+ // //淇濆瓨瀹屾瘯鍚庡鐞�
+ // //if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
+ // //{
+ // // bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ // //}
+ // //else
+ // //{
+ // // bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ // //}
+ // bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ // //鎻愮ず
+ // if (bResult == true)
+ // {
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // //objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ // objJsonResult.Message = ClsPub.sExeReturnInfo+"鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+ #endregion
+
+ #region[杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚]
/// <summary>
/// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
/// </summary>
@@ -319,7 +419,9 @@
return objJsonResult;
}
}
+ #endregion
+ #region[杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚]
/// <summary>
/// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
/// </summary>
@@ -339,7 +441,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
+ ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid + " and HEntryID=" + HEntryID+ " and HSTOCKINORGID='"+ OrganizationID+"'", "h_v_S_Sc_ICMOBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -366,7 +468,138 @@
return objJsonResult;
}
}
+ #endregion
- //
+ #region[缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+ /// <summary>
+ /// 缂栬緫鑾峰彇琛ㄥご淇℃伅
+ /// </summary>
+ /// <param name="HInterID">涓籌D</param>
+ /// <returns></returns>
+ [Route("Sc_ProcessExchangeBill/GetProcessExchangeBillMain")]
+ [HttpGet]
+ public ApiResult<DataSet> GetProcessExchangeBillMain(string HInterID)
+ {
+ if (string.IsNullOrEmpty(HInterID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillQuery where hmainid= " + HInterID + " ", "h_v_Sc_ProcessExchangeBillQuery");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ伐搴忔祦杞崱" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region[缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+ [Route("Sc_ProcessExchangeBill/GetProcessExchangeBillSub")]
+ [HttpGet]
+ public object GetProcessExchangeBillSub(string HInterID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format(@"select 娴佹按鍙� HProcNo,HProcID,宸ュ簭浠ｇ爜 HProcNumber,宸ュ簭鍚嶇О HProcName,鍔犲伐璇存槑 HWorkRemark,HCenterID,宸ヤ綔涓績浠ｇ爜 HCenterNumber,
+ 宸ヤ綔涓績 HCenterName,HSupID,渚涘簲鍟嗕唬鐮� HSupNumber,渚涘簲鍟� HSupName,isEntrust,璁″垝鏁伴噺 HQty,鍔犲伐鍗曚环 HOutPrice, 琛ㄤ綋澶囨敞 HRemark,
+ 杩涚珯鏁伴噺 HRelationQty_In,鍑虹珯鏁伴噺 HRelationQty_Out,濮斿宸ュ崟鏁伴噺 HRelationQty_WWOrder,涓嶅悎鏍兼暟閲� HRelationQty_Bad,瓒呴姣斾緥 HOverRate,
+ 鑹巼 HPassRate,绱鑹巼 HSumPassRate,鍥剧焊缂栧彿 HPicNum,鏈伐搴忕‘璁よ褰� HProcCheckNote,宸ヨ壓鍙傛暟 HTechnologyParameter,HDeptID,
+ 鍔犲伐杞﹂棿浠ｇ爜 HDeptNumber,鍔犲伐杞﹂棿 HDeptName
+ from h_v_Sc_ProcessExchangeBillQuerySub");
+ ds = oCN.RunProcReturn(sql+ " where hmainid="+ HInterID, "h_v_Sc_ProcessExchangeBillQuerySub");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region [妯″叿淇濆吇璁″垝鍗曞垹闄ゅ姛鑳絔
+ /// <summary>
+ /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID")]
+ [HttpGet]
+ public object DeltetProcessExchangeBillByID(string HInterID, string user)
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Drop", 1, false, user))
+ {
+ 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;
+ }
+ DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ 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/SCGL/Sc_ComplementGoodBillController.cs b/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
index 8475e02..6e9855f 100644
--- a/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
@@ -99,6 +99,7 @@
public long HSourceEntryID = 0;//HSourceEntryIDCol
public int? 鍙枡鏁伴噺 = 0;//HBHGQtyCol
public int? 宸插彨鏂欐暟閲� = 0;//HBHGQtyCol
+ public int? 宸查厤閫佹暟閲� = 0;//HBHGQtyCol
public double? 閫�鏂欐暟閲� = 0;//閫�鏂欐暟閲�
public long HSTOCKID = 0;//HSTOCKID
public string 閫�鏂欏師鍥� { get; set; }//閫�鏂欏師鍥�
@@ -384,11 +385,11 @@
{
if (listCa[i].閫�鏂欐暟閲� > 0)
{
- if (listCa[i].閫�鏂欐暟閲� > listCa[i].宸插彨鏂欐暟閲�)
+ if (listCa[i].閫�鏂欐暟閲� > listCa[i].宸查厤閫佹暟閲�)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閫�鏂欐暟閲忓ぇ浜庡凡鍙枡鏁伴噺!";
+ objJsonResult.Message = "閫�鏂欐暟閲忓ぇ浜庡凡閰嶉�佹暟閲�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -396,7 +397,7 @@
ds = oCN.RunProcReturn("select sum(HQty) from JIT_CallGoodsBackRequestBillSub " +
$"where HSourceInterID={listCa[i].HSouceInterID} and HSourceEntryID ={listCa[i].HSourceEntryID} and HSourceBillNo = '{listCa[i].HSourceBillNo}' and HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub");
- if ((double.Parse(ds.Tables[0].Rows[0][0].ToString())+listCa[i].閫�鏂欐暟閲�) > listCa[i].宸插彨鏂欐暟閲�)
+ if ((double.Parse(ds.Tables[0].Rows[0][0].ToString()==""?"0": ds.Tables[0].Rows[0][0].ToString()) +listCa[i].閫�鏂欐暟閲�) > listCa[i].宸插彨鏂欐暟閲�)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -521,11 +522,11 @@
{
if (listCa[i].閫�鏂欐暟閲� > 0)
{
- if (listCa[i].閫�鏂欐暟閲� > listCa[i].宸插彨鏂欐暟閲�)
+ if (listCa[i].閫�鏂欐暟閲� > listCa[i].宸查厤閫佹暟閲�)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閫�鏂欐暟閲忓ぇ浜庡凡鍙枡鏁伴噺!";
+ objJsonResult.Message = "閫�鏂欐暟閲忓ぇ浜庡凡閰嶉�佹暟閲�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -533,7 +534,7 @@
ds = oCN.RunProcReturn("select sum(HQty) from JIT_CallGoodsBackRequestBillSub " +
$"where HSourceInterID={listCa[i].HSouceInterID} and HSourceEntryID ={listCa[i].HSourceEntryID} and HSourceBillNo = '{listCa[i].HSourceBillNo}' and HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub");
- if ((double.Parse(ds.Tables[0].Rows[0][0].ToString()) + listCa[i].閫�鏂欐暟閲�) > listCa[i].宸插彨鏂欐暟閲�)
+ if ((double.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString()) + listCa[i].閫�鏂欐暟閲�) > listCa[i].宸插彨鏂欐暟閲�)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -618,11 +619,11 @@
{
if (listCa[i].閫�鏂欐暟閲� > 0)
{
- if (listCa[i].閫�鏂欐暟閲� > listCa[i].宸插彨鏂欐暟閲�)
+ if (listCa[i].閫�鏂欐暟閲� > listCa[i].宸查厤閫佹暟閲�)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閫�鏂欐暟閲忓ぇ浜庡凡鍙枡鏁伴噺!";
+ objJsonResult.Message = "閫�鏂欐暟閲忓ぇ浜庡凡閰嶉�佹暟閲�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -630,7 +631,7 @@
ds = oCN.RunProcReturn("select sum(HQty) from JIT_CallGoodsBackRequestBillSub " +
$"where HSourceInterID={listCa[i].HSouceInterID} and HSourceEntryID ={listCa[i].HSourceEntryID} and HSourceBillNo = '{listCa[i].HSourceBillNo}' and HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub");
- if ((double.Parse(ds.Tables[0].Rows[0][0].ToString()) + listCa[i].閫�鏂欐暟閲�) > listCa[i].宸插彨鏂欐暟閲�)
+ if ((double.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString()) + listCa[i].閫�鏂欐暟閲�) > listCa[i].宸插彨鏂欐暟閲�)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs b/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
index 2cc29ad..96f2adb 100644
--- a/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
@@ -332,10 +332,35 @@
oCN.RunProc($"update b set b.HQty=b.HQty+{listCa[i].鏈鎷ｆ枡鏁伴噺} from JIT_SendGoodsBillMain a with(nolock) inner join JIT_SendGoodsBillSub b with(nolock) on a.HInterID = b.HInterID " +
$"where HMainSourceInterID ={SourceInterID} and b.HMaterID ={listCa[i].HMaterID} and a.HBillStatus =1 ");
}
- //淇敼璋冩嫧鏁伴噺
- oCN.RunProc($"update JIT_ComplementGoodsBillSub_LK set HSendQTY=HSendQTY+{listCa[i].鏈鎷ｆ枡鏁伴噺} where HMaterID={listCa[i].HMaterID} " +
- $" and HSourceInterID=(select top 1 HSourceInterID from JIT_ComplementGoodsBillSub_LK " +
- $"where HMaterID={listCa[i].HMaterID} and HInterID={SourceInterID} order by HSourceInterID ) and HInterID={SourceInterID} ");
+
+ DataSet dsTable = new DataSet();
+ //鏌ヨJIT_ComplementGoodsBillSub_LK
+ dsTable = oCN.RunProcReturn($"select * from JIT_ComplementGoodsBillSub_LK where HMaterID={listCa[i].HMaterID} and HInterID={SourceInterID} order by HSourceInterID ", "JIT_ComplementGoodsBillSub_LK");
+
+ for (int j = 0; j < dsTable.Tables[0].Rows.Count; j++)
+ {
+ if (double.Parse(dsTable.Tables[0].Rows[j]["HCallQTY"].ToString()) != double.Parse(dsTable.Tables[0].Rows[j]["HSendQTY"].ToString()))
+ {
+ if (double.Parse(dsTable.Tables[0].Rows[j]["HSendQTY"].ToString()) + listCa[i].鏈鎷ｆ枡鏁伴噺 > double.Parse(dsTable.Tables[0].Rows[j]["HCallQTY"].ToString()))
+ {
+ var HCallQTY = double.Parse(dsTable.Tables[0].Rows[j]["HCallQTY"].ToString()) - double.Parse(dsTable.Tables[0].Rows[j]["HSendQTY"].ToString());
+ //淇敼璋冩嫧鏁伴噺 瓒呭嚭閮ㄥ垎缁欎簣涓嬩竴鍒楁暟鎹�
+ oCN.RunProc($"update JIT_ComplementGoodsBillSub_LK set HSendQTY=HSendQTY+{HCallQTY} where HMaterID={listCa[i].HMaterID} " +
+ $" and HSourceInterID={double.Parse(dsTable.Tables[0].Rows[j]["HSourceInterID"].ToString())} and HInterID={SourceInterID} ");
+
+ oCN.RunProc($"update JIT_ComplementGoodsBillSub_LK set HSendQTY=HSendQTY+{(listCa[i].鏈鎷ｆ枡鏁伴噺 - HCallQTY)} where HMaterID={listCa[i].HMaterID} " +
+ $" and HSourceInterID={dsTable.Tables[0].Rows[j + 1]["HSourceInterID"].ToString()} and HInterID={SourceInterID} ");
+ break;
+ }
+ else
+ {
+ //淇敼璋冩嫧鏁伴噺
+ oCN.RunProc($"update JIT_ComplementGoodsBillSub_LK set HSendQTY=HSendQTY+{listCa[i].鏈鎷ｆ枡鏁伴噺} where HMaterID={listCa[i].HMaterID} " +
+ $" and HSourceInterID={dsTable.Tables[0].Rows[j]["HSourceInterID"].ToString()} and HInterID={SourceInterID} ");
+ break;
+ }
+ }
+ }
}
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index ca43ad8..08618dc 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -188,6 +188,8 @@
$"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate())");
}
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HDayPlanSumQty={list[i]["鏃ヨ鍒掓暟閲忔�婚噺"].ToString()} where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'");
+
int SumDay = 31; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
for (int j = 0; j < SumDay; j++)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
index dc3d054..3d73e5b 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
@@ -58,6 +58,8 @@
tb2.Columns.Add("HEmpID", typeof(Int32));//鑱屽憳
tb2.Columns.Add("HUnitID", typeof(Int32));//璁￠噺鍗曚綅
tb2.Columns.Add("HSourceID", typeof(Int32));//鐢熶骇璧勬簮id
+ tb2.Columns.Add("ICMOBillHInterID", typeof(Int32));//鐢熶骇璁㈠崟涓籭d
+ tb2.Columns.Add("ICMOBillHEntryID", typeof(Int32));//鐢熶骇璁㈠崟瀛恑d
//娣诲姞鏁版嵁
for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
@@ -122,6 +124,9 @@
tb2.Rows[i]["鐗╂枡鍚嶇О"] = ds.Tables[0].Rows[0]["浜у搧鍚嶇О"].ToString();
tb2.Rows[i]["瑙勬牸鍨嬪彿"] = ds.Tables[0].Rows[0]["瑙勬牸鍨嬪彿"].ToString();
tb2.Rows[i]["HWorkShopID"] = ds.Tables[0].Rows[0]["HDeptID"].ToString();
+ tb2.Rows[i]["ICMOBillHInterID"] = ds.Tables[0].Rows[0]["hmainid"].ToString();//鐢熶骇璁㈠崟涓籭d
+ tb2.Rows[i]["ICMOBillHEntryID"] = ds.Tables[0].Rows[0]["HEntryID"].ToString();//鐢熶骇璁㈠崟瀛恑d
+ tb2.Rows[i]["鐢熶骇璁㈠崟鏁伴噺"] = ds.Tables[0].Rows[0]["鐢熶骇浠诲姟鍗曟暟閲�"].ToString();//鐢熶骇璁㈠崟鏁伴噺
}
ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList " +
@@ -143,7 +148,6 @@
tb2.Rows[i]["璁￠噺鍗曚綅"] = ds.Tables[0].Rows[0]["璁￠噺鍗曚綅"].ToString();
tb2.Rows[i]["鎵规鍙�"] = ds.Tables[0].Rows[0]["鎵规"].ToString();
tb2.Rows[i]["閿�鍞鍗曟暟閲�"] = ds.Tables[0].Rows[0]["閿�鍞鍗曟暟閲�"].ToString();
- tb2.Rows[i]["鐢熶骇璁㈠崟鏁伴噺"] = ds.Tables[0].Rows[0]["璁㈠崟闇�姹傛暟閲�"].ToString();
tb2.Rows[i]["鎬婚綈濂楁暟閲�"] = ds.Tables[0].Rows[0]["榻愬鏁伴噺"].ToString();
}
else
@@ -266,22 +270,37 @@
var HUnitID = list[i]["HUnitID"].ToString();
var HBatchNo = list[i]["鎵规鍙�"].ToString();
var HSeOrderBillQty = list[i]["閿�鍞鍗曟暟閲�"].ToString();
- var HOrderNeedQty = list[i]["鐢熶骇璁㈠崟鏁伴噺"].ToString();
+ var HPlanQty = list[i]["鐢熶骇璁㈠崟鏁伴噺"].ToString();
var HCompleteQty = list[i]["鎬婚綈濂楁暟閲�"].ToString();
var HOrderType = omdelMian.HOrderType;
var HDate = omdelMian.HDate;
+ var HMainSourceInterID = list[i]["ICMOBillHInterID"].ToString();
+ var HMainSourceEntryID = list[i]["ICMOBillHEntryID"].ToString();
+
+ ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
+ $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愭湁閲嶅,璇蜂慨鏀�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//涓昏〃
oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
"HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
"HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
" HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
- " HSeOrderBillQty, HOrderNeedQty, HCompleteQty,HPreparatDate)values" +
+ " HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
+ "HMainSourceInterID,HMainSourceEntryID)values" +
$"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
$"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
$"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
$" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
- $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HOrderNeedQty == "" ? 0.ToString() : HOrderNeedQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate())");
+ $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
+ $" {HMainSourceInterID},{HMainSourceEntryID})");
}
int SumDay = 31; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
index a178ff1..c8f9d5b 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
@@ -11,7 +11,7 @@
{
public class Sc_WorkBillSortBillController : ApiController
{
- private json objJsonResult = new json();
+ private json objJsonResult = new json();
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -91,7 +91,7 @@
string user = sArray[3].ToString();
try
{
- if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Edit", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Edit", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -140,6 +140,18 @@
}
else if (OperationType == 3)
{
+
+ ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={omdelMian.HMainSourceInterID}" +
+ $" and HMainSourceEntryID={omdelMian.HMainSourceEntryID} and HICMOBillNo='{omdelMian.HICMOBillNo}' and HICMOEntrySEQ={omdelMian.HICMOEntrySEQ} and HSourceID={omdelMian.HSourceID}", "Sc_WorkBillSortBillMain");
+ if ((ds.Tables[0].Rows.Count == 1 && ds.Tables[0].Rows[0]["HInterID"].ToString() != omdelMian.HInterID.ToString()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熶骇璧勬簮鏈夐噸澶�,璇蜂慨鏀�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//淇敼
oCN.RunProc($"update Sc_WorkBillSortBillMain set HDate='{omdelMian.HDate}',HUpDater='{omdelMian.HMaker}',HUpDateDate=GETDATE()" +
$", HRemark='{omdelMian.HRemark}', HPrintQty={(omdelMian.HPrintQty == null ? 0 : omdelMian.HPrintQty)}" +
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index a0338de..fc505e7 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -41,7 +41,7 @@
[Route("Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill")]
[HttpGet]
- public object GetMESBeginStepWorkBill(string sWhere,string user)
+ public object GetMESBeginStepWorkBill(string sWhere, string user)
{
try
{
@@ -84,7 +84,7 @@
{
LogService.Write("鎵ц浜�1");
string sql1 = "select * from h_v_Sc_MESBeginWorkBillList_NEW where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc ";
+ string sql = sql1 + sWhere + " order by hmainid desc ";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MESBeginWorkBillList_NEW");
}
@@ -802,7 +802,7 @@
oItemSub.HOtherItem4 = "";
oItemSub.HOtherItem5 = "";
oItemSub.HPackType = "";
- oItemSub.HBatchNo="";
+ oItemSub.HBatchNo = "";
//oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
//oItemSub.HRepairID = 0; //缁翠慨椤圭洰
//oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
@@ -1028,7 +1028,7 @@
oCN.BeginTran();
//鍒犻櫎宸ュ簭姹囨姤瀛愯〃
- string sql1 = string.Format(@"delete Sc_ProcessReportSub where HInterID='"+HInterID+"' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
+ string sql1 = string.Format(@"delete Sc_ProcessReportSub where HInterID='" + HInterID + "' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
oCN.RunProc(sql1);
//鍒犻櫎宸ュ簭姹囨姤涓昏〃
string sql = string.Format(@"delete Sc_ProcessReportMain where HInterID='" + HInterID + "'");
@@ -1057,7 +1057,7 @@
#region 鎶ュ伐骞冲彴鎶ユ鐢宠淇濆瓨
[Route("Sc_MESBeginStepWorkBill/SaveGetMESProductReportBillList")]
[HttpGet]
- public object SaveGetMESProductReportBillList(string ScMaxWork, string HSourceBillType, string workcode, int HSourceID, int HICMOInterID, int HICMOEntryID, string HMaker, string Czybm,string HProcID)
+ public object SaveGetMESProductReportBillList(string ScMaxWork, string HSourceBillType, string workcode, int HSourceID, int HICMOInterID, int HICMOEntryID, string HMaker, string Czybm, string HProcID)
{
ListModels oListModels = new ListModels();
try
@@ -1125,7 +1125,7 @@
//model.HPRDORGID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HPRDORGID"]);
model.HMainSourceInterID = HICMOInterID;
model.HMainSourceEntryID = HICMOEntryID;
-
+
//oWebs.Timeout = 30000;
bool flag = oWebs.set_SaveICMOProductReportBill_LayuiYqn(model, workcode, HSourceID, sHSourceType, HProcID, ref DBUtility.ClsPub.sErrInfo);
@@ -1182,7 +1182,7 @@
try
{
//鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
- if (!DBUtility.ClsPub.Security_Log("MES_ProcExchReport_Edit",1,false,user))
+ if (!DBUtility.ClsPub.Security_Log("MES_ProcExchReport_Edit", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1585,36 +1585,38 @@
if (oBill.omodel.HInterID == 0)
{
oCN.BeginTran();
+ //淇敼閲戣澏鐢熶骇鍗曠殑鐘舵��
+ oCN.RunProc("update AIS20200908101915zs..T_PRD_MOENTRY_A set FSTATUS=4,FPLANCONFIRMDATE=getdate() where FENTRYID=" + (EntyID).Split('-')[1]);
//璁块棶閲戣澏
- var loginRet = InvokeHelper.Login();
- var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
- if (isSuccess == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
- objJsonResult.data = null;
- return objJsonResult;
- }
- var json = new
- {
- //CreateOrgId = 0,
- Numbers = BillNo,
- //Ids = (EntyID).Split('-')[0],
- PkEntryIds = (EntyID).Split('-')[1]
- };
- Console.Write("json="+json);
- var result = InvokeHelper.ExcuteOperation("PRD_MO", "ToStart", JsonConvert.SerializeObject(json));
- if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀵瑰簲閲戣澏浜戠敓浜ц鍗曟洿鏀瑰紑宸ョ姸鎬佸け璐ワ紒" + result;
- objJsonResult.data = null;
- return objJsonResult;
- }
- //鎵ц淇濆瓨
+ //var loginRet = InvokeHelper.Login();
+ //var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ //if (isSuccess == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //var json = new
+ //{
+ // //CreateOrgId = 0,
+ // Numbers = BillNo,
+ // //Ids = (EntyID).Split('-')[0],
+ // PkEntryIds = (EntyID).Split('-')[1]
+ //};
+ //Console.Write("json=" + json);
+ //var result = InvokeHelper.ExcuteOperation("PRD_MO", "ToStart", JsonConvert.SerializeObject(json));
+ //if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ //{
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀵瑰簲閲戣澏浜戠敓浜ц鍗曟洿鏀瑰紑宸ョ姸鎬佸け璐ワ紒" + result;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ ////鎵ц淇濆瓨
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
if (bResult)
{
@@ -1653,4 +1655,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 9529dd2..3cf012e 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -173,14 +173,17 @@
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string msg5 = sArray[2].ToString();
+ string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
+ string msg3 = sArray[1].ToString();//鐧诲綍浜�
+ string msg5 = sArray[2].ToString();//鐧诲綍缁勭粐
+ string msg6 = sArray[3].ToString();//鏍囪
+ string msg7 = sArray[4].ToString();//褰撳墠鐢ㄦ枡娓呭崟
ListModels oListModels = new ListModels();
DataSet ds = new DataSet();
ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HItemID=" + msg5, "Xt_ORGANIZATIONS");
string OrgNum = ds.Tables[0].Rows[0]["HNumber"].ToString();//缁勭粐浠ｇ爜
+ DataSet d = oCN.RunProcReturn("select HRemark from Sc_PPBomBillMain where HBillNo='" + msg7 + "'", "Sc_ICMOBillMain");//鏌ユ壘璇ョ敤鏂欐竻鍗曚笂娆＄敓鎴愮殑绠卞彿(HRemark瀛樻斁绠卞彿)
DataSet Ds1 = new DataSet();
try
{
@@ -206,6 +209,8 @@
int LSH;
string LSH2;
string TM = "";
+ int XH = Convert.ToInt32(d.Tables[0].Rows[0]["HRemark"].ToString() == ""? 0 : Convert.ToInt32(d.Tables[0].Rows[0]["HRemark"].ToString()));
+
foreach (Models.ClsQK_PackingBill oItemSub in ls)
{
//鏍规嵁鐢熸垚鏉℃暟鐢熸垚鐩稿簲鏁伴噺鏉＄爜
@@ -222,6 +227,16 @@
LSH2 = "0" + LSH2;
}
TM = sTMNumber + LSH2;
+
+ if (msg6 == "ZZ")
+ {
+ XH = XH +1;
+ }
+ else if (msg6 == "PZ"&& ls.IndexOf(oItemSub) == 0)
+ {
+ XH = XH + 1;
+ }
+
//鑾峰彇鍐呯爜
oCN.RunProc("insert into Gy_BarCodeBill (HEntryID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
@@ -235,7 +250,7 @@
+ ",'" + TM + "','鍞竴鏉＄爜'," + oItemSub.HMaterID.ToString() + "," + oItemSub.HUnitID.ToString() + "," + oItemSub.HMinQty.ToString()
+ ",'',0,0,'" + msg3 + "',getdate(),0," + oItemSub.HMinQty.ToString()
+ ", " + oItemSub.HInterID.ToString() + "," + oItemSub.HEntryID.ToString() + ",'" + oItemSub.HBillNo + "','3710',''"
- + ",1,1," + oItemSub.HDeptID.ToString() + ",0,0,'"+ (int.Parse(oItemSub.HXH.ToString())+i) + "'"
+ + ",1,1," + oItemSub.HDeptID.ToString() + ",0,0,'"+ XH + "'"
+ ", " + oItemSub.HCusID.ToString() + ",'',getdate(),'',getdate()"
+ ", " + msg5.ToString() + "," + OrgNum.ToString() + ",'" + oItemSub.HSeOrderBillNo.ToString() + "'," + HInterID.ToString()
+ ",0"
@@ -245,6 +260,7 @@
}
oCN.RunProc("update Sc_ICMOBillSub set HQty=" + oItemSub.HSpsQty + " where HEntryID=" + oItemSub.HEntryID);
+ oCN.RunProc("update Sc_PPBomBillMain set HRemark=" +XH+ " where HBillNo='" + msg7+"'");
DataSet Dsn = oCN.RunProcReturn("select top " + oItemSub.HTotalQty + " HItemID from Gy_BarCodeBill order by HItemID desc", "Gy_BarCodeBill"); //鑾峰彇鏈�澶ф祦姘村彿
for (int i = 0; i < oItemSub.HTotalQty; i++)
{
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 40dd50d..4ed8160 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -547,6 +547,29 @@
/// <summary>
+ /// 澶勭悊鏂板宸ュ簭娴佽浆鍗′富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_ProcessExchangeBillMain> getObjectByJson_Sc_ProcessExchangeBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_ProcessExchangeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 澶勭悊鏂板宸ュ簭娴佽浆鍗′富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_ProcessExchangeBillSub> getObjectByJson_Sc_ProcessExchangeBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_ProcessExchangeBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板妯″叿淇濆吇璁″垝鍗曞瓙琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
index 03322e9..f7f6463 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
@@ -3722,5 +3722,10 @@
//
DBUtility.ClsPub.HideGridView(grdMain, Name, ClsPub.AppPath);//璁剧疆闅愯棌鍒�
}
+
+ private void grdMain_CellContentClick(object sender, DataGridViewCellEventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
index 91b7ee3..296450c 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
@@ -79,6 +79,7 @@
this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.gbUp = new System.Windows.Forms.GroupBox();
+ this.textHPicNumVer = new System.Windows.Forms.TextBox();
this.textHProductNum = new System.Windows.Forms.TextBox();
this.textHMaterTexture = new System.Windows.Forms.TextBox();
this.label62 = new System.Windows.Forms.Label();
@@ -235,7 +236,6 @@
this.grdSum = new System.Windows.Forms.DataGridView();
this.panel6 = new System.Windows.Forms.Panel();
this.lblHStockQty = new System.Windows.Forms.Label();
- this.textHPicNumVer = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
this.tabControl2.SuspendLayout();
@@ -269,10 +269,10 @@
this.sc,
this.fz,
this.toolStripSeparator8,
+ this.bc,
this.AddRow,
this.DelRow,
this.toolStripSeparator4,
- this.bc,
this.fq,
this.toolStripSeparator5,
this.sh,
@@ -296,7 +296,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(1348, 50);
+ this.Tool.Size = new System.Drawing.Size(1797, 62);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -346,7 +346,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
//
// xz
//
@@ -409,7 +409,7 @@
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
//
// AddRow
//
@@ -442,7 +442,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
//
@@ -475,7 +475,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
this.toolStripSeparator5.Visible = false;
//
// sh
@@ -511,7 +511,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// sz
//
@@ -576,7 +576,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
this.toolStripSeparator6.Visible = false;
//
// qt
@@ -597,7 +597,7 @@
this.qt.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.qt.ImageTransparentColor = System.Drawing.Color.White;
this.qt.Name = "qt";
- this.qt.Size = new System.Drawing.Size(45, 47);
+ this.qt.Size = new System.Drawing.Size(53, 59);
this.qt.Text = "鍏朵粬";
this.qt.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.qt.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -605,71 +605,71 @@
// 鍏抽棴ToolStripMenuItem
//
this.鍏抽棴ToolStripMenuItem.Name = "鍏抽棴ToolStripMenuItem";
- this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鍏抽棴ToolStripMenuItem.Text = "鍏抽棴";
this.鍏抽棴ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽棴ToolStripMenuItem_Click);
//
// 鍙嶅叧闂璗oolStripMenuItem
//
this.鍙嶅叧闂璗oolStripMenuItem.Name = "鍙嶅叧闂璗oolStripMenuItem";
- this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鍙嶅叧闂璗oolStripMenuItem.Text = "鍙嶅叧闂�";
this.鍙嶅叧闂璗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅叧闂璗oolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
- this.toolStripSeparator15.Size = new System.Drawing.Size(133, 6);
+ this.toolStripSeparator15.Size = new System.Drawing.Size(164, 6);
//
// 瀹℃牳ToolStripMenuItem
//
this.瀹℃牳ToolStripMenuItem.Name = "瀹℃牳ToolStripMenuItem";
- this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.瀹℃牳ToolStripMenuItem.Text = "瀹℃牳";
this.瀹℃牳ToolStripMenuItem.Click += new System.EventHandler(this.瀹℃牳ToolStripMenuItem_Click);
//
// 鍙嶅鏍窽oolStripMenuItem
//
this.鍙嶅鏍窽oolStripMenuItem.Name = "鍙嶅鏍窽oolStripMenuItem";
- this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鍙嶅鏍窽oolStripMenuItem.Text = "鍙嶅鏍�";
this.鍙嶅鏍窽oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅鏍窽oolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
- this.toolStripSeparator14.Size = new System.Drawing.Size(133, 6);
+ this.toolStripSeparator14.Size = new System.Drawing.Size(164, 6);
//
// 浣滃簾ToolStripMenuItem
//
this.浣滃簾ToolStripMenuItem.Name = "浣滃簾ToolStripMenuItem";
- this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.浣滃簾ToolStripMenuItem.Text = "浣滃簾";
this.浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.浣滃簾ToolStripMenuItem_Click);
//
// 鎾ら攢浣滃簾ToolStripMenuItem
//
this.鎾ら攢浣滃簾ToolStripMenuItem.Name = "鎾ら攢浣滃簾ToolStripMenuItem";
- this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鎾ら攢浣滃簾ToolStripMenuItem.Text = "鎾ら攢浣滃簾";
this.鎾ら攢浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.鎾ら攢浣滃簾ToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(133, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(164, 6);
//
// 闅愯棌鍒楄缃甌oolStripMenuItem
//
this.闅愯棌鍒楄缃甌oolStripMenuItem.Name = "闅愯棌鍒楄缃甌oolStripMenuItem";
- this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.闅愯棌鍒楄缃甌oolStripMenuItem.Text = "闅愯棌鍒楄缃�";
this.闅愯棌鍒楄缃甌oolStripMenuItem.Click += new System.EventHandler(this.闅愯棌鍒楄缃甌oolStripMenuItem_Click_1);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// tc
//
@@ -689,7 +689,7 @@
//
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);
//
// yc
//
@@ -699,7 +699,7 @@
this.yc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.yc.ImageTransparentColor = System.Drawing.Color.White;
this.yc.Name = "yc";
- this.yc.Size = new System.Drawing.Size(48, 47);
+ this.yc.Size = new System.Drawing.Size(58, 59);
this.yc.Text = "闅愯棌鍒�";
this.yc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.yc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -710,7 +710,7 @@
//
this.toolStripSeparator13.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator13.Name = "toolStripSeparator13";
- this.toolStripSeparator13.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator13.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -720,7 +720,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;
@@ -730,7 +730,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
//
@@ -740,7 +740,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;
@@ -750,15 +750,16 @@
//
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);
//
// lblCaption
//
this.lblCaption.Dock = System.Windows.Forms.DockStyle.Top;
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(0, 0);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(1268, 34);
+ this.lblCaption.Size = new System.Drawing.Size(1690, 42);
this.lblCaption.TabIndex = 18;
this.lblCaption.Text = "鍗曟嵁缂栬緫";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -770,9 +771,10 @@
this.P1.Controls.Add(this.pic1);
this.P1.Controls.Add(this.lblCaption);
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, 4, 4, 4);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(1268, 254);
+ this.P1.Size = new System.Drawing.Size(1690, 318);
this.P1.TabIndex = 31;
//
// tabControl2
@@ -781,21 +783,21 @@
this.tabControl2.Controls.Add(this.tabPage3);
this.tabControl2.Controls.Add(this.tabPage4);
this.tabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl2.Location = new System.Drawing.Point(0, 34);
- this.tabControl2.Margin = new System.Windows.Forms.Padding(2);
+ this.tabControl2.Location = new System.Drawing.Point(0, 42);
+ this.tabControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
- this.tabControl2.Size = new System.Drawing.Size(1268, 220);
+ this.tabControl2.Size = new System.Drawing.Size(1690, 276);
this.tabControl2.TabIndex = 310;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.gbUp);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(2);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(2);
- this.tabPage2.Size = new System.Drawing.Size(1260, 194);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPage2.Size = new System.Drawing.Size(1682, 247);
this.tabPage2.TabIndex = 0;
this.tabPage2.Text = "琛ㄥご淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -856,27 +858,42 @@
this.gbUp.Controls.Add(this.label4);
this.gbUp.Controls.Add(this.txtHBillNo);
this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gbUp.Location = new System.Drawing.Point(2, 2);
+ this.gbUp.Location = new System.Drawing.Point(3, 2);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(1256, 190);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Size = new System.Drawing.Size(1676, 243);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
+ //
+ // textHPicNumVer
+ //
+ this.textHPicNumVer.BackColor = System.Drawing.SystemColors.Window;
+ this.textHPicNumVer.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHPicNumVer.Location = new System.Drawing.Point(1333, 29);
+ this.textHPicNumVer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.textHPicNumVer.Name = "textHPicNumVer";
+ this.textHPicNumVer.Size = new System.Drawing.Size(249, 25);
+ this.textHPicNumVer.TabIndex = 337;
+ this.textHPicNumVer.Tag = "0";
//
// textHProductNum
//
this.textHProductNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.textHProductNum.Location = new System.Drawing.Point(1001, 106);
+ this.textHProductNum.Location = new System.Drawing.Point(1335, 132);
+ this.textHProductNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textHProductNum.Name = "textHProductNum";
- this.textHProductNum.Size = new System.Drawing.Size(189, 21);
+ this.textHProductNum.Size = new System.Drawing.Size(251, 25);
this.textHProductNum.TabIndex = 336;
this.textHProductNum.Tag = "0";
//
// textHMaterTexture
//
this.textHMaterTexture.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.textHMaterTexture.Location = new System.Drawing.Point(1001, 80);
+ this.textHMaterTexture.Location = new System.Drawing.Point(1335, 100);
+ this.textHMaterTexture.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textHMaterTexture.Name = "textHMaterTexture";
- this.textHMaterTexture.Size = new System.Drawing.Size(189, 21);
+ this.textHMaterTexture.Size = new System.Drawing.Size(251, 25);
this.textHMaterTexture.TabIndex = 335;
this.textHMaterTexture.Tag = "0";
//
@@ -884,18 +901,20 @@
//
this.label62.AutoSize = true;
this.label62.ForeColor = System.Drawing.Color.Black;
- this.label62.Location = new System.Drawing.Point(928, 138);
+ this.label62.Location = new System.Drawing.Point(1237, 172);
+ this.label62.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label62.Name = "label62";
- this.label62.Size = new System.Drawing.Size(53, 12);
+ this.label62.Size = new System.Drawing.Size(69, 15);
this.label62.TabIndex = 333;
this.label62.Text = "鐗� 鏈�";
//
// textHVerNum
//
this.textHVerNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.textHVerNum.Location = new System.Drawing.Point(1000, 134);
+ this.textHVerNum.Location = new System.Drawing.Point(1333, 168);
+ this.textHVerNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textHVerNum.Name = "textHVerNum";
- this.textHVerNum.Size = new System.Drawing.Size(189, 21);
+ this.textHVerNum.Size = new System.Drawing.Size(251, 25);
this.textHVerNum.TabIndex = 334;
this.textHVerNum.Tag = "0";
//
@@ -903,9 +922,10 @@
//
this.label63.AutoSize = true;
this.label63.ForeColor = System.Drawing.Color.Black;
- this.label63.Location = new System.Drawing.Point(928, 110);
+ this.label63.Location = new System.Drawing.Point(1237, 138);
+ this.label63.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label63.Name = "label63";
- this.label63.Size = new System.Drawing.Size(53, 12);
+ this.label63.Size = new System.Drawing.Size(67, 15);
this.label63.TabIndex = 330;
this.label63.Text = "鎴愬搧缂栧彿";
//
@@ -913,9 +933,10 @@
//
this.label64.AutoSize = true;
this.label64.ForeColor = System.Drawing.Color.Black;
- this.label64.Location = new System.Drawing.Point(926, 27);
+ this.label64.Location = new System.Drawing.Point(1235, 34);
+ this.label64.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label64.Name = "label64";
- this.label64.Size = new System.Drawing.Size(53, 12);
+ this.label64.Size = new System.Drawing.Size(67, 15);
this.label64.TabIndex = 328;
this.label64.Text = "鍥惧彿鐗堟湰";
//
@@ -923,9 +944,10 @@
//
this.label65.AutoSize = true;
this.label65.ForeColor = System.Drawing.Color.Black;
- this.label65.Location = new System.Drawing.Point(927, 56);
+ this.label65.Location = new System.Drawing.Point(1236, 70);
+ this.label65.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label65.Name = "label65";
- this.label65.Size = new System.Drawing.Size(53, 12);
+ this.label65.Size = new System.Drawing.Size(67, 15);
this.label65.TabIndex = 326;
this.label65.Text = "鎬昏鍥惧彿";
//
@@ -933,9 +955,10 @@
//
this.textHPicNumAssemble.BackColor = System.Drawing.SystemColors.Window;
this.textHPicNumAssemble.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.textHPicNumAssemble.Location = new System.Drawing.Point(1001, 52);
+ this.textHPicNumAssemble.Location = new System.Drawing.Point(1335, 65);
+ this.textHPicNumAssemble.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textHPicNumAssemble.Name = "textHPicNumAssemble";
- this.textHPicNumAssemble.Size = new System.Drawing.Size(188, 21);
+ this.textHPicNumAssemble.Size = new System.Drawing.Size(249, 25);
this.textHPicNumAssemble.TabIndex = 327;
this.textHPicNumAssemble.Tag = "0";
//
@@ -943,9 +966,10 @@
//
this.label66.AutoSize = true;
this.label66.ForeColor = System.Drawing.Color.Black;
- this.label66.Location = new System.Drawing.Point(926, 84);
+ this.label66.Location = new System.Drawing.Point(1235, 105);
+ this.label66.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label66.Name = "label66";
- this.label66.Size = new System.Drawing.Size(53, 12);
+ this.label66.Size = new System.Drawing.Size(69, 15);
this.label66.TabIndex = 323;
this.label66.Text = "鏉� 璐�";
//
@@ -953,18 +977,20 @@
//
this.label42.AutoSize = true;
this.label42.ForeColor = System.Drawing.Color.Black;
- this.label42.Location = new System.Drawing.Point(608, 138);
+ this.label42.Location = new System.Drawing.Point(811, 172);
+ this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label42.Name = "label42";
- this.label42.Size = new System.Drawing.Size(53, 12);
+ this.label42.Size = new System.Drawing.Size(67, 15);
this.label42.TabIndex = 321;
this.label42.Text = "椤圭洰缂栧彿";
//
// txtHProjectNum
//
this.txtHProjectNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProjectNum.Location = new System.Drawing.Point(680, 134);
+ this.txtHProjectNum.Location = new System.Drawing.Point(907, 168);
+ this.txtHProjectNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProjectNum.Name = "txtHProjectNum";
- this.txtHProjectNum.Size = new System.Drawing.Size(189, 21);
+ this.txtHProjectNum.Size = new System.Drawing.Size(251, 25);
this.txtHProjectNum.TabIndex = 322;
this.txtHProjectNum.Tag = "0";
//
@@ -973,9 +999,10 @@
this.cmdEquipMentID.BackColor = System.Drawing.Color.Transparent;
this.cmdEquipMentID.Image = ((System.Drawing.Image)(resources.GetObject("cmdEquipMentID.Image")));
this.cmdEquipMentID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdEquipMentID.Location = new System.Drawing.Point(848, 106);
+ this.cmdEquipMentID.Location = new System.Drawing.Point(1131, 132);
+ this.cmdEquipMentID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdEquipMentID.Name = "cmdEquipMentID";
- this.cmdEquipMentID.Size = new System.Drawing.Size(22, 22);
+ this.cmdEquipMentID.Size = new System.Drawing.Size(29, 28);
this.cmdEquipMentID.TabIndex = 320;
this.cmdEquipMentID.UseVisualStyleBackColor = false;
this.cmdEquipMentID.Click += new System.EventHandler(this.cmdEquipMentID_Click);
@@ -984,18 +1011,20 @@
//
this.label41.AutoSize = true;
this.label41.ForeColor = System.Drawing.Color.Black;
- this.label41.Location = new System.Drawing.Point(608, 110);
+ this.label41.Location = new System.Drawing.Point(811, 138);
+ this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label41.Name = "label41";
- this.label41.Size = new System.Drawing.Size(53, 12);
+ this.label41.Size = new System.Drawing.Size(67, 15);
this.label41.TabIndex = 318;
this.label41.Text = "妯″叿璁惧";
//
// txtHEquipMentID
//
this.txtHEquipMentID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEquipMentID.Location = new System.Drawing.Point(680, 106);
+ this.txtHEquipMentID.Location = new System.Drawing.Point(907, 132);
+ this.txtHEquipMentID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEquipMentID.Name = "txtHEquipMentID";
- this.txtHEquipMentID.Size = new System.Drawing.Size(167, 21);
+ this.txtHEquipMentID.Size = new System.Drawing.Size(221, 25);
this.txtHEquipMentID.TabIndex = 319;
this.txtHEquipMentID.Tag = "0";
this.txtHEquipMentID.TextChanged += new System.EventHandler(this.txtEquipMentID_TextChanged);
@@ -1004,9 +1033,10 @@
//
this.label40.AutoSize = true;
this.label40.ForeColor = System.Drawing.Color.Black;
- this.label40.Location = new System.Drawing.Point(607, 166);
+ this.label40.Location = new System.Drawing.Point(809, 208);
+ this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label40.Name = "label40";
- this.label40.Size = new System.Drawing.Size(53, 12);
+ this.label40.Size = new System.Drawing.Size(67, 15);
this.label40.TabIndex = 316;
this.label40.Text = "鍘熸枡鎵规";
//
@@ -1014,19 +1044,20 @@
//
this.txtHMateOutBatchNo.BackColor = System.Drawing.SystemColors.Window;
this.txtHMateOutBatchNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMateOutBatchNo.Location = new System.Drawing.Point(680, 162);
+ this.txtHMateOutBatchNo.Location = new System.Drawing.Point(907, 202);
+ this.txtHMateOutBatchNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMateOutBatchNo.Name = "txtHMateOutBatchNo";
- this.txtHMateOutBatchNo.Size = new System.Drawing.Size(190, 21);
+ this.txtHMateOutBatchNo.Size = new System.Drawing.Size(252, 25);
this.txtHMateOutBatchNo.TabIndex = 317;
this.txtHMateOutBatchNo.Tag = "0";
//
// chkHBLFlag
//
this.chkHBLFlag.AutoSize = true;
- this.chkHBLFlag.Location = new System.Drawing.Point(494, 142);
- this.chkHBLFlag.Margin = new System.Windows.Forms.Padding(2);
+ this.chkHBLFlag.Location = new System.Drawing.Point(659, 178);
+ this.chkHBLFlag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.chkHBLFlag.Name = "chkHBLFlag";
- this.chkHBLFlag.Size = new System.Drawing.Size(72, 16);
+ this.chkHBLFlag.Size = new System.Drawing.Size(89, 19);
this.chkHBLFlag.TabIndex = 315;
this.chkHBLFlag.Text = "琛ユ枡鏍囪";
this.chkHBLFlag.UseVisualStyleBackColor = true;
@@ -1035,9 +1066,10 @@
//
this.label39.AutoSize = true;
this.label39.ForeColor = System.Drawing.Color.Black;
- this.label39.Location = new System.Drawing.Point(24, 142);
+ this.label39.Location = new System.Drawing.Point(32, 178);
+ this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label39.Name = "label39";
- this.label39.Size = new System.Drawing.Size(53, 12);
+ this.label39.Size = new System.Drawing.Size(67, 15);
this.label39.TabIndex = 314;
this.label39.Text = "琛ユ枡鍘熷洜";
//
@@ -1045,9 +1077,10 @@
//
this.txtHQty.BackColor = System.Drawing.SystemColors.Window;
this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQty.Location = new System.Drawing.Point(376, 78);
+ this.txtHQty.Location = new System.Drawing.Point(501, 98);
+ this.txtHQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHQty.Name = "txtHQty";
- this.txtHQty.Size = new System.Drawing.Size(188, 21);
+ this.txtHQty.Size = new System.Drawing.Size(249, 25);
this.txtHQty.TabIndex = 299;
this.txtHQty.Tag = "0";
this.txtHQty.TextChanged += new System.EventHandler(this.txtHQty_TextChanged);
@@ -1056,9 +1089,10 @@
//
this.label38.AutoSize = true;
this.label38.ForeColor = System.Drawing.Color.Black;
- this.label38.Location = new System.Drawing.Point(305, 82);
+ this.label38.Location = new System.Drawing.Point(407, 102);
+ this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(65, 12);
+ this.label38.Size = new System.Drawing.Size(82, 15);
this.label38.TabIndex = 312;
this.label38.Text = "娴佽浆鍗℃暟閲�";
//
@@ -1066,9 +1100,10 @@
//
this.label37.AutoSize = true;
this.label37.ForeColor = System.Drawing.Color.Black;
- this.label37.Location = new System.Drawing.Point(602, 26);
+ this.label37.Location = new System.Drawing.Point(803, 32);
+ this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label37.Name = "label37";
- this.label37.Size = new System.Drawing.Size(65, 12);
+ this.label37.Size = new System.Drawing.Size(82, 15);
this.label37.TabIndex = 310;
this.label37.Text = "璁㈠崟璺熻釜鍙�";
//
@@ -1077,10 +1112,11 @@
this.txtHOrderProcNO.BackColor = System.Drawing.Color.Beige;
this.txtHOrderProcNO.Enabled = false;
this.txtHOrderProcNO.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHOrderProcNO.Location = new System.Drawing.Point(680, 24);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(907, 30);
+ this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
this.txtHOrderProcNO.ReadOnly = true;
- this.txtHOrderProcNO.Size = new System.Drawing.Size(188, 21);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(249, 25);
this.txtHOrderProcNO.TabIndex = 311;
//
// cmdHMaterID2
@@ -1088,9 +1124,10 @@
this.cmdHMaterID2.BackColor = System.Drawing.Color.Transparent;
this.cmdHMaterID2.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID2.Image")));
this.cmdHMaterID2.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHMaterID2.Location = new System.Drawing.Point(261, 51);
+ this.cmdHMaterID2.Location = new System.Drawing.Point(348, 64);
+ this.cmdHMaterID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHMaterID2.Name = "cmdHMaterID2";
- this.cmdHMaterID2.Size = new System.Drawing.Size(22, 22);
+ this.cmdHMaterID2.Size = new System.Drawing.Size(29, 28);
this.cmdHMaterID2.TabIndex = 307;
this.cmdHMaterID2.UseVisualStyleBackColor = false;
this.cmdHMaterID2.Click += new System.EventHandler(this.cmdHMaterID2_Click);
@@ -1099,9 +1136,10 @@
//
this.label34.AutoSize = true;
this.label34.ForeColor = System.Drawing.Color.Black;
- this.label34.Location = new System.Drawing.Point(607, 56);
+ this.label34.Location = new System.Drawing.Point(809, 70);
+ this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(53, 12);
+ this.label34.Size = new System.Drawing.Size(67, 15);
this.label34.TabIndex = 305;
this.label34.Text = "浜у搧瑙勬牸";
//
@@ -1109,9 +1147,10 @@
//
this.txtHModel2.BackColor = System.Drawing.SystemColors.Window;
this.txtHModel2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHModel2.Location = new System.Drawing.Point(681, 52);
+ this.txtHModel2.Location = new System.Drawing.Point(908, 65);
+ this.txtHModel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHModel2.Name = "txtHModel2";
- this.txtHModel2.Size = new System.Drawing.Size(188, 21);
+ this.txtHModel2.Size = new System.Drawing.Size(249, 25);
this.txtHModel2.TabIndex = 306;
this.txtHModel2.Tag = "0";
//
@@ -1119,9 +1158,10 @@
//
this.label35.AutoSize = true;
this.label35.ForeColor = System.Drawing.Color.Black;
- this.label35.Location = new System.Drawing.Point(310, 56);
+ this.label35.Location = new System.Drawing.Point(413, 70);
+ this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(53, 12);
+ this.label35.Size = new System.Drawing.Size(67, 15);
this.label35.TabIndex = 303;
this.label35.Text = "浜у搧浠ｇ爜";
//
@@ -1129,9 +1169,10 @@
//
this.txtHMaterNumber2.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber2.Location = new System.Drawing.Point(376, 52);
+ this.txtHMaterNumber2.Location = new System.Drawing.Point(501, 65);
+ this.txtHMaterNumber2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterNumber2.Name = "txtHMaterNumber2";
- this.txtHMaterNumber2.Size = new System.Drawing.Size(188, 21);
+ this.txtHMaterNumber2.Size = new System.Drawing.Size(249, 25);
this.txtHMaterNumber2.TabIndex = 304;
this.txtHMaterNumber2.Tag = "0";
//
@@ -1139,9 +1180,10 @@
//
this.label36.AutoSize = true;
this.label36.ForeColor = System.Drawing.Color.Black;
- this.label36.Location = new System.Drawing.Point(24, 56);
+ this.label36.Location = new System.Drawing.Point(32, 70);
+ this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label36.Name = "label36";
- this.label36.Size = new System.Drawing.Size(53, 12);
+ this.label36.Size = new System.Drawing.Size(67, 15);
this.label36.TabIndex = 300;
this.label36.Text = "浜у搧鍚嶇О";
//
@@ -1149,9 +1191,10 @@
//
this.txtHMaterID2.BackColor = System.Drawing.Color.Beige;
this.txtHMaterID2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID2.Location = new System.Drawing.Point(93, 52);
+ this.txtHMaterID2.Location = new System.Drawing.Point(124, 65);
+ this.txtHMaterID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterID2.Name = "txtHMaterID2";
- this.txtHMaterID2.Size = new System.Drawing.Size(167, 21);
+ this.txtHMaterID2.Size = new System.Drawing.Size(221, 25);
this.txtHMaterID2.TabIndex = 301;
this.txtHMaterID2.Tag = "0";
//
@@ -1159,18 +1202,20 @@
//
this.dtpHPlanEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dtpHPlanEndDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.dtpHPlanEndDate.Location = new System.Drawing.Point(376, 108);
+ this.dtpHPlanEndDate.Location = new System.Drawing.Point(501, 135);
+ this.dtpHPlanEndDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHPlanEndDate.Name = "dtpHPlanEndDate";
- this.dtpHPlanEndDate.Size = new System.Drawing.Size(188, 21);
+ this.dtpHPlanEndDate.Size = new System.Drawing.Size(249, 25);
this.dtpHPlanEndDate.TabIndex = 282;
//
// label12
//
this.label12.AutoSize = true;
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(295, 112);
+ this.label12.Location = new System.Drawing.Point(393, 140);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(77, 12);
+ this.label12.Size = new System.Drawing.Size(97, 15);
this.label12.TabIndex = 281;
this.label12.Text = "璁″垝瀹屽伐鏃ユ湡";
//
@@ -1178,18 +1223,20 @@
//
this.dtpHPlanBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dtpHPlanBeginDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.dtpHPlanBeginDate.Location = new System.Drawing.Point(92, 108);
+ this.dtpHPlanBeginDate.Location = new System.Drawing.Point(123, 135);
+ this.dtpHPlanBeginDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHPlanBeginDate.Name = "dtpHPlanBeginDate";
- this.dtpHPlanBeginDate.Size = new System.Drawing.Size(188, 21);
+ this.dtpHPlanBeginDate.Size = new System.Drawing.Size(249, 25);
this.dtpHPlanBeginDate.TabIndex = 280;
//
// label7
//
this.label7.AutoSize = true;
this.label7.ForeColor = System.Drawing.Color.Black;
- this.label7.Location = new System.Drawing.Point(10, 112);
+ this.label7.Location = new System.Drawing.Point(13, 140);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(77, 12);
+ this.label7.Size = new System.Drawing.Size(97, 15);
this.label7.TabIndex = 279;
this.label7.Text = "璁″垝寮�宸ユ棩鏈�";
//
@@ -1198,9 +1245,10 @@
this.cmdHUnitID.BackColor = System.Drawing.Color.Transparent;
this.cmdHUnitID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHUnitID.Image")));
this.cmdHUnitID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHUnitID.Location = new System.Drawing.Point(847, 78);
+ this.cmdHUnitID.Location = new System.Drawing.Point(1129, 98);
+ this.cmdHUnitID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHUnitID.Name = "cmdHUnitID";
- this.cmdHUnitID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHUnitID.Size = new System.Drawing.Size(29, 28);
this.cmdHUnitID.TabIndex = 274;
this.cmdHUnitID.UseVisualStyleBackColor = false;
this.cmdHUnitID.Visible = false;
@@ -1210,9 +1258,10 @@
//
this.label26.AutoSize = true;
this.label26.ForeColor = System.Drawing.Color.Black;
- this.label26.Location = new System.Drawing.Point(606, 84);
+ this.label26.Location = new System.Drawing.Point(808, 105);
+ this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(53, 12);
+ this.label26.Size = new System.Drawing.Size(69, 15);
this.label26.TabIndex = 272;
this.label26.Text = "鍗� 浣�";
//
@@ -1220,9 +1269,10 @@
//
this.txtHUnitID.BackColor = System.Drawing.Color.Beige;
this.txtHUnitID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHUnitID.Location = new System.Drawing.Point(680, 80);
+ this.txtHUnitID.Location = new System.Drawing.Point(907, 100);
+ this.txtHUnitID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHUnitID.Name = "txtHUnitID";
- this.txtHUnitID.Size = new System.Drawing.Size(166, 21);
+ this.txtHUnitID.Size = new System.Drawing.Size(220, 25);
this.txtHUnitID.TabIndex = 273;
this.txtHUnitID.Tag = "0";
this.txtHUnitID.TextChanged += new System.EventHandler(this.txtHUnitID_TextChanged);
@@ -1231,9 +1281,10 @@
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(18, 83);
+ this.label1.Location = new System.Drawing.Point(24, 104);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(65, 12);
+ this.label1.Size = new System.Drawing.Size(82, 15);
this.label1.TabIndex = 265;
this.label1.Text = "鐢熶骇璁㈠崟鍙�";
//
@@ -1241,9 +1292,10 @@
//
this.txtHICMOBillNo.BackColor = System.Drawing.SystemColors.Window;
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo.Location = new System.Drawing.Point(92, 80);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(123, 100);
+ this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
- this.txtHICMOBillNo.Size = new System.Drawing.Size(188, 21);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(249, 25);
this.txtHICMOBillNo.TabIndex = 266;
this.txtHICMOBillNo.Tag = "0";
//
@@ -1251,36 +1303,40 @@
//
this.txtHExplanation.BackColor = System.Drawing.SystemColors.Window;
this.txtHExplanation.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHExplanation.Location = new System.Drawing.Point(92, 139);
+ this.txtHExplanation.Location = new System.Drawing.Point(123, 174);
+ this.txtHExplanation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHExplanation.Name = "txtHExplanation";
- this.txtHExplanation.Size = new System.Drawing.Size(398, 21);
+ this.txtHExplanation.Size = new System.Drawing.Size(529, 25);
this.txtHExplanation.TabIndex = 284;
this.txtHExplanation.Tag = "0";
//
// txtHRemark
//
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(92, 166);
+ this.txtHRemark.Location = new System.Drawing.Point(123, 208);
+ this.txtHRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(472, 21);
+ this.txtHRemark.Size = new System.Drawing.Size(628, 25);
this.txtHRemark.TabIndex = 264;
//
// label20
//
this.label20.AutoSize = true;
this.label20.ForeColor = System.Drawing.Color.Black;
- this.label20.Location = new System.Drawing.Point(22, 170);
+ this.label20.Location = new System.Drawing.Point(29, 212);
+ this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(53, 12);
+ this.label20.Size = new System.Drawing.Size(69, 15);
this.label20.TabIndex = 263;
this.label20.Text = "澶� 娉�";
//
// txtHWWOrderBillNo
//
this.txtHWWOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWOrderBillNo.Location = new System.Drawing.Point(681, 305);
+ this.txtHWWOrderBillNo.Location = new System.Drawing.Point(908, 381);
+ this.txtHWWOrderBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHWWOrderBillNo.Name = "txtHWWOrderBillNo";
- this.txtHWWOrderBillNo.Size = new System.Drawing.Size(188, 21);
+ this.txtHWWOrderBillNo.Size = new System.Drawing.Size(249, 25);
this.txtHWWOrderBillNo.TabIndex = 262;
this.txtHWWOrderBillNo.Tag = "0";
this.txtHWWOrderBillNo.Visible = false;
@@ -1289,9 +1345,10 @@
//
this.label2.AutoSize = true;
this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(601, 309);
+ this.label2.Location = new System.Drawing.Point(801, 386);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(65, 12);
+ this.label2.Size = new System.Drawing.Size(82, 15);
this.label2.TabIndex = 261;
this.label2.Text = "濮斿璁㈠崟鍙�";
this.label2.Visible = false;
@@ -1300,9 +1357,10 @@
//
this.label5.AutoSize = true;
this.label5.ForeColor = System.Drawing.Color.Black;
- this.label5.Location = new System.Drawing.Point(23, 309);
+ this.label5.Location = new System.Drawing.Point(31, 386);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(77, 12);
+ this.label5.Size = new System.Drawing.Size(97, 15);
this.label5.TabIndex = 259;
this.label5.Text = "濮斿璁㈠崟鍐呯爜";
this.label5.Visible = false;
@@ -1310,9 +1368,10 @@
// txtHWWOrderInterID
//
this.txtHWWOrderInterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWOrderInterID.Location = new System.Drawing.Point(104, 305);
+ this.txtHWWOrderInterID.Location = new System.Drawing.Point(139, 381);
+ this.txtHWWOrderInterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHWWOrderInterID.Name = "txtHWWOrderInterID";
- this.txtHWWOrderInterID.Size = new System.Drawing.Size(188, 21);
+ this.txtHWWOrderInterID.Size = new System.Drawing.Size(249, 25);
this.txtHWWOrderInterID.TabIndex = 260;
this.txtHWWOrderInterID.Tag = "0";
this.txtHWWOrderInterID.Visible = false;
@@ -1320,9 +1379,10 @@
// txtHWWOrderEntryID
//
this.txtHWWOrderEntryID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWOrderEntryID.Location = new System.Drawing.Point(400, 305);
+ this.txtHWWOrderEntryID.Location = new System.Drawing.Point(533, 381);
+ this.txtHWWOrderEntryID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHWWOrderEntryID.Name = "txtHWWOrderEntryID";
- this.txtHWWOrderEntryID.Size = new System.Drawing.Size(188, 21);
+ this.txtHWWOrderEntryID.Size = new System.Drawing.Size(249, 25);
this.txtHWWOrderEntryID.TabIndex = 258;
this.txtHWWOrderEntryID.Tag = "0";
this.txtHWWOrderEntryID.Visible = false;
@@ -1331,9 +1391,10 @@
//
this.label16.AutoSize = true;
this.label16.ForeColor = System.Drawing.Color.Black;
- this.label16.Location = new System.Drawing.Point(306, 309);
+ this.label16.Location = new System.Drawing.Point(408, 386);
+ this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(89, 12);
+ this.label16.Size = new System.Drawing.Size(112, 15);
this.label16.TabIndex = 257;
this.label16.Text = "濮斿璁㈠崟瀛愬唴鐮�";
this.label16.Visible = false;
@@ -1342,18 +1403,20 @@
//
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dtpHDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.dtpHDate.Location = new System.Drawing.Point(376, 23);
+ this.dtpHDate.Location = new System.Drawing.Point(501, 29);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(184, 21);
+ this.dtpHDate.Size = new System.Drawing.Size(244, 25);
this.dtpHDate.TabIndex = 256;
//
// label9
//
this.label9.AutoSize = true;
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(307, 27);
+ this.label9.Location = new System.Drawing.Point(409, 34);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(53, 12);
+ this.label9.Size = new System.Drawing.Size(69, 15);
this.label9.TabIndex = 255;
this.label9.Text = "鏃� 鏈�";
//
@@ -1361,9 +1424,10 @@
//
this.label4.AutoSize = true;
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(22, 27);
+ this.label4.Location = new System.Drawing.Point(29, 34);
+ 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(68, 15);
this.label4.TabIndex = 251;
this.label4.Text = "鍗� 鎹� 鍙�";
//
@@ -1371,9 +1435,10 @@
//
this.txtHBillNo.BackColor = System.Drawing.Color.Beige;
this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBillNo.Location = new System.Drawing.Point(92, 23);
+ this.txtHBillNo.Location = new System.Drawing.Point(123, 29);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(188, 21);
+ this.txtHBillNo.Size = new System.Drawing.Size(249, 25);
this.txtHBillNo.TabIndex = 252;
//
// tabPage3
@@ -1408,11 +1473,11 @@
this.tabPage3.Controls.Add(this.cmdHMaterID);
this.tabPage3.Controls.Add(this.label6);
this.tabPage3.Controls.Add(this.label10);
- this.tabPage3.Location = new System.Drawing.Point(4, 22);
- this.tabPage3.Margin = new System.Windows.Forms.Padding(2);
+ this.tabPage3.Location = new System.Drawing.Point(4, 25);
+ this.tabPage3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Padding = new System.Windows.Forms.Padding(2);
- this.tabPage3.Size = new System.Drawing.Size(1260, 194);
+ this.tabPage3.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPage3.Size = new System.Drawing.Size(1682, 247);
this.tabPage3.TabIndex = 1;
this.tabPage3.Text = "鍏朵粬淇℃伅";
//
@@ -1420,47 +1485,52 @@
//
this.txtHprocExQty.BackColor = System.Drawing.SystemColors.Window;
this.txtHprocExQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHprocExQty.Location = new System.Drawing.Point(704, 81);
+ this.txtHprocExQty.Location = new System.Drawing.Point(939, 101);
+ this.txtHprocExQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHprocExQty.Name = "txtHprocExQty";
this.txtHprocExQty.ReadOnly = true;
- this.txtHprocExQty.Size = new System.Drawing.Size(86, 21);
+ this.txtHprocExQty.Size = new System.Drawing.Size(113, 25);
this.txtHprocExQty.TabIndex = 313;
this.txtHprocExQty.Tag = "0";
this.txtHprocExQty.TextChanged += new System.EventHandler(this.txtHprocExQty_TextChanged);
//
// txtHWorkTypeID
//
- this.txtHWorkTypeID.Location = new System.Drawing.Point(618, 111);
+ this.txtHWorkTypeID.Location = new System.Drawing.Point(824, 139);
+ this.txtHWorkTypeID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHWorkTypeID.Name = "txtHWorkTypeID";
- this.txtHWorkTypeID.Size = new System.Drawing.Size(173, 21);
+ this.txtHWorkTypeID.Size = new System.Drawing.Size(229, 25);
this.txtHWorkTypeID.TabIndex = 308;
//
// txtHPlanQty
//
this.txtHPlanQty.BackColor = System.Drawing.SystemColors.Window;
this.txtHPlanQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanQty.Location = new System.Drawing.Point(618, 81);
+ this.txtHPlanQty.Location = new System.Drawing.Point(824, 101);
+ this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHPlanQty.Name = "txtHPlanQty";
this.txtHPlanQty.ReadOnly = true;
- this.txtHPlanQty.Size = new System.Drawing.Size(85, 21);
+ this.txtHPlanQty.Size = new System.Drawing.Size(112, 25);
this.txtHPlanQty.TabIndex = 278;
this.txtHPlanQty.Tag = "0";
this.txtHPlanQty.TextChanged += new System.EventHandler(this.txtHPlanQty_TextChanged);
//
// txtHICMOEntryID
//
- this.txtHICMOEntryID.Location = new System.Drawing.Point(328, 111);
+ this.txtHICMOEntryID.Location = new System.Drawing.Point(437, 139);
+ this.txtHICMOEntryID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOEntryID.Name = "txtHICMOEntryID";
- this.txtHICMOEntryID.Size = new System.Drawing.Size(188, 21);
+ this.txtHICMOEntryID.Size = new System.Drawing.Size(249, 25);
this.txtHICMOEntryID.TabIndex = 309;
//
// label28
//
this.label28.AutoSize = true;
this.label28.ForeColor = System.Drawing.Color.Black;
- this.label28.Location = new System.Drawing.Point(540, 81);
+ this.label28.Location = new System.Drawing.Point(720, 101);
+ this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(53, 12);
+ this.label28.Size = new System.Drawing.Size(67, 15);
this.label28.TabIndex = 277;
this.label28.Text = "鐢熶骇鏁伴噺";
//
@@ -1468,9 +1538,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(493, 47);
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(657, 59);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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 = 293;
this.cmdSourceBillNo.UseVisualStyleBackColor = true;
this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
@@ -1479,9 +1550,10 @@
//
this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(540, 15);
+ this.label3.Location = new System.Drawing.Point(720, 19);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(77, 12);
+ this.label3.Size = new System.Drawing.Size(97, 15);
this.label3.TabIndex = 285;
this.label3.Text = "濮斿鍔犲伐鍗曚綅";
//
@@ -1489,9 +1561,10 @@
//
this.txtHModel.BackColor = System.Drawing.SystemColors.Window;
this.txtHModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHModel.Location = new System.Drawing.Point(85, 81);
+ this.txtHModel.Location = new System.Drawing.Point(113, 101);
+ this.txtHModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHModel.Name = "txtHModel";
- this.txtHModel.Size = new System.Drawing.Size(171, 21);
+ this.txtHModel.Size = new System.Drawing.Size(227, 25);
this.txtHModel.TabIndex = 297;
this.txtHModel.Tag = "0";
//
@@ -1499,9 +1572,10 @@
//
this.txtHUnitNumber.BackColor = System.Drawing.SystemColors.Window;
this.txtHUnitNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHUnitNumber.Location = new System.Drawing.Point(618, 47);
+ this.txtHUnitNumber.Location = new System.Drawing.Point(824, 59);
+ this.txtHUnitNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHUnitNumber.Name = "txtHUnitNumber";
- this.txtHUnitNumber.Size = new System.Drawing.Size(173, 21);
+ this.txtHUnitNumber.Size = new System.Drawing.Size(229, 25);
this.txtHUnitNumber.TabIndex = 276;
this.txtHUnitNumber.Tag = "0";
//
@@ -1509,25 +1583,28 @@
//
this.label18.AutoSize = true;
this.label18.ForeColor = System.Drawing.Color.Black;
- this.label18.Location = new System.Drawing.Point(266, 81);
+ this.label18.Location = new System.Drawing.Point(355, 101);
+ this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(53, 12);
+ this.label18.Size = new System.Drawing.Size(67, 15);
this.label18.TabIndex = 94;
this.label18.Text = "涓昏鏉愭枡";
//
// txtHKeyMaterID
//
- this.txtHKeyMaterID.Location = new System.Drawing.Point(85, 111);
+ this.txtHKeyMaterID.Location = new System.Drawing.Point(113, 139);
+ this.txtHKeyMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHKeyMaterID.Name = "txtHKeyMaterID";
- this.txtHKeyMaterID.Size = new System.Drawing.Size(171, 21);
+ this.txtHKeyMaterID.Size = new System.Drawing.Size(227, 25);
this.txtHKeyMaterID.TabIndex = 278;
//
// txtHSupID
//
this.txtHSupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSupID.Location = new System.Drawing.Point(618, 15);
+ this.txtHSupID.Location = new System.Drawing.Point(824, 19);
+ this.txtHSupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSupID.Name = "txtHSupID";
- this.txtHSupID.Size = new System.Drawing.Size(173, 21);
+ this.txtHSupID.Size = new System.Drawing.Size(229, 25);
this.txtHSupID.TabIndex = 286;
this.txtHSupID.Tag = "0";
this.txtHSupID.TextChanged += new System.EventHandler(this.txtHSupID_TextChanged);
@@ -1536,34 +1613,38 @@
//
this.label24.AutoSize = true;
this.label24.ForeColor = System.Drawing.Color.Black;
- this.label24.Location = new System.Drawing.Point(540, 47);
+ this.label24.Location = new System.Drawing.Point(720, 59);
+ this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(53, 12);
+ this.label24.Size = new System.Drawing.Size(67, 15);
this.label24.TabIndex = 275;
this.label24.Text = "鍗曚綅浠ｇ爜";
//
// txtHMainMaterID
//
- this.txtHMainMaterID.Location = new System.Drawing.Point(328, 81);
+ this.txtHMainMaterID.Location = new System.Drawing.Point(437, 101);
+ this.txtHMainMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMainMaterID.Name = "txtHMainMaterID";
- this.txtHMainMaterID.Size = new System.Drawing.Size(188, 21);
+ this.txtHMainMaterID.Size = new System.Drawing.Size(249, 25);
this.txtHMainMaterID.TabIndex = 277;
//
// textBox2
//
this.textBox2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.textBox2.Location = new System.Drawing.Point(328, 47);
+ this.textBox2.Location = new System.Drawing.Point(437, 59);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(167, 21);
+ this.textBox2.Size = new System.Drawing.Size(221, 25);
this.textBox2.TabIndex = 292;
//
// label22
//
this.label22.AutoSize = true;
this.label22.ForeColor = System.Drawing.Color.Black;
- this.label22.Location = new System.Drawing.Point(540, 111);
+ this.label22.Location = new System.Drawing.Point(720, 139);
+ this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(65, 12);
+ this.label22.Size = new System.Drawing.Size(82, 15);
this.label22.TabIndex = 253;
this.label22.Text = "娴佽浆鍗＄被鍨�";
//
@@ -1572,9 +1653,10 @@
this.cmdHSupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSupID.Image")));
this.cmdHSupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHSupID.Location = new System.Drawing.Point(791, 15);
+ this.cmdHSupID.Location = new System.Drawing.Point(1055, 19);
+ this.cmdHSupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHSupID.Name = "cmdHSupID";
- this.cmdHSupID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHSupID.Size = new System.Drawing.Size(29, 28);
this.cmdHSupID.TabIndex = 287;
this.cmdHSupID.UseVisualStyleBackColor = false;
this.cmdHSupID.Click += new System.EventHandler(this.cmdHSupID_Click);
@@ -1583,9 +1665,10 @@
//
this.label31.AutoSize = true;
this.label31.ForeColor = System.Drawing.Color.Black;
- this.label31.Location = new System.Drawing.Point(28, 81);
+ this.label31.Location = new System.Drawing.Point(37, 101);
+ this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(53, 12);
+ this.label31.Size = new System.Drawing.Size(67, 15);
this.label31.TabIndex = 296;
this.label31.Text = "瀛愪欢瑙勬牸";
//
@@ -1594,9 +1677,10 @@
this.cmdHWorkShopID.BackColor = System.Drawing.Color.Transparent;
this.cmdHWorkShopID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWorkShopID.Image")));
this.cmdHWorkShopID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHWorkShopID.Location = new System.Drawing.Point(233, 15);
+ this.cmdHWorkShopID.Location = new System.Drawing.Point(311, 19);
+ this.cmdHWorkShopID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHWorkShopID.Name = "cmdHWorkShopID";
- this.cmdHWorkShopID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWorkShopID.Size = new System.Drawing.Size(29, 28);
this.cmdHWorkShopID.TabIndex = 290;
this.cmdHWorkShopID.UseVisualStyleBackColor = false;
this.cmdHWorkShopID.Click += new System.EventHandler(this.cmdHWorkShopID_Click);
@@ -1605,9 +1689,10 @@
//
this.label29.AutoSize = true;
this.label29.ForeColor = System.Drawing.Color.Black;
- this.label29.Location = new System.Drawing.Point(266, 47);
+ this.label29.Location = new System.Drawing.Point(355, 59);
+ this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(53, 12);
+ this.label29.Size = new System.Drawing.Size(68, 15);
this.label29.TabIndex = 291;
this.label29.Text = "閫� 鍗� 鍙�";
//
@@ -1616,9 +1701,10 @@
this.cmdWorkType.BackColor = System.Drawing.Color.Transparent;
this.cmdWorkType.Image = ((System.Drawing.Image)(resources.GetObject("cmdWorkType.Image")));
this.cmdWorkType.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdWorkType.Location = new System.Drawing.Point(791, 111);
+ this.cmdWorkType.Location = new System.Drawing.Point(1055, 139);
+ this.cmdWorkType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdWorkType.Name = "cmdWorkType";
- this.cmdWorkType.Size = new System.Drawing.Size(22, 22);
+ this.cmdWorkType.Size = new System.Drawing.Size(29, 28);
this.cmdWorkType.TabIndex = 309;
this.cmdWorkType.UseVisualStyleBackColor = false;
this.cmdWorkType.Click += new System.EventHandler(this.cmdWorkType_Click);
@@ -1626,9 +1712,10 @@
// txtHWorkShopID
//
this.txtHWorkShopID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWorkShopID.Location = new System.Drawing.Point(86, 15);
+ this.txtHWorkShopID.Location = new System.Drawing.Point(115, 19);
+ this.txtHWorkShopID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHWorkShopID.Name = "txtHWorkShopID";
- this.txtHWorkShopID.Size = new System.Drawing.Size(146, 21);
+ this.txtHWorkShopID.Size = new System.Drawing.Size(193, 25);
this.txtHWorkShopID.TabIndex = 289;
this.txtHWorkShopID.Tag = "0";
this.txtHWorkShopID.TextChanged += new System.EventHandler(this.txtHWorkShopID_TextChanged);
@@ -1637,9 +1724,10 @@
//
this.label32.AutoSize = true;
this.label32.ForeColor = System.Drawing.Color.Black;
- this.label32.Location = new System.Drawing.Point(28, 111);
+ this.label32.Location = new System.Drawing.Point(37, 139);
+ this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(53, 12);
+ this.label32.Size = new System.Drawing.Size(67, 15);
this.label32.TabIndex = 283;
this.label32.Text = "鍏抽敭鏉愭枡";
//
@@ -1647,9 +1735,10 @@
//
this.txtHMaterNumber.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber.Location = new System.Drawing.Point(328, 15);
+ this.txtHMaterNumber.Location = new System.Drawing.Point(437, 19);
+ this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterNumber.Name = "txtHMaterNumber";
- this.txtHMaterNumber.Size = new System.Drawing.Size(188, 21);
+ this.txtHMaterNumber.Size = new System.Drawing.Size(249, 25);
this.txtHMaterNumber.TabIndex = 271;
this.txtHMaterNumber.Tag = "0";
//
@@ -1657,9 +1746,10 @@
//
this.txtHMaterID.BackColor = System.Drawing.Color.Beige;
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID.Location = new System.Drawing.Point(85, 47);
+ this.txtHMaterID.Location = new System.Drawing.Point(113, 59);
+ this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterID.Name = "txtHMaterID";
- this.txtHMaterID.Size = new System.Drawing.Size(149, 21);
+ this.txtHMaterID.Size = new System.Drawing.Size(197, 25);
this.txtHMaterID.TabIndex = 268;
this.txtHMaterID.Tag = "0";
this.txtHMaterID.TextChanged += new System.EventHandler(this.txtHMaterID_TextChanged);
@@ -1668,9 +1758,10 @@
//
this.label14.AutoSize = true;
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(28, 47);
+ this.label14.Location = new System.Drawing.Point(37, 59);
+ 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(67, 15);
this.label14.TabIndex = 267;
this.label14.Text = "瀛愪欢鍚嶇О";
//
@@ -1679,9 +1770,10 @@
this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
this.cmdHMaterID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHMaterID.Location = new System.Drawing.Point(233, 47);
+ this.cmdHMaterID.Location = new System.Drawing.Point(311, 59);
+ this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHMaterID.Size = new System.Drawing.Size(29, 28);
this.cmdHMaterID.TabIndex = 269;
this.cmdHMaterID.UseVisualStyleBackColor = false;
this.cmdHMaterID.Click += new System.EventHandler(this.cmdHMaterID_Click);
@@ -1690,9 +1782,10 @@
//
this.label6.AutoSize = true;
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(28, 15);
+ this.label6.Location = new System.Drawing.Point(37, 19);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(53, 12);
+ this.label6.Size = new System.Drawing.Size(67, 15);
this.label6.TabIndex = 288;
this.label6.Text = "鐢熶骇杞﹂棿";
//
@@ -1700,9 +1793,10 @@
//
this.label10.AutoSize = true;
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(266, 15);
+ this.label10.Location = new System.Drawing.Point(355, 19);
+ 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 = 270;
this.label10.Text = "瀛愪欢浠ｇ爜";
//
@@ -1747,10 +1841,11 @@
this.tabPage4.Controls.Add(this.label44);
this.tabPage4.Controls.Add(this.txtHProdMaterCode);
this.tabPage4.Controls.Add(this.label43);
- this.tabPage4.Location = new System.Drawing.Point(4, 22);
+ this.tabPage4.Location = new System.Drawing.Point(4, 25);
+ this.tabPage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage4.Name = "tabPage4";
- this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage4.Size = new System.Drawing.Size(1260, 194);
+ this.tabPage4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage4.Size = new System.Drawing.Size(1683, 246);
this.tabPage4.TabIndex = 2;
this.tabPage4.Text = "妫�绉荤エ淇℃伅";
//
@@ -1758,9 +1853,10 @@
//
this.txtHMaterIDD.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterIDD.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterIDD.Location = new System.Drawing.Point(108, 170);
+ this.txtHMaterIDD.Location = new System.Drawing.Point(144, 212);
+ this.txtHMaterIDD.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterIDD.Name = "txtHMaterIDD";
- this.txtHMaterIDD.Size = new System.Drawing.Size(188, 21);
+ this.txtHMaterIDD.Size = new System.Drawing.Size(249, 25);
this.txtHMaterIDD.TabIndex = 308;
this.txtHMaterIDD.Tag = "0";
//
@@ -1768,9 +1864,10 @@
//
this.label61.AutoSize = true;
this.label61.ForeColor = System.Drawing.Color.Black;
- this.label61.Location = new System.Drawing.Point(27, 173);
+ this.label61.Location = new System.Drawing.Point(36, 216);
+ this.label61.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label61.Name = "label61";
- this.label61.Size = new System.Drawing.Size(71, 12);
+ this.label61.Size = new System.Drawing.Size(90, 15);
this.label61.TabIndex = 307;
this.label61.Text = "鍘熸潗鏂欏唴鐮丏";
//
@@ -1778,9 +1875,10 @@
//
this.txtHMaterIDC.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterIDC.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterIDC.Location = new System.Drawing.Point(706, 143);
+ this.txtHMaterIDC.Location = new System.Drawing.Point(941, 179);
+ this.txtHMaterIDC.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterIDC.Name = "txtHMaterIDC";
- this.txtHMaterIDC.Size = new System.Drawing.Size(188, 21);
+ this.txtHMaterIDC.Size = new System.Drawing.Size(249, 25);
this.txtHMaterIDC.TabIndex = 306;
this.txtHMaterIDC.Tag = "0";
//
@@ -1788,9 +1886,10 @@
//
this.label60.AutoSize = true;
this.label60.ForeColor = System.Drawing.Color.Black;
- this.label60.Location = new System.Drawing.Point(631, 146);
+ this.label60.Location = new System.Drawing.Point(841, 182);
+ this.label60.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label60.Name = "label60";
- this.label60.Size = new System.Drawing.Size(71, 12);
+ this.label60.Size = new System.Drawing.Size(90, 15);
this.label60.TabIndex = 305;
this.label60.Text = "鍘熸潗鏂欏唴鐮丆";
//
@@ -1798,9 +1897,10 @@
//
this.txtHMaterIDB.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterIDB.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterIDB.Location = new System.Drawing.Point(399, 143);
+ this.txtHMaterIDB.Location = new System.Drawing.Point(532, 179);
+ this.txtHMaterIDB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterIDB.Name = "txtHMaterIDB";
- this.txtHMaterIDB.Size = new System.Drawing.Size(188, 21);
+ this.txtHMaterIDB.Size = new System.Drawing.Size(249, 25);
this.txtHMaterIDB.TabIndex = 304;
this.txtHMaterIDB.Tag = "0";
//
@@ -1808,9 +1908,10 @@
//
this.label59.AutoSize = true;
this.label59.ForeColor = System.Drawing.Color.Black;
- this.label59.Location = new System.Drawing.Point(322, 146);
+ this.label59.Location = new System.Drawing.Point(429, 182);
+ this.label59.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label59.Name = "label59";
- this.label59.Size = new System.Drawing.Size(71, 12);
+ this.label59.Size = new System.Drawing.Size(90, 15);
this.label59.TabIndex = 303;
this.label59.Text = "鍘熸潗鏂欏唴鐮丅";
//
@@ -1818,9 +1919,10 @@
//
this.txtHMaterIDA.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterIDA.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterIDA.Location = new System.Drawing.Point(108, 143);
+ this.txtHMaterIDA.Location = new System.Drawing.Point(144, 179);
+ this.txtHMaterIDA.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterIDA.Name = "txtHMaterIDA";
- this.txtHMaterIDA.Size = new System.Drawing.Size(188, 21);
+ this.txtHMaterIDA.Size = new System.Drawing.Size(249, 25);
this.txtHMaterIDA.TabIndex = 302;
this.txtHMaterIDA.Tag = "0";
//
@@ -1828,9 +1930,10 @@
//
this.label58.AutoSize = true;
this.label58.ForeColor = System.Drawing.Color.Black;
- this.label58.Location = new System.Drawing.Point(27, 146);
+ this.label58.Location = new System.Drawing.Point(36, 182);
+ this.label58.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label58.Name = "label58";
- this.label58.Size = new System.Drawing.Size(71, 12);
+ this.label58.Size = new System.Drawing.Size(90, 15);
this.label58.TabIndex = 301;
this.label58.Text = "鍘熸潗鏂欏唴鐮丄";
//
@@ -1838,9 +1941,10 @@
//
this.txtHMaterShortName.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterShortName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterShortName.Location = new System.Drawing.Point(706, 116);
+ this.txtHMaterShortName.Location = new System.Drawing.Point(941, 145);
+ this.txtHMaterShortName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterShortName.Name = "txtHMaterShortName";
- this.txtHMaterShortName.Size = new System.Drawing.Size(188, 21);
+ this.txtHMaterShortName.Size = new System.Drawing.Size(249, 25);
this.txtHMaterShortName.TabIndex = 300;
this.txtHMaterShortName.Tag = "0";
//
@@ -1848,9 +1952,10 @@
//
this.label57.AutoSize = true;
this.label57.ForeColor = System.Drawing.Color.Black;
- this.label57.Location = new System.Drawing.Point(631, 119);
+ this.label57.Location = new System.Drawing.Point(841, 149);
+ this.label57.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label57.Name = "label57";
- this.label57.Size = new System.Drawing.Size(65, 12);
+ this.label57.Size = new System.Drawing.Size(82, 15);
this.label57.TabIndex = 299;
this.label57.Text = "鍘熸潗鏂欑畝绉�";
//
@@ -1858,9 +1963,10 @@
//
this.txtHProdType.BackColor = System.Drawing.SystemColors.Window;
this.txtHProdType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProdType.Location = new System.Drawing.Point(399, 116);
+ this.txtHProdType.Location = new System.Drawing.Point(532, 145);
+ this.txtHProdType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProdType.Name = "txtHProdType";
- this.txtHProdType.Size = new System.Drawing.Size(188, 21);
+ this.txtHProdType.Size = new System.Drawing.Size(249, 25);
this.txtHProdType.TabIndex = 298;
this.txtHProdType.Tag = "0";
//
@@ -1868,9 +1974,10 @@
//
this.label56.AutoSize = true;
this.label56.ForeColor = System.Drawing.Color.Black;
- this.label56.Location = new System.Drawing.Point(322, 119);
+ this.label56.Location = new System.Drawing.Point(429, 149);
+ this.label56.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label56.Name = "label56";
- this.label56.Size = new System.Drawing.Size(53, 12);
+ this.label56.Size = new System.Drawing.Size(67, 15);
this.label56.TabIndex = 297;
this.label56.Text = "鐢熶骇绫诲瀷";
//
@@ -1878,9 +1985,10 @@
//
this.txtHMaterNumber_D.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber_D.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber_D.Location = new System.Drawing.Point(108, 116);
+ this.txtHMaterNumber_D.Location = new System.Drawing.Point(144, 145);
+ this.txtHMaterNumber_D.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterNumber_D.Name = "txtHMaterNumber_D";
- this.txtHMaterNumber_D.Size = new System.Drawing.Size(188, 21);
+ this.txtHMaterNumber_D.Size = new System.Drawing.Size(249, 25);
this.txtHMaterNumber_D.TabIndex = 296;
this.txtHMaterNumber_D.Tag = "0";
//
@@ -1888,9 +1996,10 @@
//
this.label55.AutoSize = true;
this.label55.ForeColor = System.Drawing.Color.Black;
- this.label55.Location = new System.Drawing.Point(27, 119);
+ this.label55.Location = new System.Drawing.Point(36, 149);
+ this.label55.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label55.Name = "label55";
- this.label55.Size = new System.Drawing.Size(71, 12);
+ this.label55.Size = new System.Drawing.Size(90, 15);
this.label55.TabIndex = 295;
this.label55.Text = "鍘熸潗鏂欑紪鍙稤";
//
@@ -1898,9 +2007,10 @@
//
this.txtHMaterNumber_C.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber_C.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber_C.Location = new System.Drawing.Point(706, 89);
+ this.txtHMaterNumber_C.Location = new System.Drawing.Point(941, 111);
+ this.txtHMaterNumber_C.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterNumber_C.Name = "txtHMaterNumber_C";
- this.txtHMaterNumber_C.Size = new System.Drawing.Size(188, 21);
+ this.txtHMaterNumber_C.Size = new System.Drawing.Size(249, 25);
this.txtHMaterNumber_C.TabIndex = 294;
this.txtHMaterNumber_C.Tag = "0";
//
@@ -1908,9 +2018,10 @@
//
this.label54.AutoSize = true;
this.label54.ForeColor = System.Drawing.Color.Black;
- this.label54.Location = new System.Drawing.Point(631, 92);
+ this.label54.Location = new System.Drawing.Point(841, 115);
+ this.label54.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label54.Name = "label54";
- this.label54.Size = new System.Drawing.Size(71, 12);
+ this.label54.Size = new System.Drawing.Size(90, 15);
this.label54.TabIndex = 293;
this.label54.Text = "鍘熸潗鏂欑紪鍙稢";
//
@@ -1918,9 +2029,10 @@
//
this.txtHMaterNumber_B.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber_B.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber_B.Location = new System.Drawing.Point(399, 89);
+ this.txtHMaterNumber_B.Location = new System.Drawing.Point(532, 111);
+ this.txtHMaterNumber_B.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterNumber_B.Name = "txtHMaterNumber_B";
- this.txtHMaterNumber_B.Size = new System.Drawing.Size(188, 21);
+ this.txtHMaterNumber_B.Size = new System.Drawing.Size(249, 25);
this.txtHMaterNumber_B.TabIndex = 292;
this.txtHMaterNumber_B.Tag = "0";
//
@@ -1928,9 +2040,10 @@
//
this.label53.AutoSize = true;
this.label53.ForeColor = System.Drawing.Color.Black;
- this.label53.Location = new System.Drawing.Point(322, 92);
+ this.label53.Location = new System.Drawing.Point(429, 115);
+ this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label53.Name = "label53";
- this.label53.Size = new System.Drawing.Size(71, 12);
+ this.label53.Size = new System.Drawing.Size(90, 15);
this.label53.TabIndex = 291;
this.label53.Text = "鍘熸潗鏂欑紪鍙稡";
//
@@ -1938,9 +2051,10 @@
//
this.txtHMaterNumber_A.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber_A.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber_A.Location = new System.Drawing.Point(108, 89);
+ this.txtHMaterNumber_A.Location = new System.Drawing.Point(144, 111);
+ this.txtHMaterNumber_A.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterNumber_A.Name = "txtHMaterNumber_A";
- this.txtHMaterNumber_A.Size = new System.Drawing.Size(188, 21);
+ this.txtHMaterNumber_A.Size = new System.Drawing.Size(249, 25);
this.txtHMaterNumber_A.TabIndex = 290;
this.txtHMaterNumber_A.Tag = "0";
//
@@ -1948,9 +2062,10 @@
//
this.label52.AutoSize = true;
this.label52.ForeColor = System.Drawing.Color.Black;
- this.label52.Location = new System.Drawing.Point(27, 92);
+ this.label52.Location = new System.Drawing.Point(36, 115);
+ this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label52.Name = "label52";
- this.label52.Size = new System.Drawing.Size(71, 12);
+ this.label52.Size = new System.Drawing.Size(90, 15);
this.label52.TabIndex = 289;
this.label52.Text = "鍘熸潗鏂欑紪鍙稟";
//
@@ -1958,9 +2073,10 @@
//
this.txtHImportNote.BackColor = System.Drawing.SystemColors.Window;
this.txtHImportNote.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHImportNote.Location = new System.Drawing.Point(706, 62);
+ this.txtHImportNote.Location = new System.Drawing.Point(941, 78);
+ this.txtHImportNote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHImportNote.Name = "txtHImportNote";
- this.txtHImportNote.Size = new System.Drawing.Size(188, 21);
+ this.txtHImportNote.Size = new System.Drawing.Size(249, 25);
this.txtHImportNote.TabIndex = 288;
this.txtHImportNote.Tag = "0";
//
@@ -1968,9 +2084,10 @@
//
this.label51.AutoSize = true;
this.label51.ForeColor = System.Drawing.Color.Black;
- this.label51.Location = new System.Drawing.Point(631, 65);
+ this.label51.Location = new System.Drawing.Point(841, 81);
+ this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label51.Name = "label51";
- this.label51.Size = new System.Drawing.Size(53, 12);
+ this.label51.Size = new System.Drawing.Size(67, 15);
this.label51.TabIndex = 287;
this.label51.Text = "閲嶈鎻愮ず";
//
@@ -1978,9 +2095,10 @@
//
this.txtHWorkRemark.BackColor = System.Drawing.SystemColors.Window;
this.txtHWorkRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWorkRemark.Location = new System.Drawing.Point(399, 62);
+ this.txtHWorkRemark.Location = new System.Drawing.Point(532, 78);
+ this.txtHWorkRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHWorkRemark.Name = "txtHWorkRemark";
- this.txtHWorkRemark.Size = new System.Drawing.Size(188, 21);
+ this.txtHWorkRemark.Size = new System.Drawing.Size(249, 25);
this.txtHWorkRemark.TabIndex = 286;
this.txtHWorkRemark.Tag = "0";
//
@@ -1988,9 +2106,10 @@
//
this.label50.AutoSize = true;
this.label50.ForeColor = System.Drawing.Color.Black;
- this.label50.Location = new System.Drawing.Point(322, 65);
+ this.label50.Location = new System.Drawing.Point(429, 81);
+ this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label50.Name = "label50";
- this.label50.Size = new System.Drawing.Size(53, 12);
+ this.label50.Size = new System.Drawing.Size(67, 15);
this.label50.TabIndex = 285;
this.label50.Text = "鐢熶骇澶囨敞";
//
@@ -1998,9 +2117,10 @@
//
this.txtHCusName.BackColor = System.Drawing.SystemColors.Window;
this.txtHCusName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCusName.Location = new System.Drawing.Point(108, 62);
+ this.txtHCusName.Location = new System.Drawing.Point(144, 78);
+ this.txtHCusName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHCusName.Name = "txtHCusName";
- this.txtHCusName.Size = new System.Drawing.Size(188, 21);
+ this.txtHCusName.Size = new System.Drawing.Size(249, 25);
this.txtHCusName.TabIndex = 284;
this.txtHCusName.Tag = "0";
//
@@ -2008,9 +2128,10 @@
//
this.label49.AutoSize = true;
this.label49.ForeColor = System.Drawing.Color.Black;
- this.label49.Location = new System.Drawing.Point(27, 65);
+ this.label49.Location = new System.Drawing.Point(36, 81);
+ this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label49.Name = "label49";
- this.label49.Size = new System.Drawing.Size(53, 12);
+ this.label49.Size = new System.Drawing.Size(67, 15);
this.label49.TabIndex = 283;
this.label49.Text = "瀹㈡埛鍚嶇О";
//
@@ -2018,9 +2139,10 @@
//
this.txtHProdMaterName.BackColor = System.Drawing.SystemColors.Window;
this.txtHProdMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProdMaterName.Location = new System.Drawing.Point(706, 34);
+ this.txtHProdMaterName.Location = new System.Drawing.Point(941, 42);
+ this.txtHProdMaterName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProdMaterName.Name = "txtHProdMaterName";
- this.txtHProdMaterName.Size = new System.Drawing.Size(188, 21);
+ this.txtHProdMaterName.Size = new System.Drawing.Size(249, 25);
this.txtHProdMaterName.TabIndex = 282;
this.txtHProdMaterName.Tag = "0";
//
@@ -2028,9 +2150,10 @@
//
this.label48.AutoSize = true;
this.label48.ForeColor = System.Drawing.Color.Black;
- this.label48.Location = new System.Drawing.Point(631, 37);
+ this.label48.Location = new System.Drawing.Point(841, 46);
+ this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label48.Name = "label48";
- this.label48.Size = new System.Drawing.Size(53, 12);
+ this.label48.Size = new System.Drawing.Size(67, 15);
this.label48.TabIndex = 281;
this.label48.Text = "浜у搧鍚嶇О";
//
@@ -2038,9 +2161,10 @@
//
this.txtHPlanSendGoodsDate.BackColor = System.Drawing.SystemColors.Window;
this.txtHPlanSendGoodsDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanSendGoodsDate.Location = new System.Drawing.Point(399, 34);
+ this.txtHPlanSendGoodsDate.Location = new System.Drawing.Point(532, 42);
+ this.txtHPlanSendGoodsDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHPlanSendGoodsDate.Name = "txtHPlanSendGoodsDate";
- this.txtHPlanSendGoodsDate.Size = new System.Drawing.Size(188, 21);
+ this.txtHPlanSendGoodsDate.Size = new System.Drawing.Size(249, 25);
this.txtHPlanSendGoodsDate.TabIndex = 280;
this.txtHPlanSendGoodsDate.Tag = "0";
//
@@ -2048,9 +2172,10 @@
//
this.label47.AutoSize = true;
this.label47.ForeColor = System.Drawing.Color.Black;
- this.label47.Location = new System.Drawing.Point(322, 37);
+ this.label47.Location = new System.Drawing.Point(429, 46);
+ this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label47.Name = "label47";
- this.label47.Size = new System.Drawing.Size(77, 12);
+ this.label47.Size = new System.Drawing.Size(97, 15);
this.label47.TabIndex = 279;
this.label47.Text = "棰勮鍑鸿揣鏃ユ湡";
//
@@ -2058,9 +2183,10 @@
//
this.txtHCusNeedMaterial.BackColor = System.Drawing.SystemColors.Window;
this.txtHCusNeedMaterial.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCusNeedMaterial.Location = new System.Drawing.Point(108, 34);
+ this.txtHCusNeedMaterial.Location = new System.Drawing.Point(144, 42);
+ this.txtHCusNeedMaterial.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHCusNeedMaterial.Name = "txtHCusNeedMaterial";
- this.txtHCusNeedMaterial.Size = new System.Drawing.Size(188, 21);
+ this.txtHCusNeedMaterial.Size = new System.Drawing.Size(249, 25);
this.txtHCusNeedMaterial.TabIndex = 278;
this.txtHCusNeedMaterial.Tag = "0";
//
@@ -2068,9 +2194,10 @@
//
this.label46.AutoSize = true;
this.label46.ForeColor = System.Drawing.Color.Black;
- this.label46.Location = new System.Drawing.Point(2, 37);
+ this.label46.Location = new System.Drawing.Point(3, 46);
+ this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label46.Name = "label46";
- this.label46.Size = new System.Drawing.Size(101, 12);
+ this.label46.Size = new System.Drawing.Size(127, 15);
this.label46.TabIndex = 277;
this.label46.Text = "瀹㈡埛瑕佹眰鏉愭枡鎴愬垎";
//
@@ -2078,9 +2205,10 @@
//
this.txtHCusShortName.BackColor = System.Drawing.SystemColors.Window;
this.txtHCusShortName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCusShortName.Location = new System.Drawing.Point(706, 6);
+ this.txtHCusShortName.Location = new System.Drawing.Point(941, 8);
+ this.txtHCusShortName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHCusShortName.Name = "txtHCusShortName";
- this.txtHCusShortName.Size = new System.Drawing.Size(188, 21);
+ this.txtHCusShortName.Size = new System.Drawing.Size(249, 25);
this.txtHCusShortName.TabIndex = 276;
this.txtHCusShortName.Tag = "0";
//
@@ -2088,9 +2216,10 @@
//
this.label45.AutoSize = true;
this.label45.ForeColor = System.Drawing.Color.Black;
- this.label45.Location = new System.Drawing.Point(631, 9);
+ this.label45.Location = new System.Drawing.Point(841, 11);
+ this.label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label45.Name = "label45";
- this.label45.Size = new System.Drawing.Size(53, 12);
+ this.label45.Size = new System.Drawing.Size(67, 15);
this.label45.TabIndex = 275;
this.label45.Text = "瀹㈡埛绠�绉�";
//
@@ -2098,9 +2227,10 @@
//
this.txtHSeOrderBillNo.BackColor = System.Drawing.SystemColors.Window;
this.txtHSeOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSeOrderBillNo.Location = new System.Drawing.Point(399, 6);
+ this.txtHSeOrderBillNo.Location = new System.Drawing.Point(532, 8);
+ this.txtHSeOrderBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
- this.txtHSeOrderBillNo.Size = new System.Drawing.Size(188, 21);
+ this.txtHSeOrderBillNo.Size = new System.Drawing.Size(249, 25);
this.txtHSeOrderBillNo.TabIndex = 274;
this.txtHSeOrderBillNo.Tag = "0";
//
@@ -2108,9 +2238,10 @@
//
this.label44.AutoSize = true;
this.label44.ForeColor = System.Drawing.Color.Black;
- this.label44.Location = new System.Drawing.Point(322, 9);
+ this.label44.Location = new System.Drawing.Point(429, 11);
+ this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label44.Name = "label44";
- this.label44.Size = new System.Drawing.Size(65, 12);
+ this.label44.Size = new System.Drawing.Size(82, 15);
this.label44.TabIndex = 273;
this.label44.Text = "閿�鍞鍗曞彿";
//
@@ -2118,9 +2249,10 @@
//
this.txtHProdMaterCode.BackColor = System.Drawing.SystemColors.Window;
this.txtHProdMaterCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProdMaterCode.Location = new System.Drawing.Point(108, 6);
+ this.txtHProdMaterCode.Location = new System.Drawing.Point(144, 8);
+ this.txtHProdMaterCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProdMaterCode.Name = "txtHProdMaterCode";
- this.txtHProdMaterCode.Size = new System.Drawing.Size(188, 21);
+ this.txtHProdMaterCode.Size = new System.Drawing.Size(249, 25);
this.txtHProdMaterCode.TabIndex = 272;
this.txtHProdMaterCode.Tag = "0";
//
@@ -2128,17 +2260,19 @@
//
this.label43.AutoSize = true;
this.label43.ForeColor = System.Drawing.Color.Black;
- this.label43.Location = new System.Drawing.Point(27, 9);
+ this.label43.Location = new System.Drawing.Point(36, 11);
+ this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label43.Name = "label43";
- this.label43.Size = new System.Drawing.Size(53, 12);
+ this.label43.Size = new System.Drawing.Size(69, 15);
this.label43.TabIndex = 271;
this.label43.Text = "浜у搧CODE";
//
// pic1
//
- this.pic1.Location = new System.Drawing.Point(302, 3);
+ this.pic1.Location = new System.Drawing.Point(403, 4);
+ this.pic1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pic1.Name = "pic1";
- this.pic1.Size = new System.Drawing.Size(66, 30);
+ this.pic1.Size = new System.Drawing.Size(88, 38);
this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pic1.TabIndex = 36;
this.pic1.TabStop = false;
@@ -2148,9 +2282,10 @@
//
this.label33.AutoSize = true;
this.label33.ForeColor = System.Drawing.Color.Black;
- this.label33.Location = new System.Drawing.Point(442, 25);
+ this.label33.Location = new System.Drawing.Point(589, 31);
+ this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(65, 12);
+ this.label33.Size = new System.Drawing.Size(82, 15);
this.label33.TabIndex = 298;
this.label33.Text = "娴佽浆鍗℃暟閲�";
this.label33.Visible = false;
@@ -2159,9 +2294,10 @@
//
this.label30.AutoSize = true;
this.label30.ForeColor = System.Drawing.Color.Black;
- this.label30.Location = new System.Drawing.Point(370, 27);
+ this.label30.Location = new System.Drawing.Point(493, 34);
+ this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(53, 12);
+ this.label30.Size = new System.Drawing.Size(69, 15);
this.label30.TabIndex = 294;
this.label30.Text = "鎵� 鍙�";
this.label30.Visible = false;
@@ -2170,9 +2306,10 @@
//
this.txtHBatchNo.BackColor = System.Drawing.SystemColors.Window;
this.txtHBatchNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBatchNo.Location = new System.Drawing.Point(444, 23);
+ this.txtHBatchNo.Location = new System.Drawing.Point(592, 29);
+ this.txtHBatchNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBatchNo.Name = "txtHBatchNo";
- this.txtHBatchNo.Size = new System.Drawing.Size(188, 21);
+ this.txtHBatchNo.Size = new System.Drawing.Size(249, 25);
this.txtHBatchNo.TabIndex = 295;
this.txtHBatchNo.Tag = "0";
this.txtHBatchNo.Visible = false;
@@ -2180,9 +2317,10 @@
// txtHInnerBillNo
//
this.txtHInnerBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHInnerBillNo.Location = new System.Drawing.Point(605, 12);
+ this.txtHInnerBillNo.Location = new System.Drawing.Point(807, 15);
+ this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHInnerBillNo.Name = "txtHInnerBillNo";
- this.txtHInnerBillNo.Size = new System.Drawing.Size(188, 21);
+ this.txtHInnerBillNo.Size = new System.Drawing.Size(249, 25);
this.txtHInnerBillNo.TabIndex = 254;
this.txtHInnerBillNo.Tag = "0";
//
@@ -2210,18 +2348,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, 526);
+ this.panel2.Location = new System.Drawing.Point(55, 658);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1268, 73);
+ this.panel2.Size = new System.Drawing.Size(1690, 91);
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
@@ -2229,9 +2369,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 = "浣滃簾鏃ユ湡";
//
@@ -2239,9 +2380,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
@@ -2249,9 +2391,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 = "浣滃簾浜�";
//
@@ -2259,9 +2402,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
@@ -2269,9 +2413,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 = "淇敼鏃ユ湡";
//
@@ -2279,9 +2424,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
@@ -2289,9 +2435,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 = "淇敼浜�";
//
@@ -2299,9 +2446,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
@@ -2309,9 +2457,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 = "鍏抽棴鏃ユ湡";
//
@@ -2319,9 +2468,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
@@ -2329,9 +2479,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 = "鍏抽棴浜�";
//
@@ -2339,9 +2490,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
@@ -2349,9 +2501,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 = "瀹℃牳鏃ユ湡";
//
@@ -2359,9 +2512,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
@@ -2369,9 +2523,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 = "瀹℃牳浜�";
//
@@ -2379,9 +2534,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
@@ -2389,9 +2545,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 = "鍒跺崟鏃ユ湡";
//
@@ -2399,9 +2556,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
@@ -2409,9 +2567,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 = "鍒跺崟浜�";
//
@@ -2423,27 +2582,30 @@
// 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, 4, 4, 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(1309, 50);
+ this.panel3.Location = new System.Drawing.Point(1745, 62);
+ this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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;
//
// 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, 4, 4, 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;
//
@@ -2451,10 +2613,11 @@
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(41, 304);
+ this.tabControl1.Location = new System.Drawing.Point(55, 380);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1268, 222);
+ this.tabControl1.Size = new System.Drawing.Size(1690, 278);
this.tabControl1.TabIndex = 55;
//
// tabPage1
@@ -2462,10 +2625,11 @@
this.tabPage1.Controls.Add(this.grdMain);
this.tabPage1.Controls.Add(this.grdSum);
this.tabPage1.Controls.Add(this.panel6);
- 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, 4, 4, 4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(1260, 196);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Size = new System.Drawing.Size(1682, 249);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鏄庣粏淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -2479,15 +2643,17 @@
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, 4, 4, 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(1254, 146);
+ this.grdMain.Size = new System.Drawing.Size(1674, 187);
this.grdMain.TabIndex = 58;
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
+ this.grdMain.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellContentClick);
this.grdMain.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
this.grdMain.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -2503,13 +2669,14 @@
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(3, 149);
+ this.grdSum.Location = new System.Drawing.Point(4, 191);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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(1254, 19);
+ this.grdSum.Size = new System.Drawing.Size(1674, 24);
this.grdSum.TabIndex = 57;
//
// panel6
@@ -2518,35 +2685,27 @@
this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel6.Controls.Add(this.lblHStockQty);
this.panel6.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel6.Location = new System.Drawing.Point(3, 168);
+ this.panel6.Location = new System.Drawing.Point(4, 215);
+ this.panel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1254, 25);
+ this.panel6.Size = new System.Drawing.Size(1674, 30);
this.panel6.TabIndex = 56;
//
// lblHStockQty
//
this.lblHStockQty.AutoSize = true;
- this.lblHStockQty.Location = new System.Drawing.Point(8, 6);
+ this.lblHStockQty.Location = new System.Drawing.Point(11, 8);
+ this.lblHStockQty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblHStockQty.Name = "lblHStockQty";
- this.lblHStockQty.Size = new System.Drawing.Size(0, 12);
+ this.lblHStockQty.Size = new System.Drawing.Size(0, 15);
this.lblHStockQty.TabIndex = 0;
- //
- // textHPicNumVer
- //
- this.textHPicNumVer.BackColor = System.Drawing.SystemColors.Window;
- this.textHPicNumVer.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.textHPicNumVer.Location = new System.Drawing.Point(1000, 23);
- this.textHPicNumVer.Name = "textHPicNumVer";
- this.textHPicNumVer.Size = new System.Drawing.Size(188, 21);
- this.textHPicNumVer.TabIndex = 337;
- this.textHPicNumVer.Tag = "0";
//
// Sc_ProcessExchangeBill
//
- 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(1348, 599);
+ this.ClientSize = new System.Drawing.Size(1797, 749);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.panel2);
this.Controls.Add(this.P1);
@@ -2560,6 +2719,7 @@
this.Controls.Add(this.label30);
this.ForeColor = System.Drawing.Color.Black;
this.KeyPreview = true;
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Sc_ProcessExchangeBill";
this.Text = "宸ュ簭娴佽浆鍗�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.resx" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.resx"
index 3c16d4c..a6b79cd 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.resx"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.resx"
@@ -360,7 +360,7 @@
<data name="set.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
go7OP2dzliGROOkp2Pgucer7XkC6xDr0ZRgGx6aCaA6GluQ4DjnPsw6KAeu66jdOEkI1AOz7jp4RjErD
TKBodvkQngYTQW9ZlvuNxl3cC88rpYNe13UaAtDDiR4otZm5F2/iSjln2bZNhzGH3iNAPIBo0yQ5fTQE
wIhZUgXwmXkqpoIGXOZxHJVorgJ02IwqrjHPv8rME/81AAV2ZYDkr79imqbqBWo0TAyBCeZWQDT67UG+
@@ -370,7 +370,7 @@
<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
@@ -380,7 +380,7 @@
<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
@@ -393,7 +393,7 @@
<data name="xz.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
@@ -407,7 +407,7 @@
<data name="xg.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
@@ -422,7 +422,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -436,7 +436,7 @@
<data name="fz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
@@ -444,31 +444,10 @@
3/47QuwBNTYBELFI9AQAAAAASUVORK5CYII=
</value>
</data>
- <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
- 9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
- W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
- mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
- jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
- sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
-</value>
- </data>
- <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
- G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
- 5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
- EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
- E8pc2+4AAAAASUVORK5CYII=
-</value>
- </data>
<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
@@ -480,10 +459,31 @@
SUVORK5CYII=
</value>
</data>
+ <data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ 9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
+ W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
+ mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
+ jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
+ sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
+ 5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
+ EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
+ E8pc2+4AAAAASUVORK5CYII=
+</value>
+ </data>
<data name="fq.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=
@@ -492,7 +492,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -505,7 +505,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -518,7 +518,7 @@
<data name="sz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAClSURBVDhPxZNBCgMhDEVz1zmQSxkQXHoEj+CmdOtx0vyU
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAClSURBVDhPxZNBCgMhDEVz1zmQSxkQXHoEj+CmdOtx0vyU
wFhjqaXQDyGEn/8QZ6Sf6TgSn8x83phl5For+iDsSOPW2uRNgJzzsARfLPVKKXsAC8OXcYKrVoBreHU6
lQd4DW8BvPAWIISgPaX7d4AYo33KAYL54zvovWthNoh5yAzyAE+H6ApB3wZABkEtAdLeLhnE/RMhXBqC
KO8tQIC4b+FPInoA2b1WbweybUAAAAAASUVORK5CYII=
@@ -527,7 +527,7 @@
<data name="syz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
xDUbDeyDQWf4805q/o3U02yblbbq+JoakhhjCdPvIrIfUuYhhGsJ4TNXgt77ocA5NxboMuGz/QSnBO1y
H7wV9MtLgtHykiDnXIbWvp4JIKX0JaGfFkAv4b4kgFbCuSwAlVCPBKCS9iXSa90KAIn+BeD9s0j9/Avz
GPMGIZpkvqVDGAQAAAAASUVORK5CYII=
@@ -536,7 +536,7 @@
<data name="xyz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
i+wUezjKSifB6mZEYYe/ZNseOM+sj34edbi4A9ifIIBa6wFOAcYYWvQtyDl/BNZJiRK8K1/iCjzJyguk
ZEkwJey4c5GsCgxOKaG1dk9gcIwRpZR7L5AwowQuzCgB7xJmbNHGBDwTlLCF3z9Bjv0LTO/dh39PCC/T
8HpVcPCyWAAAAABJRU5ErkJggg==
@@ -545,7 +545,7 @@
<data name="mz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACXSURBVDhPrZPBCYAwDEW7a4fpsWdB6LEjdIRevHec2JQE
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACXSURBVDhPrZPBCYAwDEW7a4fpsWdB6LEjdIRevHec2JQE
NIlgxA9B6c97iGj4JTHuQLcq2F2Hju+hAsYYagG7DQC2A9ZOa01L1hItSIkUlFJswexNiU9gSNxPICV+
AUnwbFbfBAznnP0ChlNKUGv1CSTsegcWzN0rwbwoGPNKMLNACWNYzvMkCL13BXPw+0cQx/wXvieEEzaJ
cBFxK5ZNAAAAAElFTkSuQmCC
@@ -554,7 +554,7 @@
<data name="qt.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADvSURBVDhPzVLBCoJAEPUT/A5P/oh/4Vd19VBdig6egwg8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADvSURBVDhPzVLBCoJAEPUT/A5P/oh/4Vd19VBdig6egwg8
SZCIeIgIIYTIIiKiw752ZlcMS43q0IPB2dmZ994OGj+F53lwXRemaXJQTjV93Q5qlh/Yto1JkKM3XnJe
EqmuBmgVHop2QLIHZmsBPxFcI5JWJ6RAaukByM5AflEk05XAKBJ81+qCFMh2dgKKK3C8VSR+XLnQ7c8o
CdJCOpAk25qDToLyCWEO3kFMO9ioHfTDN57wuMR5JhBk0rocHiyUOt3paIZWYDUaoqCcahQYmnAcp53k
@@ -564,7 +564,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
@@ -574,7 +574,7 @@
<data name="yc.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
@@ -584,7 +584,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
@@ -599,7 +599,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
--
Gitblit v1.9.1