From 48ec49f7f011eb9a8da70e53336b0f1287c8192b Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 11 十二月 2025 17:00:59 +0800
Subject: [PATCH] 1
---
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LianXiang.cs | 2299 +++++++++++++++++++++++++
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 42
LMES/ClsShowMod.cs | 6
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 267 ++
WebAPI/WebAPI.csproj.user | 13
Model/Model.csproj | 2
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 2
WarM/WarM.csproj | 10
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
Model/基础资料/基础资料/ClsCg_ContractTransportBillMain.cs | 22
WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user | 18
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
Model/基础资料/基础资料/ClsCg_ContractTransportBillSub.cs | 27
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 227 ++
WebAPI/Controllers/WebAPIController.cs | 2
WebAPI/ListModels.cs | 25
WebAPI/Models/Gy_Mould.cs | 11
DAL/基础资料/公用基础资料/ClsCg_ContractTransportBillList.cs | 332 +++
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
DAL/DAL.csproj | 1
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LianXiang.designer.cs | 1074 +++++++++++
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LianXiang.resx | 539 +++++
WebAPI/WebAPI.csproj | 2
WebAPI/Controllers/Cg_ContractTransportBillListController.cs | 386 ++++
26 files changed, 5,219 insertions(+), 132 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 232260a..9b496d0 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -85,6 +85,7 @@
<Compile Include="浠撳簱绠＄悊\灏忚溅閿佸畾\ClsKf_TrolleyPositionBill.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Driver_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Car_Ctl_2.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsCg_ContractTransportBillList.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_PatrolCheckItemMethod_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_MaintainClass_Ctl.cs" />
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsCg_ContractTransportBillList.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsCg_ContractTransportBillList.cs"
new file mode 100644
index 0000000..4e2de6c
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsCg_ContractTransportBillList.cs"
@@ -0,0 +1,332 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsCg_ContractTransportBillList : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsCg_ContractTransportBillMain omodel = new Model.ClsCg_ContractTransportBillMain();
+ public List<Model.ClsCg_ContractTransportBillSub> DetailColl = new List<Model.ClsCg_ContractTransportBillSub>();
+
+ public ClsCg_ContractTransportBillList()
+ {
+ base.MvarItemKeySub = "Cg_ContractTransportBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "Cg_ContractTransportBillMain";
+ base.MvarReportTitle="鎵胯繍鍚堝悓";
+ base.BillType = "1117";
+ base.HBillSubType = "1117";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsCg_ContractTransportBillList()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+
+ oCn.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Cg_ContractTransportBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Cg_ContractTransportBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Cg_ContractTransportBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ //",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+
+ ",HContractDate ='" + omodel.HContractDate.ToString() +"',"+ "HSupID = "+ omodel.HSupID.ToString()+","+ "HContractNumber='"+ omodel.HContractNumber.ToString()+"',"+ "HContractName='"+ omodel.HContractName.ToString() + "',"+
+ "HAddress='"+ omodel.HAddress.ToString() + "',"+ "HSSID="+ omodel.HSSID.ToString() + "," + "HCurID=" + omodel.HCurID.ToString() + "," + "HEmpID=" + omodel.HEmpID.ToString() + "," + "HDeptID=" + omodel.HDeptID.ToString() + ""+
+ // ",HExplanation ='" + omodel.HExplanation.ToString() +"'"+ ",HInnerBillNo ='" + omodel.HInnerBillNo.ToString() + "'"+
+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsCg_ContractTransportBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Cg_ContractTransportBillSub " +
+ "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HTransportLineName,HBeginAddr,HEndAddr,HTransportCar,HDistance,HTransportTimes ,HTransportTyep ,HMoney ,HMoney_His) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + (oSub.HSourceBillNo??"a") +
+ "','" + (oSub.HSourceBillType??"a") +
+ "','" + (oSub.HTransportLineName ?? "") +
+ "','" + (oSub.HBeginAddr ) +
+ "','" + (oSub.HEndAddr ) +
+ "','" + (oSub.HTransportCar) +
+ "','" + (oSub.HDistance ?? "") +
+ "','" + (oSub.HTransportTimes ?? "") +
+ "','" + (oSub.HTransportTyep ?? "") +
+ "','" + (oSub.HMoney??"") +
+ "','" + (oSub.HMoney_His??"") +
+ "')";
+ oCn.RunProc(subSql);
+ }
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Cg_ContractTransportBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Cg_ContractTransportBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+
+ DataSet ds;
+
+ oCn.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ ds = oCn.RunProcReturn("Exec h_p_Cg_ContractTransportBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Cg_ContractTransportBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+
+ //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅
+ while (true)
+ {
+ ds = oCn.RunProcReturn("select * from Cg_ContractTransportBillMain where HInterID = " + omodel.HInterID, "Cg_ContractTransportBillMain");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ //涓昏〃
+ string mainSql = "insert into Cg_ContractTransportBillMain" +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
+ ",HContractDate,HSupID,HContractNumber,HContractName,HAddress,HSSID,HCurID,HEmpID,HDeptID,HExplanation,HInnerBillNo) " +
+ "values(" +
+ "" + (omodel.HYear.ToString() != "0" ? omodel.HYear.ToString() : DateTime.Now.Year.ToString()) +
+ "," + omodel.HPeriod.ToString() +
+ ",'" + this.BillType +
+ "','" + this.HBillSubType +
+ "'," + omodel.HInterID +
+ ",'" + omodel.HDate +
+ "','" + omodel.HBillNo +
+ "','" + omodel.HRemark +
+ "','" + omodel.HMaker +
+ "','" + omodel.HMakeDate +
+ "','" + omodel.HContractDate +
+ "','" + omodel.HSupID +
+ "','" + omodel.HContractNumber +
+ "','" + omodel.HContractName +
+ "','" + omodel.HAddress +
+ "','" + omodel.HSSID +
+ "','" + omodel.HCurID +
+ "','" + omodel.HEmpID +
+ "','" + omodel.HDeptID +
+ "','" + omodel.HExplanation +
+ "','" + omodel.HInnerBillNo +
+ "')";
+
+ oCn.RunProc(mainSql);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsCg_ContractTransportBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Cg_ContractTransportBillSub " +
+ "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
+ ",HTransportLineName,HBeginAddr,HEndAddr,HTransportCar,HDistance,HTransportTimes,HTransportTyep,HMoney,HMoney_His) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "','" + oSub.HRemark +
+ "','" + oSub.HTransportLineName +
+ "','" + oSub.HBeginAddr +
+ "','" + oSub.HEndAddr +
+ "','" + oSub.HTransportCar +
+ "','" + oSub.HDistance +
+ "','" + oSub.HTransportTimes +
+ "','" + oSub.HTransportTyep +
+ "','" + oSub.HMoney +
+ "','" + oSub.HMoney_His +
+ "')";
+ oCn.RunProc(subSql);
+ }
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Cg_ContractTransportBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Cg_ContractTransportBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ ////鏄剧ず鍗曟嵁
+ //public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ //{
+ // try
+ // {
+ // //鏌ヨ涓昏〃
+ // DataSet Ds ;
+ // Ds = oCn.RunProcReturn("Select * from Gy_MaterPreventErrMouldBillMain Where HInterID=" + lngBillKey.ToString(), "Gy_MaterPreventErrMouldBillMain");
+ // if(Ds.Tables[0].Rows.Count==0)
+ // {
+ // sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ // return false;
+ // }
+ // //鍥哄畾璧嬪��===========================================
+ // omodel.HInterID =DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ // omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ // omodel.HDate =DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ // omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ // omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ // omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ // omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ // omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ // omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ // omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ // omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ // omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ // omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ // omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ // omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ // omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ // omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ // omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ // omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ // omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ // omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ // omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ // omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ // omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ // //========================================================
+
+ // //
+
+ // //寰幆
+ // DataSet DsSub ;
+ // DsSub = oCn.RunProcReturn("Select * from Gy_MaterPreventErrMouldBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_WorkBeginDotCheckBillSub");
+ // DetailColl.Clear();//娓呯┖
+ // for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ // {
+ // Model.ClsGy_MaterPreventErrMouldBillSub oSub = new Model.ClsGy_MaterPreventErrMouldBillSub();
+ // // 鍥哄畾璧嬪��===============================================
+ // oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ // oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ // oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ // oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ // oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ // oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ // oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ // oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ // oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ // oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ // oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ // oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ // //===================================================
+
+ // DetailColl.Add(oSub);
+ // }
+ // sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ // return true;
+ // }
+ // catch (Exception e)
+ // {
+ // sReturn = e.Message;
+ // throw (e);
+ // }
+ //}
+
+
+ }
+
+}
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 0d75033..99a2436 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3677,6 +3677,12 @@
oGy_CusBarCodeBill_KaiBei_HuaSan.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
oGy_CusBarCodeBill_KaiBei_HuaSan.ShowDialog();
break;
+ case "gy_cusbarcodebill_kaibei_lianxiang":
+ //
+ Gy_CusBarCodeBill_KaiBei_LianXiang oGy_CusBarCodeBill_KaiBei_LianXiang = new Gy_CusBarCodeBill_KaiBei_LianXiang();
+ oGy_CusBarCodeBill_KaiBei_LianXiang.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oGy_CusBarCodeBill_KaiBei_LianXiang.ShowDialog();
+ break;
case "gy_datain_updatebarcodestatus":
//
Gy_DataIn_UpDateBarCodeStatus oGy_DataIn_UpDateBarCodeStatus = new Gy_DataIn_UpDateBarCodeStatus();
diff --git a/Model/Model.csproj b/Model/Model.csproj
index bc0e102..efadc9e 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -106,11 +106,13 @@
<Compile Include="浠撳簱绠＄悊\ClsKf_TrolleyPositionBillSub.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_PurPrice_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MatePrice_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsCg_ContractTransportBillSub.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AssistantData.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AssistantDataEntry.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Car_Model_2.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Driver_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DiscountList.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsCg_ContractTransportBillMain.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_OperatorGroup.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsSc_PackUnionBillBarCode_temp_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Model.cs" />
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsCg_ContractTransportBillMain.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsCg_ContractTransportBillMain.cs"
new file mode 100644
index 0000000..21fce2a
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsCg_ContractTransportBillMain.cs"
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsCg_ContractTransportBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+
+ public string HContractDate;
+ public int HSupID;
+ public string HContractNumber;
+ public string HContractName;
+ public string HAddress;
+ public int HSSID;
+ public int HCurID;
+ public int HEmpID;
+ public int HDeptID;
+ public string HExplanation;
+ public string HInnerBillNo;
+ }
+}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsCg_ContractTransportBillSub.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsCg_ContractTransportBillSub.cs"
new file mode 100644
index 0000000..79af6d8
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsCg_ContractTransportBillSub.cs"
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsCg_ContractTransportBillSub : DBUtility.ClsXt_BaseBillMain
+ {
+
+ public string HTransportLineName;
+ public int HEntryID;
+ public int HSourceInterID;
+ public int HSourceEntryID;
+ public string HSourceBillNo;
+ public string HSourceBillType;
+ public long HBeginAddr;
+ public long HEndAddr;
+ public long HTransportCar;
+ public string HDistance;
+ public string HTransportTimes;
+ public string HTransportTyep;
+ public string HMoney;
+ public string HMoney_His;
+
+
+ }
+}
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 0e294fc..9b9313f 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -743,6 +743,12 @@
<Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_New.designer.cs">
<DependentUpon>Gy_BarCodeBill_New.cs</DependentUpon>
</Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LianXiang.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LianXiang.designer.cs">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_LianXiang.cs</DependentUpon>
+ </Compile>
<Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_HuaSan.cs">
<SubType>Form</SubType>
</Compile>
@@ -1240,6 +1246,10 @@
<DependentUpon>Gy_BarCodeBill_New.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LianXiang.resx">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_LianXiang.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_HuaSan.resx">
<DependentUpon>Gy_CusBarCodeBill_KaiBei_HuaSan.cs</DependentUpon>
<SubType>Designer</SubType>
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.cs"
new file mode 100644
index 0000000..c1bf32c
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.cs"
@@ -0,0 +1,2299 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using Pub_Class;
+using System.Threading;
+using System.Globalization;
+
+namespace WarM
+{
+ public partial class Gy_CusBarCodeBill_KaiBei_LianXiang : Form
+ {
+ public Gy_CusBarCodeBill_KaiBei_LianXiang()
+ {
+ InitializeComponent();
+ }
+ //瀹氫箟
+ public const Int16 HTagCol = 0;
+ public const Int16 HSnoCol = 1;
+ public const Int16 HMainIDCol = 2;
+ public const Int16 HSubIDCol = 3;
+ public const Int16 HBillNoCol = 4;
+ public const Int16 HBillTypeCol = 5;
+ public const Int16 HMaterIDCol = 6;
+ public const Int16 HMaterNumberCol = 7;
+ public const Int16 HMaterNameCol = 8;
+ public const Int16 HMaterModelCol = 9;
+ public const Int16 HCusModelNameCol = 10;
+ public const Int16 HUnitIDCol = 11;
+ public const Int16 HUnitNumberCol = 12;
+ public const Int16 HUnitNameCol = 13;
+ public const Int16 HAuxPropIDCol = 14;
+ public const Int16 HAuxPropNumberCol = 15;
+ public const Int16 HAuxPropNameCol = 16;
+ public const Int16 HBatchManagerCol = 17;
+ public const Int16 HBatchNoCol = 18;
+ public const Int16 HGiveAwayFlagCol = 19;
+ public const Int16 HCode1Col = 20;
+ public const Int16 HCode2Col = 21;
+ public const Int16 HCode3Col = 22;
+ public const Int16 HCustom1Col = 23;
+ public const Int16 HCustom2Col = 24;
+ public const Int16 HInnerBillNoCol = 25;
+ public const Int16 HCustom3Col = 26;
+ public const Int16 HCustom4Col = 27;
+ public const Int16 HCustom5Col = 28;
+ public const Int16 HCustom6Col = 29;
+ public const Int16 HQtyCol = 30;
+ public const Int16 HMinQtyCol = 31;
+ public const Int16 HBQtyCol = 32;
+ public const Int16 HWMinQtyCol = 33;
+ public const Int16 HWBQtyCol = 34;
+ public const Int16 HCustomQty1Col = 35;
+ public const Int16 HZMinQtyCol = 36;
+ public const Int16 HZBQtyCol = 37;
+ public const Int16 HCustomQty2Col = 38;
+ public const Int16 HProduceDateCol = 39;
+ public const Int16 HExpiryDateCol = 40;
+ public const Int16 HCusIDCol = 41;
+ public const Int16 HCusNumberCol = 42;
+ public const Int16 HCusNameCol = 43;
+ public const Int16 HSourceInterIDCol = 44;
+ public const Int16 HSourceEntryIDCol = 45;
+ public const Int16 HSourceBillNoCol = 46;
+ public const Int16 HSourceBillTypeCol = 47;
+ public const Int16 HInitQtyCol = 48;
+ public const Int16 HMTONoCol = 49;
+ public const Int16 HISKFPERIODCol = 50;
+ public const Int16 HEXPUNITCol = 51;
+ public const Int16 HEXPPERIODCol = 52;
+ public const Int16 HLSHCol = 53;
+ public const Int16 HBaNoCol = 54;
+ public const Int16 HCusModelCol = 55;
+ public const Int16 HRemarkCol = 56;
+ //
+ public string ModName = "85";
+ public string ModCaption = "鑱旀兂瀹㈡埛鏍囩鐢熸垚";
+ public const string ModRightName = "Gy_CusBarCodeBill_KaiBei_LianXiang";
+
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DBUtility.ClsXt_BaseBill BaseBill;
+ ClsGridViewSum oSumGrid = new ClsGridViewSum();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public Frm_Split oDlg = new Frm_Split();
+ public bool grdStatus;
+ public int selectRow = 0;
+ public Int64 HInterID = 0; //鍐呯爜
+ public Int64 HOrgID = ClsPub.HOrgID;
+ public Int64 HType = 2;
+ public string sDate = ""; //鏃ユ湡
+ public string sYear = ""; //骞达紙2浣嶏級
+ public string sYear1 = ""; //骞达紙1浣嶏級
+ public string sPeriod = ""; //鏈�
+ public string sPeriod2 = ""; //鏈堬紙姝ｅ父锛�
+ public string sDay = ""; //鏃�
+ public string sWeek = ""; //鍛�
+
+
+ #region 鍥哄畾浠ｇ爜
+
+ //娓呯┖鐣岄潰
+ public void Sub_ClearBill()
+ {
+ cmbSourceBillType.Items.Clear();
+ //婧愬崟绫诲瀷
+ cmbSourceBillType.Items.Add("鐢熶骇璁㈠崟");
+ //cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
+
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ //鑾峰彇褰撳墠缁勭粐
+ DataSet Ds1 = oCn.RunProcReturn("select * from Xt_ORGANIZATIONS with(nolock) where HItemID=" + ClsPub.HOrgID, "Xt_ORGANIZATIONS", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (Ds1.Tables[0].Rows.Count != 0)
+ {
+ cmbHOrgID.Text = DBUtility.ClsPub.isStrNull(Ds1.Tables[0].Rows[0]["HName"]);
+ }
+
+ txtHMaker.Text = ClsPub.CurUserName;
+ txtHMakeDate.Text = "";
+ txtHChecker.Text = "";
+ txtHCheckDate.Text = "";
+ txtHCloseMan.Text = "";
+ txtHCloseDate.Text = "";
+ txtHDeleteMan.Text = "";
+ txtHDeleteDate.Text = "";
+ txtHUpDater.Text = "";
+ txtHUpDateDate.Text = "";
+ initGrid();
+ grdSub.DataSource = null;
+ grdList.DataSource = null;
+ grdList2.DataSource = null;
+ }
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name + "grdSub");
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdList, this.Name + "grdList");
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdList2, this.Name + "grdList2");
+ }
+
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name + "grdSub");
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdList, this.Name + "grdList");
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdList2, this.Name + "grdList2");
+ }
+
+ //鍒犺鎸夌航
+ private void DelRow_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DelRow(oSumGrid);
+ }
+
+ //淇濆瓨鎸夐挳
+ private void bc_Click(object sender, EventArgs e)
+ {
+ this.Sub_SaveBill();
+ Display();
+ }
+
+ //閲嶇疆鎸夌航
+ private void cz_Click(object sender, EventArgs e)
+ {
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew || BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ {
+ if (MessageBox.Show("纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+ {
+ this.Sub_AddBill();
+ }
+ }
+ grdMain.Columns[HBillNoCol].ReadOnly = false;
+ tabControl1.SelectedIndex = 0;
+ }
+
+ //鏂板鍗曟嵁
+ private void Sub_AddBill()
+ {
+ this.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ this.Sub_OperStatus();//璁剧疆TOOLBAR
+ this.Sub_ClearBill();//娓呯┖鐣岄潰
+ }
+
+ //閫�鍑烘寜閽�
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ //绂诲紑鍗曞厓鏍�
+ private void grdMain_LeaveCell(object sender, EventArgs e)
+ {
+ oSumGrid.LeaveCell();
+ }
+
+ //缃戞牸鍗曞厓鏍煎彉鍖栦簨浠�
+ private void grdMain_RowColChange(object sender, EventArgs e)
+ {
+ if (!grdStatus)
+ {
+ return;
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //
+ //if (oSumGrid.Changelock)
+ // return;
+ //if(oSumGrid.EditStatus)
+ //{
+ if (!CheckGridRow(oSumGrid.OldCell.Row))
+ return;
+ //}
+ }
+
+ private void Gy_CusBarCodeBill_KaiBei_LianXiang_Paint(object sender, PaintEventArgs e)//鐢荤嚎
+ {
+ Graphics g = this.panel2.CreateGraphics();
+ Pen p = new Pen(Color.Gray);
+ p.Width = 1;
+ g.DrawLine(p, new Point(txtHMaker.Left, txtHMaker.Top + txtHMaker.Height), new Point(txtHMaker.Left + txtHMaker.Width, txtHMaker.Top + txtHMaker.Height));
+ g.DrawLine(p, new Point(txtHMakeDate.Left, txtHMakeDate.Top + txtHMakeDate.Height), new Point(txtHMakeDate.Left + txtHMakeDate.Width, txtHMakeDate.Top + txtHMakeDate.Height));
+ //
+ g.DrawLine(p, new Point(txtHChecker.Left, txtHChecker.Top + txtHChecker.Height), new Point(txtHChecker.Left + txtHChecker.Width, txtHChecker.Top + txtHChecker.Height));
+ g.DrawLine(p, new Point(txtHCheckDate.Left, txtHCheckDate.Top + txtHCheckDate.Height), new Point(txtHCheckDate.Left + txtHCheckDate.Width, txtHCheckDate.Top + txtHCheckDate.Height));
+ //
+ g.DrawLine(p, new Point(txtHCloseMan.Left, txtHCloseMan.Top + txtHCloseMan.Height), new Point(txtHCloseMan.Left + txtHCloseMan.Width, txtHCloseMan.Top + txtHCloseMan.Height));
+ g.DrawLine(p, new Point(txtHCloseDate.Left, txtHCloseDate.Top + txtHCloseDate.Height), new Point(txtHCloseDate.Left + txtHCloseDate.Width, txtHCloseDate.Top + txtHCloseDate.Height));
+ //
+ g.DrawLine(p, new Point(this.txtHDeleteMan.Left, txtHDeleteMan.Top + txtHDeleteMan.Height), new Point(txtHDeleteMan.Left + txtHDeleteMan.Width, txtHDeleteMan.Top + txtHDeleteMan.Height));
+ g.DrawLine(p, new Point(txtHDeleteDate.Left, txtHDeleteDate.Top + txtHDeleteDate.Height), new Point(txtHDeleteDate.Left + txtHDeleteDate.Width, txtHDeleteDate.Top + txtHDeleteDate.Height));
+ //
+ g.DrawLine(p, new Point(this.txtHUpDater.Left, txtHUpDater.Top + txtHUpDater.Height), new Point(txtHUpDater.Left + txtHUpDater.Width, txtHUpDater.Top + txtHUpDater.Height));
+ g.DrawLine(p, new Point(txtHUpDateDate.Left, txtHUpDateDate.Top + txtHUpDateDate.Height), new Point(txtHUpDateDate.Left + txtHUpDateDate.Width, txtHUpDateDate.Top + txtHUpDateDate.Height));
+ //鎺т欢浣嶇疆璁剧疆
+
+ }
+
+ //鎺т欢浣嶇疆
+ private void Sub_ControlLocation()
+ {
+ //gbUp.Width = P1.Width - 20;
+ //gbUp.Left = 10;
+ //gbUp.Height = P1.Height - 35;
+ //gbUp.Top = 30;
+ }
+
+ //绐椾綋鍔犺浇
+ private void Gy_CusBarCodeBill_KaiBei_LianXiang_Load(object sender, EventArgs e)
+ {
+ //鎵撳嵃鍒濆鍖�
+ oSumGrid.NoCol = HSnoCol;
+ oSumGrid.ogrdMain = grdMain;
+ oSumGrid.oGridsum = grdSum;
+ this.Text = ModCaption;
+ this.lblCaption.Text = ModCaption;
+ //鍔犺浇缁勭粐淇℃伅
+ Sub_AddOrdList();
+ //鍔犺浇瀹㈡埛淇℃伅
+ Sub_AddHCusNameList();
+ }
+
+ //鍔犺浇缁勭粐淇℃伅
+ private void Sub_AddOrdList()
+ {
+ DataSet ds;
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ ds = oClsGy_ORGANIZATIONS_View.GetList();
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鑾峰彇缁勭粐澶辫触");
+ return;
+ }
+ cmbHOrgID.DataSource = null;
+ cmbHOrgID.Items.Clear();
+ cmbHOrgID.DataSource = ds.Tables[0];
+ cmbHOrgID.DisplayMember = "HName";
+ cmbHOrgID.ValueMember = "HItemID";
+ }
+
+ //鍔犺浇瀹㈡埛淇℃伅
+ private void Sub_AddHCusNameList()
+ {
+ DataSet ds = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_Cus_New " + HOrgID.ToString() + "," + HType.ToString(), "h_p_Gy_CusBarCodeBill_Cus_New");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ cmbHCusName.DataSource = null;
+ cmbHCusName.Items.Clear();
+ MessageBox.Show("鑾峰彇瀹㈡埛淇℃伅澶辫触");
+ return;
+ }
+ cmbHCusName.DataSource = null;
+ cmbHCusName.Items.Clear();
+ cmbHCusName.DataSource = ds.Tables[0];
+ cmbHCusName.DisplayMember = "HName";
+ cmbHCusName.ValueMember = "HItemID";
+ }
+
+ //绐椾綋灏哄鍙樺寲鏃�
+ private void Gy_CusBarCodeBill_KaiBei_LianXiang_Resize(object sender, EventArgs e)
+ {
+ //Sub_ControlLocation();
+ }
+
+ //鏍规嵁缂栬緫鐘舵�� 璁剧疆 鎺т欢鏄惁鍏佽褰曞叆
+ private void Sub_LrtextStatus(bool TextEnabled)
+ {
+ if (TextEnabled == true)
+ {
+ //鎺т欢鍏ㄩ儴鏈夋晥
+ gbUp.Enabled = true;
+ grdMain.BackColor = ClsPub.EditColor;
+ }
+ else
+ { //鎺т欢鍏ㄩ儴鏃犳晥
+ gbUp.Enabled = false;
+ grdMain.BackColor = ClsPub.ViewColor;
+ }
+ }
+
+ //timer
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled = false;
+ Sub_ControlLocation();
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_View)
+ {
+ //this.Sub_ShowBill();
+ }
+ else
+ {
+ this.Sub_AddBill();
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ //绐椾綋鍗歌浇
+ private void Gy_CusBarCodeBill_KaiBei_LianXiang_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ //TOOLBAR鐘舵�� 鎸夐挳鏄惁鐏板害
+ public void Sub_OperStatus()
+ {
+ switch (BillStatus)
+ {
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_View:
+ //娴忚鐘舵��
+ ylw.Enabled = true;
+ DelRow.Enabled = false;
+ bc.Enabled = false;
+ cz.Enabled = false;
+ tc.Enabled = true;
+ //鏈鏍�
+ if (txtHChecker.Text.Trim() == "")
+ {
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ }
+ else if (txtHCloseMan.Text.Trim() == "" && txtHChecker.Text.Trim() != "")//瀹℃牳鏈叧闂�
+ {
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Checked.jpg");
+ //
+ }
+ else//宸插叧闂�
+ {
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Closed.jpg");
+ //
+ }
+ if (txtHDeleteMan.Text.Trim() == "")
+ {
+ }
+ else //宸蹭綔搴�
+ {
+ DelRow.Enabled = false;
+ bc.Enabled = false;
+ cz.Enabled = false;
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Deleted.jpg");
+ //
+ }
+ Sub_LrtextStatus(false);
+ grdStatus = false;
+ break;
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew:
+ //鏂板鐘舵��
+ ylw.Enabled = true;
+ DelRow.Enabled = true;
+ bc.Enabled = true;
+ cz.Enabled = true;
+ tc.Enabled = true;
+ Sub_LrtextStatus(true);
+ grdStatus = true;
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ break;
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify:
+ //淇敼鐘舵��
+ ylw.Enabled = true;
+ DelRow.Enabled = true;
+ bc.Enabled = true;
+ cz.Enabled = true;
+ tc.Enabled = true;
+ Sub_LrtextStatus(true);
+ grdStatus = true;
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ break;
+ }
+ }
+
+ #endregion
+
+
+ #region 鐢熸垚鏉＄爜
+
+ private bool Sub_SaveBill()
+ {
+ //鑾峰彇鍐呯爜
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ lblCaption.Focus();
+ //鐢熸垚鏉＄爜鍓嶆帶鍒�
+ if (!Sub_AllowSave())
+ {
+ return false;
+ }
+ bc.Enabled = false;
+ SaveBarCode();
+ return true;
+ }
+
+ #region 鐢熸垚鏉＄爜鍓嶆帶鍒�
+ private bool Sub_AllowSave()
+ {
+ string sHRemark = "";
+ //鏄庣粏琛ㄦ槸鍚︿负闆惰
+ bool b = false;
+ for (int i = 0; i < grdMain.RowCount; i++)
+ {
+ if (!IsNullRow(i))
+ {
+ b = true;
+ break;
+ }
+ }
+ if (b == false)
+ {
+ MessageBox.Show("鏄庣粏琛屼笉瀛樺湪锛�", "鎻愮ず");
+ return false;
+ }
+
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ sDate = dtpHDate.Value.ToShortDateString();
+ sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ sYear1 = ClsPub.isDate(sDate).Year.ToString().Substring(3, 1);
+ sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sPeriod2 = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ //鑾峰彇鍛�
+ GregorianCalendar calendar = new GregorianCalendar();
+ int weekNumber = calendar.GetWeekOfYear(dtpHDate.Value, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday);
+ sWeek = "0" + weekNumber.ToString();
+ sWeek = sWeek.Substring(sWeek.Length - 2, 2);
+ //==================================
+ switch (sPeriod)
+ {
+ case "01":
+ sPeriod = "1";
+ break;
+ case "02":
+ sPeriod = "2";
+ break;
+ case "03":
+ sPeriod = "3";
+ break;
+ case "04":
+ sPeriod = "4";
+ break;
+ case "05":
+ sPeriod = "5";
+ break;
+ case "06":
+ sPeriod = "6";
+ break;
+ case "07":
+ sPeriod = "7";
+ break;
+ case "08":
+ sPeriod = "8";
+ break;
+ case "09":
+ sPeriod = "9";
+ break;
+ case "10":
+ sPeriod = "A";
+ break;
+ case "11":
+ sPeriod = "B";
+ break;
+ case "12":
+ sPeriod = "C";
+ break;
+ default:
+ sPeriod = "";
+ break;
+ }
+ if (sPeriod == "")
+ {
+ MessageBox.Show("閿欒鐨勬湀浠斤紒");
+ return false;
+ }
+
+ switch (sDay)
+ {
+ case "01":
+ sDay = "1";
+ break;
+ case "02":
+ sDay = "2";
+ break;
+ case "03":
+ sDay = "3";
+ break;
+ case "04":
+ sDay = "4";
+ break;
+ case "05":
+ sDay = "5";
+ break;
+ case "06":
+ sDay = "6";
+ break;
+ case "07":
+ sDay = "7";
+ break;
+ case "08":
+ sDay = "8";
+ break;
+ case "09":
+ sDay = "9";
+ break;
+ case "10":
+ sDay = "A";
+ break;
+ case "11":
+ sDay = "B";
+ break;
+ case "12":
+ sDay = "C";
+ break;
+ case "13":
+ sDay = "D";
+ break;
+ case "14":
+ sDay = "E";
+ break;
+ case "15":
+ sDay = "F";
+ break;
+ case "16":
+ sDay = "G";
+ break;
+ case "17":
+ sDay = "H";
+ break;
+ case "18":
+ sDay = "J";
+ break;
+ case "19":
+ sDay = "K";
+ break;
+ case "20":
+ sDay = "L";
+ break;
+ case "21":
+ sDay = "M";
+ break;
+ case "22":
+ sDay = "N";
+ break;
+ case "23":
+ sDay = "P";
+ break;
+ case "24":
+ sDay = "R";
+ break;
+ case "25":
+ sDay = "S";
+ break;
+ case "26":
+ sDay = "T";
+ break;
+ case "27":
+ sDay = "V";
+ break;
+ case "28":
+ sDay = "W";
+ break;
+ case "29":
+ sDay = "X";
+ break;
+ case "30":
+ sDay = "Y";
+ break;
+ case "31":
+ sDay = "Z";
+ break;
+ default:
+ sDay = "";
+ break;
+ }
+ if (sDay == "")
+ {
+ MessageBox.Show("閿欒鐨勬棩锛�");
+ return false;
+ }
+
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ long HSno = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value); // 搴忓彿
+ string HSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value); // 婧愬崟鍗曞彿
+ long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
+ double HSourceQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HInitQtyCol].Value); // 婧愬崟鏁伴噺
+ double HQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value); // 鏁伴噺
+ double HMinQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value); // 鍐呯鏈�灏忓寘瑁呮暟
+ double HWMinQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HWMinQtyCol].Value); // 澶栫鏈�灏忓寘瑁呮暟
+ double HZMinQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HZMinQtyCol].Value); // 鏍堟澘鏈�灏忓寘瑁呮暟
+ double HCustomQty1 = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty1Col].Value); // 鏁寸姣涢噸
+ double HCustomQty2 = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty2Col].Value); // 鏁存爤姣涢噸
+ string HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value); // 鎵瑰彿
+ string HCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value); // 瀹㈡埛鐗╂枡缂栫爜
+ string HCusModel = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value); // 瀹㈡埛鐗╂枡鍚嶇О
+ string HCustom4 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom4Col].Value); // FRU
+ string HCustom5 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom5Col].Value); // EC
+ string HCustom6 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom6Col].Value); // 鎴愬搧鏂欏彿
+ string HBarCodeType = cmbHCusName.Text; // 鏉＄爜绫诲瀷
+
+ if (HMaterID != 0)
+ {
+ DataSet oDsCheck = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_KaiBeiLX_AddCheck " + HSno.ToString() + ",'" + HSourceBillNo + "'," + HMaterID.ToString() + "," + HSourceQty.ToString() + "," + HQty.ToString() + "," + HMinQty.ToString() + "," + HWMinQty.ToString() + "," + HZMinQty.ToString() + "," + HCustomQty1.ToString() + "," + HCustomQty2.ToString() + ",'" + HBatchNo + "','" + HCusModelName + "','" + HCusModel + "','" + HCustom4 + "','" + HCustom5 + "','" + HCustom6 + "','" + HBarCodeType + "'", "h_p_Gy_CusBarCodeBill_KaiBeiLX_AddCheck");
+ //
+ if (oDsCheck == null && oDsCheck.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("瀹㈡埛鏍囩鐢熸垚瀹屾暣鎬у垽鏂敊璇紒");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0][0]) == "1")
+ {
+ sHRemark = sHRemark + DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HRemark"]);
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value) == "")
+ {
+ if (DBUtility.ClsPub.isBool(oDsCheck.Tables[0].Rows[0]["HISKFPERIOD"]))
+ {
+ DateTime HProduceDate; //鐢熶骇鏃ユ湡
+ string HEXPUNIT; //淇濊川鏈熷崟浣�
+ int HEXPPERIOD; //淇濊川鏈�
+
+ HProduceDate = dtpHDate.Value;
+ HEXPUNIT = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HEXPUNIT"]);
+ HEXPPERIOD = DBUtility.ClsPub.isInt(oDsCheck.Tables[0].Rows[0]["HEXPPERIOD"]);
+
+ grdMain.Rows[j].Cells[HISKFPERIODCol].Value = 1;
+ grdMain.Rows[j].Cells[HEXPUNITCol].Value = HEXPUNIT;
+ grdMain.Rows[j].Cells[HEXPPERIODCol].Value = HEXPPERIOD.ToString();
+ grdMain.Rows[j].Cells[HProduceDateCol].Value = HProduceDate.ToShortDateString();
+
+ if (HEXPUNIT == "Y")
+ {
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddYears(HEXPPERIOD).ToShortDateString();
+ }
+ else if (HEXPUNIT == "M")
+ {
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddMonths(HEXPPERIOD).ToShortDateString();
+ }
+ else
+ {
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddDays(HEXPPERIOD).ToShortDateString();
+ }
+ }
+ else
+ {
+ grdMain.Rows[j].Cells[HISKFPERIODCol].Value = 0;
+ grdMain.Rows[j].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[j].Cells[HEXPPERIODCol].Value = 0;
+ grdMain.Rows[j].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = "";
+ }
+ }
+ }
+ }
+ }
+ if (sHRemark != "")
+ {
+ MessageBox.Show(sHRemark);
+ return false;
+ }
+ return true;
+ }
+
+ #endregion
+
+ #region 鍐欏叆瀹㈡埛鏉＄爜妗ｆ
+ private void SaveBarCode()
+ {
+ try
+ {
+ string TM = ""; //鏉＄爜
+ int LSHlen = 4; //娴佹按鍙烽暱搴�
+ int LWSHlen = 6; //澶栫娴佹按鍙烽暱搴�
+ double HSumQty = 0; //浜у搧鏁伴噺
+ double HMinQty = 0; //鍐呯鏈�灏忓寘瑁呮暟
+ int HBQty = 0; //鍐呯鏁�
+ double HWMinQty = 0; //澶栫鏈�灏忓寘瑁呮暟
+ int HWBQty = 0; //澶栫鏁�
+ double HZMinQty = 0; //鏍堟澘鏈�灏忓寘瑁呮暟
+ int HZBQty = 0; //鏍堟澘鏁�
+ Int64 LSH = 0; //鍐呯娴佹按鍙�
+ Int64 LWSH = 0; //澶栫娴佹按鍙�
+ Int64 LZSH = 0; //鏍堟澘娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ string HCode1 = ""; //鐗╂枡绫诲埆
+ string HCode2 = ""; //鎵规浣�
+ string HCode3 = ""; //鐗堟湰鍙�
+ string sTMNumber = ""; //鍐呯鏉＄爜鍓嶇紑
+ string sWTMNumber = ""; //澶栫鏉＄爜鍓嶇紑
+ string sZTMNumber = ""; //鏍堟澘鏉＄爜鍓嶇紑
+ DataSet Ds;
+
+ Int64 HEntryID = 0;
+ string HBarCode = ""; //鏉″舰鐮�
+ string HBarCodeType = ""; //鏉＄爜绫诲瀷
+ Int64 HMaterID = 0; //鐗╂枡ID
+ string HMaterNumber = ""; //鐗╂枡浠ｇ爜
+ string HMaterModel = ""; //瑙勬牸鍨嬪彿
+ Int64 HUnitID = 0; //璁￠噺鍗曚綅ID
+ Int64 HAuxPropID = 0; //杈呭姪灞炴�D
+ string HBatchNo = ""; //鎵规
+ double HQty = 0; //鏁伴噺
+ Int64 HCusID = 0; //瀹㈡埛ID
+ string HCusModelName = ""; //瀹㈡埛鏂欏彿
+ string HCusModel = ""; //瀹㈡埛鐗╂枡鍚嶇О
+ bool HGiveAwayFlag = false; //璧犲搧鏍囪
+ string HProduceDate; //鐢熶骇鏃ユ湡锛堜繚璐ㄦ湡鐢級
+ string HExpiryDate; //淇濊川鏈熻嚦锛堜繚璐ㄦ湡鐢級
+ bool HISKFPERIOD = false; //淇濊川鏈熷惎鐢ㄦ爣璁�
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HBarcodeNo = 0; //褰撳墠鎵樺彿
+ Int64 HSourceInterID = 0; //婧愬崟涓籌D
+ Int64 HSourceEntryID = 0; //婧愬崟瀛怚D
+ string HSourceBillNo = ""; //婧愬崟鍗曞彿
+ string HSourceBillType = "";//婧愬崟绫诲瀷
+ string HMTONo = ""; //MTO鍙�
+ string HRemark = ""; //澶囨敞
+ string HInnerBillNo = ""; //瀹㈡埛璁㈠崟鍙�
+ string HCustom1 = ""; //浜у搧浠ｇ爜
+ string HCustom2 = ""; //鏂欏彿
+ string HCustom3 = ""; //MPN
+ string HCustom4 = ""; //FRU
+ string HCustom5 = ""; //EC
+ string HCustom6 = ""; //鎴愬搧鏂欏彿
+ double HCustomQty1 = 0; //鏁寸姣涢噸
+ double HCustomQty2 = 0; //鏁存爤姣涢噸
+ Int64 HSno = 0; //鎵规搴忓垪鍙�
+ string HBoxNo = ""; //鎵规鐢熸垚鍓嶇紑
+ string sHBaNo = ""; //鐣岄潰涓婅緭鍏ョ殑鎵规浣�
+ int HSumBQty = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
+ int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ int nn = 0; //鏈娴佹按鍙风疮璁′娇鐢ㄤ釜鏁�
+ pb1.Value = 0;
+
+ oCn.BeginTran();
+ Application.DoEvents();
+ //鑾峰彇鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ HSumBQty = HSumBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value) + ClsPub.isInt(grdMain.Rows[j].Cells[HWBQtyCol].Value) + ClsPub.isInt(grdMain.Rows[j].Cells[HZBQtyCol].Value);
+ pb1.Maximum = HSumBQty;
+ }
+ }
+ //鐢熸垚鍐呯鏉＄爜
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ HCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);//瀹㈡埛鐗╂枡瀵瑰簲琛ㄤ腑瀹㈡埛浜у搧缂栫爜
+
+ //鏉＄爜鍓嶇紑 = 涓や綅鍥哄畾鐮侊紙鍥哄畾'8S'锛�+瀹㈡埛鐗╂枡瀵瑰簲琛ㄤ腑瀹㈡埛浜у搧缂栫爜+鍑礉鍦ㄨ仈鎯冲叕鍙镐唬鐮侊紙鍥哄畾'C1HZ'锛�+骞存湀鏃ワ紙YMD锛�
+ sTMNumber = "8S" + HCusModelName + "C1HZ" + sYear1 + sPeriod + sDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+
+ HBQty = ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
+ HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
+
+ nn = 0; //鏈娴佹按鍙风疮璁′娇鐢ㄤ釜鏁�
+ for (int i = 0; i < HBQty; i++)
+ {
+ if (HSumQty - HMinQty > 0)
+ {
+ HSumQty = HSumQty - HMinQty;
+ }
+ else
+ {
+ HMinQty = HSumQty;
+ }
+ //
+ LSH = LSH + 1;
+ LSH2 = ConvertToBase(ClsPub.isInt(LSH), 33);
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� LSHlen 鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ //鏉＄爜缂栧彿 = 涓や綅鍥哄畾鐮侊紙鍥哄畾'8S'锛�+瀹㈡埛鐗╂枡瀵瑰簲琛ㄤ腑瀹㈡埛浜у搧缂栫爜+鍑礉鍦ㄨ仈鎯冲叕鍙镐唬鐮侊紙鍥哄畾'C1HZ'锛�+骞存湀鏃ワ紙YMD锛�+ 4浣嶆祦姘村彿
+ TM = sTMNumber + LSH2;
+
+ HEntryID = j + 1;
+ HBarCode = TM.ToUpper();
+ if (cmbHCusName.Text.Contains("鑱旀兂"))
+ {
+ HBarCodeType = "鑱旀兂8S鐮�";
+ }
+ else
+ {
+ HBarCodeType = "鑱旀兂8S鐮�";
+ }
+ HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+ HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
+ HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);
+ HQty = HMinQty;
+ HCusID = ClsPub.isLong(cmbHCusName.SelectedValue);
+ HCusModelName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);
+ HCusModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value);
+ HGiveAwayFlag = ClsPub.isBool(grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value);
+ HISKFPERIOD = ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value);
+ HProduceDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HProduceDateCol].Value);
+ HExpiryDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value);
+ HBarcodeQtys = HBQty;
+ HBarcodeNo = i + 1;
+ HSourceInterID = ClsPub.isLong(grdMain.Rows[j].Cells[HSourceInterIDCol].Value);
+ HSourceEntryID = ClsPub.isLong(grdMain.Rows[j].Cells[HSourceEntryIDCol].Value);
+ HSourceBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceBillNoCol].Value);
+ HSourceBillType = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceBillTypeCol].Value);
+ HRemark = ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value);
+ HMTONo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMTONoCol].Value);
+ HInnerBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value);
+ HCustom4 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom4Col].Value); // FRU 鐣岄潰涓婅緭鍏�
+ HCustom5 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom5Col].Value); // EC 鐣岄潰涓婅緭鍏�
+ HCustom6 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom6Col].Value); // 鎴愬搧鏂欏彿 鐣岄潰涓婅緭鍏�
+ HCustomQty1 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty1Col].Value); // 鏁寸姣涢噸 鐣岄潰涓婅緭鍏�
+ HCustomQty2 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty2Col].Value); // 鏁存爤姣涢噸 鐣岄潰涓婅緭鍏�
+
+ //FRU HCustom4銆丒C HCustom5銆佹垚鍝佹枡鍙� HCustom6銆佹暣绠辨瘺閲岺CustomQty1銆佹暣鏍堟瘺閲岺CustomQty2
+ oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
+ "(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
+ ",HMaterID,HUnitID,HAuxPropID,HBatchNo,HQty" +
+ ",HCusID,HCusModel,HCusModelName,HBarCodeDate,HBarCodeStatus" +
+ ",HGiveAwayFlag,HISKFPERIOD,HEndQty" +
+ ",HProduceDate,HExpiryDate" +
+ ",HBarcodeQtys,HBarcodeNo,HPieceQty,HPrintQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType " +
+ ",HStopflag,HUseFlag,HRemark,HSTOCKORGID,HOWNERID" +
+ ",HMaker,HMakeDate,HStopMan,HMTONo" +
+ ",HKFPeriod,HKFDate,HKFDQDate,HInnerBillNo" +
+ ",HStatus,HDeleteMan,HSupNumber,HSupName,HCode1" +
+ ",HCustom1,HCustom2,HCustom3,HCustom4,HCustom5,HCustom6" +
+ ",HCustomQty1,HCustomQty2" +
+ ",HCode2,HCode3,HBackDataFlag,HSno,HBoxNo" +
+ ") values (" + HInterID + "," + HEntryID + ",'','" + HBarCode + "','" + HBarCodeType + "'"
+ + "," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HAuxPropID.ToString() + ",'" + HBatchNo + "'," + HQty.ToString()
+ + "," + HCusID.ToString() + ",'" + HCusModel + "','" + HCusModelName + "','" + sDate + "',''"
+ + "," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",''"
+ + "," + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+ + "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",1,0"
+ + "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'"
+ + ",0,'','" + HRemark + "'," + HOrgID.ToString() + "," + HOrgID.ToString()
+ + ",'" + ClsPub.CurUserName + "',getdate(),'','" + HMTONo + "'"
+ + ",0,'','','" + HInnerBillNo + "'"
+ + ",'','','" + HMaterModel + "','" + sHBaNo + "','" + HCode1 + "'"
+ + ",'" + HCustom1 + "','" + HCustom2 + "','" + HCustom3 + "','" + HCustom4 + "','" + HCustom5 + "','" + HCustom6 + "'"
+ + "," + HCustomQty1.ToString() + "," + HCustomQty2.ToString()
+ + ",'" + HCode2 + "','" + HCode3 + "',''," + HSno.ToString() + ",'" + HBoxNo + "')");
+ pb1.Value = n + 1;
+ n = n + 1;
+ nn = nn + 1;
+ }
+ //鍥炲～娴佹按鍙蜂俊鎭�
+ oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
+ }
+ }
+
+ //鐢熸垚澶栫鏉＄爜
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ //鑾峰彇鏈�澶ф祦姘村彿
+ //鑱旀兂
+ //鏉＄爜鍓嶇紑 = 鑱旀兂ECC渚涘簲鍟嗕唬鐮侊紙鍥哄畾'0002033577'锛� + 绠卞畾涔夌爜锛堝浐瀹�'B'锛�+ 3浣嶈嚜琛屽畾涔夛紙鍥哄畾'001'锛�+ 2浣嶅勾浠斤紙YY锛� + 鍛�
+ sWTMNumber = "0002033577B001" + sYear + sWeek;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sWTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+
+ HWBQty = ClsPub.isInt(grdMain.Rows[j].Cells[HWBQtyCol].Value);
+ HWMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HWMinQtyCol].Value);
+ HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
+
+ nn = 0; //鏈娴佹按鍙风疮璁′娇鐢ㄤ釜鏁�
+ for (int i = 0; i < HWBQty; i++)
+ {
+ if (HSumQty - HWMinQty > 0)
+ {
+ HSumQty = HSumQty - HWMinQty;
+ }
+ else
+ {
+ HWMinQty = HSumQty;
+ }
+ //
+ LWSH = LWSH + 1;
+ LSH2 = ConvertToBase(ClsPub.isInt(LWSH), 33);
+ while (LSH2.Length < LWSHlen) //濡傛灉澶栫娴佹按鍙蜂綅鏁板皬浜� 澶栫娴佹按鍙烽暱搴� 鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sWTMNumber + LSH2;
+
+ HEntryID = j + 1;
+ HBarCode = TM.ToUpper();
+ if (cmbHCusName.Text.Contains("鑱旀兂"))
+ {
+ HBarCodeType = "鑱旀兂澶栫鐮�";
+ }
+ else
+ {
+ HBarCodeType = "鑱旀兂澶栫鐮�";
+ }
+ HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+ HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
+ HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);
+ HQty = HWMinQty;
+ HCusID = ClsPub.isLong(cmbHCusName.SelectedValue);
+ HCusModelName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);
+ HCusModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value);
+ HGiveAwayFlag = ClsPub.isBool(grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value);
+ HISKFPERIOD = ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value);
+ HProduceDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HProduceDateCol].Value);
+ HExpiryDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value);
+ HBarcodeQtys = HWBQty;
+ HBarcodeNo = i + 1;
+ HSourceInterID = ClsPub.isLong(grdMain.Rows[j].Cells[HSourceInterIDCol].Value);
+ HSourceEntryID = ClsPub.isLong(grdMain.Rows[j].Cells[HSourceEntryIDCol].Value);
+ HSourceBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceBillNoCol].Value);
+ HSourceBillType = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceBillTypeCol].Value);
+ HRemark = ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value);
+ HMTONo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMTONoCol].Value);
+ HInnerBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value);
+ HCustom4 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom4Col].Value); // FRU 鐣岄潰涓婅緭鍏�
+ HCustom5 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom5Col].Value); // EC 鐣岄潰涓婅緭鍏�
+ HCustom6 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom6Col].Value); // 鎴愬搧鏂欏彿 鐣岄潰涓婅緭鍏�
+ HCustomQty1 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty1Col].Value); // 鏁寸姣涢噸 鐣岄潰涓婅緭鍏�
+ HCustomQty2 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty2Col].Value); // 鏁存爤姣涢噸 鐣岄潰涓婅緭鍏�
+
+ //FRU HCustom4銆丒C HCustom5銆佹垚鍝佹枡鍙� HCustom6銆佹暣绠辨瘺閲岺CustomQty1銆佹暣鏍堟瘺閲岺CustomQty2
+ oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
+ "(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
+ ",HMaterID,HUnitID,HAuxPropID,HBatchNo,HQty" +
+ ",HCusID,HCusModel,HCusModelName,HBarCodeDate,HBarCodeStatus" +
+ ",HGiveAwayFlag,HISKFPERIOD,HEndQty" +
+ ",HProduceDate,HExpiryDate" +
+ ",HBarcodeQtys,HBarcodeNo,HPieceQty,HPrintQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType " +
+ ",HStopflag,HUseFlag,HRemark,HSTOCKORGID,HOWNERID" +
+ ",HMaker,HMakeDate,HStopMan,HMTONo" +
+ ",HKFPeriod,HKFDate,HKFDQDate,HInnerBillNo" +
+ ",HStatus,HDeleteMan,HSupNumber,HSupName,HCode1" +
+ ",HCustom1,HCustom2,HCustom3,HCustom4,HCustom5,HCustom6" +
+ ",HCustomQty1,HCustomQty2" +
+ ",HCode2,HCode3,HBackDataFlag,HSno,HBoxNo" +
+ ") values (" + HInterID + "," + HEntryID + ",'','" + HBarCode + "','" + HBarCodeType + "'"
+ + "," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HAuxPropID.ToString() + ",'" + HBatchNo + "'," + HQty.ToString()
+ + "," + HCusID.ToString() + ",'" + HCusModel + "','" + HCusModelName + "','" + sDate + "',''"
+ + "," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",''"
+ + "," + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+ + "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",1,0"
+ + "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'"
+ + ",0,'','" + HRemark + "'," + HOrgID.ToString() + "," + HOrgID.ToString()
+ + ",'" + ClsPub.CurUserName + "',getdate(),'','" + HMTONo + "'"
+ + ",0,'','','" + HInnerBillNo + "'"
+ + ",'','','" + HMaterModel + "','" + sHBaNo + "','" + HCode1 + "'"
+ + ",'" + HCustom1 + "','" + HCustom2 + "','" + HCustom3 + "','" + HCustom4 + "','" + HCustom5 + "','" + HCustom6 + "'"
+ + "," + HCustomQty1.ToString() + "," + HCustomQty2.ToString()
+ + ",'" + HCode2 + "','" + HCode3 + "',''," + HSno.ToString() + ",'" + HBoxNo + "')");
+ pb1.Value = n + 1;
+ n = n + 1;
+ nn = nn + 1;
+ }
+ //鍥炲～娴佹按鍙蜂俊鎭�
+ oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sWTMNumber + "'," + nn.ToString() + " ");
+ }
+ }
+
+ //鐢熸垚鏍堟澘鏉＄爜
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ //鑾峰彇鏈�澶ф祦姘村彿
+ //鑱旀兂
+ //鏉＄爜鍓嶇紑 = 鑱旀兂ECC渚涘簲鍟嗕唬鐮侊紙鍥哄畾'0002033577'锛� + 鏍堟澘瀹氫箟鐮侊紙鍥哄畾'P'锛�+ 3浣嶈嚜琛屽畾涔夛紙鍥哄畾'001'锛�+ 2浣嶅勾浠斤紙YY锛� + 鍛�
+ sZTMNumber = "0002033577P001" + sYear + sWeek;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sZTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LZSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+
+ HZBQty = ClsPub.isInt(grdMain.Rows[j].Cells[HZBQtyCol].Value);
+ HZMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HZMinQtyCol].Value);
+ HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
+
+ nn = 0; //鏈娴佹按鍙风疮璁′娇鐢ㄤ釜鏁�
+ for (int i = 0; i < HZBQty; i++)
+ {
+ if (HSumQty - HZMinQty > 0)
+ {
+ HSumQty = HSumQty - HZMinQty;
+ }
+ else
+ {
+ HZMinQty = HSumQty;
+ }
+ //
+ LZSH = LZSH + 1;
+ LSH2 = ConvertToBase(ClsPub.isInt(LZSH), 33);
+ while (LSH2.Length < LWSHlen) //濡傛灉澶栫娴佹按鍙蜂綅鏁板皬浜� 澶栫娴佹按鍙烽暱搴� 鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sZTMNumber + LSH2;
+
+ HEntryID = j + 1;
+ HBarCode = TM.ToUpper();
+ if (cmbHCusName.Text.Contains("鑱旀兂"))
+ {
+ HBarCodeType = "鑱旀兂鏍堟澘鐮�";
+ }
+ else
+ {
+ HBarCodeType = "鑱旀兂鏍堟澘鐮�";
+ }
+ HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+ HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
+ HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);
+ HQty = HZMinQty;
+ HCusID = ClsPub.isLong(cmbHCusName.SelectedValue);
+ HCusModelName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);
+ HCusModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value);
+ HGiveAwayFlag = ClsPub.isBool(grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value);
+ HISKFPERIOD = ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value);
+ HProduceDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HProduceDateCol].Value);
+ HExpiryDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value);
+ HBarcodeQtys = HZBQty;
+ HBarcodeNo = i + 1;
+ HSourceInterID = ClsPub.isLong(grdMain.Rows[j].Cells[HSourceInterIDCol].Value);
+ HSourceEntryID = ClsPub.isLong(grdMain.Rows[j].Cells[HSourceEntryIDCol].Value);
+ HSourceBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceBillNoCol].Value);
+ HSourceBillType = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceBillTypeCol].Value);
+ HRemark = ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value);
+ HMTONo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMTONoCol].Value);
+ HInnerBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value);
+ HCustom4 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom4Col].Value); // FRU 鐣岄潰涓婅緭鍏�
+ HCustom5 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom5Col].Value); // EC 鐣岄潰涓婅緭鍏�
+ HCustom6 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCustom6Col].Value); // 鎴愬搧鏂欏彿 鐣岄潰涓婅緭鍏�
+ HCustomQty1 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty1Col].Value); // 鏁寸姣涢噸 鐣岄潰涓婅緭鍏�
+ HCustomQty2 = ClsPub.isDoule(grdMain.Rows[j].Cells[HCustomQty2Col].Value); // 鏁存爤姣涢噸 鐣岄潰涓婅緭鍏�
+
+ //FRU HCustom4銆丒C HCustom5銆佹垚鍝佹枡鍙� HCustom6銆佹暣绠辨瘺閲岺CustomQty1銆佹暣鏍堟瘺閲岺CustomQty2
+ oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
+ "(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
+ ",HMaterID,HUnitID,HAuxPropID,HBatchNo,HQty" +
+ ",HCusID,HCusModel,HCusModelName,HBarCodeDate,HBarCodeStatus" +
+ ",HGiveAwayFlag,HISKFPERIOD,HEndQty" +
+ ",HProduceDate,HExpiryDate" +
+ ",HBarcodeQtys,HBarcodeNo,HPieceQty,HPrintQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType " +
+ ",HStopflag,HUseFlag,HRemark,HSTOCKORGID,HOWNERID" +
+ ",HMaker,HMakeDate,HStopMan,HMTONo" +
+ ",HKFPeriod,HKFDate,HKFDQDate,HInnerBillNo" +
+ ",HStatus,HDeleteMan,HSupNumber,HSupName,HCode1" +
+ ",HCustom1,HCustom2,HCustom3,HCustom4,HCustom5,HCustom6" +
+ ",HCustomQty1,HCustomQty2" +
+ ",HCode2,HCode3,HBackDataFlag,HSno,HBoxNo" +
+ ") values (" + HInterID + "," + HEntryID + ",'','" + HBarCode + "','" + HBarCodeType + "'"
+ + "," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HAuxPropID.ToString() + ",'" + HBatchNo + "'," + HQty.ToString()
+ + "," + HCusID.ToString() + ",'" + HCusModel + "','" + HCusModelName + "','" + sDate + "',''"
+ + "," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",''"
+ + "," + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+ + "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",1,0"
+ + "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'"
+ + ",0,'','" + HRemark + "'," + HOrgID.ToString() + "," + HOrgID.ToString()
+ + ",'" + ClsPub.CurUserName + "',getdate(),'','" + HMTONo + "'"
+ + ",0,'','','" + HInnerBillNo + "'"
+ + ",'','','" + HMaterModel + "','" + sHBaNo + "','" + HCode1 + "'"
+ + ",'" + HCustom1 + "','" + HCustom2 + "','" + HCustom3 + "','" + HCustom4 + "','" + HCustom5 + "','" + HCustom6 + "'"
+ + "," + HCustomQty1.ToString() + "," + HCustomQty2.ToString()
+ + ",'" + HCode2 + "','" + HCode3 + "',''," + HSno.ToString() + ",'" + HBoxNo + "')");
+ pb1.Value = n + 1;
+ n = n + 1;
+ nn = nn + 1;
+ }
+ //鍥炲～娴佹按鍙蜂俊鎭�
+ oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sZTMNumber + "'," + nn.ToString() + " ");
+ }
+ }
+ oCn.Commit();
+ MessageBox.Show("瀹㈡埛鏍囩鐢熸垚瀹屾瘯锛�");
+ tabControl1.SelectedIndex = 1;
+ }
+ catch (Exception e)
+ {
+ bc.Enabled = true;
+ oCn.RollBack();
+ MessageBox.Show("瀹㈡埛鏍囩鐢熸垚澶辫触锛�" + e.Message);
+ }
+ }
+
+ #endregion
+
+ #region 鍒锋柊鏉＄爜鍒楄〃
+ private void Display()
+ {
+ //鍒锋柊鍐呯鐮佸垪琛�
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='鑱旀兂8S鐮�') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ //MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdSub.DataSource = DSet.Tables[0].DefaultView;
+
+ //鍒锋柊澶栫鐮佸垪琛�
+ DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='鑱旀兂澶栫鐮�') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DWSet == null)
+ {
+ //MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdList.DataSource = DWSet.Tables[0].DefaultView;
+
+ //鍒锋柊鏍堟澘鐮佸垪琛�
+ DataSet DZSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='鑱旀兂鏍堟澘鐮�') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DZSet == null)
+ {
+ //MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdList2.DataSource = DZSet.Tables[0].DefaultView;
+
+ //鍐荤粨
+ int FrCol = 0;
+ string s = "鏄�";
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdList, this.Name + "grdList", s, FrCol);
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdList2, this.Name + "grdList2", s, FrCol);
+ //鐢荤嚎
+ GraphLine();
+ }
+ private void GraphLine()
+ {
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ int WMainIDCol = Fun_GetCol_w("hmainid");
+ int WSubIDCol = Fun_GetCol_w("hsubid");
+ int ZMainIDCol = Fun_GetCol_z("hmainid");
+ int ZSubIDCol = Fun_GetCol_z("hsubid");
+ string s = "鏄�";
+ long n = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine(grdSub, MainIDCol, SubIDCol, s, ref n);
+ DBUtility.Xt_BaseBillFun.GraphLine(grdList, WMainIDCol, WSubIDCol, s, ref n);
+ DBUtility.Xt_BaseBillFun.GraphLine(grdList2, ZMainIDCol, ZSubIDCol, s, ref n);
+ }
+
+ #endregion
+
+ #region 灏嗗崄杩涘埗鏁板�艰浆鎴愭寚瀹氳繘鍒舵暟鍊硷紙num涓鸿杞崲鐨勫崄杩涜鏁板�硷紝nbase涓烘寚瀹氳繘鍒讹級
+ public string ConvertToBase(int num, int nbase)
+ {
+ string chars = "0123456789ABCDEFGHJKLMNPQRSTVWXYZ";
+ if (nbase < 2 || nbase > chars.Length)
+ return "";
+ int r;
+ string newNumber = "";
+ while (num >= nbase)
+ {
+ r = num % nbase;
+ newNumber = chars[r] + newNumber;
+ num = num / nbase;
+ }
+ newNumber = chars[num] + newNumber;
+ return newNumber;
+ }
+
+ #endregion
+
+ #endregion
+
+
+ #region 绐椾綋澶勭悊鏂规硶
+ //鍒濆鍖朑RID
+ private void initGrid()
+ {
+ grdMain.RowCount = 0;
+ grdMain.ColumnCount = 57; //鎬诲垪鏁�
+ DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
+ grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
+ grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
+ grdMain.Columns[HSubIDCol].HeaderText = "婧愬崟瀛怚D";
+ grdMain.Columns[HBillNoCol].HeaderText = "婧愬崟鍗曞彿";
+ grdMain.Columns[HBillTypeCol].HeaderText = "婧愬崟绫诲瀷";
+ grdMain.Columns[HMaterIDCol].HeaderText = "鐗╂枡ID";
+ grdMain.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠ｇ爜";
+ grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
+ grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain.Columns[HCusModelNameCol].HeaderText = "瀹㈡埛鐗╂枡缂栫爜";
+ grdMain.Columns[HCusModelCol].HeaderText = "瀹㈡埛鐗╂枡鍚嶇О";
+ grdMain.Columns[HUnitIDCol].HeaderText = "璁￠噺鍗曚綅ID";
+ grdMain.Columns[HUnitNumberCol].HeaderText = "璁￠噺鍗曚綅浠ｇ爜";
+ grdMain.Columns[HUnitNameCol].HeaderText = "璁￠噺鍗曚綅鍚嶇О";
+ grdMain.Columns[HAuxPropIDCol].HeaderText = "杈呭姪灞炴�D";
+ grdMain.Columns[HAuxPropNumberCol].HeaderText = "杈呭姪灞炴�т唬鐮�";
+ grdMain.Columns[HAuxPropNameCol].HeaderText = "杈呭姪灞炴�у悕绉�";
+ grdMain.Columns[HBatchManagerCol].HeaderText = "鏄惁鍚敤鎵规";
+ grdMain.Columns[HBatchNoCol].HeaderText = "鎵瑰彿";
+ grdMain.Columns[HGiveAwayFlagCol].HeaderText = "鏄惁璧犲搧";
+ grdMain.Columns[HQtyCol].HeaderText = "鏁伴噺";
+ grdMain.Columns[HMinQtyCol].HeaderText = "鍐呯鏈�灏忓寘瑁呮暟";
+ grdMain.Columns[HBQtyCol].HeaderText = "鍐呯绠辨暟";
+ grdMain.Columns[HWMinQtyCol].HeaderText = "澶栫鏈�灏忓寘瑁呮暟";
+ grdMain.Columns[HWBQtyCol].HeaderText = "澶栫绠辨暟";
+ grdMain.Columns[HZMinQtyCol].HeaderText = "鏍堟澘鏈�灏忓寘瑁呮暟";
+ grdMain.Columns[HZBQtyCol].HeaderText = "鏍堟澘绠辨暟";
+ grdMain.Columns[HCusIDCol].HeaderText = "瀹㈡埛ID";
+ grdMain.Columns[HCusNumberCol].HeaderText = "瀹㈡埛浠ｇ爜";
+ grdMain.Columns[HCusNameCol].HeaderText = "瀹㈡埛";
+ grdMain.Columns[HProduceDateCol].HeaderText = "鐢熶骇鏃ユ湡";
+ grdMain.Columns[HExpiryDateCol].HeaderText = "鏈夋晥鏈熻嚦";
+ grdMain.Columns[HISKFPERIODCol].HeaderText = "鏄惁鍚敤淇濊川鏈�";
+ grdMain.Columns[HEXPUNITCol].HeaderText = "淇濊川鏈熷崟浣�";
+ grdMain.Columns[HEXPPERIODCol].HeaderText = "淇濊川鏈�";
+ grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
+ grdMain.Columns[HMTONoCol].HeaderText = "璁″垝璺熻釜鍙�";
+ grdMain.Columns[HCode1Col].HeaderText = "鐗╂枡绫诲埆";
+ grdMain.Columns[HCode2Col].HeaderText = "鎵规浣�";
+ grdMain.Columns[HCode3Col].HeaderText = "鐗堟湰鍙�";
+ grdMain.Columns[HInnerBillNoCol].HeaderText = "閿�鍞鍗曞彿";
+ grdMain.Columns[HCustom1Col].HeaderText = "浜у搧浠ｇ爜";
+ grdMain.Columns[HCustom2Col].HeaderText = "鏂欏彿";
+ grdMain.Columns[HCustom3Col].HeaderText = "MPN";
+ grdMain.Columns[HCustom4Col].HeaderText = "FRU";
+ grdMain.Columns[HCustom5Col].HeaderText = "EC";
+ grdMain.Columns[HCustom6Col].HeaderText = "鎴愬搧鏂欏彿";
+ grdMain.Columns[HCustomQty1Col].HeaderText = "鏁寸姣涢噸";
+ grdMain.Columns[HCustomQty2Col].HeaderText = "鏁存爤姣涢噸";
+
+ //鏍煎紡鍖� 闅愯棌鍒�
+ grdMain.Columns[HTagCol].Visible = false;
+ grdMain.Columns[HMainIDCol].Visible = false;
+ grdMain.Columns[HSubIDCol].Visible = false;
+ grdMain.Columns[HBillTypeCol].Visible = false;
+ grdMain.Columns[HMaterIDCol].Visible = false;
+ grdMain.Columns[HUnitIDCol].Visible = false;
+ grdMain.Columns[HUnitNumberCol].Visible = false;
+ grdMain.Columns[HUnitNameCol].Visible = false;
+ grdMain.Columns[HAuxPropIDCol].Visible = false;
+ grdMain.Columns[HAuxPropNumberCol].Visible = false;
+ grdMain.Columns[HAuxPropNameCol].Visible = false;
+ grdMain.Columns[HBatchManagerCol].Visible = false;
+ grdMain.Columns[HGiveAwayFlagCol].Visible = false;
+ grdMain.Columns[HProduceDateCol].Visible = false;
+ grdMain.Columns[HExpiryDateCol].Visible = false;
+ grdMain.Columns[HCusIDCol].Visible = false;
+ grdMain.Columns[HCusNumberCol].Visible = false;
+ grdMain.Columns[HCusNameCol].Visible = false;
+ grdMain.Columns[HSourceInterIDCol].Visible = false;
+ grdMain.Columns[HSourceEntryIDCol].Visible = false;
+ grdMain.Columns[HSourceBillNoCol].Visible = false;
+ grdMain.Columns[HSourceBillTypeCol].Visible = false;
+ grdMain.Columns[HInitQtyCol].Visible = false;
+ grdMain.Columns[HMTONoCol].Visible = false;
+ grdMain.Columns[HISKFPERIODCol].Visible = false;
+ grdMain.Columns[HEXPUNITCol].Visible = false;
+ grdMain.Columns[HEXPPERIODCol].Visible = false;
+ grdMain.Columns[HLSHCol].Visible = false;
+ grdMain.Columns[HBaNoCol].Visible = false;
+ //grdMain.Columns[HCusModelNameCol].Visible = false;
+ //grdMain.Columns[HCusModelCol].Visible = false;
+ //grdMain.Columns[HBatchNoCol].Visible = false;
+ grdMain.Columns[HCode1Col].Visible = false;
+ grdMain.Columns[HCode2Col].Visible = false;
+ grdMain.Columns[HCode3Col].Visible = false;
+ grdMain.Columns[HInnerBillNoCol].Visible = false;
+ grdMain.Columns[HCustom1Col].Visible = false;
+ grdMain.Columns[HCustom2Col].Visible = false;
+ grdMain.Columns[HCustom3Col].Visible = false;
+
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HQtyCol.ToString()+
+ "," + HMinQtyCol.ToString() +
+ "," + HWMinQtyCol.ToString() +
+ "," + HZMinQtyCol.ToString() +
+ //"," + HMaterNumberCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
+ "," + HUnitNumberCol.ToString() +
+ "," + HBatchNoCol.ToString() +
+ "," + HCusModelNameCol.ToString() +
+ "," + HCusModelCol.ToString() +
+ "," + HCustom4Col.ToString() +
+ "," + HCustom5Col.ToString() +
+ "," + HCustom6Col.ToString() +
+ "," + HCustomQty1Col.ToString() +
+ "," + HCustomQty2Col.ToString() +
+ "," + HRemarkCol.ToString();
+
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HQtyCol.ToString();
+
+ //璁剧疆鐗规畩鍒�
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ //缃戞牸鎵撳嬀
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = 0;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell;
+ }
+
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol,oSumGrid);
+ DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.initGridList(grdSub, this.Name + "grdSub");
+ DBUtility.Xt_BaseBillFun.initGridList(grdList, this.Name + "grdList");
+ DBUtility.Xt_BaseBillFun.initGridList(grdList2, this.Name + "grdList2");
+ }
+
+ //鍏紡閲嶇畻
+ private void RowCount(int sRow, int sTag)
+ {
+ if (sTag == 0)
+ {
+ //鍐呯鏁板垪=鏁伴噺/鍐呯鏈�灏忓寘瑁呮暟
+ double sMoney = 0;
+ if (ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value) == 0)
+ {
+ sMoney = 0;
+ }
+ else
+ {
+ sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
+ }
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
+ sMoney = Math.Ceiling(sMoney);
+ grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
+
+ //澶栫鏁板垪=鏁伴噺/澶栫鏈�灏忓寘瑁呮暟
+ double sWMoney = 0;
+ if (ClsPub.isDoule(grdMain.Rows[sRow].Cells[HWMinQtyCol].Value) == 0)
+ {
+ sWMoney = 0;
+ }
+ else
+ {
+ sWMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HWMinQtyCol].Value);
+ }
+ sWMoney = Math.Round(sWMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
+ sWMoney = Math.Ceiling(sWMoney);
+ grdMain.Rows[sRow].Cells[HWBQtyCol].Value = sWMoney;
+
+ //鏍堟澘鏁板垪=鏁伴噺/鏍堟澘鏈�灏忓寘瑁呮暟
+ double sZMoney = 0;
+ if (ClsPub.isDoule(grdMain.Rows[sRow].Cells[HZMinQtyCol].Value) == 0)
+ {
+ sZMoney = 0;
+ }
+ else
+ {
+ sZMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HZMinQtyCol].Value);
+ }
+ sZMoney = Math.Round(sZMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
+ sZMoney = Math.Ceiling(sZMoney);
+ grdMain.Rows[sRow].Cells[HZBQtyCol].Value = sZMoney;
+ }
+ else
+ {
+
+ }
+ }
+
+ //鏄惁鏄┖琛�
+ private bool IsNullRow(int Row)
+ {
+ return DBUtility.Xt_BaseBillFun.IsNullRow(Row, HMaterIDCol,grdMain);
+ }
+
+ //鍒ゆ柇缃戞牸琛岀殑褰曞叆鏄惁姝ｇ‘
+ private bool CheckGridRow(int Row)
+ {
+ Cell oCell = new Cell();
+ int c = 0;
+ //if (ClsPub.isStrNull(grdMain.get_TextMatrix(Row, HTagCol)) != "*")
+ //{
+ // return true;
+ //}
+ //
+ for (c = 0; c < grdMain.ColumnCount; c++)
+ {
+ oCell.Row = Row;
+ oCell.Col = c;
+ //if (!CheckGridCell(oCell))
+ // return false;
+ }
+ return true;
+ }
+
+ //甯姪鍑芥暟
+ private void Sub_GridKey(int sKeyCode, int sRow, int sCol, DataGridViewTextBoxEditingControl oEdit)
+ {
+ string sWhere = "";
+ DAL.ClsIF_Material_View oMater = new DAL.ClsIF_Material_View();//鐗╂枡
+ DAL.ClsIF_Unit_View oUnit = new DAL.ClsIF_Unit_View();//璁￠噺鍗曚綅
+ DAL.ClsIF_Property_View oProperty = new DAL.ClsIF_Property_View();//杈呭姪灞炴��
+ if (!grdStatus)
+ {
+ return;
+ }
+ oSumGrid.EditStatus = true;
+
+ switch (sKeyCode)
+ {
+ case 118: //F7
+ {
+ switch (sCol)
+ {
+ case HMaterNumberCol:
+ oMater.WherePart = "";
+ sWhere = " and HUSEORGID = " + HOrgID;
+ if (oMater.RefreshViewForBig(sWhere))
+ {
+ if (oMater.GetInfoByID(oMater.oModel.HItemID))
+ {
+ grdMain.Rows[sRow].Cells[HMaterIDCol].Value = oMater.omodel.HItemID.ToString();
+ grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber;
+ grdMain.Rows[sRow].Cells[HMaterNameCol].Value = oMater.omodel.HName;
+ grdMain.Rows[sRow].Cells[HMaterModelCol].Value = oMater.omodel.HModel;
+ grdMain.Rows[sRow].Cells[HMinQtyCol].Value = oMater.omodel.HQtyMin;
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+ if (oUnit.GetInfoByID(oMater.omodel.HUnitID))
+ {
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = oUnit.omodel.HItemID.ToString();
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = oUnit.omodel.HNumber;
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = oUnit.omodel.HName;
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+ }
+ GetCusMatNo(2);
+ oEdit.Text = oMater.omodel.HNumber;
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HMaterIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+ }
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HMaterIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+ }
+ break;
+
+ case HUnitNumberCol:
+ oUnit.WherePart = "";
+ if (oUnit.RefreshView())
+ {
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = oUnit.oModel.HItemID.ToString();
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = oUnit.oModel.HNumber;
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = oUnit.oModel.HName;
+ EditingControl.Text = oUnit.oModel.HNumber;
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+ }
+ break;
+
+ case HCusNumberCol:
+ BLL.ClsBaseSelect_InterFace.SetGridByCus(grdMain, sRow, HCusIDCol, HCusNumberCol, HCusNameCol);
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HCusNumberCol].Value);
+ break;
+
+ case HAuxPropNumberCol:
+ oProperty.WherePart = "";
+ sWhere = " and HMaterNumber = '" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[HMaterNumberCol].Value) + "'";
+
+ if (oProperty.RefreshView(sWhere))
+ {
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = oProperty.oModel.HItemID.ToString();
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = oProperty.oModel.HNumber;
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oProperty.oModel.HName;
+ oEdit.Text = oProperty.oModel.HNumber;
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+ }
+ break;
+
+ default:
+ break;
+ }
+ bc.Enabled = true;
+ break;
+ }
+ case 117: //F6
+ {
+ switch (sCol)
+ {
+
+
+ default:
+ break;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ }
+
+ //缃戞牸缂栬緫鍓嶅垽鏂�
+ private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
+ {
+ int i = grdMain.CurrentCell.ColumnIndex;
+ if (DBUtility.Xt_BaseBillFun.AllowEdit(grdStatus, oSumGrid,i))
+ {
+ e.Cancel = true;
+ }
+ }
+
+ //缃戞牸缂栬緫鍚庡鐞�
+ private void grdMain_CellEndEdit(object sender, DataGridViewCellEventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ if (e.ColumnIndex == HMinQtyCol)
+ {
+ RowCount(e.RowIndex, 0); //
+ }
+ else if (e.ColumnIndex == HWMinQtyCol)
+ {
+ RowCount(e.RowIndex, 0); //
+ }
+ else if (e.ColumnIndex == HZMinQtyCol)
+ {
+ RowCount(e.RowIndex, 0); //
+ }
+ else if (e.ColumnIndex == HQtyCol)
+ {
+ RowCount(e.RowIndex, 0); //
+ }
+ //
+ if (this.EditingControl != null) //閲婃斁浜嬩欢
+ {
+ EditingControl.KeyDown -= new KeyEventHandler(this.EditingControl_KeyDown);
+ this.EditingControl = null;
+ }
+ }
+ DataGridViewTextBoxEditingControl EditingControl;
+
+ private void grdMain_CellLeave(object sender, DataGridViewCellEventArgs e)
+ {
+ if (!grdStatus)
+ {
+ return;
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //
+ //if (oSumGrid.Changelock)
+ // return;
+ //if(oSumGrid.EditStatus)
+ //{
+ if (!CheckGridRow(oSumGrid.OldCell.Row))
+ return;
+ //}
+ }
+
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ private void grdMain_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)
+ {
+ if (grdMain.CurrentCell != null)
+ {
+ if (e.Control is DataGridViewTextBoxEditingControl)
+ {
+ this.EditingControl = (DataGridViewTextBoxEditingControl)e.Control;
+ //澧炲姞濮旀墭澶勭悊
+ this.EditingControl.KeyDown += new KeyEventHandler(this.EditingControl_KeyDown);
+ }
+ }
+ }
+
+ private void EditingControl_KeyDown(object sender, KeyEventArgs e)
+ {
+ //涓氬姟澶勭悊
+ Sub_GridKey(e.KeyValue, grdMain.CurrentRow.Index, grdMain.CurrentCell.ColumnIndex, EditingControl);
+ }
+
+ private void grdMain_RowHeadersWidthChanged(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ private void grdMain_Scroll(object sender, ScrollEventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ oSumGrid.DisplayCurRow();
+ }
+
+ #endregion
+
+
+ #region 閫夋簮鍗曡繑鍥炰俊鎭� 鎸夋斁澶ч暅鍥炬爣杩斿洖
+
+ private void cmdSourceBillNo_Click(object sender, EventArgs e)
+ {
+ if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
+ {
+ string sWhere = " and HOrgID =" + HOrgID.ToString();
+ DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill oIF_ICMOBillList = new DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill();
+ if (oIF_ICMOBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_ICMOBillList.oBillSelectColl);
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
+ {
+ string sWhere = " and HOrgID =" + HOrgID.ToString();
+ DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill();
+ if (oIF_ICMOReportBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
+ }
+ }
+ }
+
+ private void FillSelectData(List<DBUtility.BillSelect> oList)
+ {
+ DataSet Ds;
+ oSumGrid.Changelock = true;
+ initGrid();
+ int i = -1;
+ foreach (DBUtility.BillSelect oSelectRow in oList)
+ {
+ i = i + 1;
+ //鐢熶骇璁㈠崟
+ if (oSelectRow.BillType == "3710")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_Sc_ICMOBillList_CusBarCodeBill where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_Sc_ICMOBillList_CusBarCodeBill");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ GetCusMatNo(1);
+ }
+ //鐢熶骇姹囨姤鍗�
+ else if (oSelectRow.BillType == "3711")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_Sc_ICMOReportList_CusBarCodeBill where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_Sc_ICMOReportList_CusBarCodeBill");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ GetCusMatNo(1);
+ }
+ }
+ //
+ oSumGrid.Changelock = false;
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ //鏍规嵁TABLE鍐欏叆鐣岄潰
+ private void Sub_WriteInForm1(DataTable oTable, int i)
+ {
+ //鍔犺浇琛ㄤ綋
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ grdMain.Rows[i].Cells[HQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ grdMain.Rows[i].Cells[HInitQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ //
+ grdMain.Rows[i].Cells[HMainIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
+ grdMain.Rows[i].Cells[HSubIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
+ grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+ grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
+ grdMain.Rows[i].Cells[HMaterIDCol].Value = oTable.Rows[0]["HMaterID"].ToString();
+ grdMain.Rows[i].Cells[HMaterNumberCol].Value = oTable.Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HMaterNameCol].Value = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ grdMain.Rows[i].Cells[HMaterModelCol].Value = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ grdMain.Rows[i].Cells[HUnitIDCol].Value = oTable.Rows[0]["HUnitID"].ToString();
+ grdMain.Rows[i].Cells[HUnitNumberCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
+ grdMain.Rows[i].Cells[HAuxPropIDCol].Value = oTable.Rows[0]["HAuxPropID"].ToString();
+ grdMain.Rows[i].Cells[HAuxPropNumberCol].Value = oTable.Rows[0]["杈呭姪灞炴�т唬鐮�"].ToString();
+ grdMain.Rows[i].Cells[HAuxPropNameCol].Value = oTable.Rows[0]["杈呭姪灞炴��"].ToString();
+ grdMain.Rows[i].Cells[HBatchManagerCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
+ grdMain.Rows[i].Cells[HCode1Col].Value = oTable.Rows[0]["鐗╂枡绫诲埆"].ToString();
+ grdMain.Rows[i].Cells[HCode3Col].Value = oTable.Rows[0]["鐗堟湰鍙�"].ToString();
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ grdMain.Rows[i].Cells[HSourceInterIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
+ grdMain.Rows[i].Cells[HSourceEntryIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
+ grdMain.Rows[i].Cells[HSourceBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+ grdMain.Rows[i].Cells[HSourceBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
+ grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
+ grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["鐢熶骇鏃ユ湡"].ToString();
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["鏈夋晥鏈熻嚦"].ToString();
+ grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = oTable.Rows[0]["HEXPPERIOD"].ToString();
+ grdMain.Rows[i].Cells[HInnerBillNoCol].Value = oTable.Rows[0]["閿�鍞鍗曠紪鍙�"].ToString();
+ grdMain.Rows[i].Cells[HCustom6Col].Value = oTable.Rows[0]["鎴愬搧鏂欏彿"].ToString();
+ //--
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HQtyCol.ToString() +
+ "," + HMinQtyCol.ToString() +
+ "," + HWMinQtyCol.ToString() +
+ "," + HZMinQtyCol.ToString() +
+ //"," + HMaterNumberCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
+ "," + HUnitNumberCol.ToString() +
+ "," + HBatchNoCol.ToString() +
+ "," + HCusModelNameCol.ToString() +
+ "," + HCusModelCol.ToString() +
+ "," + HCustom4Col.ToString() +
+ "," + HCustom5Col.ToString() +
+ "," + HCustom6Col.ToString() +
+ "," + HCustomQty1Col.ToString() +
+ "," + HCustomQty2Col.ToString() +
+ "," + HRemarkCol.ToString();
+ grdMain.Columns[HBillNoCol].ReadOnly = true;
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HQtyCol.ToString();
+ //
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+ tabControl1.SelectedIndex = 0;
+ bc.Enabled = true;
+ //
+ RowCount(i, 0);
+ }
+
+ #endregion
+
+
+ #region 閫夋簮鍗曡繑鍥炰俊鎭� 鎸夊洖杞﹂敭杩斿洖
+ private void txtHSourceBillNo_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == (char)Keys.Return)//鍥炶溅甯﹀嚭婧愬崟淇℃伅
+ {
+ if (txtHSourceBillNo.Text.Length < 4)
+ {
+ MessageBox.Show("璇疯緭鍏�4浣嶄互涓婃暟鎹紒");
+ return;
+ }
+ //鏍规嵁婧愬崟绫诲瀷 鍜屾簮鍗曞彿 鑾峰彇淇℃伅
+ if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
+ {
+ DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill oIF_ICMOBillList = new DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill();
+ if (oIF_ICMOBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_ICMOBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
+ {
+ DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill();
+ if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else
+ {
+ MessageBox.Show("鎵�閫夋簮鍗曠被鍨嬶紝涓嶆敮鎸佹鍔熻兘锛�");
+ return;
+ }
+
+ }
+ }
+
+ #endregion
+
+
+ #region //鎵撳嵃璁剧疆
+
+ GridppReport Report;
+
+ #region 鍐呯棰勮銆佹墦鍗�
+
+ #region 鍐呯棰勮
+ private void yl_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdSub.Rows.Count < 1)
+ {
+ MessageBox.Show("鍐呯鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀棰勮锛�");
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
+ Thread.Sleep(1000);
+ }
+ }
+
+ #endregion
+
+ #region 鍐呯鎵撳嵃
+ private void dy_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdSub.Rows.Count < 1)
+ {
+ MessageBox.Show("鍐呯鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀鎵撳嵃锛�");
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //寰幆閫変腑琛�
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.Print(true);
+ Thread.Sleep(1000);
+ }
+ }
+
+ #endregion
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ for (int i = 0; i < grdSub.Rows.Count; i++)
+ {
+ grdSub.Rows[i].Cells[0].Value = "*";
+ }
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
+ }
+
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord()//
+ {
+ try
+ {
+ //Report.FieldByName("澶囨敞").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HRemark2Col].Value);
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鍐呯鏉＄爜鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
+ }
+ }
+
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ DataTable ds = new DataTable();
+ BLL.Utility.FillRecordToReport_Sel(Report, grdSub, ds, Fun_GetCol("閫夋嫨"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鍐呯鏉＄爜鎵撳嵃澶辫触!琛ㄤ綋锛�" + e.Message);
+ }
+ }
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd()
+ {
+ try
+ {
+ oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('鑱旀兂8S鐮�') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鍐呯鏉＄爜鎵撳嵃澶辫触!鎵撳嵃缁撴潫 锛�" + e.Message);
+ }
+ }
+
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdSub);
+ }
+
+ #endregion
+
+ #region 澶栫棰勮銆佹墦鍗�
+
+ #region 澶栫棰勮
+ private void ylw_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdList.Rows.Count < 1)
+ {
+ MessageBox.Show("澶栫鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀棰勮锛�");
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption + "_澶栫";
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReport_w(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
+ Thread.Sleep(1000);
+ }
+ }
+
+ #endregion
+
+ #region 澶栫鎵撳嵃
+ private void dyw_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdList.Rows.Count < 1)
+ {
+ MessageBox.Show("澶栫鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀鎵撳嵃锛�");
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption + "_澶栫";
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //寰幆閫変腑琛�
+ Sub_SetReport_w(oFrm.sOpenTmp);
+ Report.Print(true);
+ Thread.Sleep(1000);
+ }
+ }
+
+ #endregion
+
+
+ private void Sub_SetReport_w(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ for (int i = 0; i < grdList.Rows.Count; i++)
+ {
+ grdList.Rows[i].Cells[0].Value = "*";
+ }
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord_w);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable_w);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd_w);
+ }
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord_w()//
+ {
+ try
+ {
+ //Report.FieldByName("澶囨敞").AsString = ClsPub.isStrNull(grdList.Rows[CurRows].Cells[HRemark2Col].Value);
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("澶栫鏉＄爜鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
+ }
+ }
+
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
+ private void ReportFetchRecordByDataTable_w()
+ {
+ try
+ {
+ DataTable ds = new DataTable();
+ BLL.Utility.FillRecordToReport_Sel(Report, grdList, ds, Fun_GetCol_w("閫夋嫨"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("澶栫鏉＄爜鎵撳嵃澶辫触!琛ㄤ綋锛�" + e.Message);
+ }
+ }
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd_w()
+ {
+ try
+ {
+ oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('鑱旀兂澶栫鐮�') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("澶栫鏉＄爜鎵撳嵃澶辫触!鎵撳嵃缁撴潫 锛�" + e.Message);
+ }
+ }
+
+ private Int32 Fun_GetCol_w(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
+ }
+
+ #endregion
+
+ #region 鏍堟澘棰勮銆佹墦鍗�
+
+ #region 鏍堟澘棰勮
+
+ private void ylz_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdList2.Rows.Count < 1)
+ {
+ MessageBox.Show("鏍堟澘鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀棰勮锛�");
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption + "_鏍堟澘";
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReport_z(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
+ Thread.Sleep(1000);
+ }
+ }
+
+ #endregion
+
+ #region 鏍堟澘鎵撳嵃
+
+ private void dyz_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdList2.Rows.Count < 1)
+ {
+ MessageBox.Show("鏍堟澘鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀鎵撳嵃锛�");
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption + "_鏍堟澘";
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //寰幆閫変腑琛�
+ Sub_SetReport_z(oFrm.sOpenTmp);
+ Report.Print(true);
+ Thread.Sleep(1000);
+ }
+ }
+
+ #endregion
+
+
+ private void Sub_SetReport_z(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ for (int i = 0; i < grdList2.Rows.Count; i++)
+ {
+ grdList2.Rows[i].Cells[0].Value = "*";
+ }
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord_z);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable_z);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd_z);
+ }
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord_z()//
+ {
+ try
+ {
+ //Report.FieldByName("澶囨敞").AsString = ClsPub.isStrNull(grdList2.Rows[CurRows].Cells[HRemark2Col].Value);
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鏍堟澘鏉＄爜鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
+ }
+ }
+
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
+ private void ReportFetchRecordByDataTable_z()
+ {
+ try
+ {
+ DataTable ds = new DataTable();
+ BLL.Utility.FillRecordToReport_Sel(Report, grdList2, ds, Fun_GetCol_z("閫夋嫨"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鏍堟澘鏉＄爜鎵撳嵃澶辫触!琛ㄤ綋锛�" + e.Message);
+ }
+ }
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd_z()
+ {
+ try
+ {
+ oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('鑱旀兂鏍堟澘鐮�') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鏍堟澘鏉＄爜鎵撳嵃澶辫触!鎵撳嵃缁撴潫 锛�" + e.Message);
+ }
+ }
+
+ private Int32 Fun_GetCol_z(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList2);
+ }
+
+ #endregion
+
+ #endregion
+
+ #region 鑾峰彇瀹㈡埛鏂欏彿
+ private void GetCusMatNo(int num)
+ {
+ Int64 HCusID = ClsPub.isLong(cmbHCusName.SelectedValue); //瀹㈡埛ID
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡ID
+
+ if (HMaterID != 0)
+ {
+ DataSet ds = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_CusMatNo " + num.ToString() + "," + HCusID.ToString() + "," + HMaterID.ToString(), "h_p_Gy_CusBarCodeBill_CusMatNo");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ //缃戞牸涓嬫媺閫夋嫨妗�
+ DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
+ column.Items.Add("");
+ grdMain.Rows[j].Cells[HCusModelNameCol] = column;
+ grdMain.Rows[j].Cells[HCusModelCol].Value = "";
+ }
+ else
+ {
+ //缃戞牸涓嬫媺閫夋嫨妗�
+ DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ column.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HCusRelationNumber"]));
+ }
+ grdMain.Rows[j].Cells[HCusModelNameCol] = column;
+ grdMain.Rows[j].Cells[HCusModelNameCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCusRelationNumber"]);
+ grdMain.Rows[j].Cells[HCusModelCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCusRelationName"]);
+ if (num == 2)
+ {
+ grdMain.Rows[j].Cells[HCode1Col].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCode1"]);
+ grdMain.Rows[j].Cells[HCode3Col].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCode3"]);
+ }
+ }
+ }
+ }
+ }
+
+ #endregion
+
+
+ #region 閫夋嫨瀹㈡埛
+ private void cmbHCusName_TextChanged(object sender, EventArgs e)
+ {
+ GetCusMatNo(1);
+ }
+
+ #endregion
+
+
+ #region 閫夋嫨缁勭粐
+ private void cmbHOrgID_SelectionChangeCommitted(object sender, EventArgs e)
+ {
+ HOrgID = ClsPub.isLong(cmbHOrgID.SelectedValue);
+ //鍔犺浇瀹㈡埛淇℃伅
+ Sub_AddHCusNameList();
+ //娓呯┖鍒濆鍖栧垪琛�
+ initGrid();
+ grdMain.Columns[HBillNoCol].ReadOnly = false;
+ }
+
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.designer.cs"
new file mode 100644
index 0000000..d1097db
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.designer.cs"
@@ -0,0 +1,1074 @@
+锘縩amespace WarM
+{
+ partial class Gy_CusBarCodeBill_KaiBei_LianXiang
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_CusBarCodeBill_KaiBei_LianXiang));
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.dy = new System.Windows.Forms.ToolStripButton();
+ this.yl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.dyw = new System.Windows.Forms.ToolStripButton();
+ this.ylw = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.DelRow = new System.Windows.Forms.ToolStripButton();
+ this.bc = new System.Windows.Forms.ToolStripButton();
+ this.cz = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
+ this.mrlk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
+ this.bclk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.lblCaption = new System.Windows.Forms.Label();
+ this.P1 = new System.Windows.Forms.Panel();
+ this.pb1 = new System.Windows.Forms.ProgressBar();
+ this.pic1 = new System.Windows.Forms.PictureBox();
+ this.gbUp = new System.Windows.Forms.GroupBox();
+ this.cmbHCusName = new System.Windows.Forms.ComboBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.dtpHDate = new System.Windows.Forms.DateTimePicker();
+ this.label2 = new System.Windows.Forms.Label();
+ this.cmbHOrgID = new System.Windows.Forms.ComboBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.cmdHEmpID = new System.Windows.Forms.Button();
+ this.cmdSourceBillNo = new System.Windows.Forms.Button();
+ this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.txtHDeleteDate = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
+ this.txtHDeleteMan = new System.Windows.Forms.Label();
+ this.label27 = new System.Windows.Forms.Label();
+ this.txtHUpDateDate = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.txtHUpDater = new System.Windows.Forms.Label();
+ this.label21 = new System.Windows.Forms.Label();
+ this.txtHCloseDate = new System.Windows.Forms.Label();
+ this.label19 = new System.Windows.Forms.Label();
+ this.txtHCloseMan = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.txtHCheckDate = new System.Windows.Forms.Label();
+ this.label15 = new System.Windows.Forms.Label();
+ this.txtHChecker = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.txtHMakeDate = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.txtHMaker = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.panel3 = new System.Windows.Forms.Panel();
+ this.grdSum = new System.Windows.Forms.DataGridView();
+ this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.grdList = new System.Windows.Forms.DataGridView();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.grdSub = new System.Windows.Forms.DataGridView();
+ this.tabPage4 = new System.Windows.Forms.TabPage();
+ this.grdList2 = new System.Windows.Forms.DataGridView();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.dyz = new System.Windows.Forms.ToolStripButton();
+ this.ylz = new System.Windows.Forms.ToolStripButton();
+ this.Tool.SuspendLayout();
+ this.P1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
+ this.gbUp.SuspendLayout();
+ this.panel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ this.tabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit();
+ this.tabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.tabControl1.SuspendLayout();
+ this.tabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
+ this.tabPage4.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdList2)).BeginInit();
+ this.SuspendLayout();
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Tool.BackgroundImage")));
+ 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.dy,
+ this.yl,
+ this.toolStripSeparator1,
+ this.dyw,
+ this.ylw,
+ this.toolStripSeparator3,
+ this.dyz,
+ this.ylz,
+ this.toolStripSeparator2,
+ this.DelRow,
+ this.bc,
+ this.cz,
+ this.toolStripSeparator5,
+ this.toolStripSeparator12,
+ this.mrlk,
+ this.toolStripSeparator11,
+ this.bclk,
+ this.toolStripSeparator10,
+ this.tc});
+ this.Tool.Location = new System.Drawing.Point(0, 0);
+ this.Tool.Name = "Tool";
+ this.Tool.Padding = new System.Windows.Forms.Padding(0);
+ this.Tool.Size = new System.Drawing.Size(1017, 50);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 17;
+ this.Tool.Text = "toolStrip1";
+ //
+ // dy
+ //
+ this.dy.AutoSize = false;
+ this.dy.Image = ((System.Drawing.Image)(resources.GetObject("dy.Image")));
+ this.dy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dy.ImageTransparentColor = System.Drawing.Color.White;
+ this.dy.Name = "dy";
+ this.dy.Size = new System.Drawing.Size(60, 47);
+ this.dy.Text = "鍐呯鎵撳嵃";
+ this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dy.Click += new System.EventHandler(this.dy_Click);
+ //
+ // yl
+ //
+ this.yl.AutoSize = false;
+ this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
+ this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.yl.Name = "yl";
+ this.yl.Size = new System.Drawing.Size(60, 47);
+ this.yl.Text = "鍐呯棰勮";
+ this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.yl.Click += new System.EventHandler(this.yl_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ //
+ // dyw
+ //
+ this.dyw.AutoSize = false;
+ this.dyw.Image = ((System.Drawing.Image)(resources.GetObject("dyw.Image")));
+ this.dyw.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dyw.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dyw.ImageTransparentColor = System.Drawing.Color.White;
+ this.dyw.Name = "dyw";
+ this.dyw.Size = new System.Drawing.Size(60, 47);
+ this.dyw.Text = "澶栫鎵撳嵃";
+ this.dyw.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dyw.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dyw.Click += new System.EventHandler(this.dyw_Click);
+ //
+ // ylw
+ //
+ this.ylw.AutoSize = false;
+ this.ylw.Image = ((System.Drawing.Image)(resources.GetObject("ylw.Image")));
+ this.ylw.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.ylw.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.ylw.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.ylw.Name = "ylw";
+ this.ylw.Size = new System.Drawing.Size(60, 47);
+ this.ylw.Text = "澶栫棰勮";
+ this.ylw.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.ylw.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.ylw.Click += new System.EventHandler(this.ylw_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ //
+ // DelRow
+ //
+ this.DelRow.AutoSize = false;
+ this.DelRow.Image = ((System.Drawing.Image)(resources.GetObject("DelRow.Image")));
+ this.DelRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.DelRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.DelRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.DelRow.Name = "DelRow";
+ this.DelRow.Size = new System.Drawing.Size(35, 47);
+ this.DelRow.Text = "鍒犺";
+ this.DelRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.DelRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.DelRow.Click += new System.EventHandler(this.DelRow_Click);
+ //
+ // bc
+ //
+ this.bc.AutoSize = false;
+ this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+ this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.bc.Name = "bc";
+ this.bc.Size = new System.Drawing.Size(35, 47);
+ this.bc.Text = "鐢熸垚";
+ this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Click += new System.EventHandler(this.bc_Click);
+ //
+ // cz
+ //
+ this.cz.AutoSize = false;
+ this.cz.Image = ((System.Drawing.Image)(resources.GetObject("cz.Image")));
+ this.cz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.cz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.cz.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.cz.Name = "cz";
+ this.cz.Size = new System.Drawing.Size(35, 47);
+ this.cz.Text = "閲嶇疆";
+ this.cz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.cz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.cz.Click += new System.EventHandler(this.cz_Click);
+ //
+ // toolStripSeparator5
+ //
+ this.toolStripSeparator5.Name = "toolStripSeparator5";
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator12
+ //
+ this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator12.Name = "toolStripSeparator12";
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 50);
+ //
+ // mrlk
+ //
+ this.mrlk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.mrlk.Image = ((System.Drawing.Image)(resources.GetObject("mrlk.Image")));
+ this.mrlk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ 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.Text = "榛樿鍒楀";
+ this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.mrlk.Click += new System.EventHandler(this.mrlk_Click);
+ //
+ // toolStripSeparator11
+ //
+ this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator11.Name = "toolStripSeparator11";
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
+ //
+ // bclk
+ //
+ this.bclk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.bclk.Image = ((System.Drawing.Image)(resources.GetObject("bclk.Image")));
+ this.bclk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ 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.Text = "淇濆瓨鍒楀";
+ this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bclk.Click += new System.EventHandler(this.bclk_Click);
+ //
+ // toolStripSeparator10
+ //
+ this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator10.Name = "toolStripSeparator10";
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
+ //
+ // tc
+ //
+ this.tc.AutoSize = false;
+ this.tc.Image = ((System.Drawing.Image)(resources.GetObject("tc.Image")));
+ this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tc.ImageTransparentColor = System.Drawing.Color.White;
+ this.tc.Name = "tc";
+ this.tc.Size = new System.Drawing.Size(35, 47);
+ this.tc.Text = "閫�鍑�";
+ this.tc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
+ //
+ // lblCaption
+ //
+ this.lblCaption.AutoSize = true;
+ this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lblCaption.Location = new System.Drawing.Point(501, 12);
+ this.lblCaption.Name = "lblCaption";
+ this.lblCaption.Size = new System.Drawing.Size(89, 19);
+ this.lblCaption.TabIndex = 18;
+ this.lblCaption.Text = "鍗曟嵁缂栬緫";
+ //
+ // P1
+ //
+ this.P1.BackColor = System.Drawing.Color.Lavender;
+ this.P1.Controls.Add(this.pb1);
+ this.P1.Controls.Add(this.pic1);
+ this.P1.Controls.Add(this.lblCaption);
+ this.P1.Controls.Add(this.gbUp);
+ this.P1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.P1.Location = new System.Drawing.Point(41, 50);
+ this.P1.Name = "P1";
+ this.P1.Size = new System.Drawing.Size(937, 137);
+ this.P1.TabIndex = 31;
+ //
+ // pb1
+ //
+ this.pb1.Location = new System.Drawing.Point(76, 12);
+ this.pb1.Name = "pb1";
+ this.pb1.Size = new System.Drawing.Size(256, 23);
+ this.pb1.TabIndex = 93;
+ //
+ // pic1
+ //
+ this.pic1.Location = new System.Drawing.Point(313, 3);
+ this.pic1.Name = "pic1";
+ this.pic1.Size = new System.Drawing.Size(78, 41);
+ this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pic1.TabIndex = 36;
+ this.pic1.TabStop = false;
+ this.pic1.Visible = false;
+ //
+ // gbUp
+ //
+ this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.cmbHCusName);
+ this.gbUp.Controls.Add(this.label4);
+ this.gbUp.Controls.Add(this.dtpHDate);
+ this.gbUp.Controls.Add(this.label2);
+ this.gbUp.Controls.Add(this.cmbHOrgID);
+ this.gbUp.Controls.Add(this.label3);
+ this.gbUp.Controls.Add(this.cmdHEmpID);
+ this.gbUp.Controls.Add(this.cmdSourceBillNo);
+ this.gbUp.Controls.Add(this.txtHSourceBillNo);
+ this.gbUp.Controls.Add(this.label14);
+ this.gbUp.Controls.Add(this.cmbSourceBillType);
+ this.gbUp.Controls.Add(this.label10);
+ this.gbUp.Location = new System.Drawing.Point(14, 39);
+ this.gbUp.Name = "gbUp";
+ this.gbUp.Size = new System.Drawing.Size(892, 80);
+ this.gbUp.TabIndex = 33;
+ this.gbUp.TabStop = false;
+ //
+ // cmbHCusName
+ //
+ this.cmbHCusName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHCusName.FormattingEnabled = true;
+ this.cmbHCusName.Location = new System.Drawing.Point(394, 17);
+ this.cmbHCusName.Name = "cmbHCusName";
+ this.cmbHCusName.Size = new System.Drawing.Size(188, 20);
+ this.cmbHCusName.TabIndex = 98;
+ this.cmbHCusName.TextChanged += new System.EventHandler(this.cmbHCusName_TextChanged);
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.ForeColor = System.Drawing.Color.Black;
+ this.label4.Location = new System.Drawing.Point(327, 21);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.TabIndex = 97;
+ this.label4.Text = "瀹� 鎴�";
+ //
+ // dtpHDate
+ //
+ this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHDate.Location = new System.Drawing.Point(676, 17);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHDate.Name = "dtpHDate";
+ this.dtpHDate.Size = new System.Drawing.Size(188, 21);
+ this.dtpHDate.TabIndex = 96;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(609, 21);
+ this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.TabIndex = 95;
+ this.label2.Text = "鏃� 鏈�";
+ //
+ // cmbHOrgID
+ //
+ this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHOrgID.FormattingEnabled = true;
+ this.cmbHOrgID.Location = new System.Drawing.Point(101, 17);
+ this.cmbHOrgID.Name = "cmbHOrgID";
+ this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
+ this.cmbHOrgID.TabIndex = 85;
+ this.cmbHOrgID.SelectionChangeCommitted += new System.EventHandler(this.cmbHOrgID_SelectionChangeCommitted);
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.ForeColor = System.Drawing.Color.Black;
+ this.label3.Location = new System.Drawing.Point(35, 21);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(53, 12);
+ this.label3.TabIndex = 84;
+ this.label3.Text = "缁� 缁�";
+ //
+ // cmdHEmpID
+ //
+ this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
+ this.cmdHEmpID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHEmpID.Location = new System.Drawing.Point(892, -7);
+ this.cmdHEmpID.Name = "cmdHEmpID";
+ this.cmdHEmpID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHEmpID.TabIndex = 79;
+ this.cmdHEmpID.UseVisualStyleBackColor = false;
+ this.cmdHEmpID.Visible = false;
+ //
+ // cmdSourceBillNo
+ //
+ this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
+ this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(560, 45);
+ this.cmdSourceBillNo.Name = "cmdSourceBillNo";
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(22, 22);
+ this.cmdSourceBillNo.TabIndex = 42;
+ this.cmdSourceBillNo.UseVisualStyleBackColor = true;
+ this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
+ //
+ // txtHSourceBillNo
+ //
+ this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 46);
+ this.txtHSourceBillNo.Name = "txtHSourceBillNo";
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21);
+ this.txtHSourceBillNo.TabIndex = 41;
+ this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.ForeColor = System.Drawing.Color.Black;
+ this.label14.Location = new System.Drawing.Point(327, 50);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(53, 12);
+ this.label14.TabIndex = 40;
+ this.label14.Text = "閫� 鍗� 鍙�";
+ //
+ // cmbSourceBillType
+ //
+ this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbSourceBillType.FormattingEnabled = true;
+ this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.cmbSourceBillType.Location = new System.Drawing.Point(101, 46);
+ this.cmbSourceBillType.Name = "cmbSourceBillType";
+ this.cmbSourceBillType.Size = new System.Drawing.Size(188, 20);
+ this.cmbSourceBillType.TabIndex = 36;
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.ForeColor = System.Drawing.Color.Black;
+ this.label10.Location = new System.Drawing.Point(35, 50);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(53, 12);
+ this.label10.TabIndex = 35;
+ this.label10.Text = "婧愬崟绫诲瀷";
+ //
+ // panel2
+ //
+ this.panel2.BackColor = System.Drawing.Color.Lavender;
+ this.panel2.Controls.Add(this.txtHDeleteDate);
+ this.panel2.Controls.Add(this.label25);
+ this.panel2.Controls.Add(this.txtHDeleteMan);
+ this.panel2.Controls.Add(this.label27);
+ this.panel2.Controls.Add(this.txtHUpDateDate);
+ this.panel2.Controls.Add(this.label23);
+ this.panel2.Controls.Add(this.txtHUpDater);
+ this.panel2.Controls.Add(this.label21);
+ this.panel2.Controls.Add(this.txtHCloseDate);
+ this.panel2.Controls.Add(this.label19);
+ this.panel2.Controls.Add(this.txtHCloseMan);
+ this.panel2.Controls.Add(this.label17);
+ this.panel2.Controls.Add(this.txtHCheckDate);
+ this.panel2.Controls.Add(this.label15);
+ this.panel2.Controls.Add(this.txtHChecker);
+ this.panel2.Controls.Add(this.label13);
+ this.panel2.Controls.Add(this.txtHMakeDate);
+ this.panel2.Controls.Add(this.label11);
+ this.panel2.Controls.Add(this.txtHMaker);
+ this.panel2.Controls.Add(this.label8);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel2.Location = new System.Drawing.Point(41, 506);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(937, 93);
+ 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.Name = "txtHDeleteDate";
+ this.txtHDeleteDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHDeleteDate.TabIndex = 19;
+ //
+ // label25
+ //
+ 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.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(53, 12);
+ this.label25.TabIndex = 18;
+ this.label25.Text = "浣滃簾鏃ユ湡";
+ //
+ // txtHDeleteMan
+ //
+ 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.Name = "txtHDeleteMan";
+ this.txtHDeleteMan.Size = new System.Drawing.Size(98, 15);
+ this.txtHDeleteMan.TabIndex = 17;
+ //
+ // label27
+ //
+ 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.Name = "label27";
+ this.label27.Size = new System.Drawing.Size(41, 12);
+ this.label27.TabIndex = 16;
+ this.label27.Text = "浣滃簾浜�";
+ //
+ // txtHUpDateDate
+ //
+ 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.Name = "txtHUpDateDate";
+ this.txtHUpDateDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHUpDateDate.TabIndex = 15;
+ //
+ // label23
+ //
+ 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.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(53, 12);
+ this.label23.TabIndex = 14;
+ this.label23.Text = "淇敼鏃ユ湡";
+ //
+ // txtHUpDater
+ //
+ 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.Name = "txtHUpDater";
+ this.txtHUpDater.Size = new System.Drawing.Size(98, 15);
+ this.txtHUpDater.TabIndex = 13;
+ //
+ // label21
+ //
+ 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.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(41, 12);
+ this.label21.TabIndex = 12;
+ this.label21.Text = "淇敼浜�";
+ //
+ // txtHCloseDate
+ //
+ 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.Name = "txtHCloseDate";
+ this.txtHCloseDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHCloseDate.TabIndex = 11;
+ //
+ // label19
+ //
+ 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.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(53, 12);
+ this.label19.TabIndex = 10;
+ this.label19.Text = "鍏抽棴鏃ユ湡";
+ //
+ // txtHCloseMan
+ //
+ 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.Name = "txtHCloseMan";
+ this.txtHCloseMan.Size = new System.Drawing.Size(98, 15);
+ this.txtHCloseMan.TabIndex = 9;
+ //
+ // label17
+ //
+ 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.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(41, 12);
+ this.label17.TabIndex = 8;
+ this.label17.Text = "鍏抽棴浜�";
+ //
+ // txtHCheckDate
+ //
+ 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.Name = "txtHCheckDate";
+ this.txtHCheckDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHCheckDate.TabIndex = 7;
+ //
+ // label15
+ //
+ 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.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(53, 12);
+ this.label15.TabIndex = 6;
+ this.label15.Text = "瀹℃牳鏃ユ湡";
+ //
+ // txtHChecker
+ //
+ 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.Name = "txtHChecker";
+ this.txtHChecker.Size = new System.Drawing.Size(98, 15);
+ this.txtHChecker.TabIndex = 5;
+ //
+ // label13
+ //
+ 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.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(41, 12);
+ this.label13.TabIndex = 4;
+ this.label13.Text = "瀹℃牳浜�";
+ //
+ // txtHMakeDate
+ //
+ 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.Name = "txtHMakeDate";
+ this.txtHMakeDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHMakeDate.TabIndex = 3;
+ //
+ // label11
+ //
+ 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.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(53, 12);
+ this.label11.TabIndex = 2;
+ this.label11.Text = "鍒跺崟鏃ユ湡";
+ //
+ // txtHMaker
+ //
+ 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.Name = "txtHMaker";
+ this.txtHMaker.Size = new System.Drawing.Size(98, 15);
+ this.txtHMaker.TabIndex = 1;
+ //
+ // label8
+ //
+ 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.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(41, 12);
+ this.label8.TabIndex = 0;
+ this.label8.Text = "鍒跺崟浜�";
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // panel1
+ //
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel1.Location = new System.Drawing.Point(0, 50);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(41, 549);
+ this.panel1.TabIndex = 33;
+ //
+ // panel3
+ //
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
+ this.panel3.Location = new System.Drawing.Point(978, 50);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(39, 549);
+ this.panel3.TabIndex = 34;
+ //
+ // grdSum
+ //
+ this.grdSum.AllowUserToAddRows = false;
+ this.grdSum.AllowUserToDeleteRows = false;
+ this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
+ this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum.Location = new System.Drawing.Point(41, 487);
+ this.grdSum.Name = "grdSum";
+ this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
+ this.grdSum.RowTemplate.Height = 23;
+ this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.grdSum.Size = new System.Drawing.Size(937, 19);
+ this.grdSum.TabIndex = 45;
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(809, 543);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.TabIndex = 46;
+ this.grdPrint.Visible = false;
+ //
+ // tabPage3
+ //
+ this.tabPage3.Controls.Add(this.grdList);
+ this.tabPage3.Location = new System.Drawing.Point(4, 22);
+ this.tabPage3.Name = "tabPage3";
+ this.tabPage3.Size = new System.Drawing.Size(929, 274);
+ this.tabPage3.TabIndex = 2;
+ this.tabPage3.Text = "澶栫鐮佹槑缁�";
+ this.tabPage3.UseVisualStyleBackColor = true;
+ //
+ // grdList
+ //
+ this.grdList.AllowUserToAddRows = false;
+ this.grdList.AllowUserToDeleteRows = false;
+ this.grdList.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdList.Location = new System.Drawing.Point(0, 0);
+ this.grdList.Name = "grdList";
+ this.grdList.ReadOnly = true;
+ this.grdList.RowHeadersWidth = 30;
+ this.grdList.RowTemplate.Height = 23;
+ this.grdList.Size = new System.Drawing.Size(929, 274);
+ this.grdList.TabIndex = 46;
+ //
+ // tabPage1
+ //
+ this.tabPage1.Controls.Add(this.grdMain);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(929, 274);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "鐗╂枡淇℃伅";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ this.grdMain.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdMain.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ 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.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 30;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.Size = new System.Drawing.Size(923, 268);
+ this.grdMain.TabIndex = 44;
+ this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
+ this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
+ 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);
+ this.grdMain.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
+ this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.Controls.Add(this.tabPage3);
+ this.tabControl1.Controls.Add(this.tabPage4);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(41, 187);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(937, 300);
+ this.tabControl1.TabIndex = 47;
+ //
+ // tabPage2
+ //
+ this.tabPage2.Controls.Add(this.grdSub);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(929, 274);
+ this.tabPage2.TabIndex = 3;
+ this.tabPage2.Text = "鍐呯鐮佹槑缁�";
+ this.tabPage2.UseVisualStyleBackColor = true;
+ //
+ // grdSub
+ //
+ this.grdSub.AllowUserToAddRows = false;
+ this.grdSub.AllowUserToDeleteRows = false;
+ this.grdSub.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdSub.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdSub.Location = new System.Drawing.Point(3, 3);
+ this.grdSub.Name = "grdSub";
+ this.grdSub.ReadOnly = true;
+ this.grdSub.RowHeadersWidth = 30;
+ this.grdSub.RowTemplate.Height = 23;
+ this.grdSub.Size = new System.Drawing.Size(923, 268);
+ this.grdSub.TabIndex = 47;
+ //
+ // tabPage4
+ //
+ this.tabPage4.Controls.Add(this.grdList2);
+ this.tabPage4.Location = new System.Drawing.Point(4, 22);
+ this.tabPage4.Name = "tabPage4";
+ this.tabPage4.Size = new System.Drawing.Size(929, 274);
+ this.tabPage4.TabIndex = 4;
+ this.tabPage4.Text = "鏍堟澘鐮佹槑缁�";
+ this.tabPage4.UseVisualStyleBackColor = true;
+ //
+ // grdList2
+ //
+ this.grdList2.AllowUserToAddRows = false;
+ this.grdList2.AllowUserToDeleteRows = false;
+ this.grdList2.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdList2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdList2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdList2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdList2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdList2.Location = new System.Drawing.Point(0, 0);
+ this.grdList2.Name = "grdList2";
+ this.grdList2.ReadOnly = true;
+ this.grdList2.RowHeadersWidth = 30;
+ this.grdList2.RowTemplate.Height = 23;
+ this.grdList2.Size = new System.Drawing.Size(929, 274);
+ this.grdList2.TabIndex = 47;
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ //
+ // dyz
+ //
+ this.dyz.AutoSize = false;
+ this.dyz.Image = ((System.Drawing.Image)(resources.GetObject("dyz.Image")));
+ this.dyz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dyz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dyz.ImageTransparentColor = System.Drawing.Color.White;
+ this.dyz.Name = "dyz";
+ this.dyz.Size = new System.Drawing.Size(60, 47);
+ this.dyz.Text = "鏍堟澘鎵撳嵃";
+ this.dyz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dyz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dyz.Click += new System.EventHandler(this.dyz_Click);
+ //
+ // ylz
+ //
+ this.ylz.AutoSize = false;
+ this.ylz.Image = ((System.Drawing.Image)(resources.GetObject("ylz.Image")));
+ this.ylz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.ylz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.ylz.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.ylz.Name = "ylz";
+ this.ylz.Size = new System.Drawing.Size(60, 47);
+ this.ylz.Text = "鏍堟澘棰勮";
+ this.ylz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.ylz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.ylz.Click += new System.EventHandler(this.ylz_Click);
+ //
+ // Gy_CusBarCodeBill_KaiBei_LianXiang
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.Lavender;
+ this.ClientSize = new System.Drawing.Size(1017, 599);
+ this.Controls.Add(this.tabControl1);
+ this.Controls.Add(this.grdSum);
+ this.Controls.Add(this.panel2);
+ this.Controls.Add(this.P1);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.panel3);
+ this.Controls.Add(this.Tool);
+ this.Controls.Add(this.grdPrint);
+ this.ForeColor = System.Drawing.Color.Black;
+ this.KeyPreview = true;
+ this.Name = "Gy_CusBarCodeBill_KaiBei_LianXiang";
+ this.Text = "鍗曟嵁缂栬緫";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_CusBarCodeBill_KaiBei_LianXiang_FormClosing);
+ this.Load += new System.EventHandler(this.Gy_CusBarCodeBill_KaiBei_LianXiang_Load);
+ this.Paint += new System.Windows.Forms.PaintEventHandler(this.Gy_CusBarCodeBill_KaiBei_LianXiang_Paint);
+ this.Resize += new System.EventHandler(this.Gy_CusBarCodeBill_KaiBei_LianXiang_Resize);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ this.P1.ResumeLayout(false);
+ this.P1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).EndInit();
+ this.gbUp.ResumeLayout(false);
+ this.gbUp.PerformLayout();
+ this.panel2.ResumeLayout(false);
+ this.panel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
+ this.tabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
+ this.tabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
+ this.tabPage4.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdList2)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton ylw;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripButton bc;
+ private System.Windows.Forms.ToolStripButton cz;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+ private System.Windows.Forms.Label lblCaption;
+ private System.Windows.Forms.Panel P1;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Label txtHMaker;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label txtHUpDateDate;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.Label txtHUpDater;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.Label txtHCloseDate;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.Label txtHCloseMan;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.Label txtHCheckDate;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.Label txtHChecker;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.Label txtHMakeDate;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.Label txtHDeleteDate;
+ private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.Label txtHDeleteMan;
+ private System.Windows.Forms.Label label27;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.ToolStripButton DelRow;
+ private System.Windows.Forms.GroupBox gbUp;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.ComboBox cmbSourceBillType;
+ private System.Windows.Forms.Button cmdSourceBillNo;
+ private System.Windows.Forms.TextBox txtHSourceBillNo;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
+ private System.Windows.Forms.ToolStripButton mrlk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
+ private System.Windows.Forms.ToolStripButton bclk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
+ private System.Windows.Forms.PictureBox pic1;
+ private System.Windows.Forms.Button cmdHEmpID;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel panel3;
+ private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.ToolStripButton dyw;
+ private System.Windows.Forms.ComboBox cmbHOrgID;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.ComboBox cmbHCusName;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.DateTimePicker dtpHDate;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TabPage tabPage3;
+ private System.Windows.Forms.DataGridView grdList;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.DataGridView grdMain;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.ProgressBar pb1;
+ private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.DataGridView grdSub;
+ private System.Windows.Forms.ToolStripButton dy;
+ private System.Windows.Forms.ToolStripButton yl;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.TabPage tabPage4;
+ private System.Windows.Forms.DataGridView grdList2;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ private System.Windows.Forms.ToolStripButton dyz;
+ private System.Windows.Forms.ToolStripButton ylz;
+ }
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.resx"
new file mode 100644
index 0000000..3e87333
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LianXiang.resx"
@@ -0,0 +1,539 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ /9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAUAAAAhodpAAQAAAAB
+ AAAAmgAAAMYASAAAAAEAAABIAAAAAQAAQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0OjEwOjE0IDE1OjUw
+ OjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAAAAYBAwADAAAAAQAG
+ AAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAAASQCAgAEAAAAAQAA
+ A1QAAAAAAAAASAAAAAEAAABIAAAAAf/Y/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4d
+ GhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIy
+ MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgABgCgAwEhAAIRAQMR
+ Af/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAE
+ EQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElK
+ U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrC
+ w8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAAB
+ AgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkj
+ M1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5
+ eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm
+ 5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9P8A+EAsf+fy4o/4QCy/5/Liuv6z/dOf2HmH/CAWX/P5
+ 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/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
+ 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
+</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="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="dyw.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="ylw.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="dyz.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="ylz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="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
+ /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
+ mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
+ ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
+ rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
+ BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
+ rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
+ ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
+ eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
+ SUVORK5CYII=
+</value>
+ </data>
+ <data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
+ mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
+ OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
+</value>
+ </data>
+ <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
+ oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
+ znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
+ vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
+ AG0RaJ0Gqp8A+0ICGBIZLkZLifXv8Xb3YnVlRdrdb23gtAHHjpdj5hAVRVdv+vBlaVkes+6pPVzhieHn
+ YQKiwHtHpSFp6+rB4sIn+Y37R+3hB5kNec2SSKV5isvebuiZj8YPxoKxYrSMAR90RyWc2AZqgp/lKSzB
+ Jc91xJI6nEoUdCECchrRJlZl4YA7XgJL+Yl7BszjauvEu9QCZoUk8UFHMq3jW+6HLJS1p+1hniZXO6pq
+ 63Hk5Bkr/Fy9SHvC4+FXhuTa7V6s/dopydbOriXA7Ll/YN7nHrNSENeXMDA4aq0WvP0V2IpLSQFOpuaQ
+ mF+WPSm4Iv7CxmaXNBbWPwUtDpLhZ8/HwyU9ZolvjjkaUH3qrBUuV9WeBkv4mufh42clHWYaz7vwG72U
+ TLZQdeFnAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
+ 77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
+ aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
+ JWylHvVeGGCm+hBQnNlCNIatWNxW6lGv9B0D3PsIXOrnQts2pGsX0mOdLX3WuYsbjT8gvTyNmsOPeJ+n
+ cOUtAa2bkEdfIbkdkLyuk8rtZGAGUuGCYzxBb/QUYJCAlpAp73+jnIEKN979pNcRPgPQEDSA7HZI4xpW
+ /pgvP+vdRzCwx/Y1AKeP3uZVtjIr0rJKPhMwxMX6RQO41U1AAL45YP77Pny/Ugitc//HAc/8BpD1wIkc
+ xxKuDnOxdh7pbc45rKBuAX4aNexfTiISYQNlALqFpwv068/EcbF0BJdfBEj0IhoGgktAKAisrXIO7yGy
+ mUI6vcPGYe/XePA+QECdF/Jk1gB0ZJWNQgpfQ273QQpeHSmf96oCquiN0R1eF1IPP+AAgRmsjnCqFmoA
+ AAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <data name="cmdHEmpID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIZBAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdSourceBillNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>93, 17</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>62</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index 2843114..a5177dd 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -14614,7 +14614,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Gy_ProjectMoney_Close", 1, false, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_ItemMoney_Close", 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 6461537..f6d5708 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -2584,11 +2584,8 @@
}
}
#endregion
- /// <summary>
- /// 鏂板妯″叿妗ｆ-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+
+ #region[鍣ㄥ叿妗ｆ淇濆瓨涓庝慨鏀逛繚瀛樻柟娉昡
[Route("Gy_Mould_Edit/AddBill")]
[HttpPost]
public object AddBill([FromBody] JObject oMain)
@@ -2702,6 +2699,16 @@
int HMouldHeight = mainList[0].HMouldHeight; //楂�
int HMouldFoldHeight = mainList[0].HMouldFoldHeight; //鎶樺彔楂樺害
+ int HUserID = mainList[0].HUserID; // 浣跨敤浜猴紙Gy_Employee锛�
+ string HBrand = mainList[0].HBrand; // 鍝佺墝
+ string HCalibrationType = mainList[0].HCalibrationType; // 鏍″噯绫诲瀷 (鍐�/澶栨牎)
+ string HLocation = mainList[0].HLocation; // 浣嶇疆
+ DateTime HCalibrationDate = mainList[0].HCalibrationDate; // 鏍″噯鏃ユ湡
+ string HCalibrationCycle = mainList[0].HCalibrationCycle; // 鏍″噯鍛ㄦ湡
+ string HProductDesignSize = mainList[0].HProductDesignSize; // 浜у搧璁捐灏哄
+ string HGaugeDesignSize = mainList[0].HGaugeDesignSize; // 妫�鍏疯璁″昂瀵�
+ int HProductQTY = mainList[0].HProductQTY; // 浜у搧鏁伴噺
+
//淇濆瓨鍓嶆帶鍒�=========================================
string HBillNote = "";
ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_BeforeSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_BeforeSaveCtrl");
@@ -2737,19 +2744,21 @@
",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus,HCREATEORGID,HUSEORGID " +
- ",HMouldLength,HMouldWidth,HMouldHeight,HMouldFoldHeight,HTransPackFlag,HSendPackFlag ) " +
+ ",HMouldLength,HMouldWidth,HMouldHeight,HMouldFoldHeight,HTransPackFlag,HSendPackFlag," +
+ "HUserID,HBrand,HCalibrationType,HLocation,HCalibrationDate,HCalibrationCycle,HProductDesignSize,HGaugeDesignSize,HProductQTY ) " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
- ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
- ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
- "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
- ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
- "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
- "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
- ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
- ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "'," + HCREATEORGID + "," + HUSEORGID +
- "," + HMouldLength + "," + HMouldWidth + "," + HMouldHeight + "," + HMouldFoldHeight + "," + Convert.ToString(HTransPackFlag ? 1 : 0) + "," + Convert.ToString(HSendPackFlag ? 1 : 0) + ") ");
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
+ ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
+ "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
+ ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
+ "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
+ "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
+ ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
+ ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "'," + HCREATEORGID + "," + HUSEORGID +
+ "," + HMouldLength + "," + HMouldWidth + "," + HMouldHeight + "," + HMouldFoldHeight + "," + Convert.ToString(HTransPackFlag ? 1 : 0) + "," + Convert.ToString(HSendPackFlag ? 1 : 0) + "," +
+ "'" + HUserID + "','" + HBrand + "','" + HCalibrationType + "','" + HLocation + "','" + HCalibrationDate + "','" + HCalibrationCycle + "','" + HProductDesignSize + "','" + HGaugeDesignSize + "','" + HProductQTY + "') ");
//瀛愯〃
oCN.RunProc("Insert into Gy_MouldFileSub " +
@@ -2796,6 +2805,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
+ objJsonResult.HInterID = HInterID.ToString();
objJsonResult.Message = null;
objJsonResult.data = null;
return objJsonResult;
@@ -2811,12 +2821,6 @@
}
}
-
- /// <summary>
- /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
[Route("Gy_Mould_Edit/AddBill1")]
[HttpPost]
public object AddBill1([FromBody] JObject oMain)
@@ -2908,6 +2912,18 @@
int HMouldWidth = mainList[0].HMouldWidth; //瀹�
int HMouldHeight = mainList[0].HMouldHeight; //楂�
int HMouldFoldHeight = mainList[0].HMouldFoldHeight; //鎶樺彔楂樺害
+
+
+ int HUserID = mainList[0].HUserID; // 浣跨敤浜猴紙Gy_Employee锛�
+ string HBrand = mainList[0].HBrand; // 鍝佺墝
+ string HCalibrationType = mainList[0].HCalibrationType; // 鏍″噯绫诲瀷 (鍐�/澶栨牎)
+ string HLocation = mainList[0].HLocation; // 浣嶇疆
+ DateTime HCalibrationDate = mainList[0].HCalibrationDate; // 鏍″噯鏃ユ湡
+ string HCalibrationCycle = mainList[0].HCalibrationCycle; // 鏍″噯鍛ㄦ湡
+ string HProductDesignSize = mainList[0].HProductDesignSize; // 浜у搧璁捐灏哄
+ string HGaugeDesignSize = mainList[0].HGaugeDesignSize; // 妫�鍏疯璁″昂瀵�
+ int HProductQTY = mainList[0].HProductQTY; // 浜у搧鏁伴噺
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -2996,12 +3012,16 @@
",HInitLife='" + HInitLife +
"',HNextMainDate='" + HNextMainDate +
"',HMouldUseStatus='" + HMouldUseStatus +
- "' where HInterID=" + HInterID.ToString());
-
- //淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- // oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ "',HUserID='" + HUserID +
+ "',HBrand='" + HBrand +
+ "',HCalibrationType='" + HCalibrationType +
+ "',HLocation='" + HLocation +
+ "',HCalibrationDate='" + HCalibrationDate +
+ "',HCalibrationCycle='" + HCalibrationCycle +
+ "',HProductDesignSize='" + HProductDesignSize +
+ "',HGaugeDesignSize='" + HGaugeDesignSize +
+ "',HProductQTY='" + HProductQTY +
+ "' where HInterID=" + HInterID.ToString());
oCN.RunProc("delete from Gy_MouldFileSub_SubMater where HInterID='" + HInterID + "'");
oCN.RunProc("delete from Gy_MouldFileSub_MaintainRule where HInterID='" + HInterID + "'");
@@ -3035,7 +3055,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
- //objJsonResult.data = null;
+ objJsonResult.HInterID = HInterID.ToString();
return objJsonResult;
}
catch (Exception e)
@@ -3130,11 +3150,9 @@
return objJsonResult;
}
- /// <summary>
- /// 纾ㄥ叿妗ｆ淇敼鎸夐挳鏂规硶-璁＄畻涓嬫淇濆吇/鏍℃鏃ユ湡-鑾峰彇妗ｆ鏈�杩戜竴娆＄殑淇濆吇璁板綍
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region [妯″叿妗ｆ淇敼鎸夐挳鏂规硶-璁＄畻涓嬫淇濆吇/鏍℃鏃ユ湡-鑾峰彇妗ｆ鏈�杩戜竴娆＄殑淇濆吇璁板綍]
[Route("Gy_Mould_Edit/calculateHNextMainDate")]
[HttpGet]
public object calculateHNextMainDate(long HInterID)
@@ -3164,6 +3182,8 @@
return objJsonResult;
}
}
+ #endregion
+
/// <summary>
/// 纾ㄥ叿妗ｆ淇敼鎸夐挳鏂规硶
@@ -4896,6 +4916,185 @@
#endregion
#endregion
+ #region 鍣ㄥ叿妗ｆ 鏂囦欢涓婁紶
+ [Route("Gy_MouldFileBIllMain/UploadFile_Gy_MouldFilen")]
+ [HttpPost]
+ public object UploadFile_Gy_MouldFilen()
+ {
+
+ string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //鍗曟嵁鍙�
+ string HRemark = HttpContext.Current.Request.Params["HRemark"]; //澶囨敞
+ string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
+ HttpPostedFile files = HttpContext.Current.Request.Files["file"];
+ string path = HttpContext.Current.Server.MapPath("~/../Files/Gy_MouldFilen/" + HBillNo);
+ dynamic dyResult = UploadFile_Gy_MouldFilen(files, path, HBillNo, HRemark, HUserName);
+ if (dyResult != null && dyResult.result == 1)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "涓婁紶鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = dyResult.returnval;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ public dynamic UploadFile_Gy_MouldFilen(HttpPostedFile files, string path, string HBillNo, string HRemark, string HUserName)
+ {
+ dynamic Result_Ob = new { result = 1, returnval = "涓婁紶鎴愬姛锛�" };
+ string filePath = Path.GetFullPath(files.FileName);//鏂囦欢涓婁紶璺緞
+ string fileExtension = Path.GetExtension(files.FileName);// 鏂囦欢鎵╁睍鍚�
+ string filename = files.FileName;//鏂囦欢鍚�
+ string fileSavePath = path;// 涓婁紶淇濆瓨璺緞
+ int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
+ int Maxsize = 40000 * 1024;//瀹氫箟涓婁紶鏂囦欢鐨勬渶澶х┖闂村ぇ灏忎负40M
+ try
+ {
+ if (files == null || files.ContentLength <= 0)
+ {
+ Result_Ob = new { result = 0, returnval = "鏂囦欢涓嶈兘涓虹┖!" };
+ return Result_Ob;
+ }
+ if (filesize >= Maxsize)
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶鏂囦欢瓒呰繃40M锛屼笉鑳戒笂浼狅紒" };
+ return Result_Ob;
+ }
+
+ string fileurl = Path.Combine(fileSavePath, filename);
+ if (Directory.Exists(fileurl) == true) //濡傛灉瀛樺湪閲嶅悕鏂囦欢灏辨彁绀�
+ {
+ Result_Ob = new { result = 0, returnval = "瀛樺湪鍚屽悕鏂囦欢锛�" };
+ return Result_Ob;
+ }
+ //鍒犻櫎鏁版嵁琛ㄦ暟鎹�
+ ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
+ if (Directory.Exists(path))
+ {
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ files.SaveAs(fileurl);
+ string StrPath = "/files/Gy_MouldFilen/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+ else
+ {
+ Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
+ files.SaveAs(fileurl);
+ string StrPath = "/files/Gy_MouldFilen/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ Result_Ob = new { result = 0, returnval = e.Message };
+ }
+ return Result_Ob;
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍗曟嵁鍙锋煡鎵句笂浼犳枃浠跺垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Gy_MouldFileBIllMain/Gy_MouldFilen_Filelist")]
+ [HttpGet]
+ public object Gy_MouldFilen_Filelist(string HBillNo)
+ {
+ var url = fileip + "/Files/Gy_MouldFilen/" + HBillNo + "/";
+
+ try
+ {
+ ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url from MES_AccessoriesList where HSourceBillNo='" + HBillNo + "'", "MES_AccessoriesList");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁ID,鍗曟嵁鍙�,鏂囦欢鍚� 鍒犻櫎鏂囦欢
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Gy_MouldFileBIllMain/Gy_MouldFilen_DeleteFilelist")]
+ [HttpGet]
+ public object Gy_MouldFilen_DeleteFilelist(string HItemID, string HSourceBillNo, string HFileName)
+ {
+ try
+ {
+
+ oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
+ string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/Gy_MouldFilen/" + HSourceBillNo), HFileName);
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ 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
+
//鏍规嵁鏉＄爜鎵剧墿鏂欎俊鎭�
[Route("Gy_Material/findMaterialByNumber")]
diff --git a/WebAPI/Controllers/Cg_ContractTransportBillListController.cs b/WebAPI/Controllers/Cg_ContractTransportBillListController.cs
new file mode 100644
index 0000000..90f972d
--- /dev/null
+++ b/WebAPI/Controllers/Cg_ContractTransportBillListController.cs
@@ -0,0 +1,386 @@
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using System.Windows.Forms;
+using WebAPI.Models;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using System.IO;
+using SyntacticSugar.constant;
+namespace WebAPI.Controllers
+{
+ public class Cg_ContractTransportBillListController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public DataSet ds1 = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DAL.ClsCg_ContractTransportBillList OBill = new DAL.ClsCg_ContractTransportBillList();
+ public DAL.ClsCg_ContractTransportBillList BillOld = new DAL.ClsCg_ContractTransportBillList();
+
+ #region 鍚堝悓鍒楄〃
+ [Route("Cg_ContractTransportBillListController/get锘縇ist")]
+ [HttpGet]
+ public object get锘縇ist(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Cg_ContractTransportBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Cg_ContractTransportBillList order by 鍗曟嵁鍙� desc", "锘縣_v_Cg_ContractTransportBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Cg_ContractTransportBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_Cg_ContractTransportBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鍒犻櫎
+ [Route("Cg_ContractTransportBillListController/Delete锘緽ill")]
+ [HttpGet]
+ public object Delete(string HInterID, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cg_ContractTransportBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (BillOld.ShowBill(Int64.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Cg_ContractTransportBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Cg_ContractTransportBill_BeforeDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ //鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
+ if (!BillOld.DeleteBill(BillOld.omodel.HInterID, BillOld.omodel.HBillNo, "h_p_Cg_ContractTransportBill_AfterDelCtrl", user, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ oCN.Commit();
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ 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 鑾峰彇缂栬緫鍒楄〃鏁版嵁
+ [Route("Cg_ContractTransportBillListController/锘縀ditList")]
+ [HttpGet]
+ public object EditList(string HInterID, string User)
+ {
+ try
+ {
+ List<DataTable> tableList = new List<DataTable>();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cg_ContractTransportBill_Edit", 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_Cg_ContractTransportBillList where HInterID = " + HInterID, " h_v_Cg_ContractTransportBillList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 淇濆瓨/缂栬緫
+ [Route("Cg_ContractTransportBillListController/Save锘緾g_ContractTransportBillList")]
+ [HttpPost]
+ public object Save锘緾g_ContractTransportBillList([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string user = sArray[3].ToString();//鐢ㄦ埛鍚�
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Cg_ContractTransportBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsCg_ContractTransportBillList oBill = new DAL.ClsCg_ContractTransportBillList();
+ List<Model.ClsCg_ContractTransportBillMain> lsmain = new List<Model.ClsCg_ContractTransportBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_ContractTransportBillMain(msg2);
+ foreach (Model.ClsCg_ContractTransportBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (OBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, OBill.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (OBill.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (OBill.omodel.HChecker != "" && OBill.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (OBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "1117";
+ oItem.HBillSubType = "1117";
+
+
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ // 琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<Model.ClsCg_ContractTransportBillSub> ls = new List<Model.ClsCg_ContractTransportBillSub>();
+ ls = oListModels.getObjectByJson_Cg_ContractTransportBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsCg_ContractTransportBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+
+ //oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index fbd8580..871fe78 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -14768,7 +14768,7 @@
#endregion
#region 鍣ㄥ叿淇濆吇璁板綍鎷嶇収涓婁紶
- [Route("Sc_MouldMaintainBill/UploadFile")]
+ [Route("Sc_MouldMaintainBill/UploadFile_Maintain")]
[HttpPost]
public object UploadFile_Maintain()
{
@@ -15523,56 +15523,20 @@
}
#endregion
-
- #region[缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
- [Route("Gy_QCVerificationBillMain/Gy_QCVerificationBillMainCheckDetai")]
+ #region[缂栬緫鏃惰幏鍙栨暟鎹甝
+ [Route("Gy_QCVerificationBillMain/Gy_QCVerificationBillDetail")]
[HttpGet]
- public ApiResult<DataSet> Gy_QCVerificationBillMainCheckDetai(string HID)
+ public ApiResult<DataSet> Gy_QCVerificationBillDetail(string HID)
{
if (string.IsNullOrEmpty(HID))
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCVerificationBillMain_Edit where hmainid= " + HID + " ", "h_v_Gy_QCVerificationBillMain");
+ var dataSet = oCN.RunProcReturn("select * from h_v_Gy_QCVerificationBillMain_Edit where hmainid= " + HID + " ", "h_v_Gy_QCVerificationBillMain_Edit");
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("Gy_QCVerificationBillMain/SGy_QCVerificationBillMainListProjectDetai")]
- [HttpGet]
- public object SGy_QCVerificationBillMainListProjectDetai(string sqlWhere)
- {
- DataSet ds;
- List<object> list = new List<object>();
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-
- string sql = "select HInspectInstruMentID,妫�楠屼华鍣ㄤ唬鐮� HInspectInstruMentNumber,妫�楠屼华鍣ㄥ悕绉� HInspectInstruMentName,鐢熸晥鏃ユ湡 HBeginDate,澶辨晥鏃ユ湡 HEndDate,鏍″噯鐘舵�� HHCalibrationStatus from h_v_Gy_QCVerificationBillMain_Edit where 1 = 1 " + sqlWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Gy_QCVerificationBillMain_Edit");
-
- list.Add(ds.Tables[0]);
-
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = null;
- objJsonResult.list = list;
-
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- }
- return objJsonResult;
- }
- #endregion
-
+ #endregion
#region 鍣ㄥ叿鏍″噯璁板綍鍗� 淇濆瓨/缂栬緫
@@ -15683,6 +15647,185 @@
}
}
#endregion
+
+ #region 鍣ㄥ叿鏍″噯璁板綍 鏂囦欢涓婁紶
+ [Route("Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification")]
+ [HttpPost]
+ public object UploadFile_Gy_QCVerification()
+ {
+
+ string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //鍗曟嵁鍙�
+ string HRemark = HttpContext.Current.Request.Params["HRemark"]; //澶囨敞
+ string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
+ HttpPostedFile files = HttpContext.Current.Request.Files["file"];
+ string path = HttpContext.Current.Server.MapPath("~/../Files/Gy_QCVerification/" + HBillNo);
+ dynamic dyResult = UploadFile_Gy_QCVerification(files, path, HBillNo, HRemark, HUserName);
+ if (dyResult != null && dyResult.result == 1)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "涓婁紶鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = dyResult.returnval;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ public dynamic UploadFile_Gy_QCVerification(HttpPostedFile files, string path, string HBillNo, string HRemark, string HUserName)
+ {
+ dynamic Result_Ob = new { result = 1, returnval = "涓婁紶鎴愬姛锛�" };
+ string filePath = Path.GetFullPath(files.FileName);//鏂囦欢涓婁紶璺緞
+ string fileExtension = Path.GetExtension(files.FileName);// 鏂囦欢鎵╁睍鍚�
+ string filename = files.FileName;//鏂囦欢鍚�
+ string fileSavePath = path;// 涓婁紶淇濆瓨璺緞
+ int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
+ int Maxsize = 40000 * 1024;//瀹氫箟涓婁紶鏂囦欢鐨勬渶澶х┖闂村ぇ灏忎负40M
+ try
+ {
+ if (files == null || files.ContentLength <= 0)
+ {
+ Result_Ob = new { result = 0, returnval = "鏂囦欢涓嶈兘涓虹┖!" };
+ return Result_Ob;
+ }
+ if (filesize >= Maxsize)
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶鏂囦欢瓒呰繃40M锛屼笉鑳戒笂浼狅紒" };
+ return Result_Ob;
+ }
+
+ string fileurl = Path.Combine(fileSavePath, filename);
+ if (Directory.Exists(fileurl) == true) //濡傛灉瀛樺湪閲嶅悕鏂囦欢灏辨彁绀�
+ {
+ Result_Ob = new { result = 0, returnval = "瀛樺湪鍚屽悕鏂囦欢锛�" };
+ return Result_Ob;
+ }
+ //鍒犻櫎鏁版嵁琛ㄦ暟鎹�
+ ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
+ if (Directory.Exists(path))
+ {
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ files.SaveAs(fileurl);
+ string StrPath = "/files/Gy_QCVerification/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+ else
+ {
+ Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
+ files.SaveAs(fileurl);
+ string StrPath = "/files/Gy_QCVerification/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ Result_Ob = new { result = 0, returnval = e.Message };
+ }
+ return Result_Ob;
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍗曟嵁鍙锋煡鎵句笂浼犳枃浠跺垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Gy_QCVerificationBillMain/Gy_QCVerification_Filelist")]
+ [HttpGet]
+ public object Gy_QCVerification_Filelist(string HBillNo)
+ {
+ var url = fileip + "/Files/Gy_QCVerification/" + HBillNo + "/";
+
+ try
+ {
+ ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url from MES_AccessoriesList where HSourceBillNo='" + HBillNo + "'", "MES_AccessoriesList");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁ID,鍗曟嵁鍙�,鏂囦欢鍚� 鍒犻櫎鏂囦欢
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Gy_QCVerificationBillMain/Gy_QCVerification_DeleteFilelist")]
+ [HttpGet]
+ public object Gy_QCVerification_DeleteFilelist(string HItemID, string HSourceBillNo, string HFileName)
+ {
+ try
+ {
+
+ oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
+ string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/Gy_QCVerification/" + HSourceBillNo), HFileName);
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ 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
#endregion
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index ce1f827..c590ab1 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -22415,7 +22415,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("Select * from Xt_BillType where HNumber = '" + HModuleType + "'", "Xt_BillType");
+ ds = oCN.RunProcReturn("Select * from Xt_BillType with(nolock) where HNumber = '" + HModuleType + "'", "Xt_BillType");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 9b063ed..708430f 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -2818,35 +2818,35 @@
{
try
{
- if(oWebs.GetWebAPIToLocal_ICMO(HBillNo, "3710", "admin", ref DBUtility.ClsPub.sErrInfo)==false)
+ //if(oWebs.GetWebAPIToLocal_ICMO(HBillNo, "3710", "admin", ref DBUtility.ClsPub.sErrInfo)==false)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "[0000-2-020]鍗曟嵁鍚屾澶辫触璇疯仈绯荤鐞嗗憳,"+ DBUtility.ClsPub.sErrInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //else
+ //{
+ ds = oCN.RunProcReturn("exec h_p_WMS_SaveSNByICMO_XW '" + @HBillNo + "','" + HSN +"',"+HBeginNo+","+HEndNo+","+HCount+",'"+HMachineCode+"'", "h_p_WMS_SaveSNByICMO_XW");
+
+ if (ds == null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "[0000-2-020]鍗曟嵁鍚屾澶辫触璇疯仈绯荤鐞嗗憳,"+ DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "[0000-2-020]娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜淇濆瓨澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
- else
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
{
- ds = oCN.RunProcReturn("exec h_p_WMS_SaveSNByICMO_XW '" + @HBillNo + "','" + HSN +"',"+HBeginNo+","+HEndNo+","+HCount+",'"+HMachineCode+"'", "h_p_WMS_SaveSNByICMO_XW");
-
- if (ds == null)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "[0000-2-020]娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜淇濆瓨澶辫触锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "[0000-2-020]鏉＄爜缁戝畾澶辫触锛�"+ ds.Tables[0].Rows[0]["HRemark"].ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-020]鏉＄爜缁戝畾澶辫触锛�"+ ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
}
+ //}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index df007fb..ddfa10a 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -3432,9 +3432,30 @@
List<Model.ClsGy_MaterPreventErrMouldBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterPreventErrMouldBillMain>>(jsonString);
return list;
}
-
-
/// <summary>
+ /// 澶勭悊鎵胯繍鍚堝悓娓呭崟涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsCg_ContractTransportBillMain> getObjectByJson_ContractTransportBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsCg_ContractTransportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_ContractTransportBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>ClsCg_ContractTransportBillSub
+ /// 澶勭悊鏂板鎵胯繍鍚堝悓瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsCg_ContractTransportBillSub> getObjectByJson_Cg_ContractTransportBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsCg_ContractTransportBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_ContractTransportBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>ClsCg_ContractTransportBillSub
/// 澶勭悊鏂板浜у搧鐘敊楠岃瘉娓呭崟瀛愯〃鐨刯son
/// </summary>
/// <param name="jsonString"></param>
diff --git a/WebAPI/Models/Gy_Mould.cs b/WebAPI/Models/Gy_Mould.cs
index 689bca4..2897b2e 100644
--- a/WebAPI/Models/Gy_Mould.cs
+++ b/WebAPI/Models/Gy_Mould.cs
@@ -80,5 +80,16 @@
public string HMouldUseStatus { get; set; }
public DateTime HNextMainDate { get; set; }
+
+ public int HUserID { get; set; } // 浣跨敤浜猴紙Gy_Employee锛�
+ public string HBrand { get; set; } // 鍝佺墝
+ public string HCalibrationType { get; set; } // 鏍″噯绫诲瀷 (鍐�/澶栨牎)
+ public string HLocation { get; set; } // 浣嶇疆
+ public DateTime HCalibrationDate { get; set; } // 鏍″噯鏃ユ湡
+ public string HCalibrationCycle { get; set; } // 鏍″噯鍛ㄦ湡
+ public string HProductDesignSize { get; set; } // 浜у搧璁捐灏哄
+ public string HGaugeDesignSize { get; set; } // 妫�鍏疯璁″昂瀵�
+ public int HProductQTY { get; set; } // 浜у搧鏁伴噺
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
index 2ad2c3b..018a239 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-12-04T01:53:53.3381625Z;False|2025-12-04T09:51:54.1953606+08:00;True|2025-12-03T20:17:43.6822978+08:00;False|2025-12-03T20:17:13.6794411+08:00;True|2025-12-03T20:04:33.7080472+08:00;False|2025-12-03T20:03:18.9092172+08:00;True|2025-12-03T17:55:36.8190814+08:00;True|2025-12-03T17:31:16.1192761+08:00;False|2025-12-03T17:25:01.3978650+08:00;True|2025-12-03T17:12:24.4237446+08:00;True|2025-12-03T16:54:15.1801517+08:00;False|2025-12-03T16:53:42.7976484+08:00;True|2025-12-03T12:26:32.8151086+08:00;True|2025-12-03T10:22:12.3177261+08:00;False|2025-12-03T10:21:38.7919750+08:00;True|2025-12-03T10:18:00.9077028+08:00;True|2025-12-03T10:02:30.4022692+08:00;False|2025-12-03T09:58:15.6880929+08:00;True|2025-12-02T20:20:19.5577161+08:00;True|2025-12-02T19:59:44.5694165+08:00;True|2025-12-02T18:53:53.4696294+08:00;True|2025-12-02T12:31:02.0786003+08:00;False|2025-12-02T12:30:35.5116200+08:00;True|2025-12-02T09:16:07.2877709+08:00;True|2025-02-12T14:57:08.1380239+08:00;True|2025-02-12T14:47:58.0901509+08:00;True|2025-02-12T14:15:10.5288654+08:00;True|2025-02-12T14:12:22.5382196+08:00;True|2025-02-12T14:07:11.7831540+08:00;True|2024-11-29T13:29:48.1554947+08:00;</History>
+ <History>True|2025-12-09T04:04:27.5887901Z;False|2025-12-09T12:02:37.2146599+08:00;True|2025-12-08T14:20:26.4878391+08:00;True|2025-12-08T12:37:30.4953352+08:00;True|2025-12-08T11:42:08.8772270+08:00;True|2025-12-08T11:38:52.8463177+08:00;True|2025-12-08T10:04:02.0917227+08:00;False|2025-12-08T10:03:46.8962836+08:00;True|2025-12-08T10:00:15.0547300+08:00;False|2025-12-08T09:58:28.7217278+08:00;True|2025-12-08T09:32:28.1251567+08:00;True|2025-12-08T09:29:41.3856966+08:00;False|2025-12-08T09:27:36.8951905+08:00;True|2025-12-05T16:39:06.2892731+08:00;True|2025-12-05T15:48:40.9542261+08:00;True|2025-12-05T14:08:26.7097242+08:00;False|2025-12-05T14:08:07.6105127+08:00;True|2025-12-05T12:59:40.2026457+08:00;True|2025-12-05T10:35:19.2246561+08:00;False|2025-12-05T10:32:23.4813105+08:00;True|2025-12-04T09:53:53.3381625+08:00;False|2025-12-04T09:51:54.1953606+08:00;True|2025-12-03T20:17:43.6822978+08:00;False|2025-12-03T20:17:13.6794411+08:00;True|2025-12-03T20:04:33.7080472+08:00;False|2025-12-03T20:03:18.9092172+08:00;True|2025-12-03T17:55:36.8190814+08:00;True|2025-12-03T17:31:16.1192761+08:00;False|2025-12-03T17:25:01.3978650+08:00;True|2025-12-03T17:12:24.4237446+08:00;True|2025-12-03T16:54:15.1801517+08:00;False|2025-12-03T16:53:42.7976484+08:00;True|2025-12-03T12:26:32.8151086+08:00;True|2025-12-03T10:22:12.3177261+08:00;False|2025-12-03T10:21:38.7919750+08:00;True|2025-12-03T10:18:00.9077028+08:00;True|2025-12-03T10:02:30.4022692+08:00;False|2025-12-03T09:58:15.6880929+08:00;True|2025-12-02T20:20:19.5577161+08:00;True|2025-12-02T19:59:44.5694165+08:00;True|2025-12-02T18:53:53.4696294+08:00;True|2025-12-02T12:31:02.0786003+08:00;False|2025-12-02T12:30:35.5116200+08:00;True|2025-12-02T09:16:07.2877709+08:00;True|2025-02-12T14:57:08.1380239+08:00;True|2025-02-12T14:47:58.0901509+08:00;True|2025-02-12T14:15:10.5288654+08:00;True|2025-02-12T14:12:22.5382196+08:00;True|2025-02-12T14:07:11.7831540+08:00;True|2024-11-29T13:29:48.1554947+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,19 +45,19 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/03/2025 22:11:14</publishTime>
+ <publishTime>12/08/2025 11:37:12</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/03/2025 22:11:14</publishTime>
+ <publishTime>12/08/2025 11:37:12</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/03/2025 22:10:50</publishTime>
+ <publishTime>12/08/2025 11:36:48</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/03/2025 22:10:50</publishTime>
+ <publishTime>12/08/2025 11:36:48</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>12/02/2025 09:07:14</publishTime>
+ <publishTime>12/04/2025 15:04:18</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/02/2025 09:07:14</publishTime>
+ <publishTime>12/04/2025 15:04:18</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/04/2025 09:53:50</publishTime>
+ <publishTime>12/09/2025 12:04:18</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/04/2025 09:53:50</publishTime>
+ <publishTime>12/09/2025 12:04:18</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/12/2025 14:57:06</publishTime>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index c8622f6..87c7f03 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-12-08T06:22:05.5028004Z;False|2025-12-08T14:21:51.5681305+08:00;True|2025-12-03T16:01:44.3905890+08:00;False|2025-12-03T16:01:35.0635101+08:00;True|2025-11-28T11:27:04.6248331+08:00;True|2025-11-28T11:07:17.0249718+08:00;False|2025-11-28T11:07:11.3086456+08:00;True|2025-11-27T18:37:16.9508633+08:00;True|2025-11-27T17:10:40.3522364+08:00;True|2025-11-27T16:35:58.2595051+08:00;True|2025-11-27T10:18:55.2307371+08:00;False|2025-11-27T10:18:46.2066993+08:00;True|2025-11-17T09:27:55.7259977+08:00;False|2025-11-17T09:27:16.7136935+08:00;True|2025-11-11T13:58:05.2172999+08:00;True|2025-11-11T10:37:35.1191334+08:00;True|2025-11-10T15:06:22.3357673+08:00;False|2025-11-10T15:06:11.8400556+08:00;True|2025-11-07T08:57:00.1734758+08:00;True|2025-11-06T16:48:00.0284671+08:00;False|2025-11-06T16:47:45.7437599+08:00;True|2025-11-05T13:31:44.6179596+08:00;True|2025-11-05T08:33:54.1548243+08:00;False|2025-11-05T08:33:24.5684931+08:00;True|2025-11-03T13:35:15.5366201+08:00;True|2025-11-03T10:57:58.1269080+08:00;True|2025-11-03T09:27:46.8362957+08:00;False|2025-11-03T09:27:37.6852594+08:00;True|2025-10-31T15:18:06.4022197+08:00;True|2025-10-31T13:32:17.1759540+08:00;False|2025-10-31T13:32:08.0028313+08:00;True|2025-10-31T11:15:10.5355694+08:00;False|2025-10-31T11:14:55.6627999+08:00;True|2025-10-31T10:49:30.4944361+08:00;True|2025-10-31T10:42:57.7706914+08:00;True|2025-10-30T16:15:53.3336368+08:00;False|2025-10-30T16:15:40.9253965+08:00;True|2025-10-28T16:01:06.5666553+08:00;False|2025-10-28T16:00:38.5947348+08:00;True|2025-10-27T13:43:49.5161274+08:00;False|2025-10-27T13:43:42.5342286+08:00;True|2025-10-27T09:42:46.5335165+08:00;True|2025-10-27T08:53:31.2276269+08:00;False|2025-10-27T08:53:25.4177209+08:00;True|2025-10-22T08:11:11.0901859+08:00;False|2025-10-22T08:11:03.4971724+08:00;True|2025-10-16T09:53:45.6893131+08:00;True|2025-10-16T09:46:23.1367811+08:00;True|2025-10-16T09:41:45.9417321+08:00;True|2025-10-16T09:37:10.8036335+08:00;True|2025-10-16T09:34:38.7879337+08:00;True|2025-10-16T09:27:23.7972937+08:00;False|2025-10-16T09:27:15.3584640+08:00;True|2025-10-15T13:18:13.1534605+08:00;True|2025-10-15T11:54:34.1416019+08:00;True|2025-10-14T14:52:11.7549757+08:00;True|2025-10-14T14:02:31.7864158+08:00;True|2025-10-14T13:58:05.5977325+08:00;True|2025-10-14T10:12:35.5186964+08:00;True|2025-10-13T09:24:47.5787047+08:00;False|2025-10-13T09:24:42.7177753+08:00;True|2025-10-13T09:16:46.4811414+08:00;True|2025-10-13T09:15:21.5309960+08:00;True|2025-10-13T09:09:15.1695102+08:00;False|2025-10-13T09:09:08.5879473+08:00;True|2025-10-09T10:00:33.5750010+08:00;True|2025-10-09T09:33:11.4532680+08:00;False|2025-10-09T09:33:04.5858282+08:00;True|2025-09-26T11:07:04.5894247+08:00;False|2025-09-26T11:06:52.9247286+08:00;True|2025-09-24T16:34:25.3145173+08:00;True|2025-09-23T09:30:03.7438798+08:00;False|2025-09-23T09:29:41.1444600+08:00;True|2025-09-17T17:02:04.9034722+08:00;False|2025-09-17T17:01:53.0112736+08:00;True|2025-09-14T18:27:58.3167162+08:00;False|2025-09-14T18:27:47.9377936+08:00;True|2025-08-29T09:29:06.6419251+08:00;True|2025-08-29T09:23:11.0758344+08:00;False|2025-08-29T09:23:00.6033841+08:00;True|2025-08-25T13:43:52.6697107+08:00;False|2025-08-25T13:43:42.8785673+08:00;True|2025-08-21T13:29:18.9335767+08:00;True|2025-08-21T11:13:20.9093967+08:00;False|2025-08-21T11:13:10.8256540+08:00;True|2025-08-19T15:35:19.4743877+08:00;True|2025-08-19T15:09:57.0299457+08:00;False|2025-08-19T15:09:49.9658349+08:00;False|2025-08-19T15:02:52.4274789+08:00;False|2025-08-19T15:02:39.9727509+08:00;False|2025-08-19T15:02:36.7287443+08:00;True|2025-08-19T11:03:00.3784015+08:00;True|2025-08-18T16:53:43.4851878+08:00;False|2025-08-18T16:53:30.4295443+08:00;True|2025-08-18T16:01:19.9787029+08:00;False|2025-08-18T16:01:03.9842180+08:00;True|2025-08-14T18:32:31.1936983+08:00;True|2025-08-13T16:33:00.5421619+08:00;True|2025-08-13T13:22:53.0413832+08:00;False|2025-08-13T13:22:41.0451268+08:00;True|2025-08-12T10:23:11.0645305+08:00;False|2025-08-12T10:23:04.2787778+08:00;True|2025-08-09T13:19:27.9772377+08:00;False|2025-08-09T13:19:12.2232716+08:00;True|2025-08-08T17:01:57.4731423+08:00;True|2025-08-08T12:51:45.7474316+08:00;True|2025-08-08T10:20:06.0336393+08:00;False|2025-08-08T10:19:49.3475689+08:00;True|2025-08-04T22:23:46.6736035+08:00;False|2025-08-04T22:23:34.5441277+08:00;True|2025-08-04T22:17:39.1859867+08:00;True|2025-08-04T22:07:00.9139591+08:00;False|2025-08-04T22:06:52.0807225+08:00;True|2025-08-04T21:40:22.9828884+08:00;True|2025-08-04T21:38:38.0973676+08:00;True|2025-08-04T17:13:55.3765124+08:00;True|2025-08-04T16:47:49.6221076+08:00;False|2025-08-04T16:47:33.9713263+08:00;True|2025-07-24T13:53:49.6344878+08:00;False|2025-07-24T13:53:30.5020566+08:00;True|2025-07-22T16:17:28.5098998+08:00;False|2025-07-22T16:17:11.7327042+08:00;True|2025-07-18T14:36:12.8758873+08:00;True|2025-07-18T14:34:51.0308463+08:00;True|2025-07-17T13:46:41.7825452+08:00;False|2025-07-17T13:46:34.7923451+08:00;True|2025-07-10T15:32:46.2125476+08:00;True|2025-07-10T13:04:51.1753421+08:00;False|2025-07-10T13:04:36.0826557+08:00;True|2025-06-30T15:07:20.0280664+08:00;True|2025-06-27T15:26:25.9639936+08:00;True|2025-06-27T14:47:26.1931097+08:00;True|2025-06-26T14:55:48.9758888+08:00;False|2025-06-26T14:55:35.8969707+08:00;True|2025-06-26T10:10:12.9628884+08:00;True|2025-06-23T11:10:52.6295857+08:00;False|2025-06-23T11:10:46.2505309+08:00;True|2025-06-18T14:13:15.0141966+08:00;False|2025-06-18T14:13:08.3724816+08:00;True|2025-06-18T13:24:40.1027054+08:00;True|2025-06-17T08:19:03.1298222+08:00;False|2025-06-17T08:18:48.1583742+08:00;True|2025-06-12T15:16:16.9926905+08:00;False|2025-06-12T15:16:09.7255464+08:00;True|2025-06-10T07:49:56.5698941+08:00;False|2025-06-10T07:49:47.3414841+08:00;True|2025-06-06T21:04:33.8746305+08:00;True|2025-06-06T20:56:56.6195108+08:00;True|2025-06-06T16:32:26.7872473+08:00;False|2025-06-06T16:31:43.4644697+08:00;True|2025-05-27T13:34:19.9152695+08:00;True|2025-05-26T13:59:11.0434021+08:00;True|2025-05-26T10:32:52.6605356+08:00;False|2025-05-26T10:32:38.4759922+08:00;True|2025-05-21T19:58:17.4859837+08:00;True|2025-05-21T19:56:00.7906025+08:00;True|2025-05-21T19:38:51.0984867+08:00;True|2025-05-21T16:49:04.2014052+08:00;True|2025-05-21T14:47:57.4746320+08:00;True|2025-05-20T19:29:56.6172010+08:00;False|2025-05-20T19:29:50.2198527+08:00;True|2025-05-19T15:06:53.2645411+08:00;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+ <History>True|2025-12-08T09:02:56.3292906Z;False|2025-12-08T17:02:50.6587191+08:00;True|2025-12-08T14:22:05.5028004+08:00;False|2025-12-08T14:21:51.5681305+08:00;True|2025-12-03T16:01:44.3905890+08:00;False|2025-12-03T16:01:35.0635101+08:00;True|2025-11-28T11:27:04.6248331+08:00;True|2025-11-28T11:07:17.0249718+08:00;False|2025-11-28T11:07:11.3086456+08:00;True|2025-11-27T18:37:16.9508633+08:00;True|2025-11-27T17:10:40.3522364+08:00;True|2025-11-27T16:35:58.2595051+08:00;True|2025-11-27T10:18:55.2307371+08:00;False|2025-11-27T10:18:46.2066993+08:00;True|2025-11-17T09:27:55.7259977+08:00;False|2025-11-17T09:27:16.7136935+08:00;True|2025-11-11T13:58:05.2172999+08:00;True|2025-11-11T10:37:35.1191334+08:00;True|2025-11-10T15:06:22.3357673+08:00;False|2025-11-10T15:06:11.8400556+08:00;True|2025-11-07T08:57:00.1734758+08:00;True|2025-11-06T16:48:00.0284671+08:00;False|2025-11-06T16:47:45.7437599+08:00;True|2025-11-05T13:31:44.6179596+08:00;True|2025-11-05T08:33:54.1548243+08:00;False|2025-11-05T08:33:24.5684931+08:00;True|2025-11-03T13:35:15.5366201+08:00;True|2025-11-03T10:57:58.1269080+08:00;True|2025-11-03T09:27:46.8362957+08:00;False|2025-11-03T09:27:37.6852594+08:00;True|2025-10-31T15:18:06.4022197+08:00;True|2025-10-31T13:32:17.1759540+08:00;False|2025-10-31T13:32:08.0028313+08:00;True|2025-10-31T11:15:10.5355694+08:00;False|2025-10-31T11:14:55.6627999+08:00;True|2025-10-31T10:49:30.4944361+08:00;True|2025-10-31T10:42:57.7706914+08:00;True|2025-10-30T16:15:53.3336368+08:00;False|2025-10-30T16:15:40.9253965+08:00;True|2025-10-28T16:01:06.5666553+08:00;False|2025-10-28T16:00:38.5947348+08:00;True|2025-10-27T13:43:49.5161274+08:00;False|2025-10-27T13:43:42.5342286+08:00;True|2025-10-27T09:42:46.5335165+08:00;True|2025-10-27T08:53:31.2276269+08:00;False|2025-10-27T08:53:25.4177209+08:00;True|2025-10-22T08:11:11.0901859+08:00;False|2025-10-22T08:11:03.4971724+08:00;True|2025-10-16T09:53:45.6893131+08:00;True|2025-10-16T09:46:23.1367811+08:00;True|2025-10-16T09:41:45.9417321+08:00;True|2025-10-16T09:37:10.8036335+08:00;True|2025-10-16T09:34:38.7879337+08:00;True|2025-10-16T09:27:23.7972937+08:00;False|2025-10-16T09:27:15.3584640+08:00;True|2025-10-15T13:18:13.1534605+08:00;True|2025-10-15T11:54:34.1416019+08:00;True|2025-10-14T14:52:11.7549757+08:00;True|2025-10-14T14:02:31.7864158+08:00;True|2025-10-14T13:58:05.5977325+08:00;True|2025-10-14T10:12:35.5186964+08:00;True|2025-10-13T09:24:47.5787047+08:00;False|2025-10-13T09:24:42.7177753+08:00;True|2025-10-13T09:16:46.4811414+08:00;True|2025-10-13T09:15:21.5309960+08:00;True|2025-10-13T09:09:15.1695102+08:00;False|2025-10-13T09:09:08.5879473+08:00;True|2025-10-09T10:00:33.5750010+08:00;True|2025-10-09T09:33:11.4532680+08:00;False|2025-10-09T09:33:04.5858282+08:00;True|2025-09-26T11:07:04.5894247+08:00;False|2025-09-26T11:06:52.9247286+08:00;True|2025-09-24T16:34:25.3145173+08:00;True|2025-09-23T09:30:03.7438798+08:00;False|2025-09-23T09:29:41.1444600+08:00;True|2025-09-17T17:02:04.9034722+08:00;False|2025-09-17T17:01:53.0112736+08:00;True|2025-09-14T18:27:58.3167162+08:00;False|2025-09-14T18:27:47.9377936+08:00;True|2025-08-29T09:29:06.6419251+08:00;True|2025-08-29T09:23:11.0758344+08:00;False|2025-08-29T09:23:00.6033841+08:00;True|2025-08-25T13:43:52.6697107+08:00;False|2025-08-25T13:43:42.8785673+08:00;True|2025-08-21T13:29:18.9335767+08:00;True|2025-08-21T11:13:20.9093967+08:00;False|2025-08-21T11:13:10.8256540+08:00;True|2025-08-19T15:35:19.4743877+08:00;True|2025-08-19T15:09:57.0299457+08:00;False|2025-08-19T15:09:49.9658349+08:00;False|2025-08-19T15:02:52.4274789+08:00;False|2025-08-19T15:02:39.9727509+08:00;False|2025-08-19T15:02:36.7287443+08:00;True|2025-08-19T11:03:00.3784015+08:00;True|2025-08-18T16:53:43.4851878+08:00;False|2025-08-18T16:53:30.4295443+08:00;True|2025-08-18T16:01:19.9787029+08:00;False|2025-08-18T16:01:03.9842180+08:00;True|2025-08-14T18:32:31.1936983+08:00;True|2025-08-13T16:33:00.5421619+08:00;True|2025-08-13T13:22:53.0413832+08:00;False|2025-08-13T13:22:41.0451268+08:00;True|2025-08-12T10:23:11.0645305+08:00;False|2025-08-12T10:23:04.2787778+08:00;True|2025-08-09T13:19:27.9772377+08:00;False|2025-08-09T13:19:12.2232716+08:00;True|2025-08-08T17:01:57.4731423+08:00;True|2025-08-08T12:51:45.7474316+08:00;True|2025-08-08T10:20:06.0336393+08:00;False|2025-08-08T10:19:49.3475689+08:00;True|2025-08-04T22:23:46.6736035+08:00;False|2025-08-04T22:23:34.5441277+08:00;True|2025-08-04T22:17:39.1859867+08:00;True|2025-08-04T22:07:00.9139591+08:00;False|2025-08-04T22:06:52.0807225+08:00;True|2025-08-04T21:40:22.9828884+08:00;True|2025-08-04T21:38:38.0973676+08:00;True|2025-08-04T17:13:55.3765124+08:00;True|2025-08-04T16:47:49.6221076+08:00;False|2025-08-04T16:47:33.9713263+08:00;True|2025-07-24T13:53:49.6344878+08:00;False|2025-07-24T13:53:30.5020566+08:00;True|2025-07-22T16:17:28.5098998+08:00;False|2025-07-22T16:17:11.7327042+08:00;True|2025-07-18T14:36:12.8758873+08:00;True|2025-07-18T14:34:51.0308463+08:00;True|2025-07-17T13:46:41.7825452+08:00;False|2025-07-17T13:46:34.7923451+08:00;True|2025-07-10T15:32:46.2125476+08:00;True|2025-07-10T13:04:51.1753421+08:00;False|2025-07-10T13:04:36.0826557+08:00;True|2025-06-30T15:07:20.0280664+08:00;True|2025-06-27T15:26:25.9639936+08:00;True|2025-06-27T14:47:26.1931097+08:00;True|2025-06-26T14:55:48.9758888+08:00;False|2025-06-26T14:55:35.8969707+08:00;True|2025-06-26T10:10:12.9628884+08:00;True|2025-06-23T11:10:52.6295857+08:00;False|2025-06-23T11:10:46.2505309+08:00;True|2025-06-18T14:13:15.0141966+08:00;False|2025-06-18T14:13:08.3724816+08:00;True|2025-06-18T13:24:40.1027054+08:00;True|2025-06-17T08:19:03.1298222+08:00;False|2025-06-17T08:18:48.1583742+08:00;True|2025-06-12T15:16:16.9926905+08:00;False|2025-06-12T15:16:09.7255464+08:00;True|2025-06-10T07:49:56.5698941+08:00;False|2025-06-10T07:49:47.3414841+08:00;True|2025-06-06T21:04:33.8746305+08:00;True|2025-06-06T20:56:56.6195108+08:00;True|2025-06-06T16:32:26.7872473+08:00;False|2025-06-06T16:31:43.4644697+08:00;True|2025-05-27T13:34:19.9152695+08:00;True|2025-05-26T13:59:11.0434021+08:00;True|2025-05-26T10:32:52.6605356+08:00;False|2025-05-26T10:32:38.4759922+08:00;True|2025-05-21T19:58:17.4859837+08:00;True|2025-05-21T19:56:00.7906025+08:00;True|2025-05-21T19:38:51.0984867+08:00;True|2025-05-21T16:49:04.2014052+08:00;True|2025-05-21T14:47:57.4746320+08:00;True|2025-05-20T19:29:56.6172010+08:00;False|2025-05-20T19:29:50.2198527+08:00;True|2025-05-19T15:06:53.2645411+08:00;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/08/2025 14:20:12</publishTime>
+ <publishTime>12/08/2025 17:02:24</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/08/2025 14:20:12</publishTime>
+ <publishTime>12/08/2025 17:02:24</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/08/2025 14:20:07</publishTime>
+ <publishTime>12/08/2025 17:02:22</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/08/2025 14:20:07</publishTime>
+ <publishTime>12/08/2025 17:02:22</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/08/2025 14:20:01</publishTime>
+ <publishTime>12/08/2025 17:02:20</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/08/2025 14:20:01</publishTime>
+ <publishTime>12/08/2025 17:02:20</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/08/2025 14:20:04</publishTime>
+ <publishTime>12/08/2025 17:02:21</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/08/2025 14:20:04</publishTime>
+ <publishTime>12/08/2025 17:02:21</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/18/2025 16:11:18</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/08/2025 14:19:56</publishTime>
+ <publishTime>12/08/2025 17:02:18</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/08/2025 14:19:56</publishTime>
+ <publishTime>12/08/2025 17:02:18</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/08/2025 14:19:59</publishTime>
+ <publishTime>12/08/2025 17:02:18</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/08/2025 14:19:59</publishTime>
+ <publishTime>12/08/2025 17:02:18</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/08/2025 14:19:58</publishTime>
+ <publishTime>12/08/2025 17:02:19</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/08/2025 14:19:58</publishTime>
+ <publishTime>12/08/2025 17:02:19</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/08/2025 14:19:55</publishTime>
+ <publishTime>12/08/2025 17:02:17</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/08/2025 14:19:55</publishTime>
+ <publishTime>12/08/2025 17:02:17</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>12/08/2025 14:19:57</publishTime>
+ <publishTime>12/08/2025 17:02:19</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/08/2025 14:19:57</publishTime>
+ <publishTime>12/08/2025 17:02:19</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/08/2025 14:22:01</publishTime>
+ <publishTime>12/08/2025 17:02:29</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/08/2025 14:22:01</publishTime>
+ <publishTime>12/08/2025 17:02:29</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -501,7 +501,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/08/2025 14:22:02</publishTime>
+ <publishTime>12/08/2025 17:02:54</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 1bb3010..ef7bc2a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -438,6 +438,7 @@
<Compile Include="Controllers\CGGL\Cg_POStockInChangeBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderChangeBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POStockInBillList_SecController.cs" />
+ <Compile Include="Controllers\Cg_ContractTransportBillListController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillBackController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillMainController.cs" />
<Compile Include="Controllers\CJGL\Cj_CenterCheckBillController.cs" />
@@ -1236,6 +1237,7 @@
<Folder Include="bin\" />
<Folder Include="Controllers\椤圭洰绠＄悊\鍩虹寤烘ā\" />
<Folder Include="obj\x86\Debug\" />
+ <Folder Include="Views\Cg_ContractTransportBillList\" />
<Folder Include="Views\Cg_PODemandPlanBill\" />
<Folder Include="Views\Cg_PurchaseReturn\" />
<Folder Include="Views\Cj_CallGoodsBillBack\" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 5b956be..0c2d8c1 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,8 +1,21 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
+<<<<<<< HEAD
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+=======
+ <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+ <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile>
+>>>>>>> ed2b4bad368b195ab7a1219c885620df7380bceb
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index f3e45ce..4611fcb 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 238b925..425ad82 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index f3e45ce..4611fcb 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 238b925..425ad82 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1