From 96bca0db0b7298f1e5a8510e3f657c2460276003 Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期三, 18 九月 2024 10:15:22 +0800
Subject: [PATCH] 导入任务1
---
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 5
WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs | 4
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs | 106
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckOtherBillController.cs | 9
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
WebAPI/WebAPI.csproj.user | 5
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 16
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs | 14
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 2
DAL/生产管理/模具管理/ClsSc_MouldDotCheckPlanBill.cs | 48
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LangChao.resx | 516 +++
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs | 302 ++
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
DAL/车间管理/ClsQc_PreventErrMouldCheckBillMain.cs | 5
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 163 +
WebAPI/Controllers/CGGL/Cg_PayableBillController.cs | 114
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 189 +
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 63
WebAPI/Controllers/WebAPIController.cs | 25
Model/车间管理/ClsCj_CenterCheckBillSub.cs | 13
WebAPI/Controllers/POStockInBillController.cs | 76
WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user | 168
DAL/工资管理/ClsPay_GroupBalBill.cs | 228 +
WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs | 105
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 188 +
WebAPI/Controllers/品质管理/库存检验单/QC_StockCheckBillController.cs | 10
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 2
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LangChao.designer.cs | 996 +++++++
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 4
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 17
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
DAL/DAL.csproj | 2
WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs | 49
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 160 +
WarM/条码打印/Gy_BarCodeBill_New.cs | 20
WarM/条码打印/Gy_CusBarCodeBill_KaiBei.cs | 44
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 4
LMES/ClsShowMod.cs | 6
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 54
WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs | 12
Model/Model.csproj | 2
WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs | 1
WebAPI/Controllers/LMESController.cs | 4
sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
DAL/源单/InterFace源单/Cls_S_IF_ICMOBillList_CusBarCodeBill.cs | 23
SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
WebAPI/Controllers/CJGL/Cj_CenterCheckBillController.cs | 921 ++++++
WebAPI/Web.config | 33
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 2
DAL/车间管理/ClsCj_CenterCheckBill.cs | 525 +++
WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs | 10
WarM/WarM.csproj | 10
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Model/车间管理/ClsCj_CenterCheckBillMain.cs | 25
WebAPI/Controllers/工资管理/Pay_GroupBalBillController.cs | 204 +
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs | 155 +
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 67
Model/工资管理/ClsPay_GroupBalBillSub.cs | 1
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LangChao.cs | 1906 ++++++++++++++
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 58
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 4
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache | 2
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 56
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs | 88
/dev/null | 6
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/品质管理/车间自检单/QC_WorkSelfCheckBillController.cs | 10
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs | 10
74 files changed, 7,493 insertions(+), 418 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index c4b1bb4..584e6f2 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -91,6 +91,7 @@
<Compile Include="ClsPM_CustomerTaskBillMain.cs" />
<Compile Include="ClsGy_MaterialMouldBillMain.cs" />
<Compile Include="ClsPM_WorkPlanMonthBillMain.cs" />
+ <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList_CusBarCodeBill.cs" />
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOReportBillList_CusBarCodeBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_MonthTarGetBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSignBill.cs" />
@@ -705,6 +706,7 @@
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationInBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsWW_EntrustWorkOrderBill.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsCj_CenterCheckBill.cs" />
<Compile Include="閲囪喘绠＄悊\ClsCg_ContractBill.cs">
<SubType>Code</SubType>
</Compile>
diff --git "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBill.cs" "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBill.cs"
index 7214ef3..d442146 100644
--- "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBill.cs"
+++ "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBill.cs"
@@ -30,15 +30,75 @@
{
DetailColl = null;
}
-
+
#endregion 鑷畾涔夋柟娉�
+
+ //淇濆瓨鍓嶆帶鍒�
+ public bool BeforeSave(Int64 HInterID, string HBillNo, Int64 OperationType, ref string sReturn)
+ {
+ try
+ {
+ DataSet Ds = oCn.RunProcReturn("Exec h_p_Pay_GroupBalBill_BeforeSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Pay_GroupBalBill_BeforeSaveCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //淇濆瓨鍚庢帶鍒�
+ public bool AfterSave(Int64 HInterID, string HBillNo, Int64 OperationType, ref string sReturn)
+ {
+ try
+ {
+ DataSet Ds = oCn.RunProcReturn("Exec h_p_Pay_GroupBalBill_AfterSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Pay_GroupBalBill_AfterSaveCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
try
{
- //
oCn.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�
+ if (!BeforeSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
//鏇存柊涓昏〃
oCn.RunProc("UpDate Pay_GroupBalBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
@@ -51,13 +111,14 @@
//========================================
",HGroupID=" + omodel.HGroupID.ToString() +
",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HPayType=" + omodel.HPayType.ToString() +
",HOtherSubsidy=" + omodel.HOtherSubsidy.ToString() +
",HOtherDeduct=" + omodel.HOtherDeduct.ToString() +
",HSumMoney=" + omodel.HSumMoney.ToString() +
",HPayMoney=" + omodel.HPayMoney.ToString() +
- ",HPayType=" + omodel.HPayType.ToString() +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HStockOrgID=" + omodel.HSTOCKORGID.ToString() +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -69,17 +130,19 @@
foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Pay_GroupBalBillSub " +
- " (HInterID,HEntryID,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HUnitID,HProcID,HTimes,HQty,HPrice,HSourceID" +
- ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
- ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HSqty" +
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMaterID,HUnitID,HProcID,HSourceID" +
+ ",HTimes,HQty,HPrice,HMoney,HSqty" +
+ ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
+ ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSourceID.ToString() +
- "," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
- "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'," + oSub.HSqty.ToString() +
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HSourceID.ToString() +
+ "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HSqty.ToString() +
+ "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
+ "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'" +
") ");
}
//
@@ -87,33 +150,26 @@
foreach (Model.ClsPay_GroupBalBillEmp oSubSec in DetailEmpColl)
{
oCn.RunProc("Insert into Pay_GroupBalBillEmp " +
- " (HInterID,HEntryID,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HEmpID,HEmpRate" +
- ",HBaseTimes,HOverTimes,HLeaveTimes,HCTPrjID" +
- ",HBaseDays,HOverDays,HLeaveDays,HYf" +
- ",HMoney,HOtherSubsidy,HOtherDeduct,HIsPay,HAvgFlag" +
- ")" +
- " values("
- + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'" +
- "," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
- "," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() +
- "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveTimes.ToString() + "," + oSubSec.HCTPrjID.ToString() +
- "," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HYf.ToString() +
- "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() + "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + ") ");
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HEmpID,HEmpRate,HCTPrjID,HMoney,HOtherSubsidy,HOtherDeduct" +
+ ",HBaseDays,HBaseTimes,HOverDays,HOverTimes,HLeaveDays,HLeaveTimes" +
+ ",HIsPay,HAvgFlag,HYF" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
+ "," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'" +
+ "," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() + "," + oSubSec.HCTPrjID.ToString() + "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() +
+ "," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HLeaveTimes.ToString() +
+ "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + "," + oSubSec.HYf.ToString() +
+ ") ");
}
- //foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
- //{
- // Ds = oCn.RunProcReturn("exec h_p_Pay_GroupBalBill_Qty " + oSub.HICMOInterID, "");
- // if (Ds.Tables[0].Rows.Count == 0)
- // return;
- // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
- // {
- // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
- // return false;
- // }
- //}
- sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 淇敼鎴愬姛锛�";
oCn.Commit();
return true;
}
@@ -124,6 +180,7 @@
throw (e);
}
}
+
//鏂板鍗曟嵁
public override bool AddBill(ref string sReturn)
{
@@ -133,36 +190,43 @@
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�
+ if (!BeforeSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
//涓昏〃
oCn.RunProc("Insert Into Pay_GroupBalBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HGroupID,HDeptID,HPayType,HOtherSubsidy" +
- ",HOtherDeduct,HSumMoney,HPayMoney" +
- ",HExplanation,HInnerBillNo" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
+ ",HGroupID,HDeptID,HPayType,HOtherSubsidy,HOtherDeduct" +
+ ",HSumMoney,HPayMoney,HExplanation,HInnerBillNo,HStockOrgID" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
- ", " + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HPayType.ToString() + "," + omodel.HOtherSubsidy.ToString() +
- "," + omodel.HOtherDeduct.ToString() + "," + omodel.HSumMoney.ToString() + "," + omodel.HPayMoney.ToString() +
- ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
+ "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
+ "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HPayType.ToString() + "," + omodel.HOtherSubsidy.ToString() + "," + omodel.HOtherDeduct.ToString() +
+ "," + omodel.HSumMoney.ToString() + "," + omodel.HPayMoney.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HSTOCKORGID.ToString() +
") ");
- //
//鎻掑叆瀛愯〃
foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Pay_GroupBalBillSub " +
- " (HInterID,HEntryID,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HUnitID,HProcID,HTimes,HQty,HPrice,HSourceID" +
- ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
- ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HSqty" +
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMaterID,HUnitID,HProcID,HSourceID" +
+ ",HTimes,HQty,HPrice,HMoney,HSqty" +
+ ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
+ ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSourceID.ToString() +
- "," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
- "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'," + oSub.HSqty.ToString() +
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HSourceID.ToString() +
+ "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HSqty.ToString() +
+ "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
+ "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'" +
") ");
}
//
@@ -170,35 +234,26 @@
foreach (Model.ClsPay_GroupBalBillEmp oSubSec in DetailEmpColl)
{
oCn.RunProc("Insert into Pay_GroupBalBillEmp " +
- " (HInterID,HEntryID,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HEmpID,HEmpRate" +
- ",HBaseTimes,HOverTimes,HLeaveTimes,HCTPrjID" +
- ",HBaseDays,HOverDays,HLeaveDays,HYf" +
- ",HMoney,HOtherSubsidy,HOtherDeduct,HIsPay,HAvgFlag" +
- ")" +
- " values("
- + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'" +
- "," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
- "," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() +
- "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveTimes.ToString() + "," + oSubSec.HCTPrjID.ToString() +
- "," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HYf.ToString() +
- "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() + "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + ") ");
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HEmpID,HEmpRate,HCTPrjID,HMoney,HOtherSubsidy,HOtherDeduct" +
+ ",HBaseDays,HBaseTimes,HOverDays,HOverTimes,HLeaveDays,HLeaveTimes" +
+ ",HIsPay,HAvgFlag,HYF" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
+ "," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'" +
+ "," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() + "," + oSubSec.HCTPrjID.ToString() + "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() +
+ "," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HLeaveTimes.ToString() +
+ "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + "," + oSubSec.HYf.ToString() +
+ ") ");
}
- //
- //foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
- //{
- // Ds = oCn.RunProcReturn("exec h_p_Pay_GroupBalBill_Qty " + oSub.HICMOInterID, "");
- // if (Ds.Tables[0].Rows.Count == 0)
- // return;
- // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
- // {
- // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
- // return false;
- // }
- //}
- //
- sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板鎴愬姛锛�";
oCn.Commit();
return true;
}
@@ -209,6 +264,7 @@
throw (e);
}
}
+
//鏄剧ず鍗曟嵁
public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
{
diff --git "a/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_ICMOBillList_CusBarCodeBill.cs" "b/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_ICMOBillList_CusBarCodeBill.cs"
new file mode 100644
index 0000000..34a7d1f
--- /dev/null
+++ "b/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_ICMOBillList_CusBarCodeBill.cs"
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using SQLHelper;
+using DBUtility;
+
+namespace DAL
+{
+ public class Cls_S_IF_ICMOBillList_CusBarCodeBill : Cls_S_Xt_BaseBill
+ {
+
+ public Cls_S_IF_ICMOBillList_CusBarCodeBill()
+ {
+ base.ViewName = "h_v_Sc_ICMOBillList_Source_CusBarCodeBill";
+ base.mvarReportTitle = "鐢熶骇璁㈠崟";
+ base.mvarItemKey = "3710";
+ base.sCondtion = " ";
+ base.sOrderSql = " order by 鍗曟嵁鍙� desc,hsubid ";
+ base.sKeyCol = "閮ㄩ棬";
+ }
+
+ }
+}
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckPlanBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckPlanBill.cs"
index ea1696f..0494001 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckPlanBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckPlanBill.cs"
@@ -74,20 +74,16 @@
omodel.HInterID = lngBillKey;
foreach (Model.ClsSc_MouldDotCheckPlanBillSub oSub in DetailColl)
{
- oCn.RunProc("Insert into Sc_MouldDotCheckPlanBillSub " +
- " (HInterID,HEntryID" +
- ",HManagerID" +
- ",HDotCheckItem,HDotCheckPart,HClaim" +
- ",HCloseMan,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HDotCheckItemClassID,HDotCheckItemMethodID" +
- ") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
- "," + oSub.HManagerID.ToString() +
- ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'" +
- ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID +
- ") ");
+ oCn.RunProc("INSERT INTO Sc_MouldDotCheckPlanBillSub " +
+ " (HInterID, HEntryID, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HRelationQty, HRelationMoney, " +
+ " HCloseMan, HCloseType, HRemark, " +
+ "HManagerID, HDotCheckItem, HDotCheckPart, HClaim, " +
+ " HDotCheckItemClassID, HDotCheckItemMethodID, HDotCheckItemID) " +
+ "VALUES (" + omodel.HInterID.ToString() + ", " + oSub.HEntryID.ToString() + ", " + oSub.HSourceInterID.ToString() + ", " + oSub.HSourceEntryID.ToString() + ", " + "'" + oSub.HSourceBillNo.Replace("'", "''") + "', " + "'" + oSub.HSourceBillType.Replace("'", "''") + "', " + oSub.HRelationQty.ToString() + ", " + oSub.HRelationMoney.ToString() + ", " +
+ "'" + oSub.HCloseMan.Replace("'", "''") + "', " + Convert.ToString(oSub.HCloseType ? 1 : 0) + ", " + "'" + oSub.HRemark.Replace("'", "''") + "'," +
+ " " + oSub.HManagerID.ToString() + ", " + "'" + oSub.HDotCheckItem.Replace("'", "''") + "', " + "'" + oSub.HDotCheckPart.Replace("'", "''") + "', " + "'" + oSub.HClaim.Replace("'", "''") + "', " +
+ oSub.HDotCheckItemClassID.ToString() + ", " + oSub.HDotCheckItemMethodID.ToString() + ", " + oSub.HDotCheckItemID.ToString() +
+ ")");
}
////閰嶄欢椤圭洰
@@ -156,20 +152,16 @@
//鎻掑叆瀛愯〃 //鐐规椤圭洰
foreach (Model.ClsSc_MouldDotCheckPlanBillSub oSub in DetailColl)
{
- oCn.RunProc("Insert into Sc_MouldDotCheckPlanBillSub " +
- " (HInterID,HEntryID" +
- ",HManagerID" +
- ",HDotCheckItem,HDotCheckPart,HClaim" +
- ",HCloseMan,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HDotCheckItemClassID,HDotCheckItemMethodID" +
- ") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
- "," + oSub.HManagerID.ToString() +
- ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'" +
- ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID +
- ") ");
+ oCn.RunProc("INSERT INTO Sc_MouldDotCheckPlanBillSub " +
+ " (HInterID, HEntryID, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HRelationQty, HRelationMoney, " +
+ " HCloseMan, HCloseType, HRemark, " +
+ "HManagerID, HDotCheckItem, HDotCheckPart, HClaim, " +
+ " HDotCheckItemClassID, HDotCheckItemMethodID, HDotCheckItemID) " +
+ "VALUES (" +omodel.HInterID.ToString() + ", " +oSub.HEntryID.ToString() + ", " +oSub.HSourceInterID.ToString() + ", " +oSub.HSourceEntryID.ToString() + ", " +"'" + oSub.HSourceBillNo+ "', " +"'" + oSub.HSourceBillType + "', " +oSub.HRelationQty.ToString() + ", " +oSub.HRelationMoney.ToString() + ", " +
+ "'" + oSub.HCloseMan + "', " +Convert.ToString(oSub.HCloseType ? 1 : 0) + ", " +"'" + oSub.HRemark + "'," +
+ " " +oSub.HManagerID.ToString() + ", " +"'" + oSub.HDotCheckItem + "', " +"'" + oSub.HDotCheckPart + "', " +"'" + oSub.HClaim + "', " +
+ oSub.HDotCheckItemClassID.ToString() + ", " +oSub.HDotCheckItemMethodID.ToString() + ", " +oSub.HDotCheckItemID.ToString() +
+ ")");
}
////閰嶄欢椤圭洰
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsCj_CenterCheckBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsCj_CenterCheckBill.cs"
new file mode 100644
index 0000000..69ae4a2
--- /dev/null
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsCj_CenterCheckBill.cs"
@@ -0,0 +1,525 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsCj_CenterCheckBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsCj_CenterCheckBillMain omodel = new Model.ClsCj_CenterCheckBillMain();
+ public List<Model.ClsCj_CenterCheckBillSub> DetailColl = new List<Model.ClsCj_CenterCheckBillSub>();
+
+ public ClsCj_CenterCheckBill()
+ {
+ base.MvarItemKeySub = "Cj_CenterCheckBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "Cj_CenterCheckBillMain";
+ base.MvarReportTitle="涓鍗�";
+ base.BillType="1502";
+ base.HBillSubType = "1502";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsCj_CenterCheckBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+
+ //oCn.BeginTran();
+ ////鏇存柊涓昏〃
+ //oCn.RunProc("UpDate Xs_SeOrderBillMain set " +
+ //" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ //",HDate='" + omodel.HDate + "'" +
+ //",HYear='" + omodel.HYear.ToString() + "'" +
+ //",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ //",HRemark='" + omodel.HRemark + "'" +
+ //",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ //",HUpDateDate=getdate()" +
+ ////========================================
+ //",HSSDate='" + omodel.HSSDate.ToShortDateString() + "'" +
+ //",HAddress='" + omodel.HAddress + "'" +
+ //",HSSID=" + omodel.HSSID.ToString() +
+ //",HSellSID=" + omodel.HSellSID.ToString() +
+ //",HCusID=" + omodel.HCusID.ToString() +
+ //",HCurID=" + omodel.HCurID.ToString() +
+ //",HExRate=" + omodel.HExRate.ToString() +
+ //",HEmpID=" + omodel.HEmpID.ToString() +
+ //",HManagerID=" + omodel.HManagerID.ToString() +
+ //",HDeptID=" + omodel.HDeptID.ToString() +
+ //",HExplanation='" + omodel.HExplanation + "'" +
+ //",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ //" where HInterID=" + lngBillKey.ToString());
+
+ ////淇濆瓨鍓嶆帶鍒�=========================================
+ //string HBillNote = "";
+ //DataSet ds = oCn.RunProcReturn("Exec h_p_Xs_SeOrderBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Xs_SeOrderBill_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.BeginTran();
+ //string mainSql = "UpDate Xs_SeOrderBillMain set " +
+ //" HBillSubType='" + omodel.HBillSubType + "'" +
+ //",HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ //",HDate='" + omodel.HDate + "'" +
+ //",HYear='" + omodel.HYear.ToString() + "'" +
+ //",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ //",HRemark='" + omodel.HRemark + "'" +
+ //",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ //",HUpDateDate=getdate()" +
+ ////========================================
+ //",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ //",HAddress='" + omodel.HAddress + "'" +
+ //",HDeptID=" + omodel.HDeptID.ToString() +
+ //",HCusID=" + omodel.HCusID.ToString() +
+ //",HEmpID=" + omodel.HEmpID.ToString() +
+ //",HCurID=" + omodel.HCurID.ToString() +
+ //",HExRate=" + omodel.HExRate.ToString() +
+ //",HEarnestRate=" + omodel.HEarnestRate.ToString() +
+ //",HManagerID=" + omodel.HManagerID.ToString() +
+ //",HSellSID=" + omodel.HSellSID.ToString() +
+ //",HSSID=" + omodel.HSSID.ToString() +
+ //",HSSDate='" + omodel.HSSDate.ToShortDateString() + "'" +
+ //",HPayCusID=" + omodel.HPayCusID +
+ //",HExplanation='" + omodel.HExplanation + "'" +
+ //",HLinkMan='" + omodel.HLinkMan + "'" +
+ //",HWHID='" + omodel.HWHID + "'" +
+ //",HProjectID='" + omodel.HProjectID + "'" +
+ //",HLinkPhone='" + omodel.HLinkPhone + "'" +
+ //" where HInterID=" + lngBillKey.ToString();
+
+ //oCn.RunProc(mainSql);
+ ////鍒犻櫎鍏宠仈
+ //DeleteRelation(ref sReturn, lngBillKey);
+ ////鍒犻櫎瀛愯〃
+ //DeleteBillSub(lngBillKey);
+ ////鎻掑叆瀛愯〃
+ //omodel.HInterID = lngBillKey;
+ //foreach (Model.ClsXs_SeOrderBillSub oSub in DetailColl)
+ //{
+ // //oCn.RunProc("Insert into Xs_SeOrderBillSub " +
+ // // " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ // // ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ // // ",HMaterID,HUnitID,HQty,HPrice,HMoney,HTaxRate" +
+ // // ",HTaxMoney,HlineTotal,HlineTotalBB,HDate" +
+ // // ",HTaxPrice,HDiscountRate,HRelTaxPrice,HOutStockQty,HInvoiceQty" +
+ // // ") values("
+ // // + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ // // "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ // // "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HTaxRate.ToString() +
+ // // "," + oSub.HTaxMoney.ToString() + "," + oSub.HlineTotal.ToString() + "," + oSub.HlineTotalBB.ToString() + ",'" + oSub.HDate.ToShortDateString() + "'" +
+ // // "," + oSub.HTaxPrice.ToString() + "," + oSub.HDiscountRate.ToString() + "," + oSub.HRelTaxPrice.ToString() + "," + oSub.HOutStockQty.ToString() + "," + oSub.HInvoiceQty.ToString() +
+ // // ") ");
+
+ // string subSql = "Insert into Xs_SeOrderBillSub" +
+ // "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationQty_SellOutCheck,HRelationMoney_SellOutCheck,HRelationQty_ICMO,HRelationQty_SellBack,HRelationQty_SellBackCheck,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
+ // ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID" +
+ // ",HCusMaterNumber,HCusModel,HCusMaterName,HisStockGoods,HWHID,HRemark_TL,HRemark_SJG) " +
+ // "values(" +
+ // "" + omodel.HInterID +
+ // "," + oSub.HEntryID +
+ // "," + oSub.HSourceInterID +
+ // "," + oSub.HSourceEntryID +
+ // ",'" + (oSub.HSourceBillNo == null ? "" : oSub.HSourceBillNo) +
+ // "','" + (oSub.HSourceBillType == null ? "" : oSub.HSourceBillType) +
+ // "'," + oSub.HRelationQty +
+ // "," + oSub.HRelationQty_SellOutCheck +
+ // "," + oSub.HRelationMoney_SellOutCheck +
+ // "," + oSub.HRelationQty_ICMO +
+ // "," + oSub.HRelationQty_SellBack +
+ // "," + oSub.HRelationQty_SellBackCheck +
+ // "," + oSub.HRelationMoney +
+ // "," + oSub.HMaterID +
+ // "," + oSub.HUnitID +
+ // "," + oSub.HQty +
+ // "," + oSub.HPrice +
+ // "," + oSub.HTaxPrice +
+ // "," + oSub.HMoney +
+ // "," + oSub.HDiscountRate +
+ // "," + oSub.HRelTaxPrice +
+ // "," + oSub.HTaxRate +
+ // "," + oSub.HTaxMoney +
+ // "," + oSub.HlineTotal +
+ // "," + oSub.HlineTotalBB +
+ // ",'" + oSub.HDate +
+ // "'," + oSub.HOutStockQty +
+ // "," + oSub.HInvoiceQty +
+ // ",'" + oSub.HRemark +
+ // "','" + oSub.HOrderLevID +
+ // "','" + oSub.HCusMaterNumber +
+ // "','" + oSub.HCusModel +
+ // "','" + oSub.HCusMaterName +
+ // "'," + (oSub.HisStockGoods?1:0) +
+ // ",'" + oSub.HWhID + "'" +
+ // ",'" + oSub.HRemark_TL + "'" +
+ // ",'" + oSub.HRemark_SJG + "'" +
+ // ")";
+ // oCn.RunProc(subSql);
+ //}
+
+ ////=========================淇濆瓨鍚庢帶鍒�
+ //DataSet ds2 = oCn.RunProcReturn("h_p_Xs_SeOrderBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Xs_SeOrderBill_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;
+ //}
+ ////============================
+
+ ////
+ ////foreach (Model.ClsXs_SeOrderBillSub oSub in DetailColl)
+ ////{
+ //// Ds = oCn.RunProcReturn("exec h_p_Xs_SeOrderBill_Qty " + oSub.HICMOInterID, "");
+ //// if (Ds.Tables[0].Rows.Count == 0)
+ //// return;
+ //// if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
+ //// {
+ //// sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
+ //// 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;
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Cj_CenterCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Xs_SeOrderBill_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.BeginTran();
+
+ //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅
+ while (true)
+ {
+ ds = oCn.RunProcReturn("select * from Cj_CenterCheckBillMain where HInterID = " + omodel.HInterID, "Cj_CenterCheckBillMain");
+ 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 Cj_CenterCheckBillMain" +
+ "(HYear,HPeriod,HBillType,HBillSubType" +
+ ",HInterID,HBillNo,HDate,HRemark,HMaker,HMakeDate,HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HPRDORGID" +
+ ",HICMOInterID,HICMOBillNo,HProcExchInterID,HProcExchBillNo,HLastResult,HMaterID,HUnitID) " +
+ "values(" +
+ "" + omodel.HDate.Year + "" +
+ "," + omodel.HDate.Month + "" +
+ ",'" + this.BillType + "'" +
+ ",'" + omodel.HBillSubType + "'" +
+
+ "," + omodel.HInterID + "" +
+ ",'" + omodel.HBillNo + "'" +
+ ",'" + omodel.HDate.ToString("yyyy-MM-dd hh:mm:ss") + "'" +
+
+ ",'" + omodel.HRemark + "'" +
+ ",'" + omodel.HMaker + "'" +
+ "," + "getdate()" + "" +
+ "," + omodel.HMainSourceInterID + "" +
+ ",'" + omodel.HMainSourceBillNo + "'" +
+ ",'" + omodel.HMainSourceBillType + "'" +
+ "," + omodel.HPRDORGID + "" +
+ "," + omodel.HICMOInterID + "" +
+ ",'" + omodel.HICMOBillNo + "'" +
+ "," + omodel.HProcExchInterID + "" +
+ ",'" + omodel.HProcExchBillNo + "'" +
+ "," + (omodel.HLastResult?1:0) + "" +
+ "," + omodel.HMaterID + "" +
+ "," + omodel.HUnitID + "" +
+ ")";
+
+ oCn.RunProc(mainSql);
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsCj_CenterCheckBillSub oSub in DetailColl)
+ {
+ string subSql = "Insert into Cj_CenterCheckBillSub" +
+ "(HInterID,HEntryID,HBillNo_Bak,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HProcNo,HProcID,HUnQualifiedBar) " +
+ "values(" +
+ "" + omodel.HInterID + "" +
+ "," + oSub.HEntryID + "" +
+ ",'" + omodel.HBillNo + "'" +
+ ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + (oSub.HSourceBillNo==null?"":oSub.HSourceBillNo) + "'" +
+ ",'" + (oSub.HSourceBillType==null?"":oSub.HSourceBillType) + "'" +
+ ",'" + oSub.HProcNo + "'" +
+ "," + oSub.HProcID + "" +
+ "," + (oSub.HUnQualifiedBar?1:0) + "" +
+ ")";
+ oCn.RunProc(subSql);
+ }
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("h_p_Cj_CenterCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Cj_CenterCheckBill_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 Cj_CenterCheckBillMain Where HInterID=" + lngBillKey.ToString(), "Cj_CenterCheckBillMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+
+ omodel.HMainSourceInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceInterID"]);
+ //omodel.HMainSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceEntryIDID"]);
+ omodel.HMainSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillNo"]);
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+ //========================================================
+ omodel.HICMOInterID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
+ omodel.HICMOBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HICMOBillNo"]);
+
+ omodel.HProcExchInterID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HProcExchInterID"]);
+ omodel.HProcExchEntryID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HProcExchEntryID"]);
+ omodel.HProcExchBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProcExchBillNo"]);
+
+ omodel.HLastResult = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HLastResult"]) == 1 ? true : false;
+ omodel.HMaterID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HMaterID"]);
+ omodel.HUnitID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HUnitID"]);
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from Cj_CenterCheckBillSub Where HInterID=" + lngBillKey.ToString(), "Cj_CenterCheckBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsCj_CenterCheckBillSub oSub = new Model.ClsCj_CenterCheckBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSub.HProcNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcNo"]);
+ oSub.HProcID = DBUtility.ClsPub.isInt(DsSub.Tables[0].Rows[i]["HProcID"]);
+ oSub.HUnQualifiedBar = DBUtility.ClsPub.isInt(DsSub.Tables[0].Rows[i]["HUnQualifiedBar"])==1?true:false;
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ //鍙戣捣瀹℃壒
+ public bool startCheckFlow(Int64 lngBillKey,Int64 HCheckFlowID_select, ref string sReturn)
+ {
+ try
+ {
+ string HBillNo = ""; //鍗曟嵁鍙�
+ string HCheckFlowID = ""; //瀹℃壒娴両D
+ string HCheckItemNowID = ""; //褰撳墠瀹℃牳椤圭洰ID
+ string HCheckItemNextID = ""; //寰呭鏍搁」鐩甀D
+
+ //鍒ゆ柇鏄惁宸茬粡鍙戣捣瀹℃壒
+ string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + this.BillType + "'";
+ DataSet ds0 = oCn.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
+ if (ds0 != null && ds0.Tables[0].Rows.Count > 0)
+ {
+ sReturn = "鍗曟嵁宸插彂璧峰鎵癸紝涓嶅彲閲嶅瀹℃壒锛�";
+ return false;
+ }
+
+ //鑾峰彇鍗曟嵁鏁版嵁
+ string sql = "select * from " + this.MvarItemKey + " where HInterID = " + lngBillKey;
+ DataSet ds = oCn.RunProcReturn(sql, this.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁涓嶅瓨鍦紒";
+ return false;
+ }
+ HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
+
+ //鑾峰彇鍗曟嵁绫诲瀷瀵瑰簲鐨勯粯璁ゅ鎵规祦
+ string sql1 = "select b.HInterID,b.HCheckItemID from Xt_CheckFlowMain as a " +
+ "inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
+ "where a.HBillTypeID = '" + this.BillType + "' " +
+ "and a.HInterID = " + HCheckFlowID_select + " " +
+ "order by b.HFlowNo asc";
+ DataSet ds1 = oCn.RunProcReturn(sql1, "Xt_CheckFlowMain");
+ if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "榛樿瀹℃壒娴佷笉瀛樺湪锛�";
+ return false;
+ }
+
+ HCheckFlowID = ds1.Tables[0].Rows[0]["HInterID"].ToString();
+ HCheckItemNowID = ds1.Tables[0].Rows[0]["HCheckItemID"].ToString();
+ if (ds1.Tables[0].Rows.Count >= 2)
+ {
+ HCheckItemNextID = ds1.Tables[0].Rows[1]["HCheckItemID"].ToString();
+ }
+ else
+ {
+ HCheckItemNextID = "0";
+ }
+
+ oCn.BeginTran();
+ //澧炲姞 鍗曟嵁瀹℃壒鐘舵�佽〃 鏁版嵁
+ for (int i = 0; i < ds1.Tables[0].Rows.Count; i++)
+ {
+ string sql2 = "insert into Xt_BillCheckFlowStatus" +
+ "(HBillTypeID,HBillInterID,HBillNo,HCheckFlowID,HCheckItemID,HChecker,HCheckDate,HCheckNote) " +
+ "values(" +
+ "'" + this.BillType + "'," +
+ "" + lngBillKey + "," +
+ "'" + HBillNo + "'," +
+ "" + ds1.Tables[0].Rows[i]["HInterID"].ToString() + "," +
+ "" + ds1.Tables[0].Rows[i]["HCheckItemID"].ToString() + "," +
+ "" + "''" + "," +
+ "" + "''" + "," +
+ "" + "''" + "" +
+ ")";
+
+ oCn.RunProc(sql2);
+ }
+
+ //鏇存柊涓昏〃 瀹℃壒娴� 鏁版嵁
+ string sql3 = "update " + this.MvarItemKey + " set HCheckFlowID = " + HCheckFlowID + ",HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + " where HInterID = " + lngBillKey;
+ oCn.RunProc(sql3);
+
+
+ oCn.Commit();
+
+ return true;
+ }
+ catch(Exception e)
+ {
+ sReturn += e.Message;
+ return false;
+ }
+ }
+ }
+
+}
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsQc_PreventErrMouldCheckBillMain.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsQc_PreventErrMouldCheckBillMain.cs"
index 71f34fa..fde391f 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsQc_PreventErrMouldCheckBillMain.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsQc_PreventErrMouldCheckBillMain.cs"
@@ -120,7 +120,7 @@
//涓昏〃
string mainSql = "insert into Qc_PreventErrMouldCheckBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
- ",HMaterID,HCheckEmpID,HNote,HLastResult) " +
+ ",HMaterID,HCheckEmpID,HNote,HLastResult,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo) " +
"values(" +
"" + (omodel.HYear.ToString() != "0" ? omodel.HYear.ToString() : DateTime.Now.Year.ToString()) +
"," + omodel.HPeriod.ToString() +
@@ -136,6 +136,9 @@
"','" + omodel.HCheckEmpID +
"','" + omodel.HNote +
"','" + omodel.HLastResult +
+ "','" + omodel.HMainSourceInterID +
+ "','" + omodel.HMainSourceEntryID +
+ "','" + omodel.HMainSourceBillNo +
"')";
oCn.RunProc(mainSql);
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 9008804..d8797f5 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3653,6 +3653,12 @@
oGy_CusBarCodeBill_KaiBei.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
oGy_CusBarCodeBill_KaiBei.ShowDialog();
break;
+ case "gy_cusbarcodebill_kaibei_langchao":
+ //
+ Gy_CusBarCodeBill_KaiBei_LangChao oGy_CusBarCodeBill_KaiBei_LangChao = new Gy_CusBarCodeBill_KaiBei_LangChao();
+ oGy_CusBarCodeBill_KaiBei_LangChao.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oGy_CusBarCodeBill_KaiBei_LangChao.ShowDialog();
+ break;
case "sc_icmotobarcode":
//
Sc_ICMOToBarCode oSc_ICMOToBarCode = new Sc_ICMOToBarCode();
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 6105323..25b9b39 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -709,6 +709,8 @@
<Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_WorkBeginDotCheckBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsCj_CenterCheckBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsCj_CenterCheckBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\Sc_AssemblyBill_BindSourceTemp.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBillSub.cs" />
diff --git "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBillSub.cs" "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBillSub.cs"
index fa8beea..9c8e54e 100644
--- "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBillSub.cs"
+++ "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBillSub.cs"
@@ -16,6 +16,7 @@
public double HPrice;// decimal(18,8) --工价
public double HMoney;// decimal(18,8) --金额
public Int64 HICMOInterID;// int --生产任务单ID
+ public Int64 HICMOEntryID;// int --生产任务单子ID
public string HICMOBillNo;// varchar(50) --生产任务单号
public Int64 HProcReportInterID;// int --工序汇报单ID
public Int64 HProcReportEntryID;// int --工序汇报单子ID
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsCj_CenterCheckBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsCj_CenterCheckBillMain.cs"
new file mode 100644
index 0000000..2845be7
--- /dev/null
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsCj_CenterCheckBillMain.cs"
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsCj_CenterCheckBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public int HPRDORGID;
+
+ public int HICMOInterID;
+ public int HICMOEntryID;
+ public string HICMOBillNo;
+ public double HICMOQty;
+
+ public int HProcExchInterID;
+ public int HProcExchEntryID;
+ public string HProcExchBillNo;
+ public double HProcExchQty;
+
+ public bool HLastResult;
+ public int HMaterID;
+ public int HUnitID;
+ }
+}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsCj_CenterCheckBillSub.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsCj_CenterCheckBillSub.cs"
new file mode 100644
index 0000000..ec6cd09
--- /dev/null
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsCj_CenterCheckBillSub.cs"
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsCj_CenterCheckBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public string HProcNo;
+ public int HProcID;
+ public bool HUnQualifiedBar;
+ }
+}
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index a9fea06..e040760 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -561,6 +561,7 @@
public string Sc_MESBeginWorkBill_SaveAutoAddnew; //保存后变为新增状态
public string Sc_MESBeginWorkBill_DeleterAndMakerMustSame; //删除人必须是制单人
public string Sc_MESBeginWorkBill_SwipeCardStart; //开工单需要刷卡验证
+ public string Sc_MESBeginWorkBill_MouldUpper; //开工单必须上模才能开工
//返工单
public string Sc_MESReturnWorkBill_AutoCheck; //保存后是否自动审核
public string Sc_MESReturnWorkBill_SaveAutoAddnew; //保存后变为新增状态
@@ -659,6 +660,9 @@
//收款单
public string YS_ReceiveBill_AutoCheck; //保存后是否自动审核
+ //下模单
+ public string Sc_MouldLowerBill_MouldUpper; //必须做上模单才能生成下模单
+
}
}
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index 00e3f17..55b6c53 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index 0652338..ceb9ba6 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 44894ab..073b9d4 100644
--- a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
index f5e894a..fea44e6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
index f5bbd48..48caaab 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8219c9ee18d6afe5441d3bfa12a5ce870beb22f6
+f95e56b5f9755e3380309c272e92c6c4a10dd4c5
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 5025e5a..e67c5c8 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -3,13 +3,10 @@
D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-<<<<<<< HEAD
-=======
D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
->>>>>>> aa4f194b945670509478a60ed7f2d5a2858b8d93
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index 00e3f17..55b6c53 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index 0652338..ceb9ba6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index ce9ff3a..329be51 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -711,6 +711,12 @@
<Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_New.designer.cs">
<DependentUpon>Gy_BarCodeBill_New.cs</DependentUpon>
</Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LangChao.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LangChao.designer.cs">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_LangChao.cs</DependentUpon>
+ </Compile>
<Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei.cs">
<SubType>Form</SubType>
</Compile>
@@ -1182,6 +1188,10 @@
<DependentUpon>Gy_BarCodeBill_New.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LangChao.resx">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_LangChao.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei.resx">
<DependentUpon>Gy_CusBarCodeBill_KaiBei.cs</DependentUpon>
<SubType>Designer</SubType>
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs"
index fb259d0..36353ba 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs"
@@ -615,9 +615,18 @@
DateTime HEndDate; //璁″垝瀹屽伐鏃ユ湡
oCn.BeginTran();
+ Application.DoEvents();
+ //鑾峰彇鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
for (int j = 0; j < grdMain.Rows.Count; j++)
{
- Application.DoEvents();
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ HSumBQty = HSumBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ pb1.Maximum = HSumBQty;
+ }
+ }
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
{
sMaterID = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterIDCol].Value);
@@ -677,12 +686,10 @@
HBQty = ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
- HSumBQty = HSumBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
- pb1.Maximum = HSumBQty;
+ int nn = 0; //鏈娴佹按鍙风疮璁′娇鐢ㄤ釜鏁�
for (int i = 0; i < HBQty; i++)
{
- pb1.Value = n+1;
if (HSumQty - HMinQty > 0)
{
HEndQty = "";
@@ -808,9 +815,12 @@
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HSeOrderBillNo + "'," + HSeOrderSEQ.ToString() + ",'" + HInnerBillNo + "','" + HWorkLineName + "'"
+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HEndDate.ToShortDateString() + "','" + ClsPub.CurUserName + "',getdate()" +
")");
+ pb1.Value = n + 1;
n = n + 1;
- Application.DoEvents();
+ nn = nn + 1;
}
+ //鍥炲～娴佹按鍙蜂俊鎭�
+ oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
}
}
oCn.Commit();
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
index bc5cde2..0f192e4 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
@@ -78,7 +78,8 @@
public Int64 HOrgID = ClsPub.HOrgID;
public string HCusModel = "Z"; //鍘傚晢浠ｇ爜
public string sDate = ""; //鏃ユ湡
- public string sYear = ""; //骞�
+ public string sYear = ""; //骞达紙2浣嶏級
+ public string sYear4 = ""; //骞达紙4浣嶏級
public string sPeriod = ""; //鏈�
public string sDay = ""; //鏃�
@@ -450,6 +451,7 @@
//鏃ユ湡鑾峰彇鏂瑰紡
sDate = dtpHDate.Value.ToShortDateString();
sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ sYear4 = ClsPub.isDate(sDate).Year.ToString();
sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
@@ -650,11 +652,14 @@
double HSumQty = 0; //浜у搧鏁伴噺
double HMinQty = 0; //鏈�灏忓寘瑁呮暟
int HBQty = 0; //绠辨暟
- int LSH = 0; //娴佹按鍙�
+ int LSH = 0; //鍐呯娴佹按鍙�
+ int LWSH = 0; //澶栫娴佹按鍙�
string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
string HCode1 = ""; //鐗╂枡绫诲埆
string HCode2 = ""; //鎵规浣�
string HCode3 = ""; //鐗堟湰鍙�
+ string sTMNumber = ""; //澶栫鏉＄爜鍓嶇紑
+ DataSet Ds;
Int64 HEntryID = 0;
string HBarCode = ""; //鏉″舰鐮�
@@ -699,11 +704,19 @@
{
//鑾峰彇鏈�澶ф祦姘村彿
LSH = 0;
- DataSet Ds = oCn.RunProcReturn("select top 1 HSno from Gy_BarCodeBill_Cus where HBatchNo='" + HBatchNo + "' order by HSno desc", "Gy_BarCodeBill_Cus");
+ Ds = oCn.RunProcReturn("select top 1 HSno from Gy_BarCodeBill_Cus where HBatchNo='" + HBatchNo + "' order by HSno desc", "Gy_BarCodeBill_Cus");
if (Ds != null && Ds.Tables[0].Rows.Count != 0)
{
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
}
+ }
+ //澶栫鐮� 渚涘簲鍟嗕唬鐮侊紙娴疆瀹氫箟鐨勪緵搴斿晢浠ｇ爜锛�+8浣嶆棩鏈燂紙渚嬪20230905锛�+5浣嶆祦姘寸爜锛堢函鏁板瓧锛�
+ else
+ {
+ //鏉＄爜鍓嶇紑 = 渚涘簲鍟嗕唬鐮� + 骞� + 鏈� + 鏃�
+ sTMNumber = HCusModel + sYear + sPeriod + sDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LWSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
}
HBQty = ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
@@ -714,7 +727,7 @@
for (int i = 0; i < HBQty; i++)
{
- pb1.Value = n+1;
+ pb1.Value = n+1;
if (HSumQty - HMinQty > 0)
{
HSumQty = HSumQty - HMinQty;
@@ -724,21 +737,27 @@
HMinQty = HSumQty;
}
//
- LSH = LSH + 1;
- LSH2 = ConvertToBase(LSH, 36);
- while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� LSHlen 鍓嶉潰琛�0
- {
- LSH2 = "0" + LSH2;
- }
if (cmbHBarCodeType.Text == "鍐呯鐮�")
{
+ LSH = LSH + 1;
+ LSH2 = ConvertToBase(LSH, 36);
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� LSHlen 鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
//鏉＄爜缂栧彿 = 鎵规 + 娴佹按鍙� + 鐗堟湰鍙�
TM = HBatchNo + LSH2 + HCode3;
}
+ //澶栫鐮�
else
{
- TM = HBatchNo;
- LSH = 0;
+ LWSH = LWSH + 1;
+ LSH2 = LWSH.ToString();
+ while (LSH2.Length < 5) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� 5 鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ TM = sTMNumber + LSH2;
}
HEntryID = j + 1;
@@ -1332,6 +1351,7 @@
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();
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
new file mode 100644
index 0000000..99f13fa
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
@@ -0,0 +1,1906 @@
+锘縰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;
+
+namespace WarM
+{
+ public partial class Gy_CusBarCodeBill_KaiBei_LangChao : Form
+ {
+ public Gy_CusBarCodeBill_KaiBei_LangChao()
+ {
+ 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 HInnerBillNoCol = 23;
+ public const Int16 HQtyCol = 24;
+ public const Int16 HMinQtyCol = 25;
+ public const Int16 HBQtyCol = 26;
+ public const Int16 HWMinQtyCol = 27;
+ public const Int16 HWBQtyCol = 28;
+ public const Int16 HProduceDateCol = 29;
+ public const Int16 HExpiryDateCol = 30;
+ public const Int16 HCusIDCol = 31;
+ public const Int16 HCusNumberCol = 32;
+ public const Int16 HCusNameCol = 33;
+ public const Int16 HSourceInterIDCol = 34;
+ public const Int16 HSourceEntryIDCol = 35;
+ public const Int16 HSourceBillNoCol = 36;
+ public const Int16 HSourceBillTypeCol = 37;
+ public const Int16 HRemarkCol = 38;
+ public const Int16 HInitQtyCol = 39;
+ public const Int16 HMTONoCol = 40;
+ public const Int16 HISKFPERIODCol = 41;
+ public const Int16 HEXPUNITCol = 42;
+ public const Int16 HEXPPERIODCol = 43;
+ public const Int16 HLSHCol = 44;
+ public const Int16 HBaNoCol = 45;
+ //
+ public string ModName = "85";
+ public string ModCaption = "娴疆瀹㈡埛鏍囩鐢熸垚";
+ public const string ModRightName = "Gy_CusBarCodeBill_KaiBei_LangChao";
+
+ 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 string HCusModel = "Z"; //鍘傚晢浠ｇ爜
+ public string sDate = ""; //鏃ユ湡
+ public string sYear = ""; //骞达紙2浣嶏級
+ public string sYear4 = ""; //骞达紙4浣嶏級
+ public string sPeriod = ""; //鏈�
+ public string sDay = ""; //鏃�
+
+
+ #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;
+ }
+
+ //淇濆瓨鍒楀
+ 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");
+ }
+
+ //榛樿鍒楀
+ 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");
+ }
+
+ //鍒犺鎸夌航
+ 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_LangChao_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_LangChao_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 " + HOrgID.ToString(), "h_p_Gy_CusBarCodeBill_Cus");
+ 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_LangChao_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_LangChao_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);
+ sYear4 = ClsPub.isDate(sDate).Year.ToString();
+ sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ //==================================
+ switch (sYear)
+ {
+ case "22":
+ sYear = "N";
+ break;
+ case "23":
+ sYear = "P";
+ break;
+ case "24":
+ sYear = "Q";
+ break;
+ case "25":
+ sYear = "R";
+ break;
+ case "26":
+ sYear = "S";
+ break;
+ case "27":
+ sYear = "T";
+ break;
+ case "28":
+ sYear = "U";
+ break;
+ case "29":
+ sYear = "V";
+ break;
+ case "30":
+ sYear = "W";
+ break;
+ case "31":
+ sYear = "X";
+ break;
+ case "32":
+ sYear = "Y";
+ break;
+ case "33":
+ sYear = "Z";
+ break;
+ default:
+ sYear = "";
+ break;
+ }
+ if (sYear == "")
+ {
+ MessageBox.Show("閿欒鐨勫勾浠斤紒");
+ return false;
+ }
+
+ 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;
+ }
+
+ 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); // 澶栫鏈�灏忓寘瑁呮暟
+ string HCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value); // 瀹㈡埛鏂欏彿
+ string HCode1 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value); // 鐗╂枡绫诲埆
+ string HCode2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value); // 鎵规浣�
+ HCode2 = HCode2.ToUpper();
+ string HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value); // 鐗堟湰鍙�
+ string HBatchNoNumber = HCode1 + sYear + sPeriod + sDay + HCusModel; // 鎵规鐢熸垚鍓嶇紑
+ HBatchNoNumber = HBatchNoNumber.ToUpper();
+ string HBarCodeType = ""; // 鏉＄爜绫诲瀷
+ string HInnerBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value); // 瀹㈡埛璁㈠崟鍙�
+
+ if (HMaterID != 0)
+ {
+ DataSet oDsCheck = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_KaiBeiLC_AddCheck " + HSno.ToString() + ",'" + HSourceBillNo + "'," + HMaterID.ToString() + "," + HSourceQty.ToString() + "," + HQty.ToString() + "," + HMinQty.ToString() + "," + HWMinQty.ToString() + ",'" + HCusModelName + "','" + HCode1 + "','" + HCode2 + "','" + HCode3 + "','" + HBatchNoNumber + "','" + HBarCodeType + "','" + HInnerBillNo + "'", "h_p_Gy_CusBarCodeBill_KaiBeiLC_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
+ {
+ //grdMain.Rows[j].Cells[HBaNoCol].Value = HCode2;
+ //grdMain.Rows[j].Cells[HBatchNoCol].Value = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HBatchNo"]);
+ //grdMain.Rows[j].Cells[HCode2Col].Value = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HCode2"]);
+
+ 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; //娴佹按鍙烽暱搴�
+ double HSumQty = 0; //浜у搧鏁伴噺
+ double HMinQty = 0; //鍐呯鏈�灏忓寘瑁呮暟
+ int HBQty = 0; //鍐呯鏁�
+ double HWMinQty = 0; //澶栫鏈�灏忓寘瑁呮暟
+ int HWBQty = 0; //澶栫鏁�
+ int LSH = 0; //鍐呯娴佹按鍙�
+ int LWSH = 0; //澶栫娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ string HCode1 = ""; //鐗╂枡绫诲埆
+ string HCode2 = ""; //鎵规浣�
+ string HCode3 = ""; //鐗堟湰鍙�
+ string sTMNumber = ""; //澶栫鏉＄爜鍓嶇紑
+ DataSet Ds;
+
+ Int64 HEntryID = 0;
+ string HBarCode = ""; //鏉″舰鐮�
+ string HBarCodeType = ""; //鏉＄爜绫诲瀷
+ Int64 HMaterID = 0; //鐗╂枡ID
+ Int64 HUnitID = 0; //璁￠噺鍗曚綅ID
+ Int64 HAuxPropID = 0; //杈呭姪灞炴�D
+ string HBatchNo = ""; //鎵规
+ double HQty = 0; //鏁伴噺
+ Int64 HCusID = 0; //瀹㈡埛ID
+ string HCusModelName = ""; //瀹㈡埛鏂欏彿
+ 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 = ""; //瀹㈡埛璁㈠崟鍙�
+ Int64 HSno = 0; //鎵规搴忓垪鍙�
+ string HBoxNo = ""; //鎵规鐢熸垚鍓嶇紑
+ string sHBaNo = ""; //鐣岄潰涓婅緭鍏ョ殑鎵规浣�
+ int HSumBQty = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
+ int n = 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);
+ pb1.Maximum = HSumBQty;
+ }
+ }
+ //鐢熸垚鍐呯鏉＄爜
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ string sHSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value); // 婧愬崟鍗曞彿
+ long sHMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
+ string sHMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumberCol].Value); // 鐗╂枡浠ｇ爜
+ string sHCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value); // 瀹㈡埛鏂欏彿
+ string sHCode1 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value); // 鐗╂枡绫诲埆
+ string sHCode2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value); // 鎵规浣�
+ sHCode2 = sHCode2.ToUpper();
+ string HBatchNoNumber = sHCode1 + sYear + sPeriod + sDay + HCusModel; // 鎵规鐢熸垚鍓嶇紑
+ HBatchNoNumber = HBatchNoNumber.ToUpper();
+
+ DataSet oDsBatchNo = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_KaiBeiLC_GetBatchNo '" + sHSourceBillNo + "'," + sHMaterID.ToString() + ",'" + sHMaterNumber + "','" + sHCusModelName + "','" + sHCode2 + "','" + HBatchNoNumber + "'", "h_p_Gy_CusBarCodeBill_KaiBeiLC_GetBatchNo");
+ //
+ if (oDsBatchNo == null && oDsBatchNo.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鑾峰彇鎵规澶辫触锛�");
+ bc.Enabled = true;
+ oCn.RollBack();
+ return;
+ }
+ else if (DBUtility.ClsPub.isStrNull(oDsBatchNo.Tables[0].Rows[0][0]) == "1")
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(oDsBatchNo.Tables[0].Rows[0]["HRemark"]));
+ bc.Enabled = true;
+ oCn.RollBack();
+ return;
+ }
+ else
+ {
+ grdMain.Rows[j].Cells[HBaNoCol].Value = sHCode2;
+ grdMain.Rows[j].Cells[HBatchNoCol].Value = DBUtility.ClsPub.isStrNull(oDsBatchNo.Tables[0].Rows[0]["HBatchNo"]);
+ grdMain.Rows[j].Cells[HCode2Col].Value = DBUtility.ClsPub.isStrNull(oDsBatchNo.Tables[0].Rows[0]["HCode2"]);
+ }
+
+ HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value);
+ //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = 0;
+ Ds = oCn.RunProcReturn("select top 1 HSno from Gy_BarCodeBill_Cus where HBatchNo='" + HBatchNo + "' order by HSno desc", "Gy_BarCodeBill_Cus");
+ if (Ds != null && Ds.Tables[0].Rows.Count != 0)
+ {
+ LSH = ClsPub.isInt(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);
+
+ for (int i = 0; i < HBQty; i++)
+ {
+ if (HSumQty - HMinQty > 0)
+ {
+ HSumQty = HSumQty - HMinQty;
+ }
+ else
+ {
+ HMinQty = HSumQty;
+ }
+ //
+ LSH = LSH + 1;
+ LSH2 = ConvertToBase(LSH, 36);
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� LSHlen 鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ //鏉＄爜缂栧彿 = 鎵规 + 娴佹按鍙� + 鐗堟湰鍙�
+ TM = HBatchNo + LSH2 + HCode3;
+
+ HEntryID = j + 1;
+ HBarCode = TM.ToUpper();
+ HBarCodeType = "鍐呯鐮�";
+ HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].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);
+ 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);
+ HCode1 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value).ToUpper();
+ HCode2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value).ToUpper();
+ HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
+ HSno = LSH;
+ HBoxNo = HCode1 + sYear + sPeriod + sDay + HCusModel;
+ HBoxNo = HBoxNo.ToUpper();
+ sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value); // 鐣岄潰涓婅緭鍏ョ殑鎵规浣�
+
+ //瀹㈡埛鏂欏彿HCusModelName銆佺墿鏂欑被鍒獺Code1銆佹壒娆′綅HCode2銆佺増鏈彿HCode3銆佹壒娆″簭鍒楀彿HSno銆佹壒娆＄敓鎴愬墠缂�HBoxNo銆佸巶鍟嗕唬鐮丠CusModel
+ //鐣岄潰涓婅緭鍏ョ殑鎵规浣岺SupName銆�36杩涘埗鎵规搴忓垪鍙稨SupNumber銆佸鎴疯鍗曞彿HInnerBillNo
+ 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,HWorkLineName,HMTONo" +
+ ",HKFPeriod,HKFDate,HKFDQDate,HInnerBillNo" +
+ ",HStatus,HDeleteMan,HSupNumber,HSupName,HCode1" +
+ ",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 + "'"
+ + ",'','','" + LSH2 + "','" + sHBaNo + "','" + HCode1 + "'"
+ + ",'" + HCode2 + "','" + HCode3 + "',''," + HSno.ToString() + ",'" + HBoxNo + "')");
+ pb1.Value = n + 1;
+ n = n + 1;
+ }
+ }
+ }
+
+ //鐢熸垚澶栫鏉＄爜
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value);
+ //鑾峰彇鏈�澶ф祦姘村彿
+ //鏉＄爜鍓嶇紑 = 渚涘簲鍟嗕唬鐮� + 骞� + 鏈� + 鏃�
+ sTMNumber = HCusModel + sYear4 + sPeriod + sDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LWSH = ClsPub.isInt(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);
+
+ int nn = 0; //鏈娴佹按鍙风疮璁′娇鐢ㄤ釜鏁�
+ for (int i = 0; i < HWBQty; i++)
+ {
+ if (HSumQty - HWMinQty > 0)
+ {
+ HSumQty = HSumQty - HWMinQty;
+ }
+ else
+ {
+ HWMinQty = HSumQty;
+ }
+ //
+ LWSH = LWSH + 1;
+ LSH2 = LWSH.ToString();
+ while (LSH2.Length < 5) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� 5 鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ TM = sTMNumber + LSH2;
+
+ HEntryID = j + 1;
+ HBarCode = TM.ToUpper();
+ HBarCodeType = "澶栫鐮�";
+ HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].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);
+ 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);
+ HCode1 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value).ToUpper();
+ HCode2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value).ToUpper();
+ HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
+ HSno = 0;
+ HBoxNo = HCode1 + sYear + sPeriod + sDay + HCusModel;
+ HBoxNo = HBoxNo.ToUpper();
+ sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value); // 鐣岄潰涓婅緭鍏ョ殑鎵规浣�
+
+ //瀹㈡埛鏂欏彿HCusModelName銆佺墿鏂欑被鍒獺Code1銆佹壒娆′綅HCode2銆佺増鏈彿HCode3銆佹壒娆″簭鍒楀彿HSno銆佹壒娆＄敓鎴愬墠缂�HBoxNo銆佸巶鍟嗕唬鐮丠CusModel
+ //鐣岄潰涓婅緭鍏ョ殑鎵规浣岺SupName銆�36杩涘埗鎵规搴忓垪鍙稨SupNumber銆佸鎴疯鍗曞彿HInnerBillNo
+ 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,HWorkLineName,HMTONo" +
+ ",HKFPeriod,HKFDate,HKFDQDate,HInnerBillNo" +
+ ",HStatus,HDeleteMan,HSupNumber,HSupName,HCode1" +
+ ",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 + "'"
+ + ",'','','" + LSH2 + "','" + sHBaNo + "','" + HCode1 + "'"
+ + ",'" + 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() + " ");
+ }
+ }
+ 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 鏉＄爜绫诲瀷='鍐呯鐮�' 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;
+
+ //鍐荤粨
+ 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);
+ //鐢荤嚎
+ 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");
+ 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);
+ }
+
+ #endregion
+
+ #region 灏嗗崄杩涘埗鏁板�艰浆鎴愭寚瀹氳繘鍒舵暟鍊硷紙num涓鸿杞崲鐨勫崄杩涜鏁板�硷紝nbase涓烘寚瀹氳繘鍒讹級
+ public string ConvertToBase(int num, int nbase)
+ {
+ string chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ 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 = 46; //鎬诲垪鏁�
+ 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[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[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[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;
+
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HQtyCol.ToString()+
+ "," + HMinQtyCol.ToString() +
+ "," + HWMinQtyCol.ToString() +
+ //"," + HMaterNumberCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
+ "," + HUnitNumberCol.ToString() +
+ //"," + HCode1Col.ToString() +
+ //"," + HCode2Col.ToString() +
+ //"," + HCode3Col.ToString() +
+ "," + HInnerBillNoCol.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");
+ }
+
+ //鍏紡閲嶇畻
+ 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.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.Ceiling(sWMoney);
+ grdMain.Rows[sRow].Cells[HWBQtyCol].Value = sWMoney;
+ }
+ 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 == 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();
+ //--
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HQtyCol.ToString() +
+ "," + HMinQtyCol.ToString() +
+ "," + HWMinQtyCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
+ //"," + HCode1Col.ToString() +
+ //"," + HCode2Col.ToString() +
+ //"," + HCode3Col.ToString() +
+ "," + HInnerBillNoCol.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='鍐呯鐮�' 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='澶栫鐮�' 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
+
+ #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)
+ {
+ grdMain.Rows[j].Cells[HCusModelNameCol].Value = "";
+ }
+ else
+ {
+ grdMain.Rows[j].Cells[HCusModelNameCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCusRelationNumber"]);
+ 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_LangChao.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.designer.cs"
new file mode 100644
index 0000000..5ff13ef
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.designer.cs"
@@ -0,0 +1,996 @@
+锘縩amespace WarM
+{
+ partial class Gy_CusBarCodeBill_KaiBei_LangChao
+ {
+ /// <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_LangChao));
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ 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.dy = new System.Windows.Forms.ToolStripButton();
+ this.yl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ 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.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.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";
+ //
+ // 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.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;
+ //
+ // 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);
+ //
+ // Gy_CusBarCodeBill_KaiBei_LangChao
+ //
+ 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_LangChao";
+ this.Text = "鍗曟嵁缂栬緫";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_CusBarCodeBill_KaiBei_LangChao_FormClosing);
+ this.Load += new System.EventHandler(this.Gy_CusBarCodeBill_KaiBei_LangChao_Load);
+ this.Paint += new System.Windows.Forms.PaintEventHandler(this.Gy_CusBarCodeBill_KaiBei_LangChao_Paint);
+ this.Resize += new System.EventHandler(this.Gy_CusBarCodeBill_KaiBei_LangChao_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.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;
+ }
+}
\ 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_LangChao.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.resx"
new file mode 100644
index 0000000..90de01e
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.resx"
@@ -0,0 +1,516 @@
+<?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="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 0238a3d..6a8549e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -4529,7 +4529,7 @@
}
string sql1 = "select * from h_v_Gy_CusType where 1 = 1";
- string sql = sql1 + sWhere + " order by 瀹㈡埛鍒嗙被浠ｇ爜 ";
+ string sql = sql1 + sWhere + " order by HNumber ";
ds = oCN.RunProcReturn(sql, "h_v_Gy_CusType");
//娣诲姞鍒楀悕
diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 61379b9..cd5c648 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -281,7 +281,7 @@
}
string HNumber = ds.Tables[0].Rows[0]["瀹㈡埛浠ｇ爜"].ToString();
// 浣跨敤姝ｅ垯琛ㄨ揪寮忔壘鍒版暟瀛楅儴鍒� (?<=\D)鏄竴涓浂瀹芥柇瑷�锛岃〃绀哄墠闈㈢殑瀛楃涓嶆槸鏁板瓧 (\d+)$琛ㄧず鍚庨潰璺熺潃涓�杩炰覆瀛楃涓茬煡閬撴湯灏�
- Match match = Regex.Match(HNumber, @"(?<=\D)(\d+)$");
+ Match match = Regex.Match(HNumber, @"(\d+)$");
if (match.Success)
{
string prefix = HNumber.Substring(0, HNumber.Length - match.Length); // 鎻愬彇鍓嶇紑
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 5d82ab6..c4222fd 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -79,7 +79,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 缁勭粐鍚嶇О='" + Organization + "'");
+ string sql1 = string.Format(@"select top(500) * from h_v_Gy_MaterialList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn(sql1 + sWhere + " order by 鐗╂枡浠ｇ爜 desc", "h_v_Gy_MaterialList");
@@ -115,6 +115,58 @@
}
}
+ #region 鐗╂枡鍒嗛〉鍒楄〃
+ [Route("Gy_Material/page")]
+ [HttpGet]
+ public object page(string sWhere, string user, string Organization,int page,int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_MaterialList " + page + "," + size + ",'" + Organization +"'," + "''", "h_p_Gy_MaterialList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_MaterialList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_Gy_MaterialList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ 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("Gy_Material/getMaxNum")]
[HttpGet]
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 83e42dc..1e0a616 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -88,6 +88,7 @@
public string Alignment;
public string ColumnWidth;
public string ColumnName_Other;
+ public bool IsTotalRow;
}
[Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMES")]
@@ -140,7 +141,7 @@
var ColumnName_Other = (omdelsub[i].ColumnName_Other == null || omdelsub[i].ColumnName_Other.Trim() == "") ? omdelsub[i].ColumnName : omdelsub[i].ColumnName_Other;
- HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName},";
+ HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName}|{(omdelsub[i].IsTotalRow == true ? 1 : 0)},";
}
HGridString = HGridString.Substring(0, HGridString.Length - 1);
@@ -224,7 +225,7 @@
if (string.IsNullOrEmpty(width) || DBUtility.ClsPub.isLong(width) == 0)
width = "120";
var ColumnName_Other = (omdelsub[i].ColumnName_Other == null || omdelsub[i].ColumnName_Other.Trim() == "") ? omdelsub[i].ColumnName : omdelsub[i].ColumnName_Other;
- HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName},";
+ HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName}|{(omdelsub[i].IsTotalRow == true ? 1 : 0)},";
}
HGridString = HGridString.Substring(0, HGridString.Length - 1);
@@ -308,8 +309,20 @@
{
try
{
- ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "'", "Xt_ModuleButtonSet");
+ ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "' order by HOrder", "Xt_ModuleButtonSet");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + "admin" + "' order by HOrder", "Xt_ModuleButtonSet");
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
objJsonResult.code = "1";
objJsonResult.count = ds.Tables[0].Rows.Count;
objJsonResult.Message = "Sucess锛�";
@@ -333,6 +346,7 @@
public string BtnID;
public string BtnName;
public bool IsHide;
+ public string HOtherName;
}
public class noEditList
{
@@ -343,6 +357,7 @@
public int HOrder;
public bool HHideFlag;
public bool HEditFlag;
+ public string HOtherName;
}
[Route("Xt_ModuleButtonSet_WMES/AddModuleButtonSetWMES")]
@@ -404,6 +419,7 @@
string HButtonID = HButtonIDLists[j].ToString();
string HButtonName = HButtonNameLists[j].ToString();
int HOrder = HOrderLists[j];
+ string HOtherName = button[i].HOtherName;
if (button[i].IsHide)
{
HHideFlag = 1;
@@ -413,7 +429,7 @@
HEditFlag = 0;
HHideFlag = 0;
}
- string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
+ string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
oCN.RunProc(sql);
}
}
@@ -431,7 +447,8 @@
string HButtonID = noEditLists[i].HButtonID;
string HButtonName = noEditLists[i].HButtonName;
int HOrder = HOrderLists[j];
- string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
+ string HOtherName = noEditLists[i].HOtherName;
+ string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
oCN.RunProc(sql);
}
}
@@ -693,5 +710,45 @@
}
}
#endregion
+
+
+
+ #region 鍩虹璧勬枡 鑾峰彇鏁版嵁
+ [Route("Gy_GetBaseData/Gy_GetBaseData")]
+ [HttpGet]
+ public object Gy_GetBaseData(string sql,string tableView, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+
+ ds = oCN.RunProcReturn(sql, tableView);
+
+ //娣诲姞鍒楀悕
+ 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
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index 10e249c..6a95f89 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -9,6 +9,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
@@ -2497,5 +2498,167 @@
}
}
#endregion
+
+ #region 鏀舵枡閫氱煡鍗曚笅鎺ㄦ煡璇㈠垪琛�
+ [Route("Cg_POInStockBill/PushList")]
+ [HttpGet]
+ public object PushList(string HBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_IF_POInStockBillList where 鍗曟嵁鍙� = '" + HBillNo + "' and 鐘舵�� = '宸插鏍�' and 鏁伴噺 - 鍏宠仈鏁伴噺 > 0";
+
+
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POInStockBillList");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎵句笉鍒扮鍚堟潯浠跺崟鎹�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏀舵枡閫氱煡鍗曟煡璇㈠垪琛�
+ [Route("Cg_POInStockBill/QueryList")]
+ [HttpGet]
+ public object QueryList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Cg_POInStockBillQuery where 1 = 1 ";
+
+ if (sWhere == "" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Cg_POInStockBillQuery order by hmainid desc", "h_v_Cg_POInStockBillQuery");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Cg_POInStockBillQuery");
+ }
+
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏀舵枡閫氱煡鍗曟煡璇㈠瓙鍒楄〃
+ [Route("Cg_POInStockBill/QuerySubList")]
+ [HttpGet]
+ public object QuerySubList(string hmainid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Cg_POInStockBillQuerySub where hmainid = " + hmainid;
+
+ ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Cg_POInStockBillQuerySub");
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 4eeca6c..bf7c8cd 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -3080,6 +3080,64 @@
}
}
#endregion
+
+ #region 閲囪喘璁㈠崟涓嬫帹鏌ヨ鍒楄〃
+ [Route("Cg_POOrderBill/PushList")]
+ [HttpGet]
+ public object PushList(string HBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_IF_POOrderBillList where 鍗曟嵁鍙� = '" + HBillNo + "' and 鐘舵�� = '宸插鏍�' and 鏈叧鑱旀暟閲� > 0";
+
+
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎵句笉鍒扮鍚堟潯浠跺崟鎹�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
index cca61bc..319c480 100644
--- a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -8,6 +8,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
@@ -1116,7 +1117,7 @@
[HttpGet]
public object AuditCg_PayableBill_Flow(int HInterID, int IsAudit, string CurUserName, string CurUserID)
{
- //string ModRightNameCheck = "Cg_POOrderBill_Check";
+ //string ModRightNameCheck = "Cg_PayableBill_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
@@ -1221,8 +1222,8 @@
{
#region 瀹℃牳鍓嶇殑鐩稿叧鍒ゆ柇
//瀹℃牳鍓嶆帶鍒�=========================================
- //string sql1 = "exec h_p_Cg_POOrderBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
- //ds = oCN.RunProcReturn(sql1, "h_p_Cg_POOrderBill_BeforeCheckCtrl");
+ //string sql1 = "exec h_p_Cg_PayableBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ //ds = oCN.RunProcReturn(sql1, "h_p_Cg_PayableBill_BeforeCheckCtrl");
//if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
//{
// objJsonResult.code = "0";
@@ -1327,7 +1328,7 @@
oCN.RunProc(sql04);
//鏇存柊鍗曟嵁鐨勫崟鎹姸鎬�
- if (oBill.CheckBill(oCN, oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POOrderBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.CheckBill(oCN, oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_PayableBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -1350,7 +1351,7 @@
{
#region 鍙嶅鏍稿墠鐨勭浉鍏冲垽鏂�
//鍙嶅鏍稿墠鎺у埗=========================================
- //DataSet ds = oCN.RunProcReturn("Exec h_p_Cg_POOrderBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Cg_POOrderBill_BeforeUnCheckCtrl");
+ //DataSet ds = oCN.RunProcReturn("Exec h_p_Cg_PayableBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Cg_PayableBill_BeforeUnCheckCtrl");
//if (ds == null)
//{
// objJsonResult.code = "0";
@@ -1550,5 +1551,108 @@
}
#endregion
+ #region 搴斾粯鍗曟煡璇㈠垪琛�
+ [Route("Cg_PayableBill/QueryList")]
+ [HttpGet]
+ public object QueryList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ //if (!DBUtility.ClsPub.Security_Log("Cg_PayableBillQuery", 1, false, user))
+ //{
+ // objJsonResult.code = CodeConstant.FAIL;
+ // objJsonResult.count = CountConstant.FAIL;
+ // objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ string sql = "select * from h_v_Cg_PayableBillQuery where 1 = 1 ";
+
+ if (sWhere == "" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Cg_PayableBillQuery order by hmainid desc", "h_v_Cg_PayableBillQuery");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Cg_PayableBillQuery");
+ }
+
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 搴斾粯鍗曟煡璇㈠瓙鍒楄〃
+ [Route("Cg_PayableBill/QuerySubList")]
+ [HttpGet]
+ public object QuerySubList(string hmainid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ //if (!DBUtility.ClsPub.Security_Log("Cg_PayableBillQuery", 1, false, user))
+ //{
+ // objJsonResult.code = CodeConstant.FAIL;
+ // objJsonResult.count = CountConstant.FAIL;
+ // objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ string sql = "select * from h_v_Cg_PayableBillQuerySub where hmainid = " + hmainid;
+
+ ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Cg_PayableBillQuerySub");
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
index 57f802d..46a466c 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -9,6 +9,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
@@ -1845,5 +1846,159 @@
}
#endregion
+ #region 閲囪喘鍏ュ簱鍗曚笅鎺ㄦ煡璇㈠垪琛�
+ [Route("Kf_POStockInBill/PushList")]
+ [HttpGet]
+ public object PushList(string HBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql = "select * from h_v_Kf_POStockInBillList where 鍗曟嵁鍙� = '" + HBillNo + "' and 鐘舵�� = '宸插鏍�' and 瀹炴敹鏁伴噺 - 鍏宠仈鏁伴噺 > 0";
+
+
+ ds = oCN.RunProcReturn(sql, "h_v_Kf_POStockInBillList");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎵句笉鍒扮鍚堟潯浠跺崟鎹�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 閲囪喘鍏ュ簱鍗曟煡璇㈠垪琛�
+ [Route("Kf_POStockInBill/QueryList")]
+ [HttpGet]
+ public object QueryList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Kf_POStockInBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Kf_POStockInBillQuery where 1 = 1 ";
+
+ if (sWhere == "" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Kf_POStockInBillQuery order by hmainid desc", "h_v_Kf_POStockInBillQuery");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Kf_POStockInBillQuery");
+ }
+
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閲囪喘鍏ュ簱鍗曟煡璇㈠瓙鍒楄〃
+ [Route("Kf_POStockInBill/QuerySubList")]
+ [HttpGet]
+ public object QuerySubList(string hmainid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Kf_POStockInBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Kf_POStockInBillQuerySub where hmainid = " + hmainid;
+
+ ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Kf_POStockInBillQuerySub");
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
index e707ccb..bbc13bd 100644
--- a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
+++ b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
@@ -8,6 +8,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
@@ -903,7 +904,6 @@
}
#endregion
-
#region 浠樻鍗� 浣滃簾/鍙嶄綔搴熷姛鑳�
[Route("YF_PayMentBill/DropYF_PayMentBill")]
[HttpGet]
@@ -1050,6 +1050,92 @@
}
#endregion
+ #region 浠樻鍗曟煡璇㈠垪琛�
+ [Route("YF_PayMentBill/QueryList")]
+ [HttpGet]
+ public object QueryList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql = "select * from h_v_YF_PayMentBillQuery where 1 = 1 ";
+
+ if (sWhere == "" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_YF_PayMentBillQuery order by hmainid desc", "h_v_YF_PayMentBillQuery");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_YF_PayMentBillQuery");
+ }
+
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浠樻鍗曟煡璇㈠瓙鍒楄〃
+ [Route("YF_PayMentBill/QuerySubList")]
+ [HttpGet]
+ public object QuerySubList(string hmainid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql = "select * from h_v_YF_PayMentBillQuerySub where hmainid = " + hmainid;
+
+ ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_YF_PayMentBillQuerySub");
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 搴斾粯鍗曢┏鍥�
[Route("YF_PayMentBill/RejectCheckFlow_POOrderBill")]
[HttpGet]
diff --git a/WebAPI/Controllers/CJGL/Cj_CenterCheckBillController.cs b/WebAPI/Controllers/CJGL/Cj_CenterCheckBillController.cs
new file mode 100644
index 0000000..c728680
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Cj_CenterCheckBillController.cs
@@ -0,0 +1,921 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ //鏀舵鍗旵ontroller
+ public class Cj_CenterCheckBillController : ApiController
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsCj_CenterCheckBill BillOld = new DAL.ClsCj_CenterCheckBill();
+ public DAL.ClsCj_CenterCheckBill BillNew0 = new DAL.ClsCj_CenterCheckBill();
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 涓鍗曞垪琛� 鏌ヨ
+ /// <summary>
+ /// 杩斿洖椤圭洰闃舵鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cj_CenterCheckBill/list")]
+ [HttpGet]
+ public object getCj_CenterCheckBill(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_CenterCheckBill_Query", 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_Cj_CenterCheckBillList_Query order by 鍗曟嵁鍙� desc", "h_v_Cj_CenterCheckBillList_Query");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Cj_CenterCheckBillList_Query where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Cj_CenterCheckBillList_Query");
+ }
+
+ //娣诲姞鍒楀悕
+ 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("Cj_CenterCheckBill/getDataByBarCode_CenterCheckBill")]
+ [HttpGet]
+ public object getDataByBarCode_CenterCheckBill(string HBarCode, string HInterID, string user, string HBillType)
+ {
+ try
+ {
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //鎷嗗垎鏉″舰鐮�
+ string sBillBarCode = HBarCode.Trim();
+ string[] NewBarCode;
+ if (sBillBarCode.CompareTo("#") > 0)
+ {
+ NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
+ sBillBarCode = NewBarCode[0];
+ }
+ string sBillNo = sBillBarCode; //鏉″舰鐮�
+
+ string[] arr = sBillNo.Split('&'); //浠ョ鍙封��&鈥欏垎鍓叉潯褰㈢爜
+ string BillNo_PGD = arr[0]; //鍗曟嵁鍙�
+ string entryid_PGD = "";//瀛恑d
+ if (arr.Length > 1)
+ {
+ entryid_PGD = arr[1];
+ }
+
+ //鎴彇鏉＄爜绫诲瀷 鍓嶄笁浣�
+ string BillNoType = BillNo_PGD.Substring(0, Math.Min(3, BillNo_PGD.Length));
+ //鎴彇鏉＄爜绫诲瀷2 鍓嶅洓浣�
+ string BillNoType2 = BillNo_PGD.Substring(0, Math.Min(4, BillNo_PGD.Length));
+ //鎴彇鍐呯爜
+ string BillNo = BillNo_PGD.Substring(3, Math.Min(BillNo_PGD.Length - 3, BillNo_PGD.Length));
+
+
+
+
+
+
+
+ string sErr = "";
+
+ switch (BillNoType2)
+ {
+ case "GXLX"://娴佽浆鍗�
+
+ string sql = "";
+ if (HBillType == "7502")
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBill__ProcList_New '" + BillNo_PGD + "','" + user + "'", "h_p_Sc_ProcessExchangeBill__ProcList");
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (ds != null)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖鏁版嵁锛屾潯鐮佸墠缂�閿欒銆�";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 涓 鏂板淇濆瓨
+ [Route("Cj_CenterCheckBill/add_CenterCheckBill")]
+ [HttpPost]
+ public object add_CenterCheckBill([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ try
+ {
+ //鍙嶅簭鍒楀寲
+ string msg2 = "[" + sArray[0].ToString() + "]";
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+ string OperationType = sArray[2].ToString();//绫诲瀷
+ string msg_entry = sArray[3].ToString(); //鏄庣粏琛屼俊鎭�
+
+ ////鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ //if (!DBUtility.ClsPub.Security_Log("Cj_CenterCheckBill_Edit", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ DAL.ClsCj_CenterCheckBill BillNew = new DAL.ClsCj_CenterCheckBill();
+ string s = "";
+
+ List<Model.ClsCj_CenterCheckBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCj_CenterCheckBillMain>>(msg2);
+ foreach (Model.ClsCj_CenterCheckBillMain oItem in lsmain)
+ {
+ if (OperationType == "1")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew0.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (OperationType == "3")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ BillNew.omodel = oItem;
+ }
+
+ //琛ㄤ綋鏁版嵁
+ List<Model.ClsCj_CenterCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCj_CenterCheckBillSub>>(msg_entry);
+ int i = 0;
+ foreach(Model.ClsCj_CenterCheckBillSub oItemSub in subList)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+ BillNew.DetailColl.Add(oItemSub);
+ }
+
+ //鍗曟嵁瀹屾暣鎬у垽鏂�
+ if (BillNew.omodel.HProcExchBillNo == "" && BillNew.omodel.HMainSourceBillNo=="")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (OperationType == "1")
+ {
+ bResult = BillNew.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (OperationType == "3")
+ {
+ bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ 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 = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 涓鍗� 鍒犻櫎
+ /// <summary>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cj_CenterCheckBill/delete")]
+ [HttpGet]
+ public object deleteCj_CenterCheckBill(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_CenterCheckBill_Drop", 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;
+ }
+
+ if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽鍒犻櫎锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Cj_CenterCheckBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Cj_CenterCheckBill_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;
+ }
+ //==================================================================================
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Cj_CenterCheckBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from Cj_CenterCheckBillSub where HInterID= " + HInterID);
+
+ //鍒犻櫎鍚庢帶鍒�==================================================================================
+ string sql2 = "exec h_p_Cj_CenterCheckBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Cj_CenterCheckBill_AfterDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ s = "鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ s = ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==============================================================================================
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勬敹娆惧崟锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 涓鍗� 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Cj_CenterCheckBill/AuditCj_CenterCheckBill")]
+ [HttpGet]
+ public object AuditCj_CenterCheckBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Cj_CenterCheckBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsCj_CenterCheckBill oBill = new DAL.ClsCj_CenterCheckBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
+
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Cj_CenterCheckBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Cj_CenterCheckBill_BeforeCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+ oCN.BeginTran();
+ //鍙嶅啓閿�鍞鍗曟暟鎹�
+ sql1 = "exec h_p_Sc_StationOutOrInBill_ReWriteByCenterCheckBill " + oBill.omodel.HInterID + ",'" + CurUserName + "'";
+ oCN.RunProcReturn(sql1, "h_p_IF_SeOrderBill_ReWriteBySeOrderChangeBill");
+
+
+
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cj_CenterCheckBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCN.RollBack();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 涓鍗� 鍏抽棴/鍙嶅叧闂�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param>
+ /// <param name="CurUserName">鍏抽棴浜�</param>
+ /// <returns></returns>
+ [Route("Cj_CenterCheckBill/CloseCj_CenterCheckBill")]
+ [HttpGet]
+ public object CloseCj_CenterCheckBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Cj_CenterCheckBill_Close";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //妫�鏌ユ潈闄�
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsCj_CenterCheckBill oBill = new DAL.ClsCj_CenterCheckBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //鍏抽棴鍒ゆ柇
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂垽鏂�
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑鍏抽棴/鍙嶅叧闂搷浣�
+ if (IsAudit == 0) //鍏抽棴鎻愪氦
+ {
+ //鍏抽棴鎻愪氦
+ if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂彁浜�
+ {
+ //鍙嶅叧闂彁浜�
+ if (oBill.CancelClose(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 涓鍗� 浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">浣滃簾(0),鍙嶄綔搴�(1)</param>
+ /// <param name="CurUserName">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("Cj_CenterCheckBill/DeleteCj_CenterCheckBill")]
+ [HttpGet]
+ public object DeleteCj_CenterCheckBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Cj_CenterCheckBill_Delete";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //妫�鏌ユ潈闄�
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsCj_CenterCheckBill oBill = new DAL.ClsCj_CenterCheckBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HBillStatus.ToString() == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //浣滃簾鍒ゆ柇
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶄綔搴燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶄綔搴熷垽鏂�
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑浣滃簾/鍙嶄綔搴熸搷浣�
+ if (IsAudit == 0) //浣滃簾鎻愪氦
+ {
+ //浣滃簾鎻愪氦
+ if (oBill.Cancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂彁浜�
+ {
+ //鍙嶅叧闂彁浜�
+ if (oBill.AbandonCancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熸垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触鎴栬�呭弽浣滃簾澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 4728444..f0edc38 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -2658,6 +2658,6 @@
}
}
#endregion
- //
+ //
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index e1ab339..51bba58 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -344,34 +344,34 @@
return objJsonResult;
}
- //ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
- //if (ds == null)
- //{
- // oCN.RollBack();
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- //if (ds.Tables[0].Rows.Count == 0)
- //{
- // oCN.RollBack();
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- //if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
- //{
- // oCN.RollBack();
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
//鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭
ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " +
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 6642d0d..d1ddb30 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -191,7 +191,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList_Query where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillList_Query");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList_Query where 1 = 1 " + sWhere + " order by 鏃ユ湡 desc ", "h_v_Sc_ProcessExchangeBillList_Query");
//娣诲姞鍒楀悕
@@ -1179,7 +1179,7 @@
{
string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 ";
//瀹㈡埛鑷畾涔�
- if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�" || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒")
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�" || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒" || oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧")
{
sql1 = "select top 1000 * from h_v_Gy_RoutingBillList where 1 = 1 ";
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs
index 546c3bd..e56f844 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs
@@ -27,6 +27,18 @@
{
try
{
+
+
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeUseBill_Query", 3, 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_Sc_MouldLifeUseBillList order by HMainID asc", "h_v_Sc_MouldLifeUseBillList");
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
index 2501eff..1b4648c 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
@@ -1636,7 +1636,7 @@
#region 涓�/涓嬫ā鍗曡幏鍙栨潯鐮佷俊鎭�
[Route("Sc_MouldUpperBill/txtHBarCode_KeyDown")]
[HttpGet]
- public object txtHBarCode_KeyDown(string HBarCode, string UserID, string HBillType)
+ public object txtHBarCode_KeyDown(string HBarCode,int HSourceID, string UserID, string HBillType)
{
try
{
@@ -1649,7 +1649,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("exec h_p_Sc_AllowLoadData '" + HBarCode + "'", "h_p_Sc_AllowLoadData");
+ ds = oCN.RunProcReturn("exec h_p_Sc_AllowLoadData '" + HBarCode + "','"+ HSourceID + "'", "h_p_Sc_AllowLoadData");
if (ds == null || ds .Tables.Count== 0 || ds.Tables[0].Rows.Count == 0)
{
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 9dcce14..c65a35e 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -5317,6 +5317,82 @@
}
+ [Route("POStockInBillList/AuditPOInStockBillPost_TianKang")]
+ [HttpPost]
+ public object AuditPOInStockBill_TianKang([FromBody] JObject msg)
+ {
+ try
+ {
+ string _msg = msg["msg"].ToString();
+ _msg = _msg.Replace("\\", "");
+ _msg = _msg.Replace("\n", "");
+ List<Models.ReciveBill_FastModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ReciveBill_FastModel>>(_msg);
+ DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
+ var hinterID = list[0].HInterID;
+ var FID = list[0].FID;
+ string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);//瀹㈡埛鍚嶇О
+ var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
+ string sql = string.Empty;
+
+ var json = new
+ {
+ Ids = FID,
+ };
+ //LogService.Write(json);
+ //鐧诲綍
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鎻愪氦
+ var _result = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
+ var _saveObj = JObject.Parse(_result);
+ if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鏀舵枡閫氱煡鍗曟彁浜ゅけ璐sonRoot:" + json.ToString());
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟彁浜ゅけ璐�" + _result;
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ //瀹℃牳
+ _result = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
+ _saveObj = JObject.Parse(_result);
+ if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot:" + json.ToString());
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot" + _result;
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ //oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 鍒拌揣纭 鎵潯鐮� 鏍￠獙
/// </summary>
diff --git a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
index 0ae4bd1..1a3e078 100644
--- a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
+++ b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
@@ -799,6 +799,55 @@
#endregion
+ #region 寮傚父宸ヨ壓鍙傛暟棰勮鍒楄〃淇℃伅
+ /// <summary>
+ /// 寮傚父宸ヨ壓鍙傛暟棰勮鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("SB_EquipICMOTechParamBillController/GetSb_EquipMentCollectionTechParam_ERR")]
+ [HttpGet]
+ public object GetSb_EquipMentCollectionTechParam_ERR(string sWhere, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //杩斿洖鍒楄〃淇℃伅
+ ds = oCn.RunProcReturn("select * from h_v_Sb_EquipMentCollectionTechParam_ERRList where 1=1 " + sWhere + " order by 鍙戠幇寮傚父鏃堕棿 desc", "h_v_Sb_EquipMentCollectionTechParam_ERRList");
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index a5f4767..b19e5ea 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -6533,8 +6533,6 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
- //string msg5 = sArray[3].ToString();
-
string UserName = "";
ListModels oListModels = new ListModels();
@@ -6555,28 +6553,14 @@
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Sc_MouldDotCheckPlanBillMain(msg2);
foreach (Model.ClsSc_MouldDotCheckPlanBillMain oItem in lsmain)
- {
- //oItem.HMaker = "";
+ {
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3820";
oItem.HBillSubType = "3820";
-
- //oItem.HInterID =0;
- //oItem.HBillNo = "";
+
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- //oItem.HMakeDate = "";
- //oItem.HYear = "";
- //oItem.HPeriod = "";
- //oItem.HRemark = "";
- //oItem.HCycleUnit = "";
- //oItem.HCheckCycle = "";
- //oItem.HBeginDate = "";
- //oItem.HEndDate = "";
- //oItem.HInnerBillNo = "";
- //oItem.HExplanation = "";
-
- //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
@@ -6601,7 +6585,7 @@
i++;
oItemSub.HEntryID = i;
- //oItemSub.HCloseMan = ""; //琛屽叧闂�
+
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
//oItemSub.HRemark = ""; //澶囨敞
@@ -6609,43 +6593,10 @@
oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
//oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- //HMaterID = "";//閰嶄欢浠ｇ爜
- //HUnitID = "";//鍗曚綅浠ｇ爜
- //HQty = "";//瀹為檯鐢ㄩ噺
- //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- //HRemark = "";//澶囨敞
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
oBill.DetailColl.Add(oItemSub);
-
- }
-
- ////閰嶄欢椤硅〃浣撴暟鎹�
- ////鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- //msg5 = msg5.Substring(1, msg5.Length - 2);
- //msg5 = msg5.Replace("\\", "");
- //msg5 = msg5.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- //List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> ls1 = new List<Model.ClsSc_MouldDotCheckPlanBillSub_Item>();
- //ls1 = oListModels.getObjectByJson_Sc_MouldDotCheckPlanBillSub_Item(msg5);
- //int j = 0;
- //foreach (Model.ClsSc_MouldDotCheckPlanBillSub_Item oItemSub in ls1)
- //{
-
- // j++;
- // oItemSub.HEntryID = j;
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
-
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
-
- // oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // oBill.DetailCol.Add(oItemSub);
- //}
-
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index d486e67..a36f008 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -13173,6 +13173,14 @@
objjson.data = null;
return objjson;
}
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "璇ヨ澶囨湁澶氫釜璁″垝鍗�,鎵嬪姩閫夌潃" ;
+ objjson.data = null;
+ return objjson;
+ }
else
{
objjson.code = "1";
@@ -13214,19 +13222,22 @@
switch (Type)
{
case "DJ":
- HView = "h_v_QJ_GetDotCheckItemList";
+ HView = "h_v_Sc_MouldDotCheckPlanBillList";
+ break;
+ case "BY":
+ HView = "h_v_Sc_MouldMaintainPlanBillList";
break;
default:
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "璁惧妯″潡绫诲瀷閿欒锛�";
+ objjson.Message = "妯″叿妯″潡绫诲瀷閿欒锛�";
objjson.data = null;
return objjson;
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//string sql = string.Format(@"select * from " + HView + " where HInterID = " + EquipProjectID);
- string sql = string.Format(@"Exec h_p_Sb_GetCheckItem_PDA '" + MouldProjectID + "','" + Type + "','" + HDate + "'");
+ string sql = string.Format(@"Exec h_p_Sb_GetCheckItemMouldFile_PDA '" + MouldProjectID + "','" + Type + "','" + HDate + "'");
ds = oCN.RunProcReturn(sql, HView);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -13236,6 +13247,14 @@
objjson.data = null;
return objjson;
}
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "璇ユā鍏锋湁澶氫釜璁″垝鍗�,鎵嬪姩閫夌潃";
+ objjson.data = null;
+ return objjson;
+ }
else
{
objjson.code = "1";
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
index d66ac75..f8d185c 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -9,6 +9,7 @@
using System.Web.Http;
using WebAPI.Models;
using System.Windows.Forms;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
@@ -1843,5 +1844,193 @@
}
}
#endregion
+
+
+ #region 閿�鍞嚭搴撳崟涓嬫帹鏌ヨ鍒楄〃
+ [Route("Kf_SellOutBill/PushList")]
+ [HttpGet]
+ public object PushList(string HBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql = "select * from h_v_IF_SellOutBillList_EditInit where 鍗曟嵁鍙� = '" + HBillNo + "' and 鐘舵�� = '宸插鏍�' and 鏁伴噺 - 鍏宠仈鏁伴噺 > 0";
+
+
+ ds = oCN.RunProcReturn(sql, "h_v_IF_SellOutBillList_EditInit");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎵句笉鍒扮鍚堟潯浠跺崟鎹�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞嚭搴撳崟鏌ヨ鍒楄〃
+ [Route("Kf_SellOutBill/QueryList")]
+ [HttpGet]
+ public object QueryList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Kf_SellOutBillQuery where 1 = 1 ";
+
+ if (sWhere == "" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Kf_SellOutBillQuery order by hmainid desc", "h_v_Kf_SellOutBillQuery");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Kf_SellOutBillQuery");
+ }
+
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞嚭搴撳崟鏌ヨ瀛愬垪琛�
+ [Route("Kf_SellOutBill/QuerySubList")]
+ [HttpGet]
+ public object QuerySubList(string hmainid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Kf_SellOutBillQuerySub where hmainid = " + hmainid;
+
+ ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Kf_SellOutBillQuerySub");
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞嚭搴撳崟 鍒ゆ柇鏄惁鍏峰鏌ョ湅閲戦鏉冮檺
+ [Route("Kf_SellOutBill/CheckRight_Money")]
+ [HttpGet]
+ public object CheckRight_Money(string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏌ヨ鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBill_Money", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ 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
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
index 207a01f..bf7fca2 100644
--- a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
@@ -8,6 +8,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
@@ -1531,5 +1532,109 @@
}
#endregion
+ #region 搴旀敹鍗曟煡璇㈠垪琛�
+ [Route("Xs_ReceivableBill/QueryList")]
+ [HttpGet]
+ public object QueryList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Xs_ReceivableBill_Query", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Xs_ReceivableBillQuery where 1 = 1 ";
+
+ if (sWhere == "" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Xs_ReceivableBillQuery order by hmainid desc", "h_v_Xs_ReceivableBillQuery");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Xs_ReceivableBillQuery");
+ }
+
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 搴旀敹鍗曟煡璇㈠瓙鍒楄〃
+ [Route("Xs_ReceivableBill/QuerySubList")]
+ [HttpGet]
+ public object QuerySubList(string hmainid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Xs_ReceivableBill_Query", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Xs_ReceivableBillQuerySub where hmainid = " + hmainid;
+
+ ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_ReceivableBillQuerySub");
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index b8b96a0..31035fa 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -9,6 +9,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
@@ -3315,5 +3316,192 @@
}
}
#endregion
+
+ #region 閿�鍞鍗曚笅鎺ㄦ煡璇㈠垪琛�
+ [Route("Xs_SeOrderBill/PushList")]
+ [HttpGet]
+ public object PushList(string HBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql = "select * from h_v_IF_SeOrderBillList where 鍗曟嵁鍙� = '" + HBillNo + "' and 鐘舵�� = '宸插鏍�' and 鏁伴噺 - 鍏宠仈鏁伴噺 > 0";
+
+
+ ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎵句笉鍒扮鍚堟潯浠跺崟鎹�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞鍗曟煡璇㈠垪琛�
+ [Route("Xs_SeOrderBill/QueryList")]
+ [HttpGet]
+ public object QueryList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Xs_SeOrderBillQuery where 1 = 1 ";
+
+ if (sWhere == "" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Xs_SeOrderBillQuery order by hmainid desc", "h_v_Xs_SeOrderBillQuery");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Xs_SeOrderBillQuery");
+ }
+
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞鍗曟煡璇㈠瓙鍒楄〃
+ [Route("Xs_SeOrderBill/QuerySubList")]
+ [HttpGet]
+ public object QuerySubList(string hmainid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Xs_SeOrderBillQuerySub where hmainid = " + hmainid;
+
+ ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_SeOrderBillQuerySub");
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞鍗� 鍒ゆ柇鏄惁鍏峰鏌ョ湅閲戦鏉冮檺
+ [Route("Xs_SeOrderBill/CheckRight_Money")]
+ [HttpGet]
+ public object CheckRight_Money(string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏌ヨ鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_Money", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ 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
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
index c0695ec..b34571b 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -9,6 +9,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
@@ -1490,7 +1491,7 @@
[HttpGet]
public object AuditXs_SeOutStockBill_Flow(int HInterID, int IsAudit, string CurUserName, string CurUserID)
{
- //string ModRightNameCheck = "Cg_POOrderBill_Check";
+ //string ModRightNameCheck = "Xs_SeOutStockBill_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
@@ -1596,7 +1597,7 @@
#region 瀹℃牳鍓嶇殑鐩稿叧鍒ゆ柇
//瀹℃牳鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Xs_SeOutStockBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + CurUserName + "'";
- ds = oCN.RunProcReturn(sql1, "h_p_Cg_POOrderBill_BeforeCheckCtrl");
+ ds = oCN.RunProcReturn(sql1, "h_p_Xs_SeOutStockBill_BeforeCheckCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1724,7 +1725,7 @@
{
#region 鍙嶅鏍稿墠鐨勭浉鍏冲垽鏂�
//鍙嶅鏍稿墠鎺у埗=========================================
- DataSet ds = oCN.RunProcReturn("Exec h_p_Xs_SeOutStockBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + CurUserName + "'", "h_p_Cg_POOrderBill_BeforeUnCheckCtrl");
+ DataSet ds = oCN.RunProcReturn("Exec h_p_Xs_SeOutStockBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + CurUserName + "'", "h_p_Xs_SeOutStockBill_BeforeUnCheckCtrl");
if (ds == null)
{
objJsonResult.code = "0";
@@ -1872,5 +1873,158 @@
}
}
#endregion
+
+ #region 鍙戣揣閫氱煡鍗曚笅鎺ㄦ煡璇㈠垪琛�
+ [Route("Xs_SeOutStockBill/PushList")]
+ [HttpGet]
+ public object PushList(string HBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql = "select * from h_v_IF_SeOutStockBillList where 鍗曟嵁鍙� = '" + HBillNo + "' and 鐘舵�� = '宸插鏍�' and 鏁伴噺 - 宸插叧鑱旀暟閲� > 0";
+
+
+ ds = oCN.RunProcReturn(sql, "h_v_IF_SeOutStockBillList");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎵句笉鍒扮鍚堟潯浠跺崟鎹�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍙戣揣閫氱煡鍗曟煡璇㈠垪琛�
+ [Route("Xs_SeOutStockBill/QueryList")]
+ [HttpGet]
+ public object QueryList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Xs_SeOutStockBillQuery where 1 = 1 ";
+
+ if (sWhere == "" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Xs_SeOutStockBillQuery order by hmainid desc", "h_v_Xs_SeOutStockBillQuery");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Xs_SeOutStockBillQuery");
+ }
+
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍙戣揣閫氱煡鍗曟煡璇㈠瓙鍒楄〃
+ [Route("Xs_SeOutStockBill/QuerySubList")]
+ [HttpGet]
+ public object QuerySubList(string hmainid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_Xs_SeOutStockBillQuerySub where hmainid = " + hmainid;
+
+ ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_SeOutStockBillQuerySub");
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
index 23437b0..1c9978b 100644
--- a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
@@ -8,6 +8,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
@@ -1651,5 +1652,110 @@
}
}
#endregion
+
+
+ #region 鏀舵鍗曟煡璇㈠垪琛�
+ [Route("YS_ReceiveBill/QueryList")]
+ [HttpGet]
+ public object QueryList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_YS_ReceiveBillQuery where 1 = 1 ";
+
+ if (sWhere == "" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn("select * from h_v_YS_ReceiveBillQuery order by hmainid desc", "h_v_YS_ReceiveBillQuery");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_YS_ReceiveBillQuery");
+ }
+
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏀舵鍗曟煡璇㈠瓙鍒楄〃
+ [Route("YS_ReceiveBill/QuerySubList")]
+ [HttpGet]
+ public object QuerySubList(string hmainid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_YS_ReceiveBillQuerySub where hmainid = " + hmainid;
+
+ ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_YS_ReceiveBillQuerySub");
+
+
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
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 a1d9e86..2207f87 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"
@@ -127,6 +127,10 @@
list.Add("浠櫒鎴愬搧鏉＄爜瑙勫垯");
list.Add("璇曞墏鎴愬搧鏉＄爜瑙勫垯");
}
+ else if (sCapName == "娣诲悍绉戞妧")
+ {
+ list.Add("鎵规鏉＄爜");
+ }
else
{
list.Add("鍞竴鏉＄爜");
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
index e246e44..0a0f39f 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
@@ -32,6 +32,15 @@
try
{
List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("QC_PatrolProcCheckOtherBill_Query", 3, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
string sql1 = "select * from h_v_QC_PatrolProcCheckOtherBill where 1 = 1 ";
string sql = sql1 + sWhere + " order by 鍒跺崟鏃ユ湡 desc ";
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
index c01d761..0095bd2 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
@@ -135,6 +135,16 @@
{
List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Query", 3, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string sql1 = "select * from h_v_QC_ProcessCheckBillMainList where 1 = 1 ";
string sql = sql1 + sWhere + " order by 鍒跺崟鏃ユ湡 desc";
ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillMainList");
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillController.cs"
index f42f5ca..9d865d0 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillController.cs"
@@ -34,6 +34,16 @@
{
List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("QC_StockCheckBill_Query", 3, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string sql1 = "select * from h_v_QC_StockCheckBillList where 1 = 1 ";
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_QC_StockCheckBillList");
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index 7cf7201..242e17d 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -723,7 +723,7 @@
[Route("QC_CustomerAppealReport/SB_EquipICMOTechParamList")]
[HttpGet]
- public object SB_EquipICMOTechParamList(string sWhere, string user)
+ public object SB_EquipICMOTechParamList(string sWhere, string user,string Type)
{
try
{
@@ -745,7 +745,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "','"+HEquipName+"'", "h_p_SB_EquipICMOTechParamBillList");
+ ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "','"+HEquipName+"','"+Type+"'", "h_p_SB_EquipICMOTechParamBillList");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs"
index 0459c16..be696a8 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs"
@@ -33,6 +33,16 @@
{
List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("QC_WorkSelfCheckBill_Query", 3, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string sql1 = "select * from h_v_QC_WorkSelfCheckBill where 1 = 1 ";
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_QC_WorkSelfCheckBill");
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index 3d8cb37..3d60667 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -84,6 +84,16 @@
{
List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("QC_FirstPieceCheckBill_Query", 3, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string sql1 = "select * from h_v_QC_FirstPieceCheckBillMainList where 1 = 1 ";
string sql = sql1 + sWhere + " ";
ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBillMainList");
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
index a1c9f76..c5ecf76 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
@@ -590,6 +590,210 @@
}
#endregion
+ #region 宸ヨ祫缁撶畻鍗�(闆嗕綋)妯″潡 浠庡垪琛ㄩ�変腑鎵撳紑鍗曟嵁锛岃繑鍥炲崟鎹俊鎭椂璋冪敤
+ /// <summary>
+ /// 宸ヨ祫缁撶畻鍗�(闆嗕綋)缂栬緫鏃讹紝鏍规嵁鍗曟嵁ID鑾峰彇鍗曟嵁淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Pay_GroupBalBillController/GetPay_GroupBalBill_Json")]
+ [HttpGet]
+ public object GetPay_GroupBalBill_Json(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //杩斿洖鍒楄〃淇℃伅
+ ds = oCn.RunProcReturn("exec h_p_Pay_GroupBalBill_EditInit " + HInterID, "h_p_Pay_GroupBalBill_EditInit");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ伐璧勭粨绠楀崟(闆嗕綋)锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = new
+ {
+ Mainlist = ds.Tables[0], //杩斿洖涓昏〃淇℃伅锛�0锛�
+ Sublist = ds.Tables[1], //杩斿洖瀛愯〃1淇℃伅锛�1锛�
+ Emplist = ds.Tables[2], //杩斿洖瀛愯〃2淇℃伅锛�2锛�
+ };
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖宸ヨ祫缁撶畻鍗�(闆嗕綋)淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ヨ祫缁撶畻鍗�(闆嗕綋)淇濆瓨
+ /// <summary>
+ /// 宸ヨ祫缁撶畻鍗�(闆嗕綋)淇濆瓨
+ /// </summary>
+ [Route("Pay_GroupBalBillController/GetPay_GroupBalBill_Save_Json")]
+ [HttpPost]
+ public object GetPay_GroupBalBill_Save_Json([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string sMainStr = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string sSubStr = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string sSubStr2 = sArray[2].ToString(); //瀛愯〃鏁版嵁2
+ string OperationType = sArray[3].ToString(); //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+ string HMaker = sArray[4].ToString(); //鍒跺崟浜�
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (OperationType == "1")
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ //鍒ゆ柇鏂板鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏂板鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify;
+ //鍒ゆ柇缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //琛ㄥご璧嬪��
+ sMainStr = sMainStr.Replace("\\", "");
+ sMainStr = sMainStr.Replace("\n", "");
+ sMainStr = "[" + sMainStr.ToString() + "]";
+ List<Model.ClsPay_GroupBalBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_GroupBalBillMain>>(sMainStr);
+ foreach (Model.ClsPay_GroupBalBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod_Pay(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oItem.HYear = sYear;
+ oItem.HPeriod = sPeriod;
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋璧嬪��
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ sSubStr = sSubStr.Substring(1, sSubStr.Length - 2);
+ sSubStr = sSubStr.Replace("\\", "");
+ sSubStr = sSubStr.Replace("\n", "");
+ sSubStr = "[" + sSubStr.ToString() + "]";
+ List<Model.ClsPay_GroupBalBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_GroupBalBillSub>>(sSubStr);
+ int i = 0;
+ foreach (Model.ClsPay_GroupBalBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oBill.DetailColl.Add(oItemSub);
+ }
+ //琛ㄤ綋璧嬪��2
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ sSubStr2 = sSubStr2.Substring(1, sSubStr2.Length - 2);
+ sSubStr2 = sSubStr2.Replace("\\", "");
+ sSubStr2 = sSubStr2.Replace("\n", "");
+ sSubStr2 = "[" + sSubStr2.ToString() + "]";
+ List<Model.ClsPay_GroupBalBillEmp> ls2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_GroupBalBillEmp>>(sSubStr2);
+ int j = 0;
+ foreach (Model.ClsPay_GroupBalBillEmp oItemSub2 in ls2)
+ {
+ j++;
+ oItemSub2.HEntryID = j;
+ oBill.DetailEmpColl.Add(oItemSub2);
+ }
+
+ //淇濆瓨
+ bool bResult;
+ if (OperationType == "1") //鏂板淇濆瓨
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else //缂栬緫淇濆瓨
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
index a1561f5..93ec4aa 100644
--- "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
@@ -100,6 +100,8 @@
public string HOriginator; //鍙戣捣浜�
public string HTitle; //鍗曟嵁鏍囬
+ public string HInstanceStatus; //瀹炰緥鐘舵��
+ public string HApprovedResult; //瀹℃壒缁撴灉
//鍗曟嵁鍐呭
public string HDate; //鏃ユ湡
@@ -124,6 +126,8 @@
public string HOriginator; //鍙戣捣浜�
public string HTitle; //鍗曟嵁鏍囬
+ public string HInstanceStatus; //瀹炰緥鐘舵��
+ public string HApprovedResult; //瀹℃壒缁撴灉
//鍗曟嵁鍐呭
public string HDate; //鏃ユ湡
@@ -154,6 +158,8 @@
public string HOriginator; //鍙戣捣浜�
public string HTitle; //鍗曟嵁鏍囬
+ public string HInstanceStatus; //瀹炰緥鐘舵��
+ public string HApprovedResult; //瀹℃壒缁撴灉
//鍗曟嵁鍐呭
public string HEmployeeID; //鎴愬憳ID
@@ -191,6 +197,8 @@
public string HOriginator; //鍙戣捣浜�
public string HTitle; //鍗曟嵁鏍囬
+ public string HInstanceStatus; //瀹炰緥鐘舵��
+ public string HApprovedResult; //瀹℃壒缁撴灉
//鍗曟嵁鍐呭
public string HQuestionType; //闂鍒嗙被
@@ -397,7 +405,7 @@
//OriginatorId = "12", //鏍规嵁娴佺▼鍙戣捣浜哄伐鍙锋煡璇€��
//TaskId = "12", //浠诲姟ID銆�
- CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01"?"2022-01-01":DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"), //鍒涘缓鏃堕棿璧峰鍊笺��
+ CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01" ? "2022-01-01" : DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"), //鍒涘缓鏃堕棿璧峰鍊笺��
CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //鍒涘缓鏃堕棿缁堟鍊笺��
PageSize = pageSize, //鍒嗛〉澶у皬銆�
@@ -547,6 +555,50 @@
}
}
#endregion
+
+ #region 鑾峰彇 瀹滄惌 鏍规嵁娴佺▼瀹炰緥ID鑾峰彇娴佺▼瀹炰緥
+ public bool getInstanceStatusByInstanceID__YiDa(string appType, string systemToken, string userID, string instanceID, ref GetInstanceByIdResponse response, ref string msg)
+ {
+ AlibabaCloud.SDK.Dingtalkyida_1_0.Client client = CreateClient5();
+ AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceByIdHeaders getInstanceByIdHeaders = new AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceByIdHeaders();
+ getInstanceByIdHeaders.XAcsDingtalkAccessToken = this.accessToken;
+ AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceByIdRequest getInstanceByIdRequest = new AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceByIdRequest
+ {
+ SystemToken = systemToken,
+ Language = "12",
+ UserId = userID,
+ AppType = appType,
+ };
+ try
+ {
+ GetInstanceByIdResponse getInstanceByIdResponse = client.GetInstanceByIdWithOptions(instanceID, getInstanceByIdRequest, getInstanceByIdHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions());
+ response = getInstanceByIdResponse;
+ return true;
+ }
+ catch (TeaException err)
+ {
+ if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message))
+ {
+ // err 涓惈鏈� code 鍜� message 灞炴�э紝鍙府鍔╁紑鍙戝畾浣嶉棶棰�
+ }
+ msg = err.Message;
+ return false;
+ }
+ catch (Exception _err)
+ {
+ TeaException err = new TeaException(new Dictionary<string, object>
+ {
+ { "message", _err.Message }
+ });
+ if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message))
+ {
+ // err 涓惈鏈� code 鍜� message 灞炴�э紝鍙府鍔╁紑鍙戝畾浣嶉棶棰�
+ }
+ msg = _err.Message;
+ return false;
+ }
+ }
+ #endregion
#endregion
#region 鏁版嵁鍚屾鏂规硶
@@ -599,32 +651,104 @@
int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
oItem.HTitle = startIndex + response.Body.Result[i].Title.Substring(startindex).Replace("\"}", "").Replace("'", "");
- if (keys.Contains("dateField_lo6w37hk"))
+ //瀹℃牳绛惧埌琛�
+ //if (keys.Contains("dateField_lo6w37hk"))
+ //{
+ // double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lo6w37hk"].ToString());
+ // oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd");
+ //}
+
+ //if (keys.Contains("selectField_lockncvh_id"))
+ //{
+ // oItem.HArea = response.Body.Result[i].FormData["selectField_lockncvh_id"].ToString().Replace("'", "");
+ //}
+
+ //if (keys.Contains("selectField_lockncvg_id"))
+ //{
+ // oItem.HCheckLevel = response.Body.Result[i].FormData["selectField_lockncvg_id"].ToString().Replace("'", "");
+ //}
+
+ //if (keys.Contains("employeeField_lo6w37hf"))
+ //{
+ // oItem.HEmplpyee = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf"])[0].ToString().Replace("'","");
+ //}
+
+ //if (keys.Contains("employeeField_lo6w37hf_id"))
+ //{
+ // oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf_id"])[0].ToString().Replace("'", "");
+ //}
+
+
+ //绛惧埌琛�
+ if (keys.Contains("dateField_ls9ma7h3"))
{
- double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lo6w37hk"].ToString());
+ double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_ls9ma7h3"].ToString());
oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd");
}
- if (keys.Contains("selectField_lockncvh_id"))
+ if (keys.Contains("selectField_ls9ma7h9"))
{
- oItem.HArea = response.Body.Result[i].FormData["selectField_lockncvh_id"].ToString().Replace("'", "");
+ oItem.HArea = response.Body.Result[i].FormData["selectField_ls9ma7h9"].ToString().Replace("'", "");
}
- if (keys.Contains("selectField_lockncvg_id"))
+ if (keys.Contains("selectField_ls9ma7h7"))
{
- oItem.HCheckLevel = response.Body.Result[i].FormData["selectField_lockncvg_id"].ToString().Replace("'", "");
+ oItem.HCheckLevel = response.Body.Result[i].FormData["selectField_ls9ma7h7"].ToString().Replace("'", "");
}
- if (keys.Contains("employeeField_lo6w37hf"))
+ if (keys.Contains("employeeField_ls9ma7h5"))
{
- oItem.HEmplpyee = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf"])[0].ToString().Replace("'","");
+ oItem.HEmplpyee = ((List<object>)response.Body.Result[i].FormData["employeeField_ls9ma7h5"])[0].ToString().Replace("'", "");
}
- if (keys.Contains("employeeField_lo6w37hf_id"))
+ if (keys.Contains("employeeField_ls9ma7h5_id"))
{
- oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf_id"])[0].ToString().Replace("'", "");
+ oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_ls9ma7h5_id"])[0].ToString().Replace("'", "");
}
-
+
+
+
+ //鑾峰彇瀹炰緥鐘舵��
+ GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
+ if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
+ {
+ return false;
+ }
+
+ oItem.HInstanceStatus = response1.Body.InstanceStatus;
+ if (oItem.HInstanceStatus == "RUNNING")
+ {
+ oItem.HInstanceStatus = "杩愯涓�";
+ }
+ else if (oItem.HInstanceStatus == "TERMINATED")
+ {
+ oItem.HInstanceStatus = "宸茬粓姝�";
+ }
+ else if (oItem.HInstanceStatus == "COMPLETED")
+ {
+ oItem.HInstanceStatus = "宸插畬鎴�";
+ }
+ else if (oItem.HInstanceStatus == "ERROR")
+ {
+ oItem.HInstanceStatus = "寮傚父";
+ }
+
+ oItem.HApprovedResult = response1.Body.ApprovedResult;
+ if (oItem.HApprovedResult == "agree")
+ {
+ oItem.HApprovedResult = "鍚屾剰";
+ }
+ else if (oItem.HApprovedResult == "disagree")
+ {
+ oItem.HApprovedResult = "鎷掔粷";
+ }
+ else
+ {
+ oItem.HApprovedResult = "";
+ }
+
+
+
lsmain.Add(oItem);
}catch(Exception e)
{
@@ -660,7 +784,8 @@
string appType = "APP_MMBPP3IFGFBX3VQAIKYX";
string systemToken = "TP866A81107FVI9LBFQRZ9953YWZ2GYR2W6OL1L";
string userID = "1933673646699149";
- string formUuid = "FORM-IQ8666B17ZZE7NQSA01K3DUN78UI3J1Z2W6OLX";
+ //string formUuid = "FORM-IQ8666B17ZZE7NQSA01K3DUN78UI3J1Z2W6OLX"; //鍒嗗眰瀹℃牳绛惧埌琛�
+ string formUuid = "FORM-A01FFB0B63A34F18B7753F695F49190DJEY7"; //绛惧埌琛�
int pageNumber = 1;
int pageSize = 100;
@@ -680,7 +805,7 @@
try
{
- oCN.BeginTran();
+ oCN.BeginTran();
foreach (YD_FenCengShenHeQianDaoBiao oItem in lsmain)
{
string sql_searchRepeat = "select * from DD_FenCengShenHeQianDaoBiao where HInstanceID = '" + oItem.HInstanceID + "'";
@@ -694,7 +819,8 @@
string sql_main = "insert into DD_FenCengShenHeQianDaoBiao" +
"(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle" +
",HDate" +
- ",HCheckLevel,HArea,HEmployeeID,HEmplpyee) " +
+ ",HCheckLevel,HArea,HEmployeeID,HEmplpyee" +
+ ",HInstanceStatus,HApprovedResult) " +
"values(" +
"'" + oItem.HMakerID + "'" +
",'" + oItem.HMakeDate + "'" +
@@ -710,6 +836,8 @@
",'" + (oItem.HArea==null?"": oItem.HArea) + "'" +
",'" + (oItem.HEmployeeID==null?"": oItem.HEmployeeID) + "'" +
",'" + (oItem.HEmplpyee==null?"": oItem.HEmplpyee) + "'" +
+ ",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
+ ",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
")";
oCN.RunProc(sql_main);
@@ -820,7 +948,50 @@
{
oItem.HRiskRemak_Result = response.Body.Result[i].FormData["textareaField_lxblb9xa"].ToString().Replace("'", "");
}
-
+
+
+ //鑾峰彇瀹炰緥鐘舵��
+ GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
+ if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
+ {
+ return false;
+ }
+
+ oItem.HInstanceStatus = response1.Body.InstanceStatus;
+ if (oItem.HInstanceStatus == "RUNNING")
+ {
+ oItem.HInstanceStatus = "杩愯涓�";
+ }
+ else if (oItem.HInstanceStatus == "TERMINATED")
+ {
+ oItem.HInstanceStatus = "宸茬粓姝�";
+ }
+ else if (oItem.HInstanceStatus == "COMPLETED")
+ {
+ oItem.HInstanceStatus = "宸插畬鎴�";
+ }
+ else if (oItem.HInstanceStatus == "ERROR")
+ {
+ oItem.HInstanceStatus = "寮傚父";
+ }
+
+ oItem.HApprovedResult = response1.Body.ApprovedResult;
+ if (oItem.HApprovedResult == "agree")
+ {
+ oItem.HApprovedResult = "鍚屾剰";
+ }
+ else if (oItem.HApprovedResult == "disagree")
+ {
+ oItem.HApprovedResult = "鎷掔粷";
+ }
+ else
+ {
+ oItem.HApprovedResult = "";
+ }
+
+
+
+
lsmain.Add(oItem);
}catch(Exception e)
{
@@ -886,7 +1057,8 @@
string sql_main = "insert into DD_XianChangBianHuaDianPingShenDan" +
"(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle" +
",HDate" +
- ",HDept,HChangeType,HRiskLevel,HChangeContent,HRiskRemark_Safe,HRiskRemark_Study,HRiskRemark_Quality,HRiskRemark_Equipment,HRiskRemark_Product,HRiskRemark_Result) " +
+ ",HDept,HChangeType,HRiskLevel,HChangeContent,HRiskRemark_Safe,HRiskRemark_Study,HRiskRemark_Quality,HRiskRemark_Equipment,HRiskRemark_Product,HRiskRemark_Result" +
+ ",HInstanceStatus,HApprovedResult) " +
"values(" +
"'" + oItem.HMakerID + "'" +
",'" + oItem.HMakeDate + "'" +
@@ -908,6 +1080,8 @@
",'" + (oItem.HRiskRemark_Equipment==null?"": oItem.HRiskRemark_Equipment) + "'" +
",'" + (oItem.HRiskRemark_Product==null?"": oItem.HRiskRemark_Product) + "'" +
",'" + (oItem.HRiskRemak_Result==null?"": oItem.HRiskRemak_Result) + "'" +
+ ",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
+ ",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
")";
oCN.RunProc(sql_main);
@@ -1049,6 +1223,43 @@
oItem.HCloseConfirm = response.Body.Result[i].FormData["selectField_ltpe6mdd"].ToString().Replace("'", "");
}
+ //鑾峰彇瀹炰緥鐘舵��
+ GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
+ if(getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
+ {
+ return false;
+ }
+
+ oItem.HInstanceStatus = response1.Body.InstanceStatus;
+ if(oItem.HInstanceStatus == "RUNNING")
+ {
+ oItem.HInstanceStatus = "杩愯涓�";
+ }else if(oItem.HInstanceStatus== "TERMINATED")
+ {
+ oItem.HInstanceStatus = "宸茬粓姝�";
+ }
+ else if (oItem.HInstanceStatus == "COMPLETED")
+ {
+ oItem.HInstanceStatus = "宸插畬鎴�";
+ }
+ else if (oItem.HInstanceStatus == "ERROR")
+ {
+ oItem.HInstanceStatus = "寮傚父";
+ }
+
+ oItem.HApprovedResult = response1.Body.ApprovedResult;
+ if (oItem.HApprovedResult== "agree")
+ {
+ oItem.HApprovedResult = "鍚屾剰";
+ }else if(oItem.HApprovedResult== "disagree")
+ {
+ oItem.HApprovedResult = "鎷掔粷";
+ }
+ else
+ {
+ oItem.HApprovedResult = "";
+ }
+
lsmain.Add(oItem);
}
catch (Exception e)
@@ -1118,7 +1329,7 @@
",HCheckLevel,HCheckArea,HPhoto_NoSatisfyRequire,HDescription_NoSatisfyRequire,HQuestionType,HRequire_ModifyDate,HEmployeeID_Duty,HEmployee_Duty" +
",HQuestionIsNoModify" +
",HReason_NoModify,HReasonAnalysis,HMethod_Modify" +
- ",HDate_Achieve,HFile_Evidence,HCloseConfirm" +
+ ",HDate_Achieve,HFile_Evidence,HCloseConfirm,HInstanceStatus,HApprovedResult" +
") " +
"values(" +
"'" + oItem.HMakerID + "'" +
@@ -1148,7 +1359,8 @@
"," + (oItem.HDate_Achieve==null?"null":"'"+ oItem.HDate_Achieve+ "'") + "" +
",'" + (oItem.HFile_Evidence==null?"": oItem.HFile_Evidence) + "'" +
",'" + (oItem.HCloseConfirm==null?"": oItem.HCloseConfirm) + "'" +
-
+ ",'" + (oItem.HInstanceStatus==null?"":oItem.HInstanceStatus) + "'" +
+ ",'" + (oItem.HApprovedResult==null?"":oItem.HApprovedResult) + "'" +
")";
oCN.RunProc(sql_main);
@@ -1224,7 +1436,46 @@
oItem.HDept_Duty = response.Body.Result[i].FormData["selectField_lxcunmsu"].ToString().Replace("'", "");
}
-
+ //鑾峰彇瀹炰緥鐘舵��
+ GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
+ if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
+ {
+ return false;
+ }
+
+ oItem.HInstanceStatus = response1.Body.InstanceStatus;
+ if (oItem.HInstanceStatus == "RUNNING")
+ {
+ oItem.HInstanceStatus = "杩愯涓�";
+ }
+ else if (oItem.HInstanceStatus == "TERMINATED")
+ {
+ oItem.HInstanceStatus = "宸茬粓姝�";
+ }
+ else if (oItem.HInstanceStatus == "COMPLETED")
+ {
+ oItem.HInstanceStatus = "宸插畬鎴�";
+ }
+ else if (oItem.HInstanceStatus == "ERROR")
+ {
+ oItem.HInstanceStatus = "寮傚父";
+ }
+
+ oItem.HApprovedResult = response1.Body.ApprovedResult;
+ if (oItem.HApprovedResult == "agree")
+ {
+ oItem.HApprovedResult = "鍚屾剰";
+ }
+ else if (oItem.HApprovedResult == "disagree")
+ {
+ oItem.HApprovedResult = "鎷掔粷";
+ }
+ else
+ {
+ oItem.HApprovedResult = "";
+ }
+
+
List<YD_QRQCWenTiTiJiaoBiaoSub1> sub1List = new List<YD_QRQCWenTiTiJiaoBiaoSub1>();
if (keys_main.Contains("tableField_lx4azand"))
@@ -1367,6 +1618,12 @@
oCN.BeginTran();
foreach (YD_QRQCWenTiTiJiaoBiao oItem in lsmain)
{
+ ////鍒ゆ柇鍗曟嵁 瀹炰緥鐘舵�佹槸鍚︿负"宸插畬鎴�"涓� 瀹℃壒缁撴灉涓�"鍚屾剰",鑻ユ槸鍒欏悓姝ユ暟鎹紝鍚﹀垯涓嶈繘琛屽悓姝ユ暟鎹�
+ //if (!(oItem.HInstanceStatus == "宸插畬鎴�" && oItem.HApprovedResult == "鍚屾剰"))
+ //{
+ // continue;
+ //}
+
string sql_searchRepeat = "select * from DD_QRQCWenTiTiJiaoBiao where HInstanceID = '" + oItem.HInstanceID + "'";
DataSet ds_searchRepeat = oCN.RunProcReturn(sql_searchRepeat, "DD_QRQCWenTiTiJiaoBiao");
if (ds_searchRepeat != null && ds_searchRepeat.Tables[0].Rows.Count > 0)
@@ -1382,7 +1639,8 @@
}
string sql_main = "insert into DD_QRQCWenTiTiJiaoBiao" +
- "(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle,HQuestionType,HDept_Duty) " +
+ "(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle,HQuestionType,HDept_Duty" +
+ ",HInstanceStatus,HApprovedResult) " +
"values(" +
"'" + oItem.HMakerID + "'" +
",'" + oItem.HMakeDate + "'" +
@@ -1395,6 +1653,8 @@
",'" + (oItem.HQuestionType==null?"": oItem.HQuestionType) + "'" +
",'" + (oItem.HDept_Duty==null?"": oItem.HDept_Duty) + "'" +
+ ",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
+ ",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
")";
oCN.RunProc(sql_main);
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index dc96ce4..8fcbc4a 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -92,17 +92,21 @@
ds = oCN.RunProcReturn
("select a.HInterID,a.HBillType,a.HICMOBillNo,a.HICMOInterID,a.HMaterID" +
",m.HNumber HMaterNumber,m.HName HMaterName,m.HModel HMaterModel,a.HICMOEntryID" +
- ",a.HSourceBillNo,a.HSourceInterID,a.HSourceEntryID,a.HDatePlanQty " +
+ ",a.HSourceBillNo,a.HSourceInterID,a.HSourceEntryID,a.HDatePlanQty,a.HDeptID,d.HName HDeptName,m.HUnitID,u.HName HUnitName" +
" from Sc_ICMOBillStatus_Tmp a " +
" left join Gy_Material m on a.HMaterID=m.HItemID " +
+ " left join Gy_Department d on a.HDeptID=d.HItemID " +
+ " left join Gy_Unit u on m.HUnitID=u.HItemID " +
" Where a.HInterID=" + HInterID + " and a.HBillType=" + HBillType, "Sc_ICMOBillStatus_Tmp");
}
else {
ds = oCN.RunProcReturn
("select a.HInterID,a.HBillType,a.HICMOBillNo,a.HICMOInterID,a.HMaterID" +
- ",m.HNumber HMaterNumber,m.HName HMaterName,m.HModel HMaterModel,a.HICMOEntryID " +
+ ",m.HNumber HMaterNumber,m.HName HMaterName,m.HModel HMaterModel,a.HICMOEntryID,a.HDeptID,d.HName HDeptName,m.HUnitID,u.HName HUnitName " +
" from Sc_ICMOBillStatus_Tmp a " +
" left join Gy_Material m on a.HMaterID=m.HItemID " +
+ " left join Gy_Department d on a.HDeptID=d.HItemID " +
+ " left join Gy_Unit u on m.HUnitID=u.HItemID " +
" Where a.HInterID=" + HInterID + " and a.HBillType=" + HBillType, "Sc_ICMOBillStatus_Tmp");
}
@@ -231,6 +235,7 @@
BillNew.HMaterID = mainList[0].HMaterID;
BillNew.HSourceID = mainList[0].HSourceID;
BillNew.HGroupID = mainList[0].HGroupID;
+ BillNew.HDeptID = mainList[0].HDeptID;
BillNew.HCheckManID = mainList[0].HCheckManID;
BillNew.HBadReasonID = mainList[0].HBadReasonID;
BillNew.HBarCode = mainList[0].HBarCode;
@@ -246,13 +251,13 @@
oCN.RunProc("Insert Into Sc_ICMOBillQualityStatus_Tmp " +
" (HInterID,HBillNo,HDate,HICMOBillNo,HICMOInterID" +
",HProcExchBillNo,HProcExchInterID,HProcExchEntryID,HProcID,HMaterID" +
- ",HSourceID,HGroupID,HCheckManID,HBadReasonID,HBarCode" +
+ ",HSourceID,HGroupID,HDeptID,HCheckManID,HBadReasonID,HBarCode" +
",HMaker,HMakeDate,HBillType,HReportType,HSourceBillNo" +
",HSourceInterID,HSourceBillType,HICMOEntryID,HSourceEntryID,HBadReasonHQty" +
") " +
" values(" + BillNew.HInterID + ",'" + BillNew.HBillNo + "','" + BillNew.HDate + "','" + BillNew.HICMOBillNo + "'," + BillNew.HICMOInterID +
",'" + BillNew.HProcExchBillNo + "'," + BillNew.HProcExchInterID + "," + BillNew.HProcExchEntryID + "," + BillNew.HProcID + "," + BillNew.HMaterID +
- "," + BillNew.HSourceID + "," + BillNew.HGroupID + "," + BillNew.HCheckManID + "," + BillNew.HBadReasonID + ",'" + BillNew.HBarCode + "'" +
+ "," + BillNew.HSourceID + "," + BillNew.HGroupID + "," + BillNew.HDeptID + "," + BillNew.HCheckManID + "," + BillNew.HBadReasonID + ",'" + BillNew.HBarCode + "'" +
",'" + BillNew.HMaker + "','" + BillNew.HMakeDate + "','" + BillNew.HBillType + "','" + +BillNew.HReportType + "','" +BillNew.HSourceBillNo + "'" +
"," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'," + BillNew.HICMOEntryID + "," + BillNew.HICMOEntryID + "," + BillNew.HBadReasonHQty +
") ");
@@ -790,7 +795,7 @@
string subSql = "Insert into Sc_QualityReportBillSub " +
" (HInterID,HEntryID,HBillNo_bak,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID,HBadReasonNumber,HGroupID" +
+ ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HProcID,HBadReasonID,HBadReasonNumber,HGroupID" +
",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
",HBarCode,HReportType" +
",HAddr,HMaker,HMakeDate" +
@@ -812,6 +817,7 @@
"','" + oSub.HResult + "'" +
"," + oSub.HEmpID.ToString() + "" +
"," + oSub.HSourceID.ToString() + "" +
+ "," + oSub.HProcID.ToString() + "" +
"," + oSub.HBadReasonID.ToString() + "" +
",'" + oSub.HBadReasonNumber.ToString() + "'" +
",'" + oSub.HGroupID.ToString() + "'" +
diff --git a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
index 5a2de6c..982f9d3 100644
--- a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
@@ -330,13 +330,6 @@
return false;
}
- //淇濆瓨鍚庢帶鍒�
- if (!AfterSave(omodel.HInterID, omodel.HICMOInterID, omodel.HICMOEntryID, omodel.HICMOBillNo, 1, ref sReturn))
- {
- oCn.RollBack();
- return false;
- }
-
//鑾峰彇鏈�杩戠殑涓婃ā鍗� 鎶婂伐鍗曡窡妯″叿杩涜缁戝畾
ds = oCn.RunProcReturn(@"select HICMOInterID,HICMOEntryID,HSourceInterID,HSourceEntryID,HSourceID from Sc_ICMOBillStatus_Tmp where HInterID=" + omodel.HMainSourceInterID.ToString(), "Sc_ICMOBillStatus_Tmp");
@@ -365,6 +358,13 @@
}
}
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(omodel.HInterID, omodel.HICMOInterID, omodel.HICMOEntryID, omodel.HICMOBillNo, 1, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+
sReturn = omodel.HInterID.ToString();
oCn.Commit();
return true;
diff --git a/WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs b/WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs
index cc2ede2..e060d78 100644
--- a/WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs
+++ b/WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs
@@ -50,6 +50,7 @@
public string HRelationBillNo { get; set; }//鍏宠仈鍗曞彿
public long HReportEntryID { get; set; }//姹囨姤鍗曞瓙鍐呯爜
public long HBadReasonHQty { get; set; }//涓嶈壇鏁伴噺 鏂帿灏�
+ public long HDeptID { get; set; }//閮ㄩ棬
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
index 75997ac..688d11b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,12 +4,12 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-09-05T03:39:53.4537518Z;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
+ <History>True|2024-09-13T02:20:53.2644847Z;False|2024-09-13T10:19:33.7686753+08:00;True|2024-09-12T19:15:21.9135805+08:00;False|2024-09-12T19:15:07.2717017+08:00;True|2024-09-12T17:25:26.5527019+08:00;True|2024-09-12T17:20:42.2498355+08:00;True|2024-09-12T17:16:44.8817635+08:00;True|2024-09-12T17:16:02.4132675+08:00;True|2024-09-12T17:08:14.2819047+08:00;True|2024-09-12T16:07:15.3675281+08:00;True|2024-09-12T16:06:23.8568906+08:00;True|2024-09-12T15:48:45.1455315+08:00;True|2024-09-12T14:59:30.0679595+08:00;True|2024-09-12T14:18:21.9534092+08:00;True|2024-09-12T14:07:35.2885035+08:00;False|2024-09-12T14:06:30.5732168+08:00;False|2024-09-12T14:06:17.1404767+08:00;True|2024-09-12T14:03:12.8150228+08:00;True|2024-09-12T13:53:20.7537798+08:00;True|2024-09-12T13:48:43.2408012+08:00;False|2024-09-12T13:48:36.5217018+08:00;True|2024-09-11T20:20:57.7845361+08:00;False|2024-09-11T20:20:38.9732855+08:00;True|2024-09-10T15:15:04.6204983+08:00;True|2024-09-10T11:33:55.3963324+08:00;True|2024-09-10T11:10:10.3836571+08:00;True|2024-09-10T10:39:06.5850395+08:00;True|2024-09-10T10:27:33.2463582+08:00;False|2024-09-10T10:26:05.4608008+08:00;True|2024-09-09T19:14:08.0718627+08:00;True|2024-09-09T19:08:42.5709780+08:00;False|2024-09-09T19:08:33.7817129+08:00;True|2024-09-06T17:00:13.2484828+08:00;False|2024-09-06T17:00:06.1281061+08:00;True|2024-09-05T11:39:53.4537518+08:00;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/05/2024 11:38:42</publishTime>
+ <publishTime>09/13/2024 10:18:38</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/05/2024 11:38:42</publishTime>
+ <publishTime>09/13/2024 10:18:38</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/05/2024 11:38:40</publishTime>
+ <publishTime>09/13/2024 10:18:37</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/05/2024 11:38:40</publishTime>
+ <publishTime>09/13/2024 10:18:37</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/05/2024 11:38:38</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/05/2024 11:38:38</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +93,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +111,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>09/05/2024 11:38:38</publishTime>
+ <publishTime>09/13/2024 10:18:35</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/05/2024 11:38:38</publishTime>
+ <publishTime>09/13/2024 10:18:35</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,28 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/05/2024 11:38:35</publishTime>
+ <publishTime>09/13/2024 10:18:31</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/05/2024 11:38:35</publishTime>
+ <publishTime>09/13/2024 10:18:31</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/05/2024 11:38:36</publishTime>
+ <publishTime>09/13/2024 10:18:32</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/05/2024 11:38:36</publishTime>
+ <publishTime>09/13/2024 10:18:32</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/05/2024 11:38:37</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/05/2024 11:38:37</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>09/13/2024 10:15:38</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>09/13/2024 10:15:38</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -246,7 +252,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -279,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>09/05/2024 11:38:38</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>09/05/2024 11:38:38</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/05/2024 11:38:50</publishTime>
+ <publishTime>09/13/2024 10:18:58</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/05/2024 11:38:50</publishTime>
+ <publishTime>09/13/2024 10:18:58</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -303,58 +309,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -363,7 +369,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -372,121 +378,121 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>07/12/2023 08:14:21</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/16/2024 09:07:08</publishTime>
+ <publishTime>08/12/2024 15:14:33</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/06/2024 13:47:57</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/05/2024 11:39:52</publishTime>
+ <publishTime>09/13/2024 10:20:52</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index 196112c..af6ed9a 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|2024-09-05T00:14:13.2359921Z;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|2024-09-12T12:40:58.7161451Z;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>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/05/2024 08:13:34</publishTime>
+ <publishTime>09/13/2024 15:10:57</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/05/2024 08:13:34</publishTime>
+ <publishTime>09/13/2024 15:10:57</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/05/2024 08:13:30</publishTime>
+ <publishTime>09/13/2024 15:10:55</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/05/2024 08:13:30</publishTime>
+ <publishTime>09/13/2024 15:10:55</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/05/2024 08:13:23</publishTime>
+ <publishTime>09/13/2024 15:10:49</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/05/2024 08:13:23</publishTime>
+ <publishTime>09/13/2024 15:10:49</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>09/05/2024 08:13:25</publishTime>
+ <publishTime>09/13/2024 15:10:50</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/05/2024 08:13:25</publishTime>
+ <publishTime>09/13/2024 15:10:50</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/05/2024 08:13:21</publishTime>
+ <publishTime>09/13/2024 15:10:47</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/05/2024 08:13:21</publishTime>
+ <publishTime>09/13/2024 15:10:47</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/05/2024 08:13:22</publishTime>
+ <publishTime>09/13/2024 15:10:48</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/05/2024 08:13:22</publishTime>
+ <publishTime>09/13/2024 15:10:48</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/05/2024 08:13:22</publishTime>
+ <publishTime>09/13/2024 15:10:48</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/05/2024 08:13:22</publishTime>
+ <publishTime>09/13/2024 15:10:48</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>09/05/2024 08:09:41</publishTime>
+ <publishTime>09/13/2024 15:08:19</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>09/05/2024 08:09:41</publishTime>
+ <publishTime>09/13/2024 15:08:19</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>09/05/2024 08:10:10</publishTime>
+ <publishTime>09/11/2024 21:15:43</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>09/05/2024 08:10:15</publishTime>
+ <publishTime>09/11/2024 21:15:51</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/05/2024 08:14:11</publishTime>
+ <publishTime>09/13/2024 15:11:26</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/05/2024 08:14:11</publishTime>
+ <publishTime>09/13/2024 15:11:26</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/29/2024 08:06:26</publishTime>
+ <publishTime>09/12/2024 09:12:52</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 92a3a80..1a295c0 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -8,10 +8,10 @@
- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
- </sectionGroup>
- </configSections>
+ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+ </sectionGroup>
+ </configSections>
<connectionStrings>
<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />
@@ -23,6 +23,8 @@
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
<!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" />--><!--棰滃彴寮忔満-->
+ <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx"/>-->
+ <!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -32,7 +34,8 @@
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
<!--<add key="sUrl" value="http://122.227.133.186:8090/WEBS/WebService1.asmx"/> -->
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
- <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
+ <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> -->
+ <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
<add key="surl" value="http://localhost/webs-web/webservice1.asmx" /> <!--缈佹稕娑涙湰鍦伴厤缃�-->
@@ -106,15 +109,15 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
+ <endpoint address="http://10.10.1.2:8090/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
</client>
</system.serviceModel>
-
- <applicationSettings>
- <WebAPI.Properties.Settings>
- <setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value>
- </setting>
- </WebAPI.Properties.Settings>
- </applicationSettings>
-</configuration>
\ No newline at end of file
+ <applicationSettings>
+ <WebAPI.Properties.Settings>
+ <setting name="WebAPI_WebS_WebService1" serializeAs="String">
+ <value>http://10.10.1.2:8090/WEBS-WMS/WebService1.asmx</value>
+ </setting>
+ </WebAPI.Properties.Settings>
+ </applicationSettings>
+</configuration>
+<!--ProjectGuid: 5B60CE0C-963C-4DC2-91B3-0B471AAC5438-->
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 8f42713..fedea3e 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,8 +9,9 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile5.pubxml</NameOfLastUsedPublishProfile>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 904abe8..98d4a8d 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 6e55c17..b23d27f 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/Release/DesignTimeResolveAssemblyReferencesInput.cache b/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
similarity index 100%
rename from sdk_dingding/TopSdk/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
rename to sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
similarity index 100%
rename from sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
rename to sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index c8929a7..cc295df 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,11 +1,6 @@
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache
deleted file mode 100644
index 6bd410c..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 904abe8..98d4a8d 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 6e55c17..b23d27f 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
deleted file mode 100644
index 5354f72..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
--
Gitblit v1.9.1