From b9d2d6f02a977d0b2ea48f28d6eb396f4326e504 Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期五, 10 十一月 2023 16:55:13 +0800
Subject: [PATCH] 1
---
Model/销售管理/ClsXs_SeOrderChangeBillMain.cs | 20
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.cs | 559 ++
WebAPI/DLL/ClsSb_EquipDotCheckBill.cs | 8
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs | 863 +++
WebAPI/WebAPI.csproj.user | 2
WebAPI/Models/ClsSb_EquipDotCheckBillMain.cs | 2
WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs | 151
Model/销售管理/ClsXs_CusRatingChangeBillMain.cs | 7
WebAPI/Controllers/SCGL/Gy_SourceWorkStationSetController.cs | 52
WarM/条码打印/Gy_BarCodeBill.cs | 14
DAL/销售管理/ClsXs_CusRatingChangeBill.cs | 62
DAL/应收管理/ClsYS_ReceiveBill.cs | 44
WebAPI/Controllers/MateOutController.cs | 4
WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs | 8
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 57
Model/销售管理/ClsXs_SeOrderBillSub.cs | 28
DAL/生产管理/设备管理/ClsGy_EquipFileMain.cs | 21
Model/生产管理/设备管理/ClsSc_EquipMaintainBillSub_Item.cs | 1
DAL/销售管理/ClsXs_ExceptiveCheckRequestBill.cs | 282 +
Model/APS/ClsSc_ICMOChangeBillSub.cs | 19
WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs | 849 +++
DAL/销售管理/ClsXs_SeOrderChangeBill.cs | 315 +
WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs | 153
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 441 ++
Model/仓库管理/ClsKf_SellOutBillMain.cs | 2
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 25
WebAPI/Controllers/WebAPIController.cs | 187
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.resx | 449 ++
DAL/生产管理/设备管理/ClsGy_EquipTypeBill.cs | 18
Model/生产管理/设备管理/ClsGy_EquipTypeBill.cs | 29
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 822 +++
WebAPI/ListModels.cs | 175
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 2
DAL/DAL.csproj | 5
Model/销售管理/ClsXs_SeOrderChangeBillSub.cs | 18
Model/销售管理/ClsXs_SeOrderBillMain.cs | 59
WebAPI/WebAPI.csproj | 6
WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs | 4
LMES/ClsShowMod.cs | 5
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 158
DAL/仓库管理/ClsKf_SellOutBillForLayUI.cs | 19
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 127
WebAPI/Controllers/条码管理/WEBSController.cs | 217 +
Model/Model.csproj | 7
Model/销售管理/ClsXs_ExceptiveCheckRequestBillMain.cs | 25
DAL/应收管理/ClsYS_ReceiveBackBill.cs | 39
DAL/生产管理/设备管理/ClsSb_EquipMaintainBill.cs | 9
Model/应收管理/ClsYS_ReceiveBackBillMain.cs | 3
DAL/APS/ClsSc_ICMOChangeBill.cs | 301 +
Model/应收管理/ClsYS_ReceiveBillMain.cs | 3
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 2
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 456 ++
WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs | 805 +++
WebAPI/Web.config | 4
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs | 153
DAL/销售管理/ClsXs_SeOrderBill.cs | 289 +
WarM/WarM.csproj | 10
WebAPI/Controllers/XSGL/Xs_CusRatingChangeBillController.cs | 813 +++
Model/APS/ClsSc_ICMOChangeBillMain.cs | 16
Model/生产管理/ClsSc_QualityReportBillSub.cs | 1
WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs | 155
WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs | 841 +++
Model/销售管理/ClsXs_ExceptiveCheckRequestBillSub.cs | 11
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs | 153
WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs | 154
WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs | 154
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.designer.cs | 1154 +++++
DBUtility/基础资料/ClsGy_Base_Ctl.cs | 99
WebAPI/Controllers/XSGL/Xs_ExceptiveCheckRequestBillController.cs | 812 +++
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 155
70 files changed, 12,642 insertions(+), 271 deletions(-)
diff --git a/DAL/APS/ClsSc_ICMOChangeBill.cs b/DAL/APS/ClsSc_ICMOChangeBill.cs
new file mode 100644
index 0000000..4f75751
--- /dev/null
+++ b/DAL/APS/ClsSc_ICMOChangeBill.cs
@@ -0,0 +1,301 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsSc_ICMOChangeBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSc_ICMOChangeBillMain omodel = new Model.ClsSc_ICMOChangeBillMain();
+ public List<Model.ClsSc_ICMOChangeBillSub> DetailColl = new List<Model.ClsSc_ICMOChangeBillSub>();
+
+ public ClsSc_ICMOChangeBill()
+ {
+ base.MvarItemKeySub = "Sc_ICMOChangeBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "Sc_ICMOChangeBillMain";
+ base.MvarReportTitle="鐢熶骇璁㈠崟鍙樻洿鍗�";
+ base.BillType="3743";
+ base.HBillSubType = "3743";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+ #region 鏃犲弬鏋勯�犲嚱鏁�
+ ~ClsSc_ICMOChangeBill()
+ {
+ DetailColl = null;
+ }
+ #endregion
+ #endregion
+
+ #region 淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ string mainSql = "update Sc_ICMOChangeBillMain set " +
+ " HBillNo = '" + omodel.HBillNo +
+ "', HDate = '" + omodel.HDate +
+ "', HYear = " + omodel.HYear +
+ ", HPeriod = " + omodel.HPeriod +
+ ", HRemark = '" + omodel.HRemark +
+ "', HUpDater = '" + omodel.HUpDater +
+ "', HUpDateDate = getdate()" +
+ //===============================================================
+ ", HDeptID=" + omodel.HDeptID +
+ ", HEmpID=" + omodel.HEmpID +
+ ", HCusID=" + omodel.HCusID +
+ ", HExplanation='" + omodel.HExplanation + "'" +
+ ", HOrgID = " + omodel.HOrgID +
+ ", HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ " where HInterID = " + omodel.HInterID;
+
+ oCn.RunProc(mainSql);
+
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSc_ICMOChangeBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Sc_ICMOChangeBillSub" +
+ "(HInterID,HEntryID,HBillNo_bak,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HQty_Old,HQty_New) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ ",'" + omodel.HBillNo + "'" +
+ ",'" + oSub.HCloseMan + "'" +
+ ",'" + oSub.HEntryCloseDate + "'" +
+ "," + Convert.ToString(oSub.HCloseType ? 1 : 0) +
+ ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo + "'" +
+ ",'" + oSub.HSourceBillType + "'" +
+ "," + oSub.HRelationQty +
+ "," + oSub.HRelationMoney +
+
+ "," + oSub.HMaterID +
+ "," + oSub.HUnitID +
+ "," + oSub.HQty_Old +
+ "," + oSub.HQty_New +
+ //",'" + oSub.HDate_Old + "'" +
+ //",'" + oSub.HDate_New + "'" +
+ ")";
+ oCn.RunProc(subSql);
+ }
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ while (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+
+ oCn.BeginTran();
+ //鎻掑叆涓昏〃
+ string mainSql = "Insert Into Sc_ICMOChangeBillMain " +
+ "(" +
+ "HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HRemark,HMaker,HMakeDate" +
+ ",HDeptID,HEmpID,HCusID,HExplanation,HOrgID,HInnerBillNo" +
+ ") " +
+ " values(" +
+ "'" + this.BillType + "'" +
+ ",'" + this.HBillSubType + "'" +
+ "," + omodel.HInterID +
+ ",'" + omodel.HBillNo + "'" +
+ ",'" + omodel.HDate + "'" +
+ "," + omodel.HYear +
+ "," + omodel.HPeriod +
+ "," + omodel.HMainSourceInterID +
+ "," + omodel.HMainSourceEntryID +
+ ",'" + omodel.HMainSourceBillNo + "'" +
+ ",'" + omodel.HMainSourceBillType + "'" +
+ ",'" + omodel.HRemark + "'" +
+ ",'" + DBUtility.ClsPub.CurUserName + "'" +
+ ",getdate()" +
+
+ "," + omodel.HDeptID +
+ "," + omodel.HEmpID +
+ "," + omodel.HCusID +
+ ",'" + omodel.HExplanation + "'" +
+ "," + omodel.HOrgID +
+ ",'" + omodel.HInnerBillNo + "'" +
+ ")";
+
+ oCn.RunProc(mainSql);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsSc_ICMOChangeBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Sc_ICMOChangeBillSub" +
+ "(HInterID,HEntryID,HBillNo_bak,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HQty_Old,HQty_New) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ ",'" + omodel.HBillNo + "'" +
+ ",'" + oSub.HCloseMan + "'" +
+ ",'" + oSub.HEntryCloseDate + "'" +
+ "," + Convert.ToString(oSub.HCloseType ? 1 : 0) +
+ ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo + "'" +
+ ",'" + oSub.HSourceBillType + "'" +
+ "," + oSub.HRelationQty +
+ "," + oSub.HRelationMoney +
+
+ "," + oSub.HMaterID +
+ "," + oSub.HUnitID +
+ "," + oSub.HQty_Old +
+ "," + oSub.HQty_New +
+ //",'" + oSub.HDate_Old + "'" +
+ //",'" + oSub.HDate_New + "'" +
+ ")";
+ oCn.RunProc(subSql);
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("select * from Sc_ICMOChangeBillMain Where HInterID = " + lngBillKey.ToString(), "Sc_ICMOChangeBillMain");
+ 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]["HMainSourceEntryID"]);
+ omodel.HMainSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillNo"]);
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+ //========================================================
+
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"]);
+ omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+ omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
+
+
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("select * from Sc_ICMOChangeBillSub where HInterID = " + lngBillKey.ToString() + "order by HEntryID", "Sc_ICMOChangeBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSc_ICMOChangeBillSub oSub = new Model.ClsSc_ICMOChangeBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ 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.HBillNo_bak = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBillNo_bak"]);
+
+ oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HQty_Old = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[0]["HQty_Old"]);
+ oSub.HQty_New = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[0]["HQty_New"]);
+ //oSub.HDate_Old = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HDate_Old"]);
+ //oSub.HDate_New = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HDate_New"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ #endregion
+
+ }
+
+}
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 960537b..b6aebc5 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -75,6 +75,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
+ <Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
<Compile Include="ClsPay_AbsentBill.cs" />
<Compile Include="ClsPay_EarlyLateErrBill.cs" />
<Compile Include="ClsPay_RewardPunishBill.cs" />
@@ -609,6 +610,8 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairInBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairOutBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStatusChangeBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_EquipFileMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_EquipTypeBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipWorkBeforeCheckBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStockInCheckBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsBill.cs" />
@@ -742,6 +745,8 @@
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcessPlanChangeSec.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchQualityReport.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchReport.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_SeOrderChangeBill.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_ExceptiveCheckRequestBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ContractBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_CreditChangeBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_CusStatusChangeBill.cs" />
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
index 87a16cd..38be5c5 100644
--- "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
@@ -90,8 +90,8 @@
{
//
oCn.BeginTran();
- //鏇存柊涓昏〃
- oCn.RunProc("UpDate Kf_ICStockBillMain set " +
+
+ string mainSql = "UpDate Kf_ICStockBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + omodel.HDate + "'" +
",HYear='" + omodel.HYear.ToString() + "'" +
@@ -99,7 +99,9 @@
",HRemark='" + omodel.HRemark + "'" +
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
",HUpDateDate=getdate()" +
- //========================================
+ //========================================
+ ",HOrgID=" + omodel.HOrgID +
+
",HEmpID=" + omodel.HEmpID.ToString() +
",HSupID=" + omodel.HSupID.ToString() +
",HWHID=" + omodel.HWHID.ToString() +
@@ -122,7 +124,10 @@
",HLinkMan='" + omodel.HLinkMan + "'" +
",HConveyMoney=" + omodel.HConveyMoney.ToString() +
",HRedBlueFlag=" + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
- " where HInterID=" + lngBillKey.ToString());
+ " where HInterID=" + lngBillKey.ToString();
+
+ //鏇存柊涓昏〃
+ oCn.RunProc(mainSql);
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
@@ -190,7 +195,7 @@
//涓昏〃
oCn.RunProc("Insert Into Kf_ICStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" +
- ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HOrgID" +
",HSupID,HWHID,HSCWHID,HEmpID,HManagerID"+
",HSecManagerID,HSellSID,HCurID" +
",HLinkMan,HLinkPhone" +
@@ -198,7 +203,7 @@
",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag,HCarriage,HCheckStatusMan" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMainSourceBillType + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" + "," + omodel.HOrgID +
", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() +
"," + omodel.HSecManagerID.ToString() + "," + omodel.HSellSID.ToString() + "," + omodel.HCurID.ToString() +
",'" + omodel.HLinkMan + "','" + omodel.HLinkPhone + "'" +
@@ -286,6 +291,8 @@
omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
//========================================================
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+
omodel.HSellSID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSellSID"]);
omodel.HCurID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCurID"]);
omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
diff --git "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBill.cs" "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBill.cs"
index 77dbe6a..7986037 100644
--- "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBill.cs"
+++ "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBill.cs"
@@ -41,7 +41,8 @@
//
oCn.BeginTran();
//鏇存柊涓昏〃
- oCn.RunProc("UpDate YS_ReceiveBillMain set " +
+ string mainSql =
+ "UpDate YS_ReceiveBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + omodel.HDate + "'" +
",HYear='" + omodel.HYear.ToString() + "'" +
@@ -49,7 +50,7 @@
",HRemark='" + omodel.HRemark + "'" +
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
",HUpDateDate=getdate()" +
- //========================================
+ //========================================
",HAccDate='" + omodel.HAccDate + "'" +
",HCusID=" + omodel.HCusID.ToString() +
",HAccCusID=" + omodel.HAccCusID.ToString() +
@@ -58,6 +59,8 @@
",HExRate=" + omodel.HExRate.ToString() +
",HDeptID=" + omodel.HDeptID.ToString() +
",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID +
+ ",HOrgID=" + omodel.HOrgID +
",HSumMoney=" + omodel.HSumMoney.ToString() +
",HBankID=" + omodel.HBankID.ToString() +
",HBankNo='" + omodel.HBankNo + "'" +
@@ -68,12 +71,13 @@
",HRemainMoney=" + omodel.HRemainMoney.ToString() +
",HCheckStatus=" + omodel.HCheckStatus.ToString() +
- ",HSSNum='" + omodel.HSSNum.ToString() +
+ ",HSSNum='" + omodel.HSSNum.ToString() + "'" +
",HRelSumMoney=" + omodel.HRelSumMoney.ToString() +
",HSumMoneyBB=" + omodel.HSumMoneyBB.ToString() +
",HRelSumMoneyBB=" + omodel.HRelSumMoneyBB.ToString() +
",HDiscountRate=" + omodel.HDiscountRate.ToString() +
- " where HInterID=" + lngBillKey.ToString());
+ " where HInterID=" + lngBillKey.ToString();
+ oCn.RunProc(mainSql);
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
@@ -129,25 +133,32 @@
try
{
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ while(IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
oCn.BeginTran();
- //涓昏〃
- oCn.RunProc("Insert Into YS_ReceiveBillMain " +
+ string mainSql = "Insert Into YS_ReceiveBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HAccDate,HCusID,HAccCusID,HSSID,HCurID,HExRate" +
- ",HDeptID,HEmpID,HSumMoney,HBankID,HBankNo,HExplanation" +
+ ",HDeptID,HEmpID,HManagerID,HOrgID,HSumMoney,HBankID,HBankNo,HExplanation" +
",HSSNum,HDiscountRate,HRelSumMoney,HSumMoneyBB,HRelSumMoneyBB" +
",HInnerBillNo,HCheckMoney,HCheckMoneyFor,HRemainMoney,HCheckStatus" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ " 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.HAccDate + "'," + omodel.HCusID.ToString() + "," + omodel.HAccCusID.ToString() + "," + omodel.HSSID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() +
- ", " + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HSumMoney.ToString() + "," + omodel.HBankID.ToString() + ",'" + omodel.HBankNo + "','" + omodel.HExplanation + "'" +
- ",'" + omodel.HSSNum + "'," + omodel.HDiscountRate.ToString() + "," + omodel.HRelSumMoney.ToString() + "," + omodel.HSumMoneyBB.ToString() + "," + omodel.HRelSumMoneyBB.ToString() +
- ",'" + omodel.HInnerBillNo + "'," + omodel.HCheckMoney.ToString() + "," + omodel.HCheckMoneyFor.ToString() + "," + omodel.HRemainMoney.ToString() + "," + omodel.HCheckStatus.ToString() +
- ") ");
+ ", " + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID + "," + omodel.HOrgID + "," + omodel.HSumMoney.ToString() + "," + omodel.HBankID.ToString() + ",'" + omodel.HBankNo + "','" + omodel.HExplanation + "'" +
+ ",'" + omodel.HSSNum + "'," + omodel.HDiscountRate.ToString() + "," + omodel.HRelSumMoney.ToString() + "," + omodel.HSumMoneyBB.ToString() + "," + omodel.HRelSumMoneyBB.ToString() +
+ ",'" + omodel.HInnerBillNo + "'," + omodel.HCheckMoney.ToString() + "," + omodel.HCheckMoneyFor.ToString() + "," + omodel.HRemainMoney.ToString() + "," + omodel.HCheckStatus.ToString() +
+ ") ";
+
+ //涓昏〃
+ oCn.RunProc(mainSql);
//鎻掑叆瀛愯〃
foreach (Model.ClsYS_ReceiveBackBillSub oSub in DetailColl)
{
@@ -241,6 +252,8 @@
omodel.HExRate = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HExRate"]);
omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
omodel.HSumMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSumMoney"]);
omodel.HBankID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBankID"]);
omodel.HBankNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBankNo"]);
diff --git "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs" "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
index a8bac17..79952d1 100644
--- "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
+++ "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
@@ -41,7 +41,7 @@
//
oCn.BeginTran();
//鏇存柊涓昏〃
- oCn.RunProc("UpDate YS_ReceiveBillMain set " +
+ string mainSql = "UpDate YS_ReceiveBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + omodel.HDate + "'" +
",HYear='" + omodel.HYear.ToString() + "'" +
@@ -49,7 +49,7 @@
",HRemark='" + omodel.HRemark + "'" +
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
",HUpDateDate=getdate()" +
- //========================================
+ //========================================
",HAccDate='" + omodel.HAccDate + "'" +
",HCusID=" + omodel.HCusID.ToString() +
",HAccCusID=" + omodel.HAccCusID.ToString() +
@@ -58,6 +58,8 @@
",HExRate=" + omodel.HExRate.ToString() +
",HDeptID=" + omodel.HDeptID.ToString() +
",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID +
+ ",HOrgID=" + omodel.HOrgID +
",HSumMoney=" + omodel.HSumMoney.ToString() +
",HBankID=" + omodel.HBankID.ToString() +
",HBankNo='" + omodel.HBankNo + "'" +
@@ -68,12 +70,15 @@
",HRemainMoney=" + omodel.HRemainMoney.ToString() +
",HCheckStatus=" + omodel.HCheckStatus.ToString() +
- ",HSSNum='" + omodel.HSSNum.ToString() +
+ ",HSSNum='" + omodel.HSSNum.ToString() + "'" +
",HRelSumMoney=" + omodel.HRelSumMoney.ToString() +
",HSumMoneyBB=" + omodel.HSumMoneyBB.ToString() +
",HRelSumMoneyBB=" + omodel.HRelSumMoneyBB.ToString() +
",HDiscountRate=" + omodel.HDiscountRate.ToString() +
- " where HInterID=" + lngBillKey.ToString());
+ " where HInterID=" + lngBillKey.ToString();
+
+
+ oCn.RunProc(mainSql);
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
@@ -129,29 +134,37 @@
try
{
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ while (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+
oCn.BeginTran();
//涓昏〃
- oCn.RunProc("Insert Into YS_ReceiveBillMain " +
+ string mainSql = "Insert Into YS_ReceiveBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HAccDate,HCusID,HAccCusID,HSSID,HCurID,HExRate" +
- ",HDeptID,HEmpID,HSumMoney,HBankID,HBankNo,HExplanation" +
+ ",HDeptID,HEmpID,HManagerID,HOrgID,HSumMoney,HBankID,HBankNo,HExplanation" +
",HSSNum,HDiscountRate,HRelSumMoney,HSumMoneyBB,HRelSumMoneyBB" +
",HInnerBillNo,HCheckMoney,HCheckMoneyFor,HRemainMoney,HCheckStatus" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ " 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.HAccDate + "'," + omodel.HCusID.ToString() + "," + omodel.HAccCusID.ToString() + "," + omodel.HSSID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() +
- ", " + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HSumMoney.ToString() + "," + omodel.HBankID.ToString() + ",'" + omodel.HBankNo + "','" + omodel.HExplanation + "'" +
- ",'" + omodel.HSSNum + "'," + omodel.HDiscountRate.ToString() + "," + omodel.HRelSumMoney.ToString() + "," + omodel.HSumMoneyBB.ToString() + "," + omodel.HRelSumMoneyBB.ToString() +
- ",'" + omodel.HInnerBillNo + "'," + omodel.HCheckMoney.ToString() + "," + omodel.HCheckMoneyFor.ToString() + "," + omodel.HRemainMoney.ToString() + "," + omodel.HCheckStatus.ToString() +
- ") ");
+ ", " + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID + "," + omodel.HOrgID + "," + omodel.HSumMoney.ToString() + "," + omodel.HBankID.ToString() + ",'" + omodel.HBankNo + "','" + omodel.HExplanation + "'" +
+ ",'" + omodel.HSSNum + "'," + omodel.HDiscountRate.ToString() + "," + omodel.HRelSumMoney.ToString() + "," + omodel.HSumMoneyBB.ToString() + "," + omodel.HRelSumMoneyBB.ToString() +
+ ",'" + omodel.HInnerBillNo + "'," + omodel.HCheckMoney.ToString() + "," + omodel.HCheckMoneyFor.ToString() + "," + omodel.HRemainMoney.ToString() + "," + omodel.HCheckStatus.ToString() +
+ ") ";
+ oCn.RunProc(mainSql);
//鎻掑叆瀛愯〃
foreach (Model.ClsYS_ReceiveBillSub oSub in DetailColl)
{
- oCn.RunProc("Insert into YS_ReceiveBillSub " +
+ string subSql = "Insert into YS_ReceiveBillSub " +
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HMaterID,HUnitID,HQty,HPrice,HMoney" +
@@ -167,7 +180,8 @@
"," + oSub.HSourceMoneyBB.ToString() + "," + oSub.HReadyCheckMoney.ToString() + "," + oSub.HUnCheckMoney.ToString() + "," + oSub.HCheckMoney.ToString() + "," + oSub.HCheckMoneyBB.ToString() + "," + oSub.HInovceExRate.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
"," + oSub.HPOContractInterID.ToString() + "," + oSub.HPOContractEntryID.ToString() + ",'" + oSub.HPOContractBillNo + "'," + oSub.HSeContractInterID.ToString() + "," + oSub.HSeContractEntryID.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
- ") ");
+ ") ";
+ oCn.RunProc(subSql);
}
//
//foreach (Model.ClsYS_ReceiveBillSub oSub in DetailColl)
@@ -241,6 +255,8 @@
omodel.HExRate = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HExRate"]);
omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
omodel.HSumMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSumMoney"]);
omodel.HBankID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBankID"]);
omodel.HBankNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBankNo"]);
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsGy_EquipFileMain.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsGy_EquipFileMain.cs"
new file mode 100644
index 0000000..ecb8c2e
--- /dev/null
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsGy_EquipFileMain.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_EquipFileMain : DBUtility.ClsXt_BaseBill
+ {
+ public ClsGy_EquipFileMain()
+ {
+ base.MvarItemKeySub = "Gy_EquipFileBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Gy_EquipFileBillMain";
+ base.MvarReportTitle = "璁惧妗ｆ";
+ base.BillType = "3308";
+ }
+ }
+}
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsGy_EquipTypeBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsGy_EquipTypeBill.cs"
new file mode 100644
index 0000000..a6eeb44
--- /dev/null
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsGy_EquipTypeBill.cs"
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_EquipTypeBill : DBUtility.ClsGy_Base_Ctl
+ {
+ public Model.ClsGy_EquipTypeBill oModel = new Model.ClsGy_EquipTypeBill();
+ public ClsGy_EquipTypeBill()
+ {
+ MvarItemKey = "Gy_EquipFileType";
+ MvarReportTitle = "璁惧鍒嗙被";
+ oModel = new Model.ClsGy_EquipTypeBill();
+ }
+ }
+}
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
index ea7b0aa..78cf638 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
@@ -120,10 +120,11 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark,HEquipID" +
",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo,HEquipMaintainRuleInterID" +
- ") "+
+ ",HDeptID" +
+ ") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
- ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString()+
+ ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString() + "," + omodel.HDeptID +
") ");
//鎻掑叆閰嶄欢瀛愯〃
foreach (Model.ClsSb_EquipMaintainBillSub oSub in DetailColl)
@@ -151,12 +152,14 @@
",HManagerID" +
",HCloseMan,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaintainResult" +
") values("
+ omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() +
",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
"," + Item.HManagerID.ToString() +
",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
- "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
+ "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() + ",'" + Item.HMaintainResult +
+ "'" +
") ");
}
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_CusRatingChangeBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_CusRatingChangeBill.cs"
index e3c7e6d..017b171 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_CusRatingChangeBill.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_CusRatingChangeBill.cs"
@@ -37,7 +37,7 @@
//
oCn.BeginTran();
//鏇存柊涓昏〃
- oCn.RunProc("UpDate Xs_CusRatingChangeBillMain set " +
+ string mainSql = "UpDate Xs_CusRatingChangeBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" +
",HDeptID=" + omodel.HDeptID.ToString() +
",HEmpID=" + omodel.HEmpID.ToString() +
@@ -46,13 +46,22 @@
",HOldRating=" + omodel.HOldRating.ToString() +
",HNewRating=" + omodel.HNewRating.ToString() +
",HReason='" + omodel.HReason + "'" +
+ ",HManagerID=" + omodel.HManagerID +
+ ",HOrgID=" + omodel.HOrgID +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HOldRatingDate=" + omodel.HOldRatingDate +
+ ",HNewRatingDate=" + omodel.HNewRatingDate +
+ ",HOldRedRatingDate=" + omodel.HOldRedRatingDate +
+ ",HNewRedRatingDate=" + omodel.HNewRedRatingDate +
",HFinanceCheck='" + omodel.HFinanceCheck + "'" +
",HFinanceCheckStatus='" + omodel.HFinanceCheckStatus + "'" +
",HGeneralManager='" + omodel.HGeneralManager + "'" +
",HGeneralManagerStatus='" + omodel.HGeneralManagerStatus + "'" +
",HUpDater='" + omodel.HUpDater + "'" +
",HUpDateDate='" + omodel.HUpDateDate + "'" +
- " where HInterID=" + lngBillKey.ToString());
+ " where HInterID=" + lngBillKey.ToString();
+
+ oCn.RunProc(mainSql);
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
////鍒犻櫎瀛愯〃
@@ -86,33 +95,42 @@
try
{
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
- omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
- {
- omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
- }
- if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ //if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
+ //{
+ // omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //}
+ //if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ //{
+ // omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //}
+ //
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ while (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
{
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
}
- //
+
+
oCn.BeginTran();
//涓昏〃
- oCn.RunProc("Insert Into Xs_CusRatingChangeBillMain " +
- "(HBillType,HInterID,HBillNo,HDate" +
- ",HYear,HPeriod,HMaker,HMakeDate" +
- ",HEmpID,HDeptID,HCusID" +
- ",HReason,HFinanceCheck,HFinanceCheckStatus,HGeneralManager,HGeneralManagerStatus" +
- ",HOldRating,HNewRating" +
+ string mainSql = "Insert Into Xs_CusRatingChangeBillMain " +
+ "(HBillType,HInterID,HBillNo,HDate,HYear,HPeriod,HMaker,HMakeDate" +
+ ",HEmpID,HDeptID,HCusID,HReason,HFinanceCheck,HFinanceCheckStatus,HGeneralManager,HGeneralManagerStatus" +
+ ",HOldRating,HNewRating,HManagerID,HOldRatingDate,HNewRatingDate,HOldRedRatingDate,HNewRedRatingDate,HOrgID,HRemark" +
") " +
" values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HEmpID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HCusID.ToString() +
",'" + omodel.HReason + "','" + omodel.HFinanceCheck + "','" + omodel.HFinanceCheckStatus + "','" + omodel.HGeneralManager + "','" + omodel.HGeneralManagerStatus + "'" +
- "," + omodel.HOldRating.ToString() + "," + omodel.HNewRating.ToString() +
- ") ");
+ "," + omodel.HOldRating.ToString() + "," + omodel.HNewRating.ToString() +
+ "," + omodel.HManagerID + "," + omodel.HOldRatingDate + "," + omodel.HNewRatingDate + "," + omodel.HOldRedRatingDate + "," + omodel.HNewRedRatingDate + "," + omodel.HOrgID + ",'" + omodel.HRemark + "'" +
+ ") ";
+
+ oCn.RunProc(mainSql);
////鎻掑叆瀛愯〃
//foreach (Model.ClsXs_CusRatingChangeBillSub oSub in DetailColl)
//{
@@ -161,6 +179,14 @@
//
omodel.HOldRating = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HOldRating"]);
omodel.HNewRating = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HNewRating"]);
+
+ omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+ omodel.HRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ omodel.HOldRatingDate = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOldRatingDate"]);
+ omodel.HNewRatingDate = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HNewRatingDate"]);
+ omodel.HOldRedRatingDate = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOldRedRatingDate"]);
+ omodel.HNewRedRatingDate = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HNewRedRatingDate"]);
//
omodel.HReason = Ds.Tables[0].Rows[0]["HReason"].ToString().Trim();
omodel.HFinanceCheck = Ds.Tables[0].Rows[0]["HFinanceCheck"].ToString().Trim();
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBill.cs"
new file mode 100644
index 0000000..d6db0f8
--- /dev/null
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBill.cs"
@@ -0,0 +1,282 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsXs_ExceptiveCheckRequestBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsXs_ExceptiveCheckRequestBillMain omodel = new Model.ClsXs_ExceptiveCheckRequestBillMain();
+ public List<Model.ClsXs_ExceptiveCheckRequestBillSub> DetailColl = new List<Model.ClsXs_ExceptiveCheckRequestBillSub>();
+
+ public ClsXs_ExceptiveCheckRequestBill()
+ {
+ base.MvarItemKeyForWeb = "";
+ base.MvarItemKeySubForWeb = "";
+ base.MvarItemKeySub = "Xs_ExceptiveCheckRequestBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "Xs_ExceptiveCheckRequestBillMain";
+ base.MvarReportTitle = "鐗规壒鐢宠鍗�";
+ base.BillType = "1422";
+ base.HBillSubType = "1422";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsXs_ExceptiveCheckRequestBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ string mainSql = "UpDate Xs_ExceptiveCheckRequestBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+
+
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HCurID=" + omodel.HCurID +
+ ",HExRate=" + omodel.HExRate +
+ ",HCusID=" + omodel.HCusID +
+ ",HManagerID=" + omodel.HManagerID +
+ ",HReason='" + omodel.HReason + "'" +
+ ",HSendMoney=" + omodel.HSendMoney +
+ ",HLeftMoney=" + omodel.HLeftMoney +
+ ",HOrgID=" + omodel.HOrgID +
+ ",HSendQty=" + omodel.HSendQty +
+ ",HLastSendDate='" + omodel.HLastSendDate + "'" +
+ ",HCreditRating_Q=" + omodel.HCreditRating_Q +
+ ",HMaxCreditRating_Q=" + omodel.HMaxCreditRating_Q +
+ " where HInterID=" + lngBillKey.ToString();
+
+ oCn.RunProc(mainSql);
+
+
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+
+
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ //鎻掑叆瀛愯〃
+ //foreach (Model.ClsXs_ExceptiveCheckRequestBillSub oSub in DetailColl)
+ //{
+ // string subSql = "Insert into Xs_ExceptiveCheckRequestBillSub " +
+ // "(" +
+ // ") " +
+ // " values(" +
+ // ")";
+ // oCn.RunProc(subSql);
+ //}
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ while (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+
+ oCn.BeginTran();
+ string mainSql = "Insert Into Xs_ExceptiveCheckRequestBillMain " +
+ "(" +
+ "HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
+ ",HDeptID,HEmpID,HCurID,HExRate,HCusID,HManagerID,HReason,HSendMoney,HLeftMoney,HOrgID,HSendQty,HLastSendDate,HCreditRating_Q,HMaxCreditRating_Q" +
+ ") " +
+ " values('" +
+ this.BillType +
+ "','" + this.HBillSubType + "'" +
+ "," + omodel.HInterID +
+ ",'" + omodel.HBillNo + "'" +
+ ",'" + omodel.HDate + "'" +
+ "," + omodel.HYear +
+ "," + omodel.HPeriod +
+ ",'" + omodel.HRemark + "'" +
+ ",'" + DBUtility.ClsPub.CurUserName + "'" +
+ ",getdate()" +
+ "," + omodel.HMainSourceInterID +
+ "," + omodel.HMainSourceEntryID +
+ ",'" + omodel.HMainSourceBillNo + "'" +
+ ",'" + omodel.HMainSourceBillType + "'" +
+ "," + omodel.HDeptID +
+ "," + omodel.HEmpID +
+ "," + omodel.HCurID +
+ "," + omodel.HExRate +
+ "," + omodel.HCusID +
+ "," + omodel.HManagerID +
+ ",'" + omodel.HReason + "'" +
+ "," + omodel.HSendMoney +
+ "," + omodel.HLeftMoney +
+ "," + omodel.HOrgID +
+ "," + omodel.HSendQty +
+ ",'" + omodel.HLastSendDate + "'" +
+ "," + omodel.HCreditRating_Q +
+ "," + omodel.HMaxCreditRating_Q +
+ ")";
+
+ //涓昏〃
+ oCn.RunProc(mainSql);
+
+
+ //鎻掑叆瀛愯〃
+ //foreach (Model.ClsXs_ExceptiveCheckRequestBillSub oSub in DetailColl)
+ //{
+ // string subSql = "Insert into Xs_ExceptiveCheckRequestBillSub " +
+ // "(" +
+ // ") " +
+ // " values(" +
+ // ")";
+ // oCn.RunProc(subSql);
+ //}
+
+ 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 Xs_ExceptiveCheckRequestBillMain Where HInterID=" + lngBillKey.ToString(), "Xs_ExceptiveCheckRequestBillMain");
+ 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]["HMainSourceEntryID"]);
+ omodel.HMainSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillNo"]);
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+ //========================================================
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HCurID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCurID"]);
+ omodel.HExRate = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HExRate"]);
+ omodel.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"]);
+ omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
+ omodel.HReason = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HReason"]);
+ omodel.HSendMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSendMoney"]);
+ omodel.HLeftMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HLeftMoney"]);
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+ omodel.HSendQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSendQty"]);
+ omodel.HLastSendDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HLastSendDate"]);
+
+ omodel.HCreditRating_Q = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HCreditRating_Q"]);
+ omodel.HMaxCreditRating_Q = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HMaxCreditRating_Q"]);
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from Xs_ExceptiveCheckRequestBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Xs_ExceptiveCheckRequestBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsXs_ExceptiveCheckRequestBillSub oSub = new Model.ClsXs_ExceptiveCheckRequestBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
index 4843688..b1fe37b 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
@@ -37,9 +37,34 @@
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());
+
+
oCn.BeginTran();
- //鏇存柊涓昏〃
- oCn.RunProc("UpDate Xs_SeOrderBillMain set " +
+ string mainSql = "UpDate Xs_SeOrderBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + omodel.HDate + "'" +
",HYear='" + omodel.HYear.ToString() + "'" +
@@ -47,20 +72,25 @@
",HRemark='" + omodel.HRemark + "'" +
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
",HUpDateDate=getdate()" +
- //========================================
- ",HSSDate='" + omodel.HSSDate.ToShortDateString() + "'" +
+ //========================================
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
",HAddress='" + omodel.HAddress + "'" +
- ",HSSID=" + omodel.HSSID.ToString() +
- ",HSellSID=" + omodel.HSellSID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
",HCusID=" + omodel.HCusID.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
",HCurID=" + omodel.HCurID.ToString() +
",HExRate=" + omodel.HExRate.ToString() +
- ",HEmpID=" + omodel.HEmpID.ToString() +
",HManagerID=" + omodel.HManagerID.ToString() +
- ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HSellSID=" + omodel.HSellSID.ToString() +
+ ",HSSID=" + omodel.HSSID.ToString() +
+ ",HSSDate='" + omodel.HSSDate.ToShortDateString() + "'" +
+ ",HPayCusID=" + omodel.HPayCusID +
",HExplanation='" + omodel.HExplanation + "'" +
- ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
- " where HInterID=" + lngBillKey.ToString());
+ ",HLinkMan='" + omodel.HLinkMan + "'" +
+ ",HLinkPhone='" + omodel.HLinkPhone + "'" +
+ " where HInterID=" + lngBillKey.ToString();
+
+ oCn.RunProc(mainSql);
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
@@ -69,19 +99,50 @@
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() +
- ") ");
+ //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,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
+ ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark) " +
+ "values(" +
+ "" + omodel.HInterID +
+ "," + oSub.HEntryID +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + (oSub.HSourceBillNo == null ? "" : oSub.HSourceBillNo) +
+ "','" + (oSub.HSourceBillType == null ? "" : oSub.HSourceBillType) +
+ "'," + oSub.HRelationQty +
+ "," + 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 +
+ "')";
+ oCn.RunProc(subSql);
}
//
//foreach (Model.ClsXs_SeOrderBillSub oSub in DetailColl)
@@ -111,48 +172,147 @@
{
try
{
- //寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
- omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
- {
- omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
- }
- if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
- {
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
- }
- //
+ DataSet ds;
+
+ ////寰楀埌mainid
+ //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ ////鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ //if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
+ //{
+ // omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //}
+ //if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ //{
+ // omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //}
+ ////
+ //oCn.BeginTran();
+ ////涓昏〃
+ //oCn.RunProc("Insert Into Xs_SeOrderBillMain " +
+ //"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ //",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ //",HAddress,HSSID,HSellSID,HCusID,HCurID,HExRate,HSSDate" +
+ //",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo" +
+ //") " +
+ //" 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.HAddress + "'," + omodel.HSSID.ToString() + "," + omodel.HSellSID.ToString() + "," + omodel.HCusID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() + ",'" + omodel.HSSDate.ToShortDateString() + "'" +
+ //", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'"+
+ //") ");
+
oCn.BeginTran();
- //涓昏〃
- oCn.RunProc("Insert Into Xs_SeOrderBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HAddress,HSSID,HSellSID,HCusID,HCurID,HExRate,HSSDate" +
- ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo" +
- ") " +
- " 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.HAddress + "'," + omodel.HSSID.ToString() + "," + omodel.HSellSID.ToString() + "," + omodel.HCusID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() + ",'" + omodel.HSSDate.ToShortDateString() + "'" +
- ", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'"+
- ") ");
+
+ //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅
+ while (true)
+ {
+ ds = oCn.RunProcReturn("select * from Xs_SeOrderBillMain where HInterID = " + omodel.HInterID, "Xs_SeOrderBillMain");
+ 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 Xs_SeOrderBillMain" +
+ "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HExplanation" +
+ ",HInterID,HBillNo,HDate,HInnerBillNo,HAddress,HDeptID,HCusID,HEmpID,HCurID,HExRate,HManagerID,HSellSID,HSSID,HSSDate,HPayCusID,HRemark,HOrgID,HMaker,HMakeDate,HLinkMan,HLinkPhone" +
+ ",HERPInterID,HERPBillType,HSALEORGID,HSALEGROUPID,HRECEIVEID,HSETTLEID,HCHARGEID,HHEADLOCID,HRECCONTACTID,HCORRESPONDORGID,HBUSINESSTYPE) " +
+ "values(" +
+ "" + omodel.HYear +
+ "," + omodel.HPeriod +
+ ",'" + this.BillType +
+ "','" + this.HBillSubType +
+ "'," + omodel.HBillStatus +
+ ",'" + omodel.HExplanation +
+
+ "'," + omodel.HInterID +
+ ",'" + omodel.HBillNo +
+ "','" + omodel.HDate +
+ "','" + omodel.HInnerBillNo +
+ "','" + omodel.HAddress +
+ "'," + omodel.HDeptID +
+ "," + omodel.HCusID +
+ "," + omodel.HEmpID +
+ "," + omodel.HCurID +
+ "," + omodel.HExRate +
+ "," + omodel.HManagerID +
+ "," + omodel.HSellSID +
+ "," + omodel.HSSID +
+ ",'" + omodel.HSSDate +
+ "'," + omodel.HPayCusID +
+ ",'" + omodel.HRemark +
+ "'," + omodel.HOrgID +
+ ",'" + omodel.HMaker +
+ "','" + omodel.HMakeDate +
+
+ "','" + omodel.HLinkMan +
+ "','" + omodel.HLinkPhone +
+
+ "'," + omodel.HERPInterID +
+ ",'" + omodel.HERPBillType +
+ "'," + omodel.HSALEORGID +
+ "," + omodel.HSALEGROUPID +
+ "," + omodel.HRECEIVEID +
+ "," + omodel.HSETTLEID +
+ "," + omodel.HCHARGEID +
+ "," + omodel.HHEADLOCID +
+ "," + omodel.HRECCONTACTID +
+ "," + omodel.HCORRESPONDORGID +
+ ",'" + omodel.HBUSINESSTYPE +
+ "')";
+
+ oCn.RunProc(mainSql);
//鎻掑叆瀛愯〃
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() +
- ") ");
+ //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,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
+ ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark) " +
+ "values(" +
+ "" + omodel.HInterID +
+ "," + oSub.HEntryID +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + (oSub.HSourceBillNo==null?"":oSub.HSourceBillNo) +
+ "','" + (oSub.HSourceBillType==null?"":oSub.HSourceBillType) +
+ "'," + oSub.HRelationQty +
+ "," + 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 +
+ "')";
+ oCn.RunProc(subSql);
}
//
//foreach (Model.ClsXs_SeOrderBillSub oSub in DetailColl)
@@ -232,8 +392,13 @@
omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
omodel.HSSDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HSSDate"]);
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+ omodel.HPayCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPayCusID"]);
+
+ omodel.HLinkMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLinkMan"]);
+ omodel.HLinkPhone = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLinkPhone"]);
//
-
+
//寰幆
DataSet DsSub ;
DsSub = oCn.RunProcReturn("Select * from Xs_SeOrderBillSub Where HInterID=" + lngBillKey.ToString(), "Xs_SeOrderBillSub");
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderChangeBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderChangeBill.cs"
new file mode 100644
index 0000000..7df559c
--- /dev/null
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderChangeBill.cs"
@@ -0,0 +1,315 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsXs_SeOrderChangeBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsXs_SeOrderChangeBillMain omodel = new Model.ClsXs_SeOrderChangeBillMain();
+ public List<Model.ClsXs_SeOrderChangeBillSub> DetailColl = new List<Model.ClsXs_SeOrderChangeBillSub>();
+
+ public ClsXs_SeOrderChangeBill()
+ {
+ base.MvarItemKeySub = "Xs_SeOrderChangeBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "Xs_SeOrderChangeBillMain";
+ base.MvarReportTitle="閿�鍞鍗曞彉鏇村崟";
+ base.BillType="1425";
+ base.HBillSubType = "1425";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+ #region 鏃犲弬鏋勯�犲嚱鏁�
+ ~ClsXs_SeOrderChangeBill()
+ {
+ DetailColl = null;
+ }
+ #endregion
+ #endregion
+
+ #region 淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ string mainSql = "update Xs_SeOrderChangeBillMain set " +
+ " HBillNo = '" + omodel.HBillNo +
+ "', HDate = '" + omodel.HDate +
+ "', HYear = " + omodel.HYear +
+ ", HPeriod = " + omodel.HPeriod +
+ ", HRemark = '" + omodel.HRemark +
+ "', HUpDater = '" + omodel.HUpDater +
+ "', HUpDateDate = getdate()" +
+ //===============================================================
+ ", HOrgID = " + omodel.HOrgID +
+ ", HDeptID=" + omodel.HDeptID +
+ ", HEmpID=" + omodel.HEmpID +
+ ", HCurID=" + omodel.HCurID +
+ ", HExRate=" + omodel.HExRate +
+ ", HCusID=" + omodel.HCusID +
+ ", HSSID=" + omodel.HSSID +
+ ", HSellSID=" + omodel.HSellSID +
+ ", HExplanation='" + omodel.HExplanation + "'" +
+ " where HInterID = " + omodel.HInterID;
+
+ oCn.RunProc(mainSql);
+
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsXs_SeOrderChangeBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Xs_SeOrderChangeBillSub" +
+ "(HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HQty_Old,HQty_New,HTaxPrice_Old,HTaxPrice_New,HDate_Old,HDate_New) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ ",'" + oSub.HCloseMan + "'" +
+ ",'" + oSub.HEntryCloseDate + "'" +
+ "," + Convert.ToString(oSub.HCloseType ? 1 : 0) +
+ ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo + "'" +
+ ",'" + oSub.HSourceBillType + "'" +
+ "," + oSub.HRelationQty +
+ "," + oSub.HRelationMoney +
+
+ "," + oSub.HMaterID +
+ "," + oSub.HUnitID +
+ "," + oSub.HQty_Old +
+ "," + oSub.HQty_New +
+ "," + oSub.HTaxPrice_Old +
+ "," + oSub.HTaxPrice_New +
+ ",'" + oSub.HDate_Old + "'" +
+ ",'" + oSub.HDate_New + "'" +
+ ")";
+ oCn.RunProc(subSql);
+ }
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ while (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+
+ oCn.BeginTran();
+ //鎻掑叆涓昏〃
+ string mainSql = "Insert Into Xs_SeOrderChangeBillMain " +
+ "(" +
+ "HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HRemark,HMaker,HMakeDate" +
+ ",HDeptID,HEmpID,HCurID,HExRate,HCusID,HSSID,HSellSID,HExplanation,HOrgID" +
+ ") " +
+ " values(" +
+ "'" + this.BillType + "'" +
+ ",'" + this.HBillSubType + "'" +
+ "," + omodel.HInterID +
+ ",'" + omodel.HBillNo + "'" +
+ ",'" + omodel.HDate + "'" +
+ "," + omodel.HYear +
+ "," + omodel.HPeriod +
+ "," + omodel.HMainSourceInterID +
+ "," + omodel.HMainSourceEntryID +
+ ",'" + omodel.HMainSourceBillNo + "'" +
+ ",'" + omodel.HMainSourceBillType + "'" +
+ ",'" + omodel.HRemark + "'" +
+ ",'" + DBUtility.ClsPub.CurUserName + "'" +
+ ",getdate()" +
+
+ "," + omodel.HDeptID +
+ "," + omodel.HEmpID +
+ "," + omodel.HCurID +
+ "," + omodel.HExRate +
+ "," + omodel.HCusID +
+ "," + omodel.HSSID +
+ "," + omodel.HSellSID +
+ ",'" + omodel.HExplanation + "'" +
+ "," + omodel.HOrgID +
+ ")";
+
+ oCn.RunProc(mainSql);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsXs_SeOrderChangeBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Xs_SeOrderChangeBillSub" +
+ "(HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HQty_Old,HQty_New,HTaxPrice_Old,HTaxPrice_New,HDate_Old,HDate_New) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ ",'" + oSub.HCloseMan + "'" +
+ ",'" + oSub.HEntryCloseDate + "'" +
+ "," + Convert.ToString(oSub.HCloseType ? 1 : 0) +
+ ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo + "'" +
+ ",'" + oSub.HSourceBillType + "'" +
+ "," + oSub.HRelationQty +
+ "," + oSub.HRelationMoney +
+
+ "," + oSub.HMaterID +
+ "," + oSub.HUnitID +
+ "," + oSub.HQty_Old +
+ "," + oSub.HQty_New +
+ "," + oSub.HTaxPrice_Old +
+ "," + oSub.HTaxPrice_New +
+ ",'" + oSub.HDate_Old + "'" +
+ ",'" + oSub.HDate_New + "'" +
+ ")";
+ oCn.RunProc(subSql);
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("select * from Xs_SeOrderChangeBillMain Where HInterID = " + lngBillKey.ToString(), "Xs_SeOrderChangeBillMain");
+ 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]["HMainSourceEntryID"]);
+ omodel.HMainSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillNo"]);
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+ //========================================================
+
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HCurID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCurID"]);
+ omodel.HExRate = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HExRate"]);
+ omodel.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"]);
+ omodel.HSSID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSSID"]);
+ omodel.HSellSID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSellSID"]);
+ omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
+
+
+
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("select * from Xs_SeOrderChangeBillSub where HInterID = " + lngBillKey.ToString() + "order by HEntryID", "Xs_SeOrderChangeBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsXs_SeOrderChangeBillSub oSub = new Model.ClsXs_SeOrderChangeBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HQty_Old = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[0]["HQty_Old"]);
+ oSub.HQty_New = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[0]["HQty_New"]);
+ oSub.HTaxPrice_Old = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[0]["HTaxPrice_Old"]);
+ oSub.HTaxPrice_New = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[0]["HTaxPrice_New"]);
+ oSub.HDate_Old = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HDate_Old"]);
+ oSub.HDate_New = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HDate_New"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ #endregion
+
+ }
+
+}
diff --git "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs" "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs"
index a58b22a..b218f0b 100644
--- "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs"
+++ "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Ctl.cs"
@@ -128,6 +128,105 @@
}
}
+ //鍏抽棴
+ public bool CloseByID(Int64 sItemID, ref string sReturn)
+ {
+ try
+ {
+ string HCloseEmp = ClsPub.CurUserName;
+ oCn.RunProc("Update " + MvarItemKey + " set HCloseEmp = '" + HCloseEmp + "',HCloseDate=getdate() where HItemID='" + sItemID + "'", ref Pub_Class.ClsPub.sExeReturnInfo);
+ sReturn = "";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ //鍙嶅叧闂�
+ public bool DeCloseByID(Int64 sItemID, ref string sReturn)
+ {
+ try
+ {
+ oCn.RunProc("Update " + MvarItemKey + " set HCloseEmp = '', HCloseDate=null where HItemID='" + sItemID + "'", ref Pub_Class.ClsPub.sExeReturnInfo);
+ sReturn = "";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ //瀹℃牳2 HCheckTime
+ public bool AuditByID2(Int64 sItemID, ref string sReturn)
+ {
+ try
+ {
+ string HCheckEmp = ClsPub.CurUserName;
+ oCn.RunProc("Update " + MvarItemKey + " set HCheckEmp = '" + HCheckEmp + "',HCheckTime=getdate() where HItemID='" + sItemID + "'", ref Pub_Class.ClsPub.sExeReturnInfo);
+ sReturn = "";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ //鍙嶅鏍�2 HCheckTime
+ public bool DeAuditByID2(Int64 sItemID, ref string sReturn)
+ {
+ try
+ {
+ oCn.RunProc("Update " + MvarItemKey + " set HCheckEmp = '', HCheckTime=null where HItemID='" + sItemID + "'", ref Pub_Class.ClsPub.sExeReturnInfo);
+ sReturn = "";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ //鍏抽棴2 HCloseTime
+ public bool CloseByID2(Int64 sItemID, ref string sReturn)
+ {
+ try
+ {
+ string HCloseEmp = ClsPub.CurUserName;
+ oCn.RunProc("Update " + MvarItemKey + " set HCloseEmp = '" + HCloseEmp + "',HCloseTime=getdate() where HItemID='" + sItemID + "'", ref Pub_Class.ClsPub.sExeReturnInfo);
+ sReturn = "";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ //鍙嶅叧闂�2 HCloseTime
+ public bool DeCloseByID2(Int64 sItemID, ref string sReturn)
+ {
+ try
+ {
+ oCn.RunProc("Update " + MvarItemKey + " set HCloseEmp = '', HCloseTime=null where HItemID='" + sItemID + "'", ref Pub_Class.ClsPub.sExeReturnInfo);
+ sReturn = "";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
//鍒犻櫎
public bool DeleteByID(Int64 sItemID)
{
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index acd9031..4a83862 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3778,6 +3778,11 @@
Kf_SellOutBill oKf_SellOutBill = new Kf_SellOutBill();
oKf_SellOutBill.ShowDialog();
break;
+ case "kf_selloutbill_barcodenote":
+ //
+ Kf_SellOutBill_BarCodeNote oKf_SellOutBill_BarCodeNote = new Kf_SellOutBill_BarCodeNote();
+ oKf_SellOutBill_BarCodeNote.ShowDialog();
+ break;
case "kf_mateoutbilllist":
//权限
Kf_MateOutBillList oKf_MateOutBillList = new Kf_MateOutBillList();
diff --git a/Model/APS/ClsSc_ICMOChangeBillMain.cs b/Model/APS/ClsSc_ICMOChangeBillMain.cs
new file mode 100644
index 0000000..ecba0cf
--- /dev/null
+++ b/Model/APS/ClsSc_ICMOChangeBillMain.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_ICMOChangeBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HDeptID;// int --生产车间 (Gy_Department)
+ public Int64 HEmpID;// int --销售员 (Gy_Employee)
+ public Int64 HCusID;// int --客户 (Gy_Customer)
+ public string HExplanation;// varchar --变更原因
+ public Int64 HOrgID;// int --组织
+ public string HInnerBillNo;// varchar --内部单据号
+ }
+}
diff --git a/Model/APS/ClsSc_ICMOChangeBillSub.cs b/Model/APS/ClsSc_ICMOChangeBillSub.cs
new file mode 100644
index 0000000..b0f8764
--- /dev/null
+++ b/Model/APS/ClsSc_ICMOChangeBillSub.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_ICMOChangeBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public string HBillNo_bak;// varchar 单据号
+
+ public Int64 HMaterID;// int 物料ID
+ public Int64 HUnitID;// int 计量单位
+ public double HQty_Old;// decimal 原数量
+ public double HQty_New;// decimal 新数量
+
+ //public DateTime HDate_Old;// datetime 原完工日期
+ //public DateTime HDate_New;// datetime 新完工日期
+ }
+}
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 5cd437b..3e5cd6b 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -90,6 +90,8 @@
<Compile Include="APS\ClsSourceICMOValues.cs" />
<Compile Include="APS\ClsSc_WorkBillMonthSortBillMain.cs" />
<Compile Include="APS\ClsSc_WorkBillMonthSortBillSub.cs" />
+ <Compile Include="APS\ClsSc_ICMOChangeBillMain.cs" />
+ <Compile Include="APS\ClsSc_ICMOChangeBillSub.cs" />
<Compile Include="ClsHR_EmpFosterBillMain.cs" />
<Compile Include="ClsHR_EmpFosterBillSub.cs" />
<Compile Include="ClsHR_EmpUpChangeBillMain.cs" />
@@ -582,6 +584,7 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStatusChangeBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStockBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStockBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_EquipTypeBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsSc_ProcessExchangeBillMain_Note.cs" />
@@ -911,6 +914,10 @@
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBackBillSub_K3.cs" />
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBillMain_K3.cs" />
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBillSub_K3.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_SeOrderChangeBillSub.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_SeOrderChangeBillMain.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_ExceptiveCheckRequestBillSub.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_ExceptiveCheckRequestBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ContractBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ContractBillScheme.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ContractBillSub.cs" />
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs"
index 06b6844..e79bdc7 100644
--- "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs"
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs"
@@ -30,5 +30,7 @@
public Int64 HSTOCKORGID; // int --库存组织
public double HCarriage; //运费
public string HCheckStatusMan; //核销人
+
+ public Int64 HOrgID; //组织
}
}
diff --git "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillMain.cs" "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillMain.cs"
index b3a6227..4910417 100644
--- "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillMain.cs"
+++ "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillMain.cs"
@@ -29,5 +29,8 @@
public Single HRelSumMoney;// dec(18,8) //折扣后金额（可编辑） --addnew
public Single HSumMoneyBB;// dec(18,8) //表头金额本位币（可编辑） --addnew
public Single HRelSumMoneyBB;// dec(18,8) //折扣后金额本位币（可编辑） --
+
+ public Int64 HManagerID; //int 销售主管
+ public Int64 HOrgID; //int 组织
}
}
diff --git "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillMain.cs" "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillMain.cs"
index fd2a38a..ab3a66c 100644
--- "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillMain.cs"
+++ "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillMain.cs"
@@ -29,5 +29,8 @@
public Single HRelSumMoney;// dec(18,8) //折扣后金额（可编辑） --addnew
public Single HSumMoneyBB;// dec(18,8) //表头金额本位币（可编辑） --addnew
public Single HRelSumMoneyBB;// dec(18,8) //折扣后金额本位币（可编辑） --
+
+ public Int64 HManagerID; //int 销售主管
+ public Int64 HOrgID; //int 组织
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs"
index ea99eb9..b0a88b0 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs"
@@ -9,6 +9,7 @@
public string HBillNo_bak;
public Int64 HMaterID;
public Int64 HUnitID;
+ public Int64 HProcID;
public Int64 HEmpID;
public Int64 HSourceID;
public Int64 HProcExchInterID;
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsGy_EquipTypeBill.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsGy_EquipTypeBill.cs"
new file mode 100644
index 0000000..b30eb6e
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsGy_EquipTypeBill.cs"
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_EquipTypeBill : DBUtility.ClsGy_Base_Model
+ {
+ public int HItemID; //涓婚敭 int
+ public string HNumber; //浠ｇ爜
+ public string HName; //鍚嶇О
+ public string HShortNumber; //鐭唬鐮�
+ public int HParentID; //鐖剁骇ID int
+ public int HLevel; //绛夌骇 int
+ public bool HEndFlag; //鏈骇鏍囧織 bit
+ public bool HStopflag; //绂佺敤鏍囧織 bit
+ public string HRemark; //澶囨敞 varchar(50)
+ public string HHelpCode; //鍔╄鐮� varchar(20)
+ public string HUseFlag = "鏈娇鐢�"; //浣跨敤鐘舵�侊紙鏈娴嬶紝鏈娇鐢紝宸蹭娇鐢級
+ public DateTime HMakeTime; //寤虹珛鏃堕棿(getdate())
+ public string HMakeEmp; //鍒涘缓浜�
+ public string HCheckEmp; //瀹℃牳浜�
+ public DateTime HCheckTime; //瀹℃牳鏃堕棿
+ public string HModifyEmp; //淇敼浜�
+ public DateTime HModifyTime; //淇敼鏃堕棿
+ public string HStopEmp; //绂佺敤浜�
+ public DateTime HStopTime; //绂佺敤鏃堕棿
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_EquipMaintainBillSub_Item.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_EquipMaintainBillSub_Item.cs"
index f001c14..4da9745 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_EquipMaintainBillSub_Item.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_EquipMaintainBillSub_Item.cs"
@@ -12,5 +12,6 @@
public string HMaintainPart;// varchar(100) --淇濆吇閮ㄤ綅
public string HClaim;// varchar(100) --鍏蜂綋瑕佹眰
public Int64 HManagerID;// int --璐熻矗浜篿d(鑱屽憳琛�)
+ public string HMaintainResult; // 淇濆吇缁撴灉
}
}
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_CusRatingChangeBillMain.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_CusRatingChangeBillMain.cs"
index 75b0876..5df80e1 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_CusRatingChangeBillMain.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_CusRatingChangeBillMain.cs"
@@ -13,6 +13,13 @@
public double HNewRating;// money --新额度
public string HReason;// varchar(500) --变更原因
+ public Int64 HManagerID; //int 销售主管
+ public Int64 HOldRatingDate; //int 原黄线天数
+ public Int64 HNewRatingDate;// int --新黄线天数
+ public Int64 HOldRedRatingDate;// int --原红线天数
+ public Int64 HNewRedRatingDate;// int --新红线天数
+ public Int64 HOrgID; //int 组织
+
public string HFinanceCheck;// varchar(50) --财务审批
public string HFinanceCheckStatus;// varchar(50) --财务审批状态(通过，不通过)
public string HGeneralManager;//
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBillMain.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBillMain.cs"
new file mode 100644
index 0000000..ed82ef8
--- /dev/null
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBillMain.cs"
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsXs_ExceptiveCheckRequestBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HDeptID; //int 销售部门
+ public Int64 HEmpID; //int 销售员
+ public Int64 HCurID; //int 结算币别
+ public double HExRate; //decimal 汇率
+ public Int64 HCusID; //int 业务客户
+ public Int64 HManagerID; //int 销售主管
+ public string HReason; //varchar 申请原因
+ public double HSendMoney; //decimal 单据金额(本次发货金额)
+ public double HLeftMoney; //decimal 欠缺金额(应收款余额)
+ public Int64 HOrgID; //int 组织
+ public double HSendQty; //decimal 本次发货数量
+ public DateTime HLastSendDate;//datetime最近发货时间
+
+ public double HCreditRating_Q;//decimal 黄线额度
+ public double HMaxCreditRating_Q;//decimal 红线额度
+ }
+}
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBillSub.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBillSub.cs"
new file mode 100644
index 0000000..bb9648c
--- /dev/null
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ExceptiveCheckRequestBillSub.cs"
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsXs_ExceptiveCheckRequestBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+
+ }
+}
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillMain.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillMain.cs"
index f013f65..c7d23bd 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillMain.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillMain.cs"
@@ -6,37 +6,47 @@
{
public class ClsXs_SeOrderBillMain:DBUtility.ClsXt_BaseBillMain
{
- public string HAddress;// varchar(200) --交货地点
- public Int64 HSSID;// int --结算方式 (Gy_SettleStyle)
- public Int64 HSellSID;// int --销售方式 (Gy_SellStyle) new
- public Int64 HCusID;// int --供应商 （Gy_Supplier）
- public Int64 HCurID;// int --币别 (Gy_Currency)
- public Single HExRate;// money --汇率 (选择完币别带出)
- public Int64 HEmpID;// int --业务员 (Gy_Employee)
- public Int64 HManagerID;// int --主管 (Gy_Employee)
- public Int64 HDeptID;// int --部门 (Gy_Employee)
- public string HExplanation;// varchar(200) --摘要
- public string HInnerBillNo;// varchar(50) --内部单据号
- public DateTime HSSDate;// datetime --结算日期 --addnew
+ public Int64 HInterID;
+ public string HBillNo;
+ public DateTime HDate;
+ public string HInnerBillNo; // varchar(200) --辅助字段
+ public string HAddress; // varchar(200) --交货地点
+ public Int64 HDeptID; // int --部门 (Gy_Employee)
+ public Int64 HCusID; // int --供应商 （Gy_Supplier）
+ public Int64 HEmpID; // int --业务员 (Gy_Employee)
+ public Int64 HCurID; // int --币别 (Gy_Currency)
+ public Single HExRate; // money --汇率 (选择完币别带出)
+ public Int64 HManagerID; // int --主管 (Gy_Employee)
+ public Int64 HSellSID; // int --销售方式 (Gy_SellStyle) new
+ public Int64 HSSID; // int --结算方式 (Gy_SettleStyle)
+ public DateTime HSSDate; // datetime --结算日期 --addnew
+ public Int64 HPayCusID; // int --结算方
+ public string HRemark; // --备注
+ public Int64 HOrgID; // int --组织
+
+ public string HLinkMan; // varchar(100) --联系人
+ public string HLinkPhone; // varchar(50) --联系电话
+
+ public string HMaker;
+ public string HMakeDate;
+ public string HUpDater;
+ public string HUpDateDate;
+ public string HChecker;
+ public string HCheckDate;
+ public string HCloseMan;
+ public string HCloseDate;
+ public string HDeleteMan;
+ public string HDeleteDate;
public string HChangeMan;// varchar(50) --变更人（不可编辑,灰色显示类似审核人） --addnew
public DateTime HChangeDate;// datetime --变更日期（不可编辑,灰色显示） --addnew
-
- public Int64 HInterID;
public long HYear;
public long HPeriod;
public string HBillType;
public string HBillSubType;
- public DateTime HDate;
- public string HBillNo;
public int HBillStatus;
- public string HRemark;
- public string HChecker;
- public string HCheckDate;
- public string HMaker;
- public string HMakeDate;
- public string HCloseMan;
- public string HCloseDate;
+ public string HExplanation;// varchar(200) 辅助字段
+
public Int64 HERPInterID;
public string HERPBillType;
public Int64 HSALEORGID;
@@ -49,5 +59,8 @@
public Int64 HRECCONTACTID;
public Int64 HCORRESPONDORGID;
public string HBUSINESSTYPE;
+
+
+
}
}
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs"
index ed3a0e7..cf881a5 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs"
@@ -6,32 +6,34 @@
{
public class ClsXs_SeOrderBillSub:DBUtility.ClsXt_BaseBillSub
{
- public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
- public string HRemark;// varchar(200) --备注
- public Int64 HMaterID;// int --物料ID (Gy_Material)
- public Int64 HUnitID;// int --计量单位 (Gy_Unit)
- public double? HQty;// dec(18,8) --数量
- public double HPrice;// dec(18,8) --原币单价
- public double HMoney;// dec(18,8) --原币金额
+ public Int64 HMaterID; // int --物料ID (Gy_Material)
+ public Int64 HUnitID; // int --计量单位 (Gy_Unit)
+ public double HQty; // dec(18,8) --数量
+ public double HPrice; // dec(18,8) --不含税单价
+ public double HTaxPrice; // dec(18,8) --含税单价 --addnew
+ public double HMoney; // dec(18,8) --金额
+ public double HDiscountRate;// money --折扣率（可编辑） --addnew
+ public double HRelTaxPrice;// dec(18,8) --实际含税单价（不可编辑） --addnew
public Single HTaxRate;// money --税率
public double HTaxMoney;// dec(18,8) --税额=原币金额*税率
public double HlineTotal;// dec(18,8) --价税合计=原币金额+税额
public double HlineTotalBB;// dec(18,8) --本位币价税合计=（原币金额+税额）*汇率 new
public DateTime HDate;// datetime --交货日期
- public double HTaxPrice;// dec(18,8) --含税单价 --addnew
- public double HDiscountRate;// money --折扣率（可编辑） --addnew
- public double HRelTaxPrice;// dec(18,8) --实际含税单价（不可编辑） --addnew
public double HOutStockQty;// dec(18,8) --出库数量（不可编辑） --addnew
public double HInvoiceQty;// dec(18,8) --开票数量（不可编辑） --addnew
-
+ public string HRemark;// varchar(200) --备注
public Int64 HInterID;
public Int64 HEntryID;
+
+
+ public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
public Int64 HSourceInterID;
public Int64 HSourceEntryID;
public string HSourceBillNo;
public string HSourceBillType;
public double HRelationQty;
+
public Int64 HPropertyID;
public string HBatChNo;
public Int64 HAuxPropID;
@@ -58,8 +60,10 @@
public decimal HSYSPRICE;
public decimal HLIMITDOWNPRICE;
public Int64 HPARENTMATID;
- public string HROWTYPE;
+
public string HROWID;
+ public string HROWTYPE;
+
public string HPARENTROWID;
public Int64 HDELIVERYCONTROL;
public Int64 HLOCALCURRID;
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderChangeBillMain.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderChangeBillMain.cs"
new file mode 100644
index 0000000..ddc9dc1
--- /dev/null
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderChangeBillMain.cs"
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsXs_SeOrderChangeBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HDeptID; //int 销售部门
+ public Int64 HEmpID; //int 销售员
+ public Int64 HCurID; //int 结算币别
+ public double HExRate; //decimal 汇率
+ public Int64 HCusID; //int 业务客户
+ public Int64 HSSID; //int 结算方式
+ public Int64 HSellSID; //int 销售方式
+ public string HExplanation; //varchar 变更原因
+
+ public Int64 HOrgID; //int 组织
+ }
+}
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderChangeBillSub.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderChangeBillSub.cs"
new file mode 100644
index 0000000..4367cc5
--- /dev/null
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderChangeBillSub.cs"
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsXs_SeOrderChangeBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HMaterID; //int 物料内码
+ public Int64 HUnitID; //int 计量单位内码
+ public double HQty_Old; //decimal 原数量
+ public double HQty_New; //decimal 新数量
+ public double HTaxPrice_Old; //decimal 原含税单价
+ public double HTaxPrice_New; //decimal 新含税单价
+ public DateTime HDate_Old; //datetime 原交货日期
+ public DateTime HDate_New; //datetime 新交货日期
+ }
+}
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 00efaff..a474da8 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -393,6 +393,12 @@
<Compile Include="浠撳簱绠＄悊\Kf_StockInRequestBillList.designer.cs">
<DependentUpon>Kf_StockInRequestBillList.cs</DependentUpon>
</Compile>
+ <Compile Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.designer.cs">
+ <DependentUpon>Kf_SellOutBill_BarCodeNote.cs</DependentUpon>
+ </Compile>
<Compile Include="瀛樿揣鏍哥畻\CH_OtherStockInCheckCount.cs">
<SubType>Form</SubType>
</Compile>
@@ -932,6 +938,10 @@
<DependentUpon>Kf_StockInRequestBillList.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.resx">
+ <DependentUpon>Kf_SellOutBill_BarCodeNote.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="瀛樿揣鏍哥畻\CH_OtherStockInCheckCount.resx">
<DependentUpon>CH_OtherStockInCheckCount.cs</DependentUpon>
<SubType>Designer</SubType>
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
new file mode 100644
index 0000000..fad273f
--- /dev/null
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
@@ -0,0 +1,559 @@
+锘縰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 SQLHelper;
+using DBUtility;
+using System.Threading;
+using System.IO;
+using Pub_Class;
+
+namespace WarM
+{
+ public partial class Kf_SellOutBill_BarCodeNote : Form
+ {
+ public Kf_SellOutBill_BarCodeNote()
+ {
+ InitializeComponent();
+ }
+ public frmBillQueryCondition_New frmCondition;
+ public string ModCaption = "閿�鍞爜鍗曟墦鍗�";
+ public const string ModName = "1205";
+ public Int64 HInterID = 0;
+ public string HBillType = "1205";
+ public string HMaker = DBUtility.ClsPub.CurUserName;
+ public Int64 HStockOrgID = DBUtility.ClsPub.HOrgID;
+ public DateTime HDate = DateTime.Today;
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ #region //鍥哄畾浠ｇ爜
+
+ //娓呯┖鐣岄潰
+ public void Sub_ClearBill()
+ {
+ cmbHSourceBillType.Items.Clear();
+ cmbHSourceBillType.Items.Add("閿�鍞鍗�");
+ cmbHSourceBillType.Items.Add("鍙戣揣閫氱煡鍗�");
+ cmbHBillStatus.Items.Clear();
+ cmbHBillStatus.Items.Add("鍒涘缓");
+ //鑾峰彇褰撳墠缁勭粐
+ DataSet Ds1 = oCn.RunProcReturn("select * from Xt_ORGANIZATIONS with(nolock) where HItemID=" + HStockOrgID, "Xt_ORGANIZATIONS", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (Ds1.Tables[0].Rows.Count != 0)
+ {
+ cmbHStockOrgID.Text = DBUtility.ClsPub.isStrNull(Ds1.Tables[0].Rows[0]["HName"]);
+ }
+
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ txtHBarCode.Text = "";
+ grdMain.DataSource = null;
+ grdSub.DataSource = null;
+ grdBarCode.DataSource = null;
+ }
+
+ //绐椾綋鍔犺浇
+ private void Kf_SellOutBill_BarCodeNote_Load(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ this.Text = ModCaption;
+ //鍔犺浇缁勭粐淇℃伅
+ Sub_AddStockOrgList();
+ }
+
+ //鍔犺浇缁勭粐淇℃伅
+ private void Sub_AddStockOrgList()
+ {
+ 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;
+ }
+ cmbHStockOrgID.Items.Clear();
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ cmbHStockOrgID.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HName"]));
+ }
+ }
+
+ private void initGrid()
+ {
+ DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.initGridList(grdSub, this.Name + "grdSub");
+ DBUtility.Xt_BaseBillFun.initGridList(grdBarCode, this.Name + "grdBarCode");
+ }
+
+
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled = false;
+ initGrid();
+ this.Sub_ClearBill();//娓呯┖鐣岄潰
+ }
+
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGrid();
+ }
+
+ private void GraphicsGrid()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ }
+
+ private void grdSub_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGridSub();
+ }
+
+ private void GraphicsGridSub()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdSub);
+ }
+
+ private void grdBarCode_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGridBarCode();
+ }
+ private void GraphicsGridBarCode()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdBarCode);
+ }
+
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+
+ private Int32 Fun_GetSubCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdSub);
+ }
+
+ private Int32 Fun_GetBarCodeCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdBarCode);
+ }
+
+ //鐢荤嚎
+ private void GraphLine()
+ {
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ string s = frmCondition.cmbHComplete.Text;
+ long n = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s, ref n);
+
+ int MainIDCol2 = Fun_GetSubCol("hmainid");
+ int SubIDCol2 = Fun_GetSubCol("hsubid");
+ string s2 = frmCondition.cmbHComplete.Text;
+ long n2 = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine(grdSub, MainIDCol2, SubIDCol2, s2, ref n2);
+
+ int MainIDCol3 = Fun_GetBarCodeCol("hmainid");
+ int SubIDCol3 = Fun_GetBarCodeCol("hsubid");
+ string s3 = frmCondition.cmbHComplete.Text;
+ long n3 = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine(grdBarCode, MainIDCol3, SubIDCol3, s3, ref n3);
+ }
+
+ //淇濆瓨鍒楀
+ 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(grdBarCode, this.Name + "grdBarCode");
+ }
+
+ //榛樿鍒楀
+ 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(grdBarCode, this.Name + "grdBarCode");
+ }
+
+ #endregion
+
+ #region //鍒锋柊
+
+ private void sx_Click_1(object sender, EventArgs e)
+ {
+ timer1.Enabled = true;
+ }
+
+ #endregion
+
+ #region //鎵弿婧愬崟鏉＄爜
+
+ private void txtHBarCode_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == (char)Keys.Return)
+ {
+ if (!AddSource())
+ {
+ txtHBarCode.Focus();
+ txtHBarCode.SelectAll();
+ return;
+ }
+ grdSub.Rows[0].Selected = true;
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ Sub_ShowBill();
+ }
+ }
+
+ private void cmdOK_Click(object sender, EventArgs e)
+ {
+ if (!AddSource())
+ {
+ txtHBarCode.Focus();
+ txtHBarCode.SelectAll();
+ return;
+ }
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ grdSub.Rows[0].Selected = true;
+ Sub_ShowBill();
+ }
+
+ private bool AddSource()
+ {
+ //灏嗘壂鎻忓崟鎹彿鍐欏叆涓存椂琛�
+ DataSet ds = oCn.RunProcReturn("exec h_p_Kf_CheckSeOrder_SellOutBillBarCodeNote '" + txtHBarCode.Text.Trim() + "'", "h_p_Kf_CheckSeOrder_SellOutBillBarCodeNote");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鎵弿閿�鍞鍗曞垽鏂敊璇紒", "鎻愮ず");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]), "鎻愮ず");
+ return false;
+ }
+ else
+ {
+ grdSub.DataSource = ds.Tables[0].DefaultView;
+ //鍐荤粨
+ int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+ string s = frmCondition.cmbHComplete.Text;
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
+ //鐢荤嚎
+ GraphLine();
+ return true;
+ }
+ }
+
+ #endregion
+
+ #region //鍙屽嚮宸︿晶閿�鍞嚭搴撳崟
+
+ private void grdSub_DoubleClick(object sender, EventArgs e)
+ {
+ Sub_ShowBill();
+ }
+
+ //鏄剧ず鍗曟嵁
+ private void Sub_ShowBill()
+ {
+ Int64 lngBillKey = 0;
+ if (grdSub.CurrentRow == null)
+ return;
+ lngBillKey = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HInterID")].Value);
+ if (lngBillKey == 0)
+ return;
+
+ DataSet DSet = oCn.RunProcReturn("exec h_p_Kf_SellOutBillBarCodeNote " + lngBillKey.ToString(), "h_p_Kf_SellOutBillBarCodeNote");
+
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉锛�" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ else
+ {
+ //杩斿洖涓昏〃淇℃伅
+ txtHBillNo.Text = DSet.Tables[0].Rows[0]["鍗曟嵁鍙�"].ToString();
+ dtpHDate.Text = DSet.Tables[0].Rows[0]["鏃ユ湡"].ToString();
+ txtHDeptName.Text = DSet.Tables[0].Rows[0]["閮ㄩ棬"].ToString();
+ txtHEmpName.Text = DSet.Tables[0].Rows[0]["閿�鍞憳"].ToString();
+ txtHSellStyle.Text = DSet.Tables[0].Rows[0]["閿�鍞柟寮�"].ToString();
+ txtHSecManagerName.Text = DSet.Tables[0].Rows[0]["鍙戣揣浜�"].ToString();
+ txtHSupName.Text = DSet.Tables[0].Rows[0]["瀹㈡埛"].ToString();
+ txtHKeeperName.Text = DSet.Tables[0].Rows[0]["浠撶鍛�"].ToString();
+ txtHWHName.Text = DSet.Tables[0].Rows[0]["浠撳簱"].ToString();
+ cmbHSourceBillType.Text = DSet.Tables[0].Rows[0]["婧愬崟绫诲瀷"].ToString();
+ txtHSourceBillNo.Text = DSet.Tables[0].Rows[0]["婧愬崟鍙�"].ToString();
+ txtHConveyCompName.Text = DSet.Tables[0].Rows[0]["杩愯緭鍏徃"].ToString();
+ txtHConveyType.Text = DSet.Tables[0].Rows[0]["杩愯緭鏂瑰紡"].ToString();
+ txtHLinkPhone.Text = DSet.Tables[0].Rows[0]["鑱旂郴鐢佃瘽"].ToString();
+ txtHLinkMan.Text = DSet.Tables[0].Rows[0]["鑱旂郴浜�"].ToString();
+ txtHRemark.Text = DSet.Tables[0].Rows[0]["澶囨敞"].ToString();
+ txtHBalance.Text = DSet.Tables[0].Rows[0]["瀹㈡埛浣欓"].ToString();
+ txtHCreditRating.Text = DSet.Tables[0].Rows[0]["瀹㈡埛淇℃伅棰濆害"].ToString();
+ cmbHStockOrgID.Text = DSet.Tables[0].Rows[0]["閿�鍞粍缁�"].ToString();
+ cmbHBillStatus.Text = DSet.Tables[0].Rows[0]["鍗曟嵁鐘舵��"].ToString();
+ txtHMoney.Text = DSet.Tables[0].Rows[0]["鏈崟閲戦"].ToString();
+ txtHCreditDifference.Text = DSet.Tables[0].Rows[0]["淇℃伅宸"].ToString();
+ HInterID = DBUtility.ClsPub.isLong(DSet.Tables[0].Rows[0]["HInterID"]);
+
+ //杩斿洖鍩烘湰淇℃伅銆佺爜鍗曚俊鎭�
+ grdMain.DataSource = DSet.Tables[1].DefaultView;
+ grdBarCode.DataSource = DSet.Tables[2].DefaultView;
+ //鍐荤粨
+ int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+ string s = frmCondition.cmbHComplete.Text;
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdBarCode, this.Name + "grdBarCode", s, FrCol);
+ //鐢荤嚎
+ GraphLine();
+
+ //鏈鏍�
+ if (cmbHBillStatus.Text == "宸插鏍�")
+ {
+ sh.Enabled = false;
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Checked.jpg");
+ }
+ else if (cmbHBillStatus.Text == "宸插叧闂�")
+ {
+ sh.Enabled = false;
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Closed.jpg");
+ }
+ else if (cmbHBillStatus.Text == "宸蹭綔搴�")
+ {
+ sh.Enabled = false;
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Deleted.jpg");
+ }
+ else
+ {
+ sh.Enabled = true;
+ pic1.Visible = false;
+ pic1.Image = null;
+ }
+ }
+ }
+
+ #endregion
+
+ #region //瀹℃牳閿�鍞嚭搴撳崟
+
+ private void sh_Click(object sender, EventArgs e)
+ {
+ DataSet ds = oCn.RunProcReturn("exec h_p_Kf_SellOutBill_Check " + HInterID.ToString() + ",'" + HBillType + "','" + HMaker + "'", "h_p_Kf_SellOutBill_Check");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("瀹℃牳閿�鍞嚭搴撳崟鍒ゆ柇閿欒锛�", "鎻愮ず");
+ return;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]), "鎻愮ず");
+ return;
+ }
+ else
+ {
+ cmbHBillStatus.Text="宸插鏍�";
+ sh.Enabled = false;
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Checked.jpg");
+ MessageBox.Show("瀹℃牳鎴愬姛锛�", "鎻愮ず");
+ return;
+ }
+ }
+
+ #endregion
+
+ #region //鐢宠鐗规壒
+
+ private void tp_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ #endregion
+
+ #region //鎵撳嵃鍔熻兘
+
+ GridppReport Report;
+
+ #region //鎵撳嵃鍙戣揣鍗�
+
+ private void Billdy_Click(object sender, EventArgs e)
+ {
+ if(cmbHBillStatus.Text!= "宸插鏍�")
+ {
+ 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_SetReportBill(oFrm.sOpenTmp);
+ //Report.Print(false);
+ Report.PrintPreview(true); //棰勮
+ Thread.Sleep(1000);
+ }
+ }
+
+ private void Sub_SetReportBill(string sOpenTmp)
+ {
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecordBill);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTableBill);
+ }
+
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecordBill()//your report?kao
+ {
+ try
+ {
+ Report.FieldByName("鍗曟嵁缂栧彿").AsString = txtHBillNo.Text;
+ Report.FieldByName("鏃ユ湡").AsString = dtpHDate.Value.ToString();
+ Report.FieldByName("閿�鍞儴闂�").AsString = txtHDeptName.Text;
+ Report.FieldByName("閿�鍞憳").AsString = txtHEmpName.Text;
+ Report.FieldByName("閿�鍞柟寮�").AsString = txtHSellStyle.Text;
+ Report.FieldByName("鍙戣揣浜�").AsString = txtHSecManagerName.Text;
+ Report.FieldByName("瀹㈡埛").AsString = txtHSupName.Text;
+ Report.FieldByName("浠撶").AsString = txtHKeeperName.Text;
+ Report.FieldByName("鍑哄簱浠撳簱").AsString = txtHWHName.Text;
+ Report.FieldByName("婧愬崟绫诲瀷").AsString = cmbHSourceBillType.Text;
+ Report.FieldByName("婧愬崟鍙�").AsString = txtHSourceBillNo.Text;
+ Report.FieldByName("杩愯緭鍏徃").AsString = txtHConveyCompName.Text;
+ Report.FieldByName("杩愯緭鏂瑰紡").AsString = txtHConveyType.Text;
+ Report.FieldByName("鑱旂郴鐢佃瘽").AsString = txtHLinkPhone.Text;
+ Report.FieldByName("鑱旂郴浜�").AsString = txtHLinkMan.Text;
+ Report.FieldByName("澶囨敞").AsString = txtHRemark.Text;
+ Report.FieldByName("瀹㈡埛浣欓").AsString = txtHBalance.Text;
+ Report.FieldByName("瀹㈡埛淇＄敤棰濆害").AsString = txtHCreditRating.Text;
+ Report.FieldByName("閿�鍞粍缁�").AsString = cmbHStockOrgID.Text;
+ Report.FieldByName("鍗曟嵁鐘舵��").AsString = cmbHBillStatus.Text;
+ Report.FieldByName("鏈崟閲戦").AsString = txtHMoney.Text;
+ Report.FieldByName("淇＄敤宸").AsString = txtHCreditDifference.Text;
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
+ }
+ }
+
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
+ private void ReportFetchRecordByDataTableBill()
+ {
+ try
+ {
+ DataTable ds = new DataTable();
+ BLL.Utility.FillRecordToReport_Sel(Report, grdMain, ds, Fun_GetCol("hmainid"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄤ綋锛�" + e.Message);
+ }
+ }
+
+ #endregion
+
+ #region //鎵撳嵃鐮佸崟
+
+ private void BarCodedy_Click(object sender, EventArgs e)
+ {
+ if (cmbHBillStatus.Text != "宸插鏍�")
+ {
+ 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(false);
+ Report.PrintPreview(true); //棰勮
+ Thread.Sleep(1000);
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ }
+
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord()//your report?kao
+ {
+ try
+ {
+ Report.FieldByName("鍗曟嵁缂栧彿").AsString = txtHBillNo.Text;
+ Report.FieldByName("鏃ユ湡").AsString = dtpHDate.Value.ToString();
+ Report.FieldByName("閿�鍞儴闂�").AsString = txtHDeptName.Text;
+ Report.FieldByName("閿�鍞憳").AsString = txtHEmpName.Text;
+ Report.FieldByName("閿�鍞柟寮�").AsString = txtHSellStyle.Text;
+ Report.FieldByName("鍙戣揣浜�").AsString = txtHSecManagerName.Text;
+ Report.FieldByName("瀹㈡埛").AsString = txtHSupName.Text;
+ Report.FieldByName("浠撶").AsString = txtHKeeperName.Text;
+ Report.FieldByName("鍑哄簱浠撳簱").AsString = txtHWHName.Text;
+ Report.FieldByName("婧愬崟绫诲瀷").AsString = cmbHSourceBillType.Text;
+ Report.FieldByName("婧愬崟鍙�").AsString = txtHSourceBillNo.Text;
+ Report.FieldByName("杩愯緭鍏徃").AsString = txtHConveyCompName.Text;
+ Report.FieldByName("杩愯緭鏂瑰紡").AsString = txtHConveyType.Text;
+ Report.FieldByName("鑱旂郴鐢佃瘽").AsString = txtHLinkPhone.Text;
+ Report.FieldByName("鑱旂郴浜�").AsString = txtHLinkMan.Text;
+ Report.FieldByName("澶囨敞").AsString = txtHRemark.Text;
+ Report.FieldByName("瀹㈡埛浣欓").AsString = txtHBalance.Text;
+ Report.FieldByName("瀹㈡埛淇＄敤棰濆害").AsString = txtHCreditRating.Text;
+ Report.FieldByName("閿�鍞粍缁�").AsString = cmbHStockOrgID.Text;
+ Report.FieldByName("鍗曟嵁鐘舵��").AsString = cmbHBillStatus.Text;
+ Report.FieldByName("鏈崟閲戦").AsString = txtHMoney.Text;
+ Report.FieldByName("淇＄敤宸").AsString = txtHCreditDifference.Text;
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
+ }
+ }
+
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ DataTable ds = new DataTable();
+ BLL.Utility.FillRecordToReport_Sel(Report, grdBarCode, ds, Fun_GetBarCodeCol("hmainid"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄤ綋锛�" + e.Message);
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+ #region //閫�鍑�
+
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs"
new file mode 100644
index 0000000..38c0de5
--- /dev/null
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs"
@@ -0,0 +1,1154 @@
+锘縩amespace WarM
+{
+ partial class Kf_SellOutBill_BarCodeNote
+ {
+ /// <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(Kf_SellOutBill_BarCodeNote));
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.mrlk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.bclk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.tp = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.sh = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.Billdy = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+ this.BarCodedy = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txtHSupName = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.txtHRemark = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.txtHSellStyle = new System.Windows.Forms.TextBox();
+ this.gbUp = new System.Windows.Forms.GroupBox();
+ this.txtHCreditDifference = new System.Windows.Forms.TextBox();
+ this.txtHCreditRating = new System.Windows.Forms.TextBox();
+ this.txtHMoney = new System.Windows.Forms.TextBox();
+ this.txtHBalance = new System.Windows.Forms.TextBox();
+ this.cmbHStockOrgID = new System.Windows.Forms.ComboBox();
+ this.txtHEmpName = new System.Windows.Forms.TextBox();
+ this.txtHConveyType = new System.Windows.Forms.TextBox();
+ this.txtHConveyCompName = new System.Windows.Forms.TextBox();
+ this.txtHLinkMan = new System.Windows.Forms.TextBox();
+ this.txtHDeptName = new System.Windows.Forms.TextBox();
+ this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
+ this.txtHLinkPhone = new System.Windows.Forms.TextBox();
+ this.txtHWHName = new System.Windows.Forms.TextBox();
+ this.txtHKeeperName = new System.Windows.Forms.TextBox();
+ this.txtHSecManagerName = new System.Windows.Forms.TextBox();
+ this.txtHBillNo = new System.Windows.Forms.TextBox();
+ this.cmbHBillStatus = new System.Windows.Forms.ComboBox();
+ this.dtpHDate = new System.Windows.Forms.DateTimePicker();
+ this.label22 = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.label21 = new System.Windows.Forms.Label();
+ this.label20 = new System.Windows.Forms.Label();
+ this.cmbHSourceBillType = new System.Windows.Forms.ComboBox();
+ this.label19 = new System.Windows.Forms.Label();
+ this.label18 = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.label15 = new System.Windows.Forms.Label();
+ this.label16 = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.label12 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.label10 = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label14 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.grdSub = new System.Windows.Forms.DataGridView();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.grdBarCode = new System.Windows.Forms.DataGridView();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.txtHBarCode = new System.Windows.Forms.TextBox();
+ this.cmdOK = new System.Windows.Forms.Button();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.宸︿晶 = new System.Windows.Forms.Panel();
+ this.涓棿 = new System.Windows.Forms.Panel();
+ this.搴曢儴 = new System.Windows.Forms.Panel();
+ this.鍙充晶 = new System.Windows.Forms.Panel();
+ this.pic1 = new System.Windows.Forms.PictureBox();
+ this.Tool.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.gbUp.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
+ this.tabControl1.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ this.tabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdBarCode)).BeginInit();
+ this.panel1.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.panel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).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.toolStripSeparator9,
+ this.mrlk,
+ this.toolStripSeparator7,
+ this.bclk,
+ this.toolStripSeparator8,
+ this.tp,
+ this.toolStripSeparator1,
+ this.sh,
+ this.toolStripSeparator2,
+ this.Billdy,
+ this.toolStripSeparator5,
+ this.BarCodedy,
+ this.toolStripSeparator3,
+ this.tc,
+ this.toolStripSeparator4});
+ 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(1396, 50);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 16;
+ this.Tool.Text = "toolStrip1";
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.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);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.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);
+ //
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ //
+ // tp
+ //
+ this.tp.AutoSize = false;
+ this.tp.Image = ((System.Drawing.Image)(resources.GetObject("tp.Image")));
+ this.tp.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tp.ImageTransparentColor = System.Drawing.Color.White;
+ this.tp.Name = "tp";
+ this.tp.Size = new System.Drawing.Size(70, 47);
+ this.tp.Text = "鐢宠鐗规壒";
+ this.tp.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tp.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tp.Click += new System.EventHandler(this.tp_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ //
+ // sh
+ //
+ this.sh.AutoSize = false;
+ this.sh.Image = ((System.Drawing.Image)(resources.GetObject("sh.Image")));
+ this.sh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sh.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.sh.Name = "sh";
+ this.sh.Size = new System.Drawing.Size(70, 47);
+ this.sh.Text = "瀹℃牳鍗曟嵁";
+ this.sh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sh.Click += new System.EventHandler(this.sh_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ //
+ // Billdy
+ //
+ this.Billdy.AutoSize = false;
+ this.Billdy.Image = ((System.Drawing.Image)(resources.GetObject("Billdy.Image")));
+ this.Billdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.Billdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.Billdy.ImageTransparentColor = System.Drawing.Color.White;
+ this.Billdy.Name = "Billdy";
+ this.Billdy.Size = new System.Drawing.Size(70, 47);
+ this.Billdy.Text = "鎵撳嵃鍙戣揣鍗�";
+ this.Billdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.Billdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.Billdy.Click += new System.EventHandler(this.Billdy_Click);
+ //
+ // toolStripSeparator5
+ //
+ this.toolStripSeparator5.Name = "toolStripSeparator5";
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ //
+ // BarCodedy
+ //
+ this.BarCodedy.AutoSize = false;
+ this.BarCodedy.Image = ((System.Drawing.Image)(resources.GetObject("BarCodedy.Image")));
+ this.BarCodedy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BarCodedy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.BarCodedy.ImageTransparentColor = System.Drawing.Color.White;
+ this.BarCodedy.Name = "BarCodedy";
+ this.BarCodedy.Size = new System.Drawing.Size(70, 47);
+ this.BarCodedy.Text = "鎵撳嵃鐮佸崟";
+ this.BarCodedy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BarCodedy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.BarCodedy.Click += new System.EventHandler(this.BarCodedy_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.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(70, 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);
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle9.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdMain.DefaultCellStyle = dataGridViewCellStyle9;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.Location = new System.Drawing.Point(3, 3);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(0);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.Size = new System.Drawing.Size(1091, 377);
+ this.grdMain.TabIndex = 19;
+ this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label2.ForeColor = System.Drawing.Color.Black;
+ this.label2.Location = new System.Drawing.Point(478, 60);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(29, 12);
+ this.label2.TabIndex = 49;
+ this.label2.Text = "瀹㈡埛";
+ //
+ // txtHSupName
+ //
+ this.txtHSupName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSupName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSupName.Location = new System.Drawing.Point(509, 56);
+ this.txtHSupName.Name = "txtHSupName";
+ this.txtHSupName.ReadOnly = true;
+ this.txtHSupName.Size = new System.Drawing.Size(335, 21);
+ this.txtHSupName.TabIndex = 50;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label3.ForeColor = System.Drawing.Color.Black;
+ this.label3.Location = new System.Drawing.Point(64, 144);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(29, 12);
+ this.label3.TabIndex = 52;
+ this.label3.Text = "澶囨敞";
+ //
+ // txtHRemark
+ //
+ this.txtHRemark.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHRemark.Location = new System.Drawing.Point(95, 140);
+ this.txtHRemark.Name = "txtHRemark";
+ this.txtHRemark.ReadOnly = true;
+ this.txtHRemark.Size = new System.Drawing.Size(335, 21);
+ this.txtHRemark.TabIndex = 53;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label4.ForeColor = System.Drawing.Color.Black;
+ this.label4.Location = new System.Drawing.Point(40, 60);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.TabIndex = 55;
+ this.label4.Text = "閿�鍞柟寮�";
+ //
+ // txtHSellStyle
+ //
+ this.txtHSellStyle.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSellStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSellStyle.Location = new System.Drawing.Point(95, 56);
+ this.txtHSellStyle.Name = "txtHSellStyle";
+ this.txtHSellStyle.ReadOnly = true;
+ this.txtHSellStyle.Size = new System.Drawing.Size(128, 21);
+ this.txtHSellStyle.TabIndex = 56;
+ //
+ // gbUp
+ //
+ this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.pic1);
+ this.gbUp.Controls.Add(this.txtHCreditDifference);
+ this.gbUp.Controls.Add(this.txtHCreditRating);
+ this.gbUp.Controls.Add(this.txtHMoney);
+ this.gbUp.Controls.Add(this.txtHBalance);
+ this.gbUp.Controls.Add(this.cmbHStockOrgID);
+ this.gbUp.Controls.Add(this.txtHEmpName);
+ this.gbUp.Controls.Add(this.txtHConveyType);
+ this.gbUp.Controls.Add(this.txtHConveyCompName);
+ this.gbUp.Controls.Add(this.txtHLinkMan);
+ this.gbUp.Controls.Add(this.txtHDeptName);
+ this.gbUp.Controls.Add(this.txtHSourceBillNo);
+ this.gbUp.Controls.Add(this.txtHLinkPhone);
+ this.gbUp.Controls.Add(this.txtHWHName);
+ this.gbUp.Controls.Add(this.txtHKeeperName);
+ this.gbUp.Controls.Add(this.txtHSecManagerName);
+ this.gbUp.Controls.Add(this.txtHBillNo);
+ this.gbUp.Controls.Add(this.cmbHBillStatus);
+ this.gbUp.Controls.Add(this.dtpHDate);
+ this.gbUp.Controls.Add(this.txtHSellStyle);
+ this.gbUp.Controls.Add(this.txtHSupName);
+ this.gbUp.Controls.Add(this.txtHRemark);
+ this.gbUp.Controls.Add(this.label22);
+ this.gbUp.Controls.Add(this.label23);
+ this.gbUp.Controls.Add(this.label21);
+ this.gbUp.Controls.Add(this.label20);
+ this.gbUp.Controls.Add(this.cmbHSourceBillType);
+ this.gbUp.Controls.Add(this.label19);
+ this.gbUp.Controls.Add(this.label18);
+ this.gbUp.Controls.Add(this.label17);
+ this.gbUp.Controls.Add(this.label15);
+ this.gbUp.Controls.Add(this.label16);
+ this.gbUp.Controls.Add(this.label13);
+ this.gbUp.Controls.Add(this.label12);
+ this.gbUp.Controls.Add(this.label11);
+ this.gbUp.Controls.Add(this.label10);
+ this.gbUp.Controls.Add(this.label9);
+ this.gbUp.Controls.Add(this.label7);
+ this.gbUp.Controls.Add(this.label14);
+ this.gbUp.Controls.Add(this.label5);
+ this.gbUp.Controls.Add(this.label8);
+ this.gbUp.Controls.Add(this.label6);
+ this.gbUp.Controls.Add(this.label4);
+ this.gbUp.Controls.Add(this.label3);
+ this.gbUp.Controls.Add(this.label2);
+ this.gbUp.Dock = System.Windows.Forms.DockStyle.Top;
+ this.gbUp.Location = new System.Drawing.Point(0, 0);
+ this.gbUp.Name = "gbUp";
+ this.gbUp.Size = new System.Drawing.Size(1105, 218);
+ this.gbUp.TabIndex = 58;
+ this.gbUp.TabStop = false;
+ //
+ // txtHCreditDifference
+ //
+ this.txtHCreditDifference.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHCreditDifference.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHCreditDifference.Location = new System.Drawing.Point(716, 168);
+ this.txtHCreditDifference.Name = "txtHCreditDifference";
+ this.txtHCreditDifference.ReadOnly = true;
+ this.txtHCreditDifference.Size = new System.Drawing.Size(128, 21);
+ this.txtHCreditDifference.TabIndex = 337;
+ //
+ // txtHCreditRating
+ //
+ this.txtHCreditRating.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHCreditRating.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHCreditRating.Location = new System.Drawing.Point(716, 140);
+ this.txtHCreditRating.Name = "txtHCreditRating";
+ this.txtHCreditRating.ReadOnly = true;
+ this.txtHCreditRating.Size = new System.Drawing.Size(128, 21);
+ this.txtHCreditRating.TabIndex = 335;
+ //
+ // txtHMoney
+ //
+ this.txtHMoney.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMoney.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMoney.Location = new System.Drawing.Point(509, 168);
+ this.txtHMoney.Name = "txtHMoney";
+ this.txtHMoney.ReadOnly = true;
+ this.txtHMoney.Size = new System.Drawing.Size(128, 21);
+ this.txtHMoney.TabIndex = 333;
+ //
+ // txtHBalance
+ //
+ this.txtHBalance.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBalance.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBalance.Location = new System.Drawing.Point(509, 140);
+ this.txtHBalance.Name = "txtHBalance";
+ this.txtHBalance.ReadOnly = true;
+ this.txtHBalance.Size = new System.Drawing.Size(128, 21);
+ this.txtHBalance.TabIndex = 331;
+ //
+ // cmbHStockOrgID
+ //
+ this.cmbHStockOrgID.Enabled = false;
+ this.cmbHStockOrgID.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmbHStockOrgID.FormattingEnabled = true;
+ this.cmbHStockOrgID.Location = new System.Drawing.Point(95, 168);
+ this.cmbHStockOrgID.Margin = new System.Windows.Forms.Padding(2);
+ this.cmbHStockOrgID.Name = "cmbHStockOrgID";
+ this.cmbHStockOrgID.Size = new System.Drawing.Size(128, 20);
+ this.cmbHStockOrgID.TabIndex = 327;
+ //
+ // txtHEmpName
+ //
+ this.txtHEmpName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHEmpName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHEmpName.Location = new System.Drawing.Point(716, 28);
+ this.txtHEmpName.Name = "txtHEmpName";
+ this.txtHEmpName.ReadOnly = true;
+ this.txtHEmpName.Size = new System.Drawing.Size(128, 21);
+ this.txtHEmpName.TabIndex = 324;
+ //
+ // txtHConveyType
+ //
+ this.txtHConveyType.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHConveyType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHConveyType.Location = new System.Drawing.Point(302, 112);
+ this.txtHConveyType.Name = "txtHConveyType";
+ this.txtHConveyType.ReadOnly = true;
+ this.txtHConveyType.Size = new System.Drawing.Size(128, 21);
+ this.txtHConveyType.TabIndex = 323;
+ //
+ // txtHConveyCompName
+ //
+ this.txtHConveyCompName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHConveyCompName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHConveyCompName.Location = new System.Drawing.Point(95, 112);
+ this.txtHConveyCompName.Name = "txtHConveyCompName";
+ this.txtHConveyCompName.ReadOnly = true;
+ this.txtHConveyCompName.Size = new System.Drawing.Size(128, 21);
+ this.txtHConveyCompName.TabIndex = 321;
+ //
+ // txtHLinkMan
+ //
+ this.txtHLinkMan.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHLinkMan.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHLinkMan.Location = new System.Drawing.Point(716, 112);
+ this.txtHLinkMan.Name = "txtHLinkMan";
+ this.txtHLinkMan.ReadOnly = true;
+ this.txtHLinkMan.Size = new System.Drawing.Size(128, 21);
+ this.txtHLinkMan.TabIndex = 319;
+ //
+ // txtHDeptName
+ //
+ this.txtHDeptName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHDeptName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHDeptName.Location = new System.Drawing.Point(509, 28);
+ this.txtHDeptName.Name = "txtHDeptName";
+ this.txtHDeptName.ReadOnly = true;
+ this.txtHDeptName.Size = new System.Drawing.Size(128, 21);
+ this.txtHDeptName.TabIndex = 155;
+ //
+ // txtHSourceBillNo
+ //
+ this.txtHSourceBillNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(716, 84);
+ this.txtHSourceBillNo.Name = "txtHSourceBillNo";
+ this.txtHSourceBillNo.ReadOnly = true;
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(128, 21);
+ this.txtHSourceBillNo.TabIndex = 153;
+ //
+ // txtHLinkPhone
+ //
+ this.txtHLinkPhone.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHLinkPhone.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHLinkPhone.Location = new System.Drawing.Point(509, 112);
+ this.txtHLinkPhone.Name = "txtHLinkPhone";
+ this.txtHLinkPhone.ReadOnly = true;
+ this.txtHLinkPhone.Size = new System.Drawing.Size(128, 21);
+ this.txtHLinkPhone.TabIndex = 151;
+ //
+ // txtHWHName
+ //
+ this.txtHWHName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHWHName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWHName.Location = new System.Drawing.Point(302, 84);
+ this.txtHWHName.Name = "txtHWHName";
+ this.txtHWHName.ReadOnly = true;
+ this.txtHWHName.Size = new System.Drawing.Size(128, 21);
+ this.txtHWHName.TabIndex = 149;
+ //
+ // txtHKeeperName
+ //
+ this.txtHKeeperName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHKeeperName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHKeeperName.Location = new System.Drawing.Point(95, 84);
+ this.txtHKeeperName.Name = "txtHKeeperName";
+ this.txtHKeeperName.ReadOnly = true;
+ this.txtHKeeperName.Size = new System.Drawing.Size(128, 21);
+ this.txtHKeeperName.TabIndex = 147;
+ //
+ // txtHSecManagerName
+ //
+ this.txtHSecManagerName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSecManagerName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSecManagerName.Location = new System.Drawing.Point(302, 56);
+ this.txtHSecManagerName.Name = "txtHSecManagerName";
+ this.txtHSecManagerName.ReadOnly = true;
+ this.txtHSecManagerName.Size = new System.Drawing.Size(128, 21);
+ this.txtHSecManagerName.TabIndex = 145;
+ //
+ // txtHBillNo
+ //
+ this.txtHBillNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBillNo.Location = new System.Drawing.Point(95, 28);
+ this.txtHBillNo.Name = "txtHBillNo";
+ this.txtHBillNo.ReadOnly = true;
+ this.txtHBillNo.Size = new System.Drawing.Size(128, 21);
+ this.txtHBillNo.TabIndex = 143;
+ //
+ // cmbHBillStatus
+ //
+ this.cmbHBillStatus.Enabled = false;
+ this.cmbHBillStatus.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmbHBillStatus.FormattingEnabled = true;
+ this.cmbHBillStatus.Location = new System.Drawing.Point(302, 168);
+ this.cmbHBillStatus.Margin = new System.Windows.Forms.Padding(2);
+ this.cmbHBillStatus.Name = "cmbHBillStatus";
+ this.cmbHBillStatus.Size = new System.Drawing.Size(128, 20);
+ this.cmbHBillStatus.TabIndex = 139;
+ //
+ // dtpHDate
+ //
+ this.dtpHDate.Enabled = false;
+ this.dtpHDate.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHDate.Location = new System.Drawing.Point(302, 28);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHDate.Name = "dtpHDate";
+ this.dtpHDate.Size = new System.Drawing.Size(128, 21);
+ this.dtpHDate.TabIndex = 100;
+ //
+ // label22
+ //
+ this.label22.AutoSize = true;
+ this.label22.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label22.ForeColor = System.Drawing.Color.Black;
+ this.label22.Location = new System.Drawing.Point(661, 172);
+ this.label22.Name = "label22";
+ this.label22.Size = new System.Drawing.Size(53, 12);
+ this.label22.TabIndex = 336;
+ this.label22.Text = "淇＄敤宸";
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label23.ForeColor = System.Drawing.Color.Black;
+ this.label23.Location = new System.Drawing.Point(637, 144);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(77, 12);
+ this.label23.TabIndex = 334;
+ this.label23.Text = "瀹㈡埛淇＄敤棰濆害";
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label21.ForeColor = System.Drawing.Color.Black;
+ this.label21.Location = new System.Drawing.Point(454, 172);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(53, 12);
+ this.label21.TabIndex = 332;
+ this.label21.Text = "鏈崟閲戦";
+ //
+ // label20
+ //
+ this.label20.AutoSize = true;
+ this.label20.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label20.ForeColor = System.Drawing.Color.Black;
+ this.label20.Location = new System.Drawing.Point(454, 144);
+ this.label20.Name = "label20";
+ this.label20.Size = new System.Drawing.Size(53, 12);
+ this.label20.TabIndex = 330;
+ this.label20.Text = "瀹㈡埛浣欓";
+ //
+ // cmbHSourceBillType
+ //
+ this.cmbHSourceBillType.Enabled = false;
+ this.cmbHSourceBillType.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmbHSourceBillType.FormattingEnabled = true;
+ this.cmbHSourceBillType.Location = new System.Drawing.Point(509, 84);
+ this.cmbHSourceBillType.Margin = new System.Windows.Forms.Padding(2);
+ this.cmbHSourceBillType.Name = "cmbHSourceBillType";
+ this.cmbHSourceBillType.Size = new System.Drawing.Size(128, 20);
+ this.cmbHSourceBillType.TabIndex = 329;
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label19.ForeColor = System.Drawing.Color.Black;
+ this.label19.Location = new System.Drawing.Point(454, 88);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(53, 12);
+ this.label19.TabIndex = 328;
+ this.label19.Text = "婧愬崟绫诲瀷";
+ //
+ // label18
+ //
+ this.label18.AutoSize = true;
+ this.label18.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label18.ForeColor = System.Drawing.Color.Black;
+ this.label18.Location = new System.Drawing.Point(40, 172);
+ this.label18.Name = "label18";
+ this.label18.Size = new System.Drawing.Size(53, 12);
+ this.label18.TabIndex = 326;
+ this.label18.Text = "閿�鍞粍缁�";
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label17.ForeColor = System.Drawing.Color.Black;
+ this.label17.Location = new System.Drawing.Point(673, 32);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(41, 12);
+ this.label17.TabIndex = 325;
+ this.label17.Text = "閿�鍞憳";
+ //
+ // label15
+ //
+ this.label15.AutoSize = true;
+ this.label15.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label15.ForeColor = System.Drawing.Color.Black;
+ this.label15.Location = new System.Drawing.Point(247, 116);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(53, 12);
+ this.label15.TabIndex = 322;
+ this.label15.Text = "杩愯緭鏂瑰紡";
+ //
+ // label16
+ //
+ this.label16.AutoSize = true;
+ this.label16.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label16.ForeColor = System.Drawing.Color.Black;
+ this.label16.Location = new System.Drawing.Point(40, 116);
+ this.label16.Name = "label16";
+ this.label16.Size = new System.Drawing.Size(53, 12);
+ this.label16.TabIndex = 320;
+ this.label16.Text = "杩愯緭鍏徃";
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label13.ForeColor = System.Drawing.Color.Black;
+ this.label13.Location = new System.Drawing.Point(673, 116);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(41, 12);
+ this.label13.TabIndex = 318;
+ this.label13.Text = "鑱旂郴浜�";
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label12.ForeColor = System.Drawing.Color.Black;
+ this.label12.Location = new System.Drawing.Point(454, 32);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(53, 12);
+ this.label12.TabIndex = 154;
+ this.label12.Text = "閿�鍞儴闂�";
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label11.ForeColor = System.Drawing.Color.Black;
+ this.label11.Location = new System.Drawing.Point(673, 88);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(41, 12);
+ this.label11.TabIndex = 152;
+ this.label11.Text = "婧愬崟鍙�";
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label10.ForeColor = System.Drawing.Color.Black;
+ this.label10.Location = new System.Drawing.Point(454, 116);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(53, 12);
+ this.label10.TabIndex = 150;
+ this.label10.Text = "鑱旂郴鐢佃瘽";
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label9.ForeColor = System.Drawing.Color.Black;
+ this.label9.Location = new System.Drawing.Point(247, 88);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(53, 12);
+ this.label9.TabIndex = 148;
+ this.label9.Text = "鍑哄簱浠撳簱";
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label7.ForeColor = System.Drawing.Color.Black;
+ this.label7.Location = new System.Drawing.Point(64, 88);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(29, 12);
+ this.label7.TabIndex = 146;
+ this.label7.Text = "浠撶";
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label14.ForeColor = System.Drawing.Color.Black;
+ this.label14.Location = new System.Drawing.Point(259, 60);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(41, 12);
+ this.label14.TabIndex = 144;
+ this.label14.Text = "鍙戣揣浜�";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label5.ForeColor = System.Drawing.Color.Black;
+ this.label5.Location = new System.Drawing.Point(40, 32);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(53, 12);
+ this.label5.TabIndex = 142;
+ this.label5.Text = "鍗曟嵁缂栧彿";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label8.ForeColor = System.Drawing.Color.Black;
+ this.label8.Location = new System.Drawing.Point(247, 172);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(53, 12);
+ this.label8.TabIndex = 138;
+ this.label8.Text = "鍗曟嵁鐘舵��";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label6.ForeColor = System.Drawing.Color.Black;
+ this.label6.Location = new System.Drawing.Point(271, 32);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(29, 12);
+ this.label6.TabIndex = 99;
+ this.label6.Text = "鏃ユ湡";
+ //
+ // grdSub
+ //
+ this.grdSub.AllowUserToAddRows = false;
+ this.grdSub.AllowUserToDeleteRows = false;
+ this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+ this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle10.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdSub.DefaultCellStyle = dataGridViewCellStyle10;
+ this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdSub.Location = new System.Drawing.Point(0, 73);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(0);
+ this.grdSub.Name = "grdSub";
+ this.grdSub.ReadOnly = true;
+ this.grdSub.RowHeadersWidth = 51;
+ this.grdSub.RowTemplate.Height = 23;
+ this.grdSub.Size = new System.Drawing.Size(257, 554);
+ this.grdSub.TabIndex = 18;
+ this.grdSub.Paint += new System.Windows.Forms.PaintEventHandler(this.grdSub_Paint);
+ this.grdSub.DoubleClick += new System.EventHandler(this.grdSub_DoubleClick);
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(0, 218);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(1105, 409);
+ this.tabControl1.TabIndex = 149;
+ //
+ // 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(1097, 383);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "鍩烘湰淇℃伅";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // tabPage2
+ //
+ this.tabPage2.Controls.Add(this.grdBarCode);
+ 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(1097, 383);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "鐮佸崟淇℃伅";
+ this.tabPage2.UseVisualStyleBackColor = true;
+ //
+ // grdBarCode
+ //
+ this.grdBarCode.AllowUserToAddRows = false;
+ this.grdBarCode.AllowUserToDeleteRows = false;
+ this.grdBarCode.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+ this.grdBarCode.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdBarCode.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdBarCode.Location = new System.Drawing.Point(3, 3);
+ this.grdBarCode.Name = "grdBarCode";
+ this.grdBarCode.ReadOnly = true;
+ this.grdBarCode.RowHeadersWidth = 30;
+ this.grdBarCode.RowTemplate.Height = 23;
+ this.grdBarCode.Size = new System.Drawing.Size(1091, 377);
+ this.grdBarCode.TabIndex = 46;
+ this.grdBarCode.Paint += new System.Windows.Forms.PaintEventHandler(this.grdBarCode_Paint);
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.grdSub);
+ this.panel1.Controls.Add(this.groupBox1);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel1.Location = new System.Drawing.Point(11, 50);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(257, 627);
+ this.panel1.TabIndex = 59;
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.label1);
+ this.groupBox1.Controls.Add(this.txtHBarCode);
+ this.groupBox1.Controls.Add(this.cmdOK);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.groupBox1.Location = new System.Drawing.Point(0, 0);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(257, 73);
+ this.groupBox1.TabIndex = 146;
+ this.groupBox1.TabStop = false;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label1.ForeColor = System.Drawing.Color.Black;
+ this.label1.Location = new System.Drawing.Point(11, 40);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(41, 12);
+ this.label1.TabIndex = 151;
+ this.label1.Text = "婧愬崟鐮�";
+ //
+ // txtHBarCode
+ //
+ this.txtHBarCode.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBarCode.Location = new System.Drawing.Point(57, 36);
+ this.txtHBarCode.Name = "txtHBarCode";
+ this.txtHBarCode.Size = new System.Drawing.Size(127, 21);
+ this.txtHBarCode.TabIndex = 152;
+ this.txtHBarCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHBarCode_KeyPress);
+ //
+ // cmdOK
+ //
+ this.cmdOK.BackColor = System.Drawing.Color.White;
+ this.cmdOK.Cursor = System.Windows.Forms.Cursors.Default;
+ this.cmdOK.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmdOK.Location = new System.Drawing.Point(189, 33);
+ this.cmdOK.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdOK.Name = "cmdOK";
+ this.cmdOK.Size = new System.Drawing.Size(55, 27);
+ this.cmdOK.TabIndex = 150;
+ this.cmdOK.Text = "鏌ヨ";
+ this.cmdOK.UseVisualStyleBackColor = false;
+ this.cmdOK.Click += new System.EventHandler(this.cmdOK_Click);
+ //
+ // panel2
+ //
+ this.panel2.Controls.Add(this.tabControl1);
+ this.panel2.Controls.Add(this.gbUp);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel2.Location = new System.Drawing.Point(279, 50);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(1105, 627);
+ this.panel2.TabIndex = 60;
+ //
+ // 宸︿晶
+ //
+ this.宸︿晶.Dock = System.Windows.Forms.DockStyle.Left;
+ this.宸︿晶.Location = new System.Drawing.Point(0, 50);
+ this.宸︿晶.Name = "宸︿晶";
+ this.宸︿晶.Size = new System.Drawing.Size(11, 627);
+ this.宸︿晶.TabIndex = 61;
+ //
+ // 涓棿
+ //
+ this.涓棿.Dock = System.Windows.Forms.DockStyle.Left;
+ this.涓棿.Location = new System.Drawing.Point(268, 50);
+ this.涓棿.Name = "涓棿";
+ this.涓棿.Size = new System.Drawing.Size(11, 627);
+ this.涓棿.TabIndex = 62;
+ //
+ // 搴曢儴
+ //
+ this.搴曢儴.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.搴曢儴.Location = new System.Drawing.Point(0, 677);
+ this.搴曢儴.Name = "搴曢儴";
+ this.搴曢儴.Size = new System.Drawing.Size(1396, 10);
+ this.搴曢儴.TabIndex = 63;
+ //
+ // 鍙充晶
+ //
+ this.鍙充晶.Dock = System.Windows.Forms.DockStyle.Right;
+ this.鍙充晶.Location = new System.Drawing.Point(1384, 50);
+ this.鍙充晶.Name = "鍙充晶";
+ this.鍙充晶.Size = new System.Drawing.Size(12, 627);
+ this.鍙充晶.TabIndex = 64;
+ //
+ // pic1
+ //
+ this.pic1.BackColor = System.Drawing.SystemColors.ActiveCaption;
+ this.pic1.Location = new System.Drawing.Point(861, 22);
+ this.pic1.Name = "pic1";
+ this.pic1.Size = new System.Drawing.Size(66, 30);
+ this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pic1.TabIndex = 338;
+ this.pic1.TabStop = false;
+ this.pic1.Visible = false;
+ //
+ // Kf_SellOutBill_BarCodeNote
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.AutoSize = true;
+ this.BackColor = System.Drawing.SystemColors.ActiveCaption;
+ this.ClientSize = new System.Drawing.Size(1396, 687);
+ this.Controls.Add(this.panel2);
+ this.Controls.Add(this.涓棿);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.宸︿晶);
+ this.Controls.Add(this.鍙充晶);
+ this.Controls.Add(this.搴曢儴);
+ this.Controls.Add(this.Tool);
+ this.Name = "Kf_SellOutBill_BarCodeNote";
+ this.Text = "閿�鍞爜鍗曟墦鍗�";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.Load += new System.EventHandler(this.Kf_SellOutBill_BarCodeNote_Load);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.gbUp.ResumeLayout(false);
+ this.gbUp.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage1.ResumeLayout(false);
+ this.tabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdBarCode)).EndInit();
+ this.panel1.ResumeLayout(false);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ public System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+ private System.Windows.Forms.ToolStripButton mrlk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.ToolStripButton bclk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+ private System.Windows.Forms.DataGridView grdMain;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox txtHSupName;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox txtHRemark;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.TextBox txtHSellStyle;
+ private System.Windows.Forms.GroupBox gbUp;
+ private System.Windows.Forms.DateTimePicker dtpHDate;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.ComboBox cmbHBillStatus;
+ private System.Windows.Forms.DataGridView grdSub;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.TextBox txtHBillNo;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.TextBox txtHSecManagerName;
+ private System.Windows.Forms.ToolStripButton Billdy;
+ private System.Windows.Forms.ToolStripButton sh;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox txtHBarCode;
+ private System.Windows.Forms.Button cmdOK;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.TextBox txtHLinkPhone;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.TextBox txtHWHName;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.TextBox txtHKeeperName;
+ private System.Windows.Forms.TextBox txtHDeptName;
+ private System.Windows.Forms.Label label12;
+ private System.Windows.Forms.TextBox txtHSourceBillNo;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.Panel 宸︿晶;
+ private System.Windows.Forms.Panel 涓棿;
+ private System.Windows.Forms.Panel 搴曢儴;
+ private System.Windows.Forms.Panel 鍙充晶;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.TextBox txtHLinkMan;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.TextBox txtHConveyType;
+ private System.Windows.Forms.Label label16;
+ private System.Windows.Forms.TextBox txtHConveyCompName;
+ private System.Windows.Forms.ToolStripButton tp;
+ private System.Windows.Forms.ToolStripButton BarCodedy;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+ private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.DataGridView grdBarCode;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.TextBox txtHEmpName;
+ private System.Windows.Forms.Label label22;
+ private System.Windows.Forms.TextBox txtHCreditDifference;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.TextBox txtHCreditRating;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.TextBox txtHMoney;
+ private System.Windows.Forms.Label label20;
+ private System.Windows.Forms.TextBox txtHBalance;
+ private System.Windows.Forms.ComboBox cmbHSourceBillType;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.ComboBox cmbHStockOrgID;
+ private System.Windows.Forms.Label label18;
+ private System.Windows.Forms.PictureBox pic1;
+ }
+}
\ No newline at end of file
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.resx" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.resx"
new file mode 100644
index 0000000..7a5bbe9
--- /dev/null
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.resx"
@@ -0,0 +1,449 @@
+<?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
+ P/MP0X/wW2n/AMZri/8AhDh6Uf8ACHD0r9f/ALPp/wAp+cfXJ9zsj+2p4oOQdO0U/wDcMtP/AIzR/wAN
+ peJ++m6KP+4Zaf8AxmuN/wCEOH93FH/CHD0prL4fyh9cn/Mdl/w2j4m/6B2if+Cy0/8AjNH/AA2n4mXr
+ puiEf9g20/8AjNcb/wAIcPSj/hDh/dNL+z6f8qBYyf8AMdkf21fEv/QN0T/wW2n/AMZo/wCG1fEv/QN0
+ T/wW2f8A8ZrjP+ENH9yl/wCEOA6KRR9Qp/yj+uz/AJmdl/w2r4l/6Buif+C2z/8AjNH/AA2r4l/6Buif
+ +C2z/wDjNcb/AMIcP7po/wCEOH900/7Ph/KL65P+Y7Mftq+JMf8AIO0Uf9w20/8AjNB/bU8S5407RD/3
+ DbT/AOM1xZ8HqOq0f8Iiv900v7Pp/wAofXZ/zHZf8NqeJe+m6L/4LbT/AOM0q/to+Je+naKP+4baf/Ga
+ 4z/hEV/umgeEAeimj+z4fyh9cn/Mdn/w2n4l/wCgdon/AILbT/4zR/w2n4l/6B2if+C20/8AjNcb/wAI
+ cP7po/4Q4f3TR/Z8P5UH1yf8x2P/AA2p4l/6Bui/+C20/wDjNH/DaniX/oG6L/4LbT/4zXHf8IcP7ppP
+ +ENH9yj+z4fyh9cn/MdmP21vEo66do3/AILbT/4zSj9tbxKemm6MT/2DbT/4zXF/8IcB/Cfyo/4RAf3T
+ +VCy+n/KH1uf8x2g/bT8SnrpmiD/ALhtp/8AGaD+2n4lH/MN0QY/6htn/wDGa4z/AIQ9f7rflSHwcp/h
+ P5U/7Pp/yjWMqfzM7Q/tp+Juo0zRP/BZZ/8AxmlX9tLxNj/kHaIP+4bZ/wDxmuK/4Q8eh/Kj/hDx6H8q
+ X9n0/wCUFjJ92ds37aPiY8HTtEx/2DbP/wCM0L+2l4lLZOnaJ/4LbP8A+M1xP/CHj0P5UDweOPlb8qP7
+ Pp/yieMn3Z2zftp+JP8AoG6Kf+4bZ/8Axmm/8Nq+Jf8AoF6L/wCC20/+M1xf/CID+435Uf8ACID+435U
+ f2fT/lD65PuztP8AhtXxJ/0DdG/8Ftp/8Zo/4bU8Rj/mG6MP+4Zaf/Ga4v8A4RH0Q4+lH/CI/wCyw+go
+ /s+n/Kg+tz7s7MftqeJP+gfop/7htp/8ZoP7aviUDjT9D/HTLT/4zXGDwgfRvypR4NY9FYj3WhZfT/lH
+ 9cn3Oy/4bU8Tf9A7Q/8AwWWn/wAZo/4bU8Tf9A7Q/wDwWWn/AMZrjv8AhDW/uH/vmk/4Q4/3f0oWX0/5
+ QWNn/Mzsv+G1fEv/AED9Fx7abaf/ABmj/htbxN/0D9F/8Ftn/wDGa40+Dj/dP5Un/CHH+6fyp/2fT/lF
+ 9bn3Oy/4bV8Tf9A7Rf8AwW2f/wAZpf8AhtXxP/0DtF/8Ftn/APGa4z/hDx/dP5Uf8IgP7p/Kl/Z9P+Uf
+ 1yp3Oz/4bU8S/wDQP0b/AMFtn/8AGaP+G1vE3bTtFx/2DbP/AOM1xn/CID+6fypR4OB/hIoWX0/5RfW5
+ 92dkf21fEx66fog/7hln/wDGaP8AhtbxP/0D9E/8Ftp/8Zrjf+EOHpS/8Id/s/pQsvp/yoFjJ/zHY/8A
+ Da3if/oH6J/4LbT/AOM0f8NqeJv+gfon/gttP/jNcePBuf4QPwo/4Qz2H5Uf2fT/AJR/XZ/zHXn9tXxL
+ 307RSf8AsG2n/wAZpR+2r4k/6B2ig/8AYNtP/jNcefBn+zTf+EOHpQsvp/yh9cqfzHZn9tPxKOPsGi/+
+ C20/+M0H9tLxKQSLDRCR2/s20/8AjNcZ/wAIcPSl/wCEOH90flR/Z9P+UX1up/Mzsf8AhtTxN/0DtD/8
+ Flp/8Zo/4bU8S99O0Q/TTbT/AOM1x3/CHj+6Pypf+ENH90/lQsvp/wAoLGVP5mdgf21PEo/5h2i/+C20
+ /wDjNJ/w2r4m3Z/s7RT9NMtP/jNcefBo/un8qP8AhDB/dYfhR/Z9P+UPrlT+Y7H/AIbW8S9Dp2igf9gy
+ 0/8AjNJ/w2r4l/6B2i/+Cyz/APjNcd/whwzjaRR/whw9KP7Ph/KCxlTudl/w2r4l/wCgdon/AILbT/4z
+ R/w2p4l/6B2if+C20/8AjNcb/wAIcPSl/wCEPH90flQsvp/ygsXU7nZf8Nq+JT007Rh/3DbT/wCM0f8A
+ Danic9NP0U5/6hlp/wDGa43/AIQ8f3R+VJ/who67Cc0LL6f8o/rlT+Y7M/tp+Jz00/RT/wBwy0H/ALRp
+ P+G0/E//AED9F/8ABZaf/Ga43/hDf9g0f8Ib/sGn/Z9P+VAsbP8AmZ2X/DaXif8A6B+in/uGWn/xmlH7
+ anicDjTtE/8ABXaf/Ga43/hDP9k0f8IZ/sml/Z8P5UL67P8AmOw/4bS8T/8AQO0X/wAFlp/8Zpf+G0/E
+ 46afon/grtP/AIzXHf8ACGf7Jo/4Qz/ZNP6hD+VB9dqfzHY/8NpeJ/8AoG6L/wCCu0/+M0v/AA2p4n/6
+ B+if+Cy0/wDjNcb/AMIZ/smj/hDP9k0ll9P+VB9dn/Mdl/w2l4nzn+ztEP8A3C7T/wCM0f8ADaXiftp2
+ iH/uF2n/AMZrjP8AhDf9g0f8Ib/sGhZfT/lQfXJ/zHZf8NpeJiMf2douf+wZaf8Axmj/AIbT8T/9A7Rf
+ /BZaf/Ga43/hDf8AYNH/AAhv+waay+H8qD65P+Y7H/htHxP/ANA3RP8AwW2n/wAZp3/DafifnOnaL/4L
+ bT/4zXF/8IkP7h/KlHhEHqhA+lDy+n/Kh/XKnc7P/htTxP207Rf/AAWWn/xmlP7anicgf6Boo/7hlp/8
+ ZrjP+EQX0P8A3zSf8Iev90n8KX9n0/5RfXKnc7P/AIbU8Tgc6fo2D/1DLT/4zSL+2n4l/wCfDRR/3C7T
+ /wCM1xv/AAh6/wB1vypf+ENX0P5Uf2fT/lQ/rlTuzsv+G1fEo/5cNF/8Flnj/wBE0p/bV8Sn/lw0XH/Y
+ Ms//AIzXGf8ACGr6H8qT/hDl9Dj6Uf2fT/lQvrdTuzs/+G0PEv8A0D9EI99MtP8A4zQf20PEwGRp2iE/
+ 9g20/wDjNcYfB6+hP4Uf8Iev91vyo/s+n/Kg+uVO7Oy/4bU8T/8AQO0X/wAFtp/8Zo/4bT8T/wDQO0X/
+ AMFtp/8AGa43/hER/dP5Uf8ACIjsp/Kj+z6f8ofXKnc7L/htLxP1Om6L/wCC20/+M0n/AA2p4l76foo/
+ 7h1p/wDGa43/AIREf3Dz7Uf8IgP7jflT/s+n/KCxlTuzs/8AhtTxKemn6If+4dZ//GaP+G0vEv8A0DtE
+ /wDBdaf/ABmuMHg8H+Aij/hEB/dP5Uv7Pp/yoPrdTudn/wANq+Jv+gdov/gttP8A4zR/w2p4m76fohH/
+ AGDbT/4zXGf8IgP7p/Kj/hEB/dP5U1l9P+UFjKnc7P8A4bW8Tf8AQO0X/wAFtp/8ZoH7aviYf8w7RR/3
+ DbT/AOM1xn/CID+6fypR4OB/hIpf2dT/AJUNYyp/Mzsx+2n4mPA07RMf9g20/wDjNB/bU8S9Dp+iZ/7B
+ tn/8ZrjP+EOHpR/whw9KP7Pp/wAqB4yf8zOy/wCG1vE//QP0T/wWWf8A8ZpT+2r4m76foo/7hln/APGa
+ 4z/hDQOi0f8ACHD+6aP7Pp9IoHjJ/wAzOzP7afiY9dP0Xj/qGWf/AMZpB+2n4m3f8g/RM/8AYNtP/jNc
+ aPBoPUYpf+ENHoKP7Ph/KhLGT/mOw/4bS8T5407RP/Bbaf8AxmlP7aXifHOn6Jj/ALBtp/8AGa43/hDh
+ 6Uf8IcPSj+z6f8qH9bqd2dl/w2n4m/6B2i49f7MtP/jNH/DafiXp/Z+iY/7Blp/8Zrjf+EOHpR/whw9K
+ f9n0/wCUPrlTudl/w2l4l/6B+if+Cy0/+M0f8NpeJP8AoH6J/wCCy0/+M1xv/CHD0o/4Q4elH1Cn/KH1
+ up3Z2Y/bV8Sr00/RP/BZaf8Axml/4bX8TdrDRef+oZaf/Ga4v/hDh6Uf8IcPShZfT/lD63U7s7P/AIbV
+ 8Tf9A/RP/BZaf/GaD+2r4mPA0/RSf+wbaf8AxmuM/wCEOHpR/wAIcPSj+z6f8ofW6ndnZf8ADanif/oH
+ aL/4LbT/AOM0f8NqeKP+gdon/gstP/jNcb/whw9KP+EOHpS/s+n/ACoFi6ndnZD9tPxOM507RB/3DbT/
+ AOM07/htTxMB/wAg7Rf/AAW2n/xmuLPg4dlo/wCEOHofyoeAp/yoPrlTudn/AMNp+Jcc6foo/wC4baf/
+ ABmg/to+JT107Rv/AAW2n/xmuMHg0Htj8KP+ENHpn8KFl9P+VCWMqfzHZ/8ADaHiT/oH6L/4LbT/AOM0
+ f8NpeJRnGnaKf+4Zaf8AxmuN/wCENX0P5Un/AAhw/un8qP7Pp/yoPrlT+Y7M/tqeJv8AoHaKf+4Zaf8A
+ xmk/4bU8T/8AQN0b/wAFtp/8Zrjf+EOH90/lSjwaPQCj+z6f8qGsZPuzsh+2n4mI507Rh/3DbT/4zTv+
+ G0fEpOf7P0Uf9wy0P/tGuL/4Q0ego/4Q0ego/s+n/Kg+t1O7Oz/4bT8Sj/mHaN/4LLQf+0aQ/to+Je2n
+ aKf+4Zaf/Ga4z/hDh6Uf8IcPSj+z6f8AKg+uVO7OzP7afiftp2ikf9gy0/8AjNJ/w2p4mHXTtFH/AHDL
+ T/4zXG/8IcPSg+DgP4SaP7Pp/wAqD65Puzsv+G1vEY66foo/7hlp/wDGaP8AhtbxIeP7P0Xn/qG2n/xm
+ uM/4RAf3T+VH/CID+6fyprL6f8oLGVO7OyP7a3iQH/kH6N/4LLT/AOM0f8Nq+Jf+gdov/gss/wD4zXG/
+ 8IgP7p/Kl/4RAf3f0pfUKf8AKH1yfdnY/wDDa3iUZP8AZ+ijH/UMs/8A4zSf8Nq+Jf8AoHaN/wCC20/+
+ M1x//CID+7+lH/CID+7+lNYCn/KCxk+7PVv+FeX/APz4T/mv+NH/AAr6+/58J/zX/Gv1p/4QTQ/+gLpH
+ /gJH/hR/wgmh/wDQF0j/AMBI/wDCvDfGlD/ny/8AwJf5Hp/6sVf+fi+5/wCZ+S3/AAr6+/58J/zX/Gj/
+ AIV9ff8APhP+a/41+tP/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hS/10of8APl/+BL/IP9WK
+ v/P1fc/8z8lv+FfX3/PhP+a/40h+Hl9jmwn/ADX/ABr9av8AhBND/wCgLpH/AICR/wCFH/CCaH/0BdI/
+ 8BI/8KFxpQ/58v8A8CX+Qf6sVf8An6vuf+Z+So+HV8RkWE/5r/jS/wDCvL5ePsE/5r/jX60/8IJof/QF
+ 0j/wEj/wo/4QTQ/+gLpH/gJH/hT/ANdKH/Pl/wDgS/yF/qxV/wCfq+5/5n5Lf8K+vv8Anwn/ADX/ABo/
+ 4V9ff8+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBdKH/Pl/ev8g/1Yq/8
+ /V9z/wAz8lv+FfX3/PhP+a/40f8ACvr7/nwn/Nf8a/Wn/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/
+ AMKP9dKH/Pl/ev8AIP8AVir/AM/V9z/zPyW/4V9ff8+E/wCa/wCNH/Cvr7/nwn/Nf8a/Wn/hBND/AOgL
+ pH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X96/yD/Vir/z9X3P/ADPyW/4V9ff8+E/5r/jR/wAK+vv+
+ fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X96/wAg/wBWKv8Az9X3P/M/
+ JUfDy/IOdPnP4r/jR/wru+/6B9x/47/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH/gJH/hQuNKH/AD5f
+ 3r/IP9WKv/P1fc/8z8lR8O77tp9x+a/40v8Awru//wCfC4/Nf8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9
+ AXSP/ASP/Cn/AK6UP+fL/wDAl/kP/Vir/wA/V9z/AMz8lv8AhXd//wA+FwfxX/Gk/wCFd33/AD43H/fS
+ /wCNfrV/wgmh/wDQF0j/AMBI/wDCj/hBND/6Aukf+Akf+FH+ulD/AJ8v/wACX+Qv9WKv/P1fc/8AM/JX
+ /hXd9/z43H/fS/40f8K6viP+PCc/iv8AjX61f8IJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ
+ /wCfL/8AAl/kH+rFX/n6vuf+Z+Sv/Cur7/oHz/mv+NA+HeoDgWEwH1X/ABr9av8AhBND/wCgLpH/AICR
+ /wCFH/CCaH/0BdI/8BI/8KP9dKH/AD5f/gS/yGuGKv8Az9X3P/M/Jb/hXd//AM+M3/jv+NH/AAry/wD+
+ fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X/4Ev8AIP8AVmr/AM/V9z/z
+ PyWPw6vyedPn/Nf8aT/hXd8Dxp8+f+AnP61+tX/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66
+ UP8Any//AAJf5D/1Zq/8/V9z/wAz8lf+Fe3/APz4T8f7v+NH/Cvb/wD58J//AB3/ABr9av8AhBND/wCg
+ LpH/AICR/wCFH/CCaH/0BdI/8BI/8KFxpQ/58v8A8CX+Qv8AVmr/AM/V9z/zPyV/4V7f/wDPhP8A+O/4
+ 0v8Awr+//wCgfN/47/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+ rFX/AJ+L7n/mfkt/wr+//wCgfN/47/jR/wAK/v8A/oHzf+O/41+tP/CCaH/0BdI/8BI/8KP+EE0P/oC6
+ R/4CR/4Uf66UP+fL/wDAl/kH+rFX/n4vuf8Amfkt/wAK/v8A/oHzf+O/40f8K/v/APoHzf8Ajv8AjX60
+ /wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8Any//AAJf5B/qxV/5+L7n/mfkt/wr+/8A
+ +gfN/wCO/wCNH/Cv7/8A58Jh/wB8/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBd
+ KH/Pl/8AgS/yD/Vir/z9X3P/ADPyW/4V9fn/AJcZh/3yf60n/Cu9QPIsrgf98/41+tX/AAgmh/8AQF0j
+ /wABI/8ACj/hBND/AOgLpH/gJH/hTXGlD/ny/wDwJf5CXDFX/n6vuf8Amfkr/wAK71D/AJ8Z/wDx3/Gk
+ /wCFd3//AD4T/wDjv+NfrX/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+ulD/ny/8AwJf5D/1Yq/8A
+ P1fc/wDM/JQfDq/6/YJ8f8B/xpf+Fe32P+QfN+a/41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4U
+ f66UP+fL/wDAl/kL/Vir/wA/V9z/AMz8lv8AhXt/n/jwnz/wH/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0
+ j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8A
+ Gj/hXl//AM+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/k
+ H+rFX/n6vuf+Z+S3/CvL/wD58J/zX/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAu
+ kf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8AGj/hXl//AM+E/wCa/wCN
+ frT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n6vuf+Z+S3/CvL
+ /wD58J/zX/Gj/hXd9/0D5/8Ax3/Gv1p/4QTQ/wDoC6R/4CR/4Uf8IJof/QF0j/wEj/wo/wBdKH/Pl/8A
+ gS/yD/Vir/z9X3P/ADPyW/4V3ff9A+f/AMd/xpP+FfX/AEFhOMe6/wCNfrV/wgmh/wDQF0j/AMBI/wDC
+ j/hBND/6Aukf+Akf+FC40of8+X/4Ev8AIf8AqxV/5+L7n/mfkr/wr2//AOfGb81/xo/4V7f/APPjN+a/
+ 41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4Uf660P+fL+9f5B/qxV/5+L7n/AJn5K/8ACvb/AP58
+ ZvzX/Gj/AIV7f/8APjN+a/41+tX/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hR/rrQ/58v71/
+ kH+rFX/n4vuf+Z+Sv/Cvb/8A58ZvzX/Gj/hXt/8A8+M35r/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH
+ /gJH/hR/rrQ/58v71/kH+rFX/n4vuf8Amfkr/wAK9v8A/nxm/Nf8aP8AhXt//wA+M35r/jX61f8ACCaH
+ /wBAXSP/AAEj/wAKP+EE0P8A6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/5n5K/8K9v/wDnxm/Nf8aP
+ +Fe3/wDz4zfmv+NfrV/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/wCZ
+ +Sv/AAr2/wD+fGb81/xo/wCFe3//AD4zfmv+NfrV/wAIJof/AEBdI/8AASP/AAo/4QTQ/wDoC6R/4CR/
+ 4Uf660P+fL+9f5B/qxV/5+L7n/mfkt/wr+//AOgfN/47/jSH4f3/AE+wTf8Ajv8AjX61f8IJof8A0BdI
+ /wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n4vuf+Z+Sv/Cvb/wD58ZvzX/Gj/hXt
+ /wD8+M35r/jX61f8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIULjSh/z5f3r/IP9WKv/Pxfc/8A
+ M/JX/hXt/wD8+M35r/jR/wAK9v8A/nxm/Nf8a/Wr/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/AMKP
+ 9daH/Pl/ev8AIP8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/
+ 4CR/4Uf8IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+
+ fGb81/xr9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/
+ JX/hXt//AM+M35r/AI07/hXt/wD8+Ev/AI7/AI1+tH/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4
+ Uf66UP8Any/vX+Qf6sVf+fi+5/5n5L/8K81DnNjNj/gP+NN/4V9ff8+E5/Ff8a/Wn/hBND/6Auk/+Acf
+ +FH/AAgmh/8AQF0n/wAA4/8ACk+NKH/Pl/8AgS/yF/qxV/5+L7n/AJn5Lf8ACv77/nwn/Nf8aD8Pr/8A
+ 58Jx/wB8/wCNfrV/wguh/wDQF0j/AMA4/wDCj/hBdD/6Aukf+Acf+FH+ulD/AJ8v/wACX+QLhir/AM/F
+ 9z/zPyW/4V5f/wDPjP8A+O/40n/Cvr//AJ8Zv/Hf8a/Wr/hBdD/6Aukf+Acf+FH/AAguh/8AQF0j/wAA
+ 4/8ACj/XSh/z5f8A4Ev8g/1Yq/8AP1fd/wAE/JX/AIV9f/8APjN/47/jR/wr6/8A+fGb/wAd/wAa/Wr/
+ AIQXQ/8AoC6R/wCAcf8AhR/wguh/9AXSP/AOP/Cj/XSh/wA+X/4Ev8g/1Yq/8/V93/BPyV/4V9f/APPj
+ N/47/jR/wr6//wCfGb/x3/Gv1q/4QXQ/+gLpH/gHH/hR/wAILof/AEBdI/8AAOP/AAo/10of8+X/AOBL
+ /IP9WKv/AD9X3f8ABPyVPw71Dp9huB/3yP60f8K8vxx9inP4r/jX61f8ILof/QF0j/wDj/wo/wCEF0P/
+ AKAukf8AgHH/AIUf660P+fL/APAl/kC4Yq/8/V9z/wAz8lf+Fe34/wCXGf8A8d/xpP8AhX1//wA+M/8A
+ 47/jX61/8ILof/QF0j/wDj/wpP8AhBND/wCgLpP/AIBx/wCFNca0P+fL+9f5AuGKv/Pxfc/8z8lv+Ff3
+ /wDz4T/+O/40f8K9v/8Anxm/Nf8AGv1q/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF0j/wEj/woXGlD/ny
+ /vX+Q/8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/4CR/4Uf8
+ IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+fGb81/xr
+ 9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/JX/hXt//
+ AM+M35r/AI0f8K9v/wDnxm/Nf8a/Wr/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF1of8+X96/y
+ D/Vir/z8X3P/ADPyV/4V7f8A/PjN+a/40f8ACvb/AP58ZvzX/Gv1q/4QTQ/+gLpH/gJH/hR/wgmh/wDQ
+ F0j/AMBI/wDCj/XWh/z5f3r/ACD/AFYq/wDPxfc/8z8lf+Fe3/8Az4zfmv8AjR/wr2//AOfGb81/xr9a
+ v+EE0P8A6Aukf+Akf+FH/CCaH/0BdI/8BI/8KP8AXWh/z5f3r/IP9WKv/Pxfc/8AM/JX/hXmof8APhN+
+ a/40v/Cvb/vYT5/4D/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+ rFX/AJ+L7n/mfkt/wr2//wCfCf8A8d/xo/4V7f8A/PhP/wCO/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4
+ QTQ/+gLpH/gJH/hR/rrR/wCfL/8AAl/kL/Vir/z9X3P/ADPyW/4V5f8A/PhP/wCO/wCNH/Cvr7/nwn/N
+ f8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X/wCBL/IP9WKv/P1fc/8AM/Jb/hX1
+ 9/z4T/mv+NH/AAr2/wCMWE+Pqv8AjX60/wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8A
+ ny//AAJf5B/qxV/5+L7n/mfkt/wry/8A+fCf81/xo/4V5f8A/PhP+a/41+tP/CCaH/0BdI/8BI/8KP8A
+ hBND/wCgLpH/AICR/wCFH+ulD/ny/wDwJf5B/qxV/wCfq+5/5n5Lf8K8v/8Anwn/ADX/ABo/4V5qBGDY
+ T/mv+NfrT/wgmh/9AXSP/ASP/Cj/AIQTQ/8AoC6R/wCAkf8AhR/rpQ/58v8A8CX+Qf6sVf8An6vuf+Z+
+ Sv8Awrq+/wCgfOD9V/xpR8O78dNPn/Nf8a/Wn/hBND/6Aukf+Akf+FH/AAgmh/8AQF0j/wABI/8ACl/r
+ pQ/58v8A8CX+Q/8AVir/AM/F9z/zPyW/4V5fnpYTj8V/xo/4V3f/APPjN/47/jX60/8ACCaH/wBAXSP/
+ AAEj/wAKP+EE0P8A6Aukf+Akf+FP/XSh/wA+X/4Ev8g/1Yq/8/F9z/zPyW/4V3f/APPjN/47/jR/wru/
+ /wCfGb/x3/Gv1p/4QTQ/+gLpH/gJH/hR/wAIJof/AEBdI/8AASP/AAo/10of8+X/AOBL/IP9Wav/AD8X
+ 3P8AzPyW/wCFd3//AD4zf+O/40f8K7v/APnxm/8AHf8AGv1p/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF
+ 0j/wEj/wo/10of8APl/+BL/IP9Wav/Pxfc/8zUwfQ/lRg+h/KvyDHxY8VZP/ABU3iD/wYzf/ABVH/C2f
+ FX/QzeIP/BjN/wDFV8N9W8z7C5+vmD6H8qMH0P5V+Qf/AAtnxV/0M3iD/wAGM3/xVH/C2fFX/QzeIP8A
+ wYzf/FUnh/MHI/XzB9D+VGD6H8q/IP8A4Wz4q/6GbxB/4MZv/iqR/i14rGMeJvEIx/1EZv8A4qj6v5i5
+ j9fcH0P5UYPofyr8gP8Ahbniv/oZ/EP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Kpew8w5z9f8AB9D+VGD6
+ H8q/ID/hbXiv/oZvEP8A4MZv/iqP+FteK/8AoZvEP/gxm/8AiqPYeYKR+v8Ag+h/KjB9D+VfkB/wtrxX
+ /wBDN4h/8GM3/wAVR/wtrxX/ANDN4h/8GM3/AMVR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/wChm8Q/+DGb
+ /wCKo/4W14r/AOhm8Q/+DGb/AOKo9h5gpH6/4PofyowfQ/lX5Af8La8V/wDQzeIf/BjN/wDFUf8AC2vF
+ f/QzeIf/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP/gxm/wDiqP8AhbXiv/oZvEP/AIMZ
+ v/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtrxX/0M3iH/wAGM3/xVH/C2vFf/QzeIf8AwYzf/FUew8wUj9f8
+ H0P5UYPofyr8gP8Ahbfiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/lX5A
+ f8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+hm8Q
+ /wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2vFf/AEM3iH/wYzf/ABVH
+ /C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A6Gbx
+ D/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/8VR7
+ DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5gpH6/4Pofy
+ owfQ/lX5Af8AC2vFf/QzeIf/AAYzf/FUf8La8V/9DN4h/wDBjN/8VR7DzBSP1/wfQ/lRg+h/KvyA/wCF
+ teK/+hm8Q/8Agxm/+Ko/4W14r/6GbxD/AODGb/4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/0M3iH/AMGM
+ 3/xVH/C2vFf/AEM3iH/wYzf/ABVHsPMFI/X/AAfQ/lRg+h/KvyA/4W14r/6GbxD/AODGb/4qj/hbXiv/
+ AKGbxD/4MZv/AIqj2HmCkfr/AIPofyowfQ/lX5Af8La8V/8AQzeIf/BjN/8AFUf8La8V/wDQzeIf/BjN
+ /wDFUew8wUj9f8H0P5UYPofyr8gP+FteK/8AoZvEP/gxm/8AiqP+FteK/wDoZvEP/gxm/wDiqPYeYKR+
+ v+D6H8qMH0P5V+QH/C2vFf8A0M3iH/wYzf8AxVH/AAtrxX/0M3iH/wAGM3/xVHsPMFI/X/B9D+VGD6H8
+ q/ID/hbXiv8A6GbxD/4MZv8A4qj/AIW14r/6GbxD/wCDGb/4qj2HmCkfr/g+h/KjB9D+VfkB/wALa8V/
+ 9DN4h/8ABjN/8VR/wtrxX/0M3iH/AMGM3/xVHsPMFI/X/B9D+VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4
+ qj/hbXiv/oZvEP8A4MZv/iqPYeYKR+v+D6H8qMH0P5V+QH/C2vFf/QzeIf8AwYzf/FUf8La8V/8AQzeI
+ f/BjN/8AFUew8wUj9f8AB9D+VGD6H8q/ID/hbXiv/oZvEP8A4MZv/iqP+FteK/8AoZvEP/gxm/8AiqPY
+ eYKR+v8Ag+h/KjB9D+VfkB/wtrxX/wBDN4h/8GM3/wAVR/wtrxX/ANDN4h/8GM3/AMVR7DzBSP1/wfQ/
+ lRg+h/KvyA/4W14r/wChm8Q/+DGb/wCKo/4W14r/AOhm8Q/+DGb/AOKo9h5gpH6/4PofyowfQ/lX5Af8
+ La8V/wDQzeIf/BjN/wDFUf8AC2vFf/QzeIf/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP
+ /gxm/wDiqP8AhbXiv/oZvEP/AIMZv/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtvxX/0M3iH/wAGM3/xVH/C
+ 2vFf/QzeIf8AwYzf/FUew8wUj9f8H0P5UYPofyr8gP8AhbXiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDg
+ xm/+Ko9h5gpH6/4PofyowfQ/lX5Af8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1
+ /wAH0P5UYPofyr8gP+FteK/+hm8Q/wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P
+ 5V+QH/C2vFf/AEM3iH/wYzf/ABVH/C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/
+ AKGbxD/4MZv/AIqj/hbXiv8A6GbxD/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/
+ AMVR/wALa8V/9DN4h/8ABjN/8VR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/
+ +hm8Q/8Agxm/+Ko9h5gpH6/4PofyowfQ/lX5Af8AC2/Ff/Qz+If/AAYzf/FUf8La8V/9DN4h/wDBjN/8
+ VR7DzBSP1/wfQ/lRg+h/KvyA/wCFteK/+hm8Q/8Agxm/+Ko/4W14r/6GbxD/AODGb/4qj2HmCkfr/g+h
+ /KjB9D+VfkB/wtrxX/0M3iH/AMGM3/xVH/C2vFf/AEM3iH/wYzf/ABVHsPMFI/X/AAfQ/lRg+h/KvyA/
+ 4W14r/6GbxD/AODGb/4qj/hbXiv/AKGbxD/4MZv/AIqj2HmCkfr/AIPofyowfQ/lX5Af8La8V/8AQzeI
+ f/BjN/8AFUf8La8V/wDQzeIf/BjN/wDFUew8wUj9f8H0P5UYPofyr8gP+Ft+K/8AoZvEP/gxm/8AiqP+
+ Ft+Kz18T+If/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP/gxm/wDiqP8AhbXiv/oZvEP/
+ AIMZv/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtrxX/0M3iH/wAGM3/xVH/C2vFf/QzeIf8AwYzf/FUew8wU
+ j9f8H0P5UYPofyr8gP8AhbXiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/
+ lX5Af8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+
+ hm8Q/wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2vFf/AEM3iH/wYzf/
+ ABVH/C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A
+ 6GbxD/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/
+ 8VR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5gpH6/4
+ PofyowfQ/lX5Af8AC2vFf/QzeIf/AAYzf/FUf8Lb8Vjp4n8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/lX5A
+ f8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+hm8Q
+ /wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2/Ff/AEM/iH/wYzf/ABVH
+ /C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A6Gbx
+ D/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/8VR7
+ DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5i5/I/X/B9D
+ +VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4qj/hbXiv/oZvEP8A4MZv/iqPYeY1M//Z
+</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="tp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
+ CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
+ tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
+ cx82d1+EpURiHmu8817neYkEHQH+BEtZSfYHLCWSdTgI3vBtcjUXOHiVAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
+ hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
+ M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
+ cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
+ gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
+ SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
+ 8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="Billdy.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="BarCodedy.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="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>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>102, 16</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>37</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index ece3c3e..1e133de 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -2393,7 +2393,7 @@
grdMain.Rows.Add();
grdMain.Rows[i].Cells[HTagCol].Value = "*";
//寰楀埌淇℃伅
- Ds = oCn.RunProcReturn("select * from h_v_IF_POStockInList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POStockInList");
+ Ds = oCn.RunProcReturn("select * from h_v_IF_POStockInBillList_Source where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POStockInBillList_Source");
//鍐欏叆淇℃伅
Sub_WriteInForm1(Ds.Tables[0], i);
}
@@ -2477,7 +2477,7 @@
//鍐欏叆淇℃伅
Sub_WriteInForm1(Ds.Tables[0], i);
}
- //鐢熶骇姹囨姤鍗�
+ //宸ュ簭姹囨姤鍗�
if (oSelectRow.BillType == "3714")
{
grdMain.Rows.Add();
@@ -2561,6 +2561,11 @@
{
grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
}
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["HProduceDate"].ToString();
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["HExpiryDate"].ToString();
+ grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = oTable.Rows[0]["HEXPPERIOD"].ToString();
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -2611,6 +2616,11 @@
grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["鐢熶骇鏃ユ湡"].ToString();
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["鏈夋晥鏈熻嚦"].ToString();
+ grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = oTable.Rows[0]["HEXPPERIOD"].ToString();
if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
{
grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index 3f4c02e..6fe24ad 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -281,5 +281,62 @@
}
}
#endregion
+
+
+ #region 涓嶈壇绫诲瀷 鏌ヨ
+ [Route("Gy_BadReason/Gy_BadTypeList")]
+ [HttpGet]
+ public object Gy_BadTypeList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_BadReason", 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_IF_BadReasonList " + sWhere + " order by 涓嶈壇鍘熷洜浠ｇ爜 ", "h_v_IF_BadReasonList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_BadReasonList where 1 = 1";
+ string sql = sql1 + sWhere + " order by 涓嶈壇鍘熷洜浠ｇ爜 ";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_BadReasonList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index e9d3302..2a9d283 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -302,7 +302,7 @@
",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
",HCusTypeID,HCREATEORGID,HUSEORGID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
- ", " + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
+ ", " + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
",'" + HTaxNum + "'," + HTaxRate + ",'" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index ca5b38e..638225a 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -230,7 +230,7 @@
",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
",HEnglishAddress,HCurID,HSSID,HAreaID) " +
" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
- "," + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
+ "," + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index e0d8611..f88b6f5 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -197,6 +197,18 @@
,0,0,'','',0,0
,0,'{HResult}',{oSub.HProcExchInterID},{oSub.HProcExchEntryID},'{oSub.HProcExchBillNo}')");
+ //淇敼鏉＄爜琛ㄧ殑鐘舵��
+ oCN.RunProc("update Gy_BarCodeBill set HStatus='"+ HResult + "' where HBarCode='"+ oSub.HBarCode + "'");
+
+ //淇敼鍑虹珯鍗曠殑 涓嶈壇 鎶ュ簾鏁伴噺
+ if (HResult == "涓嶈壇") {
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID);
+ }
+ else if (HResult == "鎶ュ簾")
+ {
+ oCN.RunProc("update Sc_StationOutBillMain set HWasterQty+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID);
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = null;
@@ -204,5 +216,120 @@
return objJsonResult;
}
#endregion
+
+ #region 宸ュ簭鍗曞搧杩囩珯 娴佽浆鍗℃煡璇㈠叧閿欢娓呭崟
+ [Route("Cj_SingleStation/HBardCodeBomList")]
+ [HttpGet]
+ public object HBardCodeBomList(string HBarCode, string user)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBillHICOMProcessExchange where 鏉＄爜='" + HBarCode + "'", "h_v_Gy_BarCodeBillHICOMProcessExchange");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜鏌ユ棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ }
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭鍗曞搧杩斾慨鍙� 鑾峰彇琛ㄦ牸鏁版嵁
+ [Route("Cj_SingleStation/ProcessItemRepair")]
+ [HttpGet]
+ public object ProcessItemRepair( string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql = @"select * from h_v_Cj_BarCodeProcessItemRepair where 1=1 " + sWhere + " order by 鏃ユ湡 desc, HInterID desc, HEntryID desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Cj_BarCodeProcessItemRepair");
+
+ //娣诲姞鍒楀悕
+ 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_SingleStation/Sc_SourceLineRepairBillSub_MaterList")]
+ [HttpGet]
+ public object Sc_SourceLineRepairBillSub_MaterList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql = @"select * from Sc_SourceLineRepairBillSub_Mater where 1=1 " + sWhere + " order by HInterID asc, HEntryID asc";
+ ds = oCN.RunProcReturn(sql, "Sc_SourceLineRepairBillSub_Mater");
+
+ //娣诲姞鍒楀悕
+ 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/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index c379f25..3cb7c26 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -2196,11 +2196,11 @@
#region 浜х嚎鏌ヨ
[Route("MaterOutEntryReport/Gy_SourceList")]
[HttpGet]
- public object Gy_SourceList(string HOrgid)
+ public object Gy_SourceList(string HOrgid,string sWhere)
{
try
{
- string sql1 = string.Format("select hitemid,hnumber,hname from Gy_Source where HUSEORGID="+ HOrgid + " order by hnumber");
+ string sql1 = string.Format("select hitemid,hnumber,hname from Gy_Source where HUSEORGID="+ HOrgid + " "+ sWhere + " order by hnumber");
ds = oCN.RunProcReturn(sql1, "Gy_Source");
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 188a2a3..7882ae9 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -18,6 +19,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
public DLL.ClsGy_EquipFileMain BillNew0 = new DLL.ClsGy_EquipFileMain();
public DLL.ClsGy_EquipFileMain BillOld0 = new DLL.ClsGy_EquipFileMain();
+ public DAL.ClsGy_EquipFileMain BillOld = new DAL.ClsGy_EquipFileMain();
#region 璁惧妗ｆ鍒楄〃
@@ -496,5 +498,156 @@
return objJsonResult;
}
#endregion
+
+ #region 璁惧妗ｆ瀹℃牳/鍙嶅鏍稿姛鑳�
+ [Route("Gy_EquipFileBill/CheckGy_EquipFileBill")]
+ [HttpGet]
+ public object CheckGy_EquipFileBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧妗ｆ鍏抽棴/鍙嶅叧闂姛鑳�
+ [Route("Gy_EquipFileBill/CloseGy_EquipFileBill")]
+ [HttpGet]
+ public object CloseGy_EquipFileBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ 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/SBGL/Gy_EquipTypeController.cs b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
index dab55bc..4c5dd72 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
@@ -18,7 +18,8 @@
public DataSet ds = new DataSet();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
public DLL.ClsGy_EquipTypeBill BillNew0 = new DLL.ClsGy_EquipTypeBill();
- public DLL.ClsGy_EquipTypeBill BillOld0 = new DLL.ClsGy_EquipTypeBill();
+ public DLL.ClsGy_EquipTypeBill BillOld0 = new DLL.ClsGy_EquipTypeBill();
+ public DAL.ClsGy_EquipTypeBill BillOld = new DAL.ClsGy_EquipTypeBill();
#region 璁惧鍒嗙被鍒楄〃
@@ -319,5 +320,157 @@
}
}
#endregion
+
+ #region 璁惧鍒嗙被瀹℃牳/鍙嶅鏍稿姛鑳�
+ [Route("Gy_EquipTypeBill/CheckGy_EquipTypeBill")]
+ [HttpGet]
+ public object CheckGy_EquipTypeBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipType_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld.AuditByID2(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld.DeAuditByID2(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧鍒嗙被鍏抽棴/鍙嶅叧闂姛鑳�
+ [Route("Gy_EquipTypeBill/CloseGy_EquipTypeBill")]
+ [HttpGet]
+ public object CloseGy_EquipTypeBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipType_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld.CloseByID2(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld.DeCloseByID2(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ 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/SBGL/Sb_EquipDotCheckBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
index b3468e2..07d321b 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
@@ -559,6 +559,157 @@
}
#endregion
+ #region 璁惧鐐规璁板綍鍗曞鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Sb_EquipDotCheckBill/CheckSb_EquipDotCheckBill")]
+ [HttpGet]
+ public object CheckSb_EquipDotCheckBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧鐐规璁板綍鍗曞叧闂�/鍙嶅叧闂姛鑳�
+ [Route("Sb_EquipDotCheckBill/CloseSb_EquipDotCheckBill")]
+ [HttpGet]
+ public object CloseSb_EquipDotCheckBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#endregion
}
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
index 245bd93..1d99e51 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -11,6 +12,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
public DataSet ds = new DataSet();
+ public DAL.ClsSb_EquipDotCheckPlanBill BillOld = new DAL.ClsSb_EquipDotCheckPlanBill();
#region 璁惧鐐规璁″垝琛�
@@ -353,7 +355,156 @@
}
#endregion
+ #region 璁惧鐐规璁″垝鍗曞鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Sb_EquipDotCheckPlanBill/CheckSb_EquipDotCheckPlanBill")]
+ [HttpGet]
+ public object CheckSb_EquipMaintainRuleBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckPlanBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧鐐规璁″垝鍗曞叧闂�/鍙嶅叧闂姛鑳�
+ [Route("Sb_EquipDotCheckPlanBill/CloseSb_EquipDotCheckPlanBill")]
+ [HttpGet]
+ public object CloseSb_EquipMaintainRuleBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckPlanBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ 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/SBGL/Sb_EquipDotCheckRuleBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
index 9ac86d4..37a814a 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -317,5 +318,156 @@
}
}
#endregion
+
+ #region 璁惧鐐规瑙勭▼鍗曞鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Sb_EquipDotCheckRuleBill/CheckSb_EquipDotCheckRuleBill")]
+ [HttpGet]
+ public object CheckSb_EquipDotCheckRuleBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckRuleBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧鐐规瑙勭▼鍗曞叧闂�/鍙嶅叧闂姛鑳�
+ [Route("Sb_EquipDotCheckRuleBill/CloseSb_EquipDotCheckRuleBill")]
+ [HttpGet]
+ public object CloseSb_EquipDotCheckRuleBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckRuleBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ 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/SBGL/Sb_EquipMaintainBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
index e6b4811..d04c5ca 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -17,6 +17,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
public DAL.ClsSb_EquipDotCheckBill BillNew = new DAL.ClsSb_EquipDotCheckBill(); //瀵瑰簲鍗曟嵁绫�
public DAL.ClsSb_EquipDotCheckBill BillOld = new DAL.ClsSb_EquipDotCheckBill(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSb_EquipMaintainBill BillOld2 = new DAL.ClsSb_EquipMaintainBill(); //璁惧淇濆吇璁板綍鍗�
#region 璁惧淇濆吇璁″垝琛�
@@ -616,6 +617,158 @@
}
#endregion
+
+ #region 璁惧淇濆吇璁板綍鍗曞鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Sb_EquipMaintainBill/CheckSb_EquipMaintainBill")]
+ [HttpGet]
+ public object CheckSb_EquipMaintainBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld2.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld2.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧淇濆吇璁板綍鍗曞叧闂�/鍙嶅叧闂姛鑳�
+ [Route("Sb_EquipMaintainBill/CloseSb_EquipMaintainBill")]
+ [HttpGet]
+ public object CloseSb_EquipMaintainBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld2.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld2.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
index bfbd5fd..d2be264 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -11,6 +12,7 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DAL.ClsSb_EquipMaintainPlanBill BillOld = new DAL.ClsSb_EquipMaintainPlanBill();
#region 璁惧淇濆吇璁″垝琛�
@@ -411,7 +413,156 @@
}
#endregion
+ #region 璁惧淇濆吇璁″垝鍗曞鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Sb_EquipMaintainPlanBill/CheckSb_EquipMaintainPlanBill")]
+ [HttpGet]
+ public object CheckSb_EquipMaintainPlanBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainPlanBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧淇濆吇璁″垝鍗曞叧闂�/鍙嶅叧闂姛鑳�
+ [Route("Sb_EquipMaintainPlanBill/CloseSb_EquipMaintainPlanBill")]
+ [HttpGet]
+ public object CloseSb_EquipMaintainPlanBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainPlanBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
index 5494a1d..7449da9 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -399,5 +400,156 @@
}
}
#endregion
+
+ #region 璁惧淇濆吇瑙勭▼鍗曞鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Sb_EquipMaintainRuleBill/CheckSb_EquipMaintainRuleBill")]
+ [HttpGet]
+ public object CheckSb_EquipMaintainRuleBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainRuleBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧淇濆吇瑙勭▼鍗曞叧闂�/鍙嶅叧闂姛鑳�
+ [Route("Sb_EquipMaintainRuleBill/CloseSb_EquipMaintainRuleBill")]
+ [HttpGet]
+ public object CloseSb_EquipMaintainRuleBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainRuleBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ 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/SCGL/Gy_SourceWorkStationSetController.cs b/WebAPI/Controllers/SCGL/Gy_SourceWorkStationSetController.cs
index 3374d00..2c68baf 100644
--- a/WebAPI/Controllers/SCGL/Gy_SourceWorkStationSetController.cs
+++ b/WebAPI/Controllers/SCGL/Gy_SourceWorkStationSetController.cs
@@ -171,5 +171,57 @@
}
#endregion
+ /// <summary>
+ /// 鐢熶骇宸ヤ綅鍒楄〃鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("DeltetGy_SourceWorkStation")]
+ [HttpGet]
+ public object DeltetGy_SourceWorkStation(string HItemID, string user)
+ {
+ DataSet ds;
+ DataSet ds1;
+ try
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from Gy_SourceWorkStationSet where HItemID=" + HItemID, "Gy_SourceWorkStationSet");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+
+ oCN.RunProc("delete from Gy_SourceWorkStationSet where HItemID=" + HItemID);
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
new file mode 100644
index 0000000..a3a7f83
--- /dev/null
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
@@ -0,0 +1,841 @@
+锘縰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 Sc_ICMOChangeBillController : ApiController
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsSc_ICMOChangeBill BillOld = new DAL.ClsSc_ICMOChangeBill();
+ public DAL.ClsSc_ICMOChangeBill BillNew0 = new DAL.ClsSc_ICMOChangeBill();
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鐢熶骇璁㈠崟鍙樻洿鍗曞垪琛� 鏌ヨ
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ICMOChangeBill/list")]
+ [HttpGet]
+ public object getSc_ICMOChangeBill(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_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_Sc_ICMOChangeBillList_Query order by 鍗曟嵁鍙� ", "h_v_Sc_ICMOChangeBillList_Query");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_ICMOChangeBillList_Query where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� ";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOChangeBillList_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("Sc_ICMOChangeBill/SaveSc_ICMOChangeBill")]
+ [HttpPost]
+ public object SaveSc_ICMOChangeBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃1鏁版嵁
+ string refSav = sArray[2].ToString(); //鎿嶄綔鏂瑰紡
+ string msg4 = sArray[3].ToString(); //鐢ㄦ埛
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_ICMOChangeBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsSc_ICMOChangeBill oBill = new DAL.ClsSc_ICMOChangeBill();
+ List<Model.ClsSc_ICMOChangeBillMain> lsmain = new List<Model.ClsSc_ICMOChangeBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sc_ICMOChangeBillMain(msg2);
+ foreach (Model.ClsSc_ICMOChangeBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ 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 (refSav == "Update")
+ {
+ 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;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3743";
+ oItem.HBillSubType = "3743";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSc_ICMOChangeBillSub> ls = new List<Model.ClsSc_ICMOChangeBillSub>();
+ ls = oListModels.getObjectByJson_Sc_ICMOChangeBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsSc_ICMOChangeBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+
+ //oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ //oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //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 = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇璁㈠崟鍙樻洿鍗� 缂栬緫椤甸潰鍒濆鍖�
+ [Route("Sc_ICMOChangeBill/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOChangeBillList where hmainid=" + HInterID, "h_v_Sc_ICMOChangeBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇璁㈠崟鍙樻洿鍗� 鍒犻櫎
+ /// <summary>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ICMOChangeBill/delete")]
+ [HttpGet]
+ public object deleteSc_ICMOChangeBill(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_ICMOChangeBill_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;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Sc_ICMOChangeBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from Sc_ICMOChangeBillSub where HInterID= " + HInterID);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇璁㈠崟鍙樻洿鍗� 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_ICMOChangeBill/AuditSc_ICMOChangeBill")]
+ [HttpGet]
+ public object AuditSc_ICMOChangeBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Sc_ICMOChangeBill_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.ClsSc_ICMOChangeBill oBill = new DAL.ClsSc_ICMOChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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 errorMessage = "";
+ foreach (Model.ClsSc_ICMOChangeBillSub oSub in oBill.DetailColl)
+ {
+ //鍒ゆ柇鏂版暟閲忔槸鍚﹀皬浜庡崟鎹叧鑱旀暟閲�
+ if (oSub.HQty_New < oSub.HRelationQty)
+ {
+ errorMessage += "鐗╂枡鏂版暟閲忓皬浜庡崟鎹鍏宠仈鏁伴噺!";
+ }
+ }
+ if (errorMessage != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + errorMessage;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //妫�鏌ユ簮鍗曟槸鍚﹀瓨鍦�
+ string sql = "select * from Sc_ICMOBillSub where HInterID = " + oBill.omodel.HMainSourceInterID + " and HEntryID =" + oBill.omodel.HMainSourceEntryID;
+ ds = oCN.RunProcReturn(sql, "Sc_ICMOBillSub");
+ if(ds==null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟鏁版嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ //鍙嶅啓婧愬崟鏁版嵁
+ oCN.BeginTran();
+ sql = "exec h_p_Sc_ICMOBill_ReWriteByICMOChangeBill " + oBill.omodel.HInterID;
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ 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) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(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("Sc_ICMOChangeBill/CloseSc_ICMOChangeBill")]
+ [HttpGet]
+ public object CloseSc_ICMOChangeBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Sc_ICMOChangeBill_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.ClsSc_ICMOChangeBill oBill = new DAL.ClsSc_ICMOChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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("Sc_ICMOChangeBill/DeleteSc_ICMOChangeBill")]
+ [HttpGet]
+ public object DeleteSc_ICMOChangeBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Sc_ICMOChangeBill_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.ClsSc_ICMOChangeBill oBill = new DAL.ClsSc_ICMOChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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 (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/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index cf6838a..3a2f56c 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -23,6 +23,9 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
public DAL.ClsSb_EquipDotCheckBill BillNew = new DAL.ClsSb_EquipDotCheckBill(); //瀵瑰簲鍗曟嵁绫�
public DAL.ClsSb_EquipDotCheckBill BillOld = new DAL.ClsSb_EquipDotCheckBill(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSb_EquipConkBookBill BillOld2 = new DAL.ClsSb_EquipConkBookBill(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSb_EquipRepairWorkBill BillOld3 = new DAL.ClsSb_EquipRepairWorkBill(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSb_EquipRepairCheckBill BillOld4 = new DAL.ClsSb_EquipRepairCheckBill(); //瀵瑰簲鍗曟嵁绫�
#region 璁惧缁翠慨宸ュ崟鍒楄〃
@@ -1321,6 +1324,459 @@
}
#endregion
+ #region 璁惧鏁呴殰鐧昏鍗曞鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Sb_EqpConkBookBill/CheckSb_EqpConkBookBill")]
+ [HttpGet]
+ public object CheckSb_EqpConkBookBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld2.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld2.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧鏁呴殰鐧昏鍗曞叧闂�/鍙嶅叧闂姛鑳�
+ [Route("Sb_EqpConkBookBill/CloseSb_EqpConkBookBill")]
+ [HttpGet]
+ public object CloseSb_EqpConkBookBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld2.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld2.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧缁翠慨璁板綍鍗曞鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Sb_EquipRepairWorkBill/CheckSb_EquipRepairWorkBill")]
+ [HttpGet]
+ public object CheckSb_EquipRepairWorkBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairWorkBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld3.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld3.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧缁翠慨璁板綍鍗曞叧闂�/鍙嶅叧闂姛鑳�
+ [Route("Sb_EquipRepairWorkBill/CloseSb_EquipRepairWorkBill")]
+ [HttpGet]
+ public object CloseSb_EquipRepairWorkBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairWorkBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld3.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld3.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧缁翠慨楠屾敹鍗曞鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Sb_EquipRepairCheckBill/CheckSb_EquipRepairCheckBill")]
+ [HttpGet]
+ public object CheckSb_EquipRepairCheckBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairCheckBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld4.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (BillOld4.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧缁翠慨楠屾敹鍗曞叧闂�/鍙嶅叧闂姛鑳�
+ [Route("Sb_EquipRepairCheckBill/CloseSb_EquipRepairCheckBill")]
+ [HttpGet]
+ public object CloseSb_EquipRepairCheckBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairCheckBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (!BillOld4.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (!BillOld4.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#endregion
}
}
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index a9f8ebd..0cf870b 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -978,6 +978,9 @@
{
try
{
+ DAL.ClsKf_SellOutBill BillOld = new DAL.ClsKf_SellOutBill();
+ string s = "";
+
//鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBill_Drop", 1, false, user))
{
@@ -985,6 +988,24 @@
objJsonResult.count = 0;
objJsonResult.Message = "鏃犳潈闄愬垹闄�!";
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;
}
@@ -1015,11 +1036,11 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList order by hmainid desc", "h_v_IF_SellOutBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList order by 鍗曟嵁鍙� desc", "h_v_IF_SellOutBillList");
}
else
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList where 1=1 " + sWhere + " order by hmainid desc", "h_v_IF_SellOutBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList where 1=1 " + sWhere + " order by 鍗曟嵁鍙� desc", "h_v_IF_SellOutBillList");
}
}
#endregion
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 4e05ac2..6695dfb 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1838,6 +1838,57 @@
}
/// <summary>
+ /// 鑾峰彇閾惰鍒楄〃
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Web/GetBankList_Json")]
+ [HttpGet]
+ public object GetBankList_Json(string sWhere)
+ {
+ DataSet ds;
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (sWhere != "")
+ {
+ sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = "select HItemID,HNumber 閾惰浠ｇ爜,HName 閾惰鍚嶇О,HStopflag from Gy_Bank where 1=1 " + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_Bank");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
+ /// <summary>
/// 鑾峰彇鐗╂枡鍒楄〃
/// <summary>
///鍙傛暟锛歴tring sql銆�
@@ -4069,6 +4120,142 @@
return objjson;
}
}
+
+ /// <summary>
+ /// 鏍规嵁璁惧甯﹀嚭椤圭洰
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetItemByEquipFile")]
+ [HttpGet]
+ public object GetItemByEquipFile(int EquipProjectID,string Type)
+ {
+ if (EquipProjectID <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "浜у搧鍣ㄥ叿鏈�夋嫨";
+ objjson.data = null;
+ return objjson;
+ }
+ try
+ {
+ string HView = "";
+ switch (Type)
+ {
+ case "DJ":
+ HView = "h_v_Sb_GetDotCheckItemList";
+ break;
+ case "BY":
+ HView = "h_v_Sb_GetMaintainItemList";
+ break;
+ default:
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "璁惧妯″潡绫诲瀷閿欒锛�";
+ objjson.data = null;
+ return objjson;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format(@"select * from " + HView + " where HInterID = " + EquipProjectID);
+ ds = oCN.RunProcReturn(sql, HView);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触,鏌ユ棤鏁版嵁" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍚勭被璁惧鍗曟嵁鍒楄〃锛堣澶囩偣妫�锛岃澶囩淮淇紝璁惧淇濆吇......锛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetEquipmentBillsList")]
+ [HttpGet]
+ public object GetEquipmentBillsList(string sWhere, string Type)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ string HView = "";
+ switch (Type)
+ {
+ case "DJ":
+ HView = "h_v_Sb_EquipDotCheckBillList";
+ break;
+ case "BY":
+ HView = "h_v_Sb_EquipMaintainBillList";
+ break;
+ case "WX":
+ HView = "h_v_Sb_EquipRepairCheckBillList";
+ break;
+ default:
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "璁惧妯″潡绫诲瀷閿欒锛�";
+ objjson.data = null;
+ return objjson;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format(@"select * from " + HView + " where 1 = 1 ");
+ ds = oCN.RunProcReturn(sql, HView);
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触,鏌ユ棤鏁版嵁" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ objjson.list = columnNameList;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ objjson.list = columnNameList;
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
/// <summary>
/// 鏍规嵁璁惧鐐规瑙勭▼鏄剧ず璁惧鐐规绋嬮」鐩�
/// </summary>
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
index 841791d..20fcf41 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -258,7 +258,7 @@
}
#endregion
- #region 閿�鍞嚭搴�
+ #region 閿�鍞嚭搴� 淇濆瓨
/// <summary>
/// 淇濆瓨閿�鍞嚭搴撳崟
/// </summary>
@@ -329,8 +329,8 @@
ls = oListModels.getSellOutBillSubByJson(msg3);
int i = 0;
foreach (Model.ClsKf_SellOutBillSub oItemSub in ls)
- {
- i++;
+ {
+ i++;
oItemSub.HSourceEntryID = 0;
oItemSub.HSourceInterID = 0;
oItemSub.HEntryID = i;
@@ -345,7 +345,7 @@
//oItemSub.HRemark = "";
oBill.DetailColl.Add(oItemSub);
- }
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -388,11 +388,7 @@
}
#endregion
- /// <summary>
- /// 鏍规嵁ID 鏌ユ壘璁板綍
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 閿�鍞嚭搴撳崟 缂栬緫椤甸潰鍒濆鍖�
[Route("Kf_SellOutBill/cx")]
[HttpGet]
public object cx(long HInterID)
@@ -426,6 +422,433 @@
return objJsonResult;
}
}
+ #endregion
+ #region 閿�鍞嚭搴� 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Kf_SellOutBill/AuditKf_SellOutBill")]
+ [HttpGet]
+ public object AuditKf_SellOutBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Kf_SellOutBill_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.ClsKf_SellOutBill oBill = new DAL.ClsKf_SellOutBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(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) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(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("Kf_SellOutBill/CloseKf_SellOutBill_1")]
+ [HttpGet]
+ public object CloseKf_SellOutBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Kf_SellOutBill_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.ClsKf_SellOutBill oBill = new DAL.ClsKf_SellOutBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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("Kf_SellOutBill/DeleteKf_SellOutBill")]
+ [HttpGet]
+ public object DeleteKf_SellOutBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Kf_SellOutBill_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.ClsKf_SellOutBill oBill = new DAL.ClsKf_SellOutBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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 (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/XSGL/Xs_CusRatingChangeBillController.cs b/WebAPI/Controllers/XSGL/Xs_CusRatingChangeBillController.cs
new file mode 100644
index 0000000..cc84359
--- /dev/null
+++ b/WebAPI/Controllers/XSGL/Xs_CusRatingChangeBillController.cs
@@ -0,0 +1,813 @@
+锘縰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 Xs_CusRatingChangeBillController : ApiController
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsXs_CusRatingChangeBill BillOld = new DAL.ClsXs_CusRatingChangeBill();
+ public DAL.ClsXs_CusRatingChangeBill BillNew0 = new DAL.ClsXs_CusRatingChangeBill();
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 淇＄敤棰濆害鐢宠鍗曞垪琛� 鏌ヨ
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xs_CusRatingChangeBill/list")]
+ [HttpGet]
+ public object getXs_CusRatingChangeBill(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_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_Xs_CusRatingChangeBillList_Query order by 鍗曟嵁鍙� ", "h_v_Xs_CusRatingChangeBillList_Query");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Xs_CusRatingChangeBillList_Query where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� ";
+ ds = oCN.RunProcReturn(sql, "h_v_Xs_CusRatingChangeBillList_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("Xs_CusRatingChangeBill/SaveXs_CusRatingChangeBill")]
+ [HttpPost]
+ public object SaveXs_CusRatingChangeBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃1鏁版嵁
+ string refSav = sArray[2].ToString(); //鎿嶄綔鏂瑰紡
+ string msg4 = sArray[3].ToString(); //鐢ㄦ埛
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Xs_CusRatingChangeBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsXs_CusRatingChangeBill oBill = new DAL.ClsXs_CusRatingChangeBill();
+ List<Model.ClsXs_CusRatingChangeBillMain> lsmain = new List<Model.ClsXs_CusRatingChangeBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Xs_CusRatingChangeBillMain(msg2);
+ foreach (Model.ClsXs_CusRatingChangeBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ 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 (refSav == "Update")
+ {
+ 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;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "1413";
+ oItem.HBillSubType = "1413";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsXs_CusRatingChangeBillSub> ls = new List<Model.ClsXs_CusRatingChangeBillSub>();
+ ls = oListModels.getObjectByJson_Xs_CusRatingChangeBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsXs_CusRatingChangeBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+
+ //oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ //oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //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 = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇＄敤棰濆害鐢宠鍗� 缂栬緫椤甸潰鍒濆鍖�
+ [Route("Xs_CusRatingChangeBill/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Xs_CusRatingChangeBillList where hmainid=" + HInterID, "h_v_Xs_CusRatingChangeBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇＄敤棰濆害鐢宠鍗� 鍒犻櫎
+ /// <summary>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xs_CusRatingChangeBill/delete")]
+ [HttpGet]
+ public object deleteXs_CusRatingChangeBill(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_CusRatingChangeBill_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;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Xs_CusRatingChangeBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from Xs_CusRatingChangeBillSub where HInterID= " + HInterID);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇＄敤棰濆害鐢宠鍗� 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Xs_CusRatingChangeBill/AuditXs_CusRatingChangeBill")]
+ [HttpGet]
+ public object AuditXs_CusRatingChangeBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_CusRatingChangeBill_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.ClsXs_CusRatingChangeBill oBill = new DAL.ClsXs_CusRatingChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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) //瀹℃牳鎻愪氦
+ {
+
+
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+
+ //鍙嶅啓瀹㈡埛淇＄敤棰濆害
+ oCN.BeginTran();
+ string sql = "exec h_p_Xs_CusRatingChangeBill_ReWriteCustomerCredit " + oBill.omodel.HCusID + "," + oBill.omodel.HNewRating + ",'" + CurUserName + "'";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ 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) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(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("Xs_CusRatingChangeBill/CloseXs_CusRatingChangeBill")]
+ [HttpGet]
+ public object CloseXs_CusRatingChangeBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_CusRatingChangeBill_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.ClsXs_CusRatingChangeBill oBill = new DAL.ClsXs_CusRatingChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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("Xs_CusRatingChangeBill/DeleteXs_CusRatingChangeBill")]
+ [HttpGet]
+ public object DeleteXs_CusRatingChangeBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_CusRatingChangeBill_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.ClsXs_CusRatingChangeBill oBill = new DAL.ClsXs_CusRatingChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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 (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/XSGL/Xs_ExceptiveCheckRequestBillController.cs b/WebAPI/Controllers/XSGL/Xs_ExceptiveCheckRequestBillController.cs
new file mode 100644
index 0000000..7822ac2
--- /dev/null
+++ b/WebAPI/Controllers/XSGL/Xs_ExceptiveCheckRequestBillController.cs
@@ -0,0 +1,812 @@
+锘縰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 Xs_ExceptiveCheckRequestBillController : ApiController
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsXs_ExceptiveCheckRequestBill BillOld = new DAL.ClsXs_ExceptiveCheckRequestBill();
+ public DAL.ClsXs_ExceptiveCheckRequestBill BillNew0 = new DAL.ClsXs_ExceptiveCheckRequestBill();
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鐗规壒鐢宠鍗曞垪琛� 鏌ヨ
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xs_ExceptiveCheckRequestBill/list")]
+ [HttpGet]
+ public object getXs_ExceptiveCheckRequestBill(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_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_Xs_ExceptiveCheckRequestBillList_Query order by 鍗曟嵁鍙� ", "h_v_Xs_ExceptiveCheckRequestBillList_Query");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Xs_ExceptiveCheckRequestBillList_Query where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� ";
+ ds = oCN.RunProcReturn(sql, "h_v_Xs_ExceptiveCheckRequestBillList_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("Xs_ExceptiveCheckRequestBill/SaveXs_ExceptiveCheckRequestBill")]
+ [HttpPost]
+ public object SaveXs_ExceptiveCheckRequestBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃1鏁版嵁
+ string refSav = sArray[2].ToString(); //鎿嶄綔鏂瑰紡
+ string msg4 = sArray[3].ToString(); //鐢ㄦ埛
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Xs_ExceptiveCheckRequestBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsXs_ExceptiveCheckRequestBill oBill = new DAL.ClsXs_ExceptiveCheckRequestBill();
+ List<Model.ClsXs_ExceptiveCheckRequestBillMain> lsmain = new List<Model.ClsXs_ExceptiveCheckRequestBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Xs_ExceptiveCheckRequestBillMain(msg2);
+ foreach (Model.ClsXs_ExceptiveCheckRequestBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ 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 (refSav == "Update")
+ {
+ 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;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "1422";
+ oItem.HBillSubType = "1422";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsXs_ExceptiveCheckRequestBillSub> ls = new List<Model.ClsXs_ExceptiveCheckRequestBillSub>();
+ ls = oListModels.getObjectByJson_Xs_ExceptiveCheckRequestBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsXs_ExceptiveCheckRequestBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+
+ //oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ //oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //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 = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐗规壒鐢宠鍗� 缂栬緫椤甸潰鍒濆鍖�
+ [Route("Xs_ExceptiveCheckRequestBill/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Xs_ExceptiveCheckRequestBillList where hmainid=" + HInterID, "h_v_Xs_ExceptiveCheckRequestBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐗规壒鐢宠鍗� 鍒犻櫎
+ /// <summary>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xs_ExceptiveCheckRequestBill/delete")]
+ [HttpGet]
+ public object deleteXs_ExceptiveCheckRequestBill(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_ExceptiveCheckRequestBill_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;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Xs_ExceptiveCheckRequestBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from Xs_ExceptiveCheckRequestBillSub where HInterID= " + HInterID);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐗规壒鐢宠鍗� 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Xs_ExceptiveCheckRequestBill/AuditXs_ExceptiveCheckRequestBill")]
+ [HttpGet]
+ public object AuditXs_ExceptiveCheckRequestBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_ExceptiveCheckRequestBill_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.ClsXs_ExceptiveCheckRequestBill oBill = new DAL.ClsXs_ExceptiveCheckRequestBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ //oBill.oCn.BeginTran();
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ //瀹℃牳婧愬崟
+ oCN.BeginTran();
+ string sql = "exec h_p_Xs_ExceptiveCheckRequestBill_ReWriteSourceStatus " + oBill.omodel.HMainSourceInterID + ",'" + oBill.omodel.HMainSourceBillType + "','" + CurUserName + "'";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ //oBill.oCn = new SQLHelper.ClsCN();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(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("Xs_ExceptiveCheckRequestBill/CloseXs_ExceptiveCheckRequestBill")]
+ [HttpGet]
+ public object CloseXs_ExceptiveCheckRequestBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_ExceptiveCheckRequestBill_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.ClsXs_ExceptiveCheckRequestBill oBill = new DAL.ClsXs_ExceptiveCheckRequestBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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("Xs_ExceptiveCheckRequestBill/DeleteXs_ExceptiveCheckRequestBill")]
+ [HttpGet]
+ public object DeleteXs_ExceptiveCheckRequestBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_ExceptiveCheckRequestBill_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.ClsXs_ExceptiveCheckRequestBill oBill = new DAL.ClsXs_ExceptiveCheckRequestBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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 (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/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 3dc11f7..8f2d331 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -19,6 +19,7 @@
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
public DAL.ClsXs_SeOrderBill BillOld = new DAL.ClsXs_SeOrderBill();
+ public DAL.ClsXs_SeOrderBill BillNew0 = new DAL.ClsXs_SeOrderBill();
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -247,7 +248,7 @@
string HERPBillType = mainList2[0].HERPBillType == null ? "''" : mainList2[0].HERPBillType;
long HSALEORGID = mainList2[0].HSALEORGID == null ? 0 : mainList2[0].HSALEORGID;
- ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_SeOrderBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_SeOrderBillList");
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
{
@@ -269,7 +270,7 @@
,HICMOFlag,HChangeMan,HSALEORGID,HERPInterID,HERPBillType
,HCloseDate,HCloseMan)
values(" + "1401," + HInterID + ",'" + HBillNo + "','" + HDate + "','" +
- DateTime.Now.Year + "','" + DateTime.Now.Month + "','" + HRemark + "','" + HMaker + "','" + HMakeDate +
+ DateTime.Now.Year + "','" + DateTime.Now.Month + "','" + HRemark + "','" + HMaker + "','" + HMakeDate +
"'," + HEmpID + "," + HCusID + ",'" + HBillType + "','" + HAddress + "','" + HSSDate +
"'," + HSSID + "," + HSellSID + "," + HCurID + "," + HExRate + "," + HManagerID + "," + HDeptID + ",'" + "''" + "'," + "0," + HBillStatus + ",'" + "''" + "'," +
0 + ",'" + "''" + "'," + HSALEORGID + "," + HERPInterID + ",'" + HERPBillType + "','" + HCloseDate + "','" + HCloseMan + "')");
@@ -279,7 +280,7 @@
oCN.RunProc("update Xs_SeOrderBillMain set " +
"HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" +
", HEmpID=" + HEmpID + ", HCusID=" + HCusID + ",HAddress='" + HAddress + "',HDeptID=" + HDeptID
- + ",HCurID=" + HCurID + ",HExRate=" + HExRate + ",HManagerID=" + HManagerID + ",HSellSID=" + HSellSID
+ + ",HCurID=" + HCurID + ",HExRate=" + HExRate + ",HManagerID=" + HManagerID + ",HSellSID=" + HSellSID
+ ",HSSID=" + HSSID + ",HSSDate='" + HSSDate + "' where HInterID=" + HInterID);
//鍒犻櫎瀛愯〃
@@ -1066,5 +1067,820 @@
}
#endregion
+
+
+ #region 閿�鍞鍗曚繚瀛� 鏂板/缂栬緫
+ [Route("Xs_SeOrderBill/SaveXs_SeOrderBill")]
+ [HttpPost]
+ public object SaveXs_SeOrderBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃1鏁版嵁
+ string refSav = sArray[2].ToString(); //鎿嶄綔鏂瑰紡
+ string msg4 = sArray[3].ToString(); //鐢ㄦ埛
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Xs_SeOrderBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill();
+ List<Model.ClsXs_SeOrderBillMain> lsmain = new List<Model.ClsXs_SeOrderBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Xs_SeOrderBillMain(msg2);
+ foreach (Model.ClsXs_SeOrderBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ 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 (refSav == "Update")
+ {
+ 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;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "1401";
+ oItem.HBillSubType = "1401";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsXs_SeOrderBillSub> ls = new List<Model.ClsXs_SeOrderBillSub>();
+ ls = oListModels.getObjectByJson_Xs_SeOrderBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsXs_SeOrderBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+
+ //oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ //oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //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 = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞鍗� 鍔犺浇缂栬緫椤甸潰
+ [Route("Xs_SeOrderBill/loadXs_SeOrderBill_Edit")]
+ [HttpGet]
+ public object loadXs_SeOrderBill_Edit(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID, "h_v_IF_SeOrderBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞鍗� 鍒犻櫎
+ [Route("Xs_SeOrderBill/DropXs_SeOrderBill")]
+ [HttpGet]
+ public object dropXs_SeOrderBill(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_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;
+ }
+
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Xs_SeOrderBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from Xs_SeOrderBillSub where HInterID='" + HInterID + "'");
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞鍗� 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Xs_SeOrderBill/AuditXs_SeOrderBill")]
+ [HttpGet]
+ public object AuditXs_SeOrderBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_SeOrderBill_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.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(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) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(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("Xs_SeOrderBill/CloseXs_SeOrderBill_1")]
+ [HttpGet]
+ public object CloseXs_SeOrderBill_1(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_SeOrderBill_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.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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("Xs_SeOrderBill/DeleteXs_SeOrderBill")]
+ [HttpGet]
+ public object DeleteXs_SeOrderBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_SeOrderBill_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.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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 (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
+
+ #region 閿�鍞鍗� 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮�
+ [Route("Xs_SeOrderBill/getCustomerByCusID")]
+ [HttpGet]
+ public object getCustomerByCusID(long HCusID)
+ {
+ try
+ {
+ string sql = @"select
+ c.HItemID HCusID
+ ,c.HNumber HCusNumber
+ ,c.HName HCusName
+ ,c.HSSID
+ ,s.HName HSSName
+ ,c.HCurID
+ ,cur.HName HCurName
+ ,cur.HExchangeRate HExRate
+ ,c.HTaxRate
+ ,ISNULL(cre.HCreditRating_Now,0) HCreditRating_Now
+ from Gy_Customer as c
+ left join Gy_SettleStyle as s on c.HSSID = s.HItemID
+ left join Gy_Currency as cur on c.HCurID = cur.HItemID
+ left join Gy_Customer_Credit as cre on c.HItemID = cre.HCusID
+ where c.HItemID = " + HCusID;
+ ds = oCN.RunProcReturn(sql,"Gy_Customer");
+
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ鎴蜂俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞鍗� 鏍规嵁鐢ㄦ埛鑾峰彇閿�鍞憳銆侀攢鍞儴闂ㄣ�侀攢鍞富绠�
+ [Route("Xs_SeOrderBill/getCzyglByUser")]
+ [HttpGet]
+ public object getCzyglByUser(string CurUserName)
+ {
+ try
+ {
+ string sql = @"select
+ c.HEmpID
+ ,e.HName HEmpName
+ ,c.HDeptID
+ ,d.HName HDeptName
+ ,d.HEmpID HManagerID
+ ,e1.HName HManagerName
+ from Gy_Czygl as c
+ left join Gy_Employee as e on c.HEmpID = e.HItemID
+ left join Gy_Department as d on c.HDeptID = d.HItemID
+ left join Gy_Employee as e1 on d.HEmpID = e1.HItemID
+ where c.Czymc = '" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql, "Gy_Czygl");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ョ敤鎴蜂俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs
new file mode 100644
index 0000000..e03d109
--- /dev/null
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs
@@ -0,0 +1,849 @@
+锘縰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
+{
+ //閿�鍞鍗曞彉鏇村崟Controller
+ public class Xs_SeOrderChangeBillController : ApiController
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsXs_SeOrderChangeBill BillOld = new DAL.ClsXs_SeOrderChangeBill();
+ public DAL.ClsXs_SeOrderChangeBill BillNew0 = new DAL.ClsXs_SeOrderChangeBill();
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 閿�鍞鍗曞彉鏇村崟鍒楄〃 鏌ヨ
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xs_SeOrderChangeBill/list")]
+ [HttpGet]
+ public object getXs_SeOrderChangeBill(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_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_Xs_SeOrderChangeBillList_Query order by 鍗曟嵁鍙� ", "h_v_Xs_SeOrderChangeBillList_Query");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Xs_SeOrderChangeBillList_Query where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� ";
+ ds = oCN.RunProcReturn(sql, "h_v_Xs_SeOrderChangeBillList_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("Xs_SeOrderChangeBill/SaveXs_SeOrderChangeBill")]
+ [HttpPost]
+ public object SaveXs_SeOrderChangeBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃1鏁版嵁
+ string refSav = sArray[2].ToString(); //鎿嶄綔鏂瑰紡
+ string msg4 = sArray[3].ToString(); //鐢ㄦ埛
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Xs_SeOrderChangeBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsXs_SeOrderChangeBill oBill = new DAL.ClsXs_SeOrderChangeBill();
+ List<Model.ClsXs_SeOrderChangeBillMain> lsmain = new List<Model.ClsXs_SeOrderChangeBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Xs_SeOrderChangeBillMain(msg2);
+ foreach (Model.ClsXs_SeOrderChangeBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ 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 (refSav == "Update")
+ {
+ 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;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "1425";
+ oItem.HBillSubType = "1425";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsXs_SeOrderChangeBillSub> ls = new List<Model.ClsXs_SeOrderChangeBillSub>();
+ ls = oListModels.getObjectByJson_Xs_SeOrderChangeBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsXs_SeOrderChangeBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+
+ //oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ //oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //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 = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞鍗曞彉鏇村崟 缂栬緫椤甸潰鍒濆鍖�
+ [Route("Xs_SeOrderChangeBill/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Xs_SeOrderChangeBillList where hmainid=" + HInterID, "h_v_Xs_SeOrderChangeBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞鍗曞彉鏇村崟 鍒犻櫎
+ /// <summary>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xs_SeOrderChangeBill/delete")]
+ [HttpGet]
+ public object deleteXs_SeOrderChangeBill(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderChangeBill_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;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Xs_SeOrderChangeBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from Xs_SeOrderChangeBillSub where HInterID= " + HInterID);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞鍗曞彉鏇村崟 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Xs_SeOrderChangeBill/AuditXs_SeOrderChangeBill")]
+ [HttpGet]
+ public object AuditXs_SeOrderChangeBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_SeOrderChangeBill_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.ClsXs_SeOrderChangeBill oBill = new DAL.ClsXs_SeOrderChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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 errorMessage = "";
+ DateTime today = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")); //褰撴棩鏃ユ湡
+ foreach (Model.ClsXs_SeOrderChangeBillSub oSub in oBill.DetailColl)
+ {
+ //鍒ゆ柇鏂版暟閲忔槸鍚﹀皬浜庡崟鎹叧鑱旀暟閲�
+ if(oSub.HQty_New < oSub.HRelationQty)
+ {
+ errorMessage += "绗�" + oSub.HEntryID + "琛岀墿鏂欐柊鏁伴噺灏忎簬鍗曟嵁琚叧鑱旀暟閲�!";
+ }
+ //鍒ゆ柇鏂颁氦璐ф棩鏈熸槸鍚︽棭浜庡綋鏃�
+ if ( oSub.HDate_New.CompareTo(today) < 0 )
+ {
+ errorMessage += "绗�" + oSub.HEntryID + "琛屾柊浜よ揣鏃ユ湡鏃╀簬褰撴棩!";
+ }
+ }
+ if(errorMessage != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀛愯〃" + errorMessage;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //妫�楠屾簮鍗曟槸鍚﹀瓨鍦�
+ string sql = "select * from Xs_SeOrderBillMain as a " +
+ "inner join Xs_SeOrderBillSub as b on a.HInterID = b.HInterID " +
+ "where a.HInterID = " + oBill.omodel.HMainSourceInterID;
+ ds = oCN.RunProcReturn(sql, "Xs_SeOrderBill");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ oCN.BeginTran();
+ //鍙嶅啓閿�鍞鍗曟暟鎹�
+ sql = "exec h_p_IF_SeOrderBill_ReWriteBySeOrderChangeBill " + oBill.omodel.HInterID;
+ oCN.RunProcReturn(sql, "h_p_IF_SeOrderBill_ReWriteBySeOrderChangeBill");
+ oCN.Commit();
+
+ 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) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(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("Xs_SeOrderChangeBill/CloseXs_SeOrderChangeBill")]
+ [HttpGet]
+ public object CloseXs_SeOrderChangeBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_SeOrderChangeBill_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.ClsXs_SeOrderChangeBill oBill = new DAL.ClsXs_SeOrderChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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("Xs_SeOrderChangeBill/DeleteXs_SeOrderChangeBill")]
+ [HttpGet]
+ public object DeleteXs_SeOrderChangeBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Xs_SeOrderChangeBill_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.ClsXs_SeOrderChangeBill oBill = new DAL.ClsXs_SeOrderChangeBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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 (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/XSGL/YS_ReceiveBackBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs
new file mode 100644
index 0000000..1776b68
--- /dev/null
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveBackBillController.cs
@@ -0,0 +1,805 @@
+锘縰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
+{
+ //搴旀敹閫�娆惧崟Controller
+ public class YS_ReceiveBackBillController : ApiController
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsYS_ReceiveBackBill BillOld = new DAL.ClsYS_ReceiveBackBill();
+ public DAL.ClsYS_ReceiveBackBill BillNew0 = new DAL.ClsYS_ReceiveBackBill();
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 搴旀敹閫�娆惧崟鍒楄〃 鏌ヨ
+ /// <summary>
+ /// 杩斿洖椤圭洰闃舵鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("YS_ReceiveBackBill/list")]
+ [HttpGet]
+ public object getYS_ReceiveBackBill(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_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_YS_ReceiveBackBillList_Query order by 鍗曟嵁鍙� ", "h_v_YS_ReceiveBackBillList_Query");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_YS_ReceiveBackBillList_Query where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� ";
+ ds = oCN.RunProcReturn(sql, "h_v_YS_ReceiveBackBillList_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("YS_ReceiveBackBill/SaveYS_ReceiveBackBill")]
+ [HttpPost]
+ public object SaveYS_ReceiveBackBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃1鏁版嵁
+ string refSav = sArray[2].ToString(); //鎿嶄綔鏂瑰紡
+ string msg4 = sArray[3].ToString(); //鐢ㄦ埛
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("YS_ReceiveBackBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsYS_ReceiveBackBill oBill = new DAL.ClsYS_ReceiveBackBill();
+ List<Model.ClsYS_ReceiveBackBillMain> lsmain = new List<Model.ClsYS_ReceiveBackBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_YS_ReceiveBackBillMain(msg2);
+ foreach (Model.ClsYS_ReceiveBackBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ 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 (refSav == "Update")
+ {
+ 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;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "2005";
+ oItem.HBillSubType = "2005";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsYS_ReceiveBackBillSub> ls = new List<Model.ClsYS_ReceiveBackBillSub>();
+ ls = oListModels.getObjectByJson_YS_ReceiveBackBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsYS_ReceiveBackBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+
+ //oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ //oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //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 = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏀舵閫�娆惧崟 缂栬緫椤甸潰鍒濆鍖�
+ [Route("YS_ReceiveBackBill/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_YS_ReceiveBackBillList where hmainid=" + HInterID, "h_v_YS_ReceiveBackBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 搴旀敹閫�娆惧崟 鍒犻櫎
+ /// <summary>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("YS_ReceiveBackBill/delete")]
+ [HttpGet]
+ public object deleteYS_ReceiveBackBill(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBackBill_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;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from YS_ReceiveBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from YS_ReceiveBillSub where HInterID= " + HInterID);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 搴旀敹閫�娆惧崟 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("YS_ReceiveBackBill/AuditYS_ReceiveBackBill")]
+ [HttpGet]
+ public object AuditYS_ReceiveBackBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "YS_ReceiveBackBill_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.ClsYS_ReceiveBackBill oBill = new DAL.ClsYS_ReceiveBackBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(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) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(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("YS_ReceiveBackBill/CloseYS_ReceiveBackBill")]
+ [HttpGet]
+ public object CloseYS_ReceiveBackBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "YS_ReceiveBackBill_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.ClsYS_ReceiveBackBill oBill = new DAL.ClsYS_ReceiveBackBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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("YS_ReceiveBackBill/DeleteYS_ReceiveBackBill")]
+ [HttpGet]
+ public object DeleteYS_ReceiveBackBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "YS_ReceiveBackBill_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.ClsYS_ReceiveBackBill oBill = new DAL.ClsYS_ReceiveBackBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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 (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/XSGL/YS_ReceiveBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
new file mode 100644
index 0000000..3cba858
--- /dev/null
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
@@ -0,0 +1,863 @@
+锘縰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 YS_ReceiveBillController : ApiController
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsYS_ReceiveBill BillOld = new DAL.ClsYS_ReceiveBill();
+ public DAL.ClsYS_ReceiveBill BillNew0 = new DAL.ClsYS_ReceiveBill();
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鏀舵鍗曞垪琛� 鏌ヨ
+ /// <summary>
+ /// 杩斿洖椤圭洰闃舵鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("YS_ReceiveBill/list")]
+ [HttpGet]
+ public object getYS_ReceiveBill(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_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_YS_ReceiveBillList_Query order by 鍗曟嵁鍙� ", "h_v_YS_ReceiveBillList_Query");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_YS_ReceiveBillList_Query where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� ";
+ ds = oCN.RunProcReturn(sql, "h_v_YS_ReceiveBillList_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("YS_ReceiveBill/SaveYS_ReceiveBill")]
+ [HttpPost]
+ public object SaveYS_ReceiveBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃1鏁版嵁
+ string refSav = sArray[2].ToString(); //鎿嶄綔鏂瑰紡
+ string msg4 = sArray[3].ToString(); //鐢ㄦ埛
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("YS_ReceiveBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsYS_ReceiveBill oBill = new DAL.ClsYS_ReceiveBill();
+ List<Model.ClsYS_ReceiveBillMain> lsmain = new List<Model.ClsYS_ReceiveBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_YS_ReceiveBillMain(msg2);
+ foreach (Model.ClsYS_ReceiveBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ 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 (refSav == "Update")
+ {
+ 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;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "2003";
+ oItem.HBillSubType = "2003";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsYS_ReceiveBillSub> ls = new List<Model.ClsYS_ReceiveBillSub>();
+ ls = oListModels.getObjectByJson_YS_ReceiveBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsYS_ReceiveBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+
+ //oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ //oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //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 = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏀舵鍗� 缂栬緫椤甸潰鍒濆鍖�
+ [Route("YS_ReceiveBill/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_YS_ReceiveBillList where hmainid=" + HInterID, "h_v_YS_ReceiveBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏀舵鍗� 鍒犻櫎
+ /// <summary>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("YS_ReceiveBill/delete")]
+ [HttpGet]
+ public object deleteYS_ReceiveBill(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBill_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;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from YS_ReceiveBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from YS_ReceiveBillSub where HInterID= " + HInterID);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏀舵鍗� 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("YS_ReceiveBill/AuditYS_ReceiveBill")]
+ [HttpGet]
+ public object AuditYS_ReceiveBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "YS_ReceiveBill_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.ClsYS_ReceiveBill oBill = new DAL.ClsYS_ReceiveBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(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) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(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("YS_ReceiveBill/CloseYS_ReceiveBill")]
+ [HttpGet]
+ public object CloseYS_ReceiveBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "YS_ReceiveBill_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.ClsYS_ReceiveBill oBill = new DAL.ClsYS_ReceiveBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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("YS_ReceiveBill/DeleteYS_ReceiveBill")]
+ [HttpGet]
+ public object DeleteYS_ReceiveBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "YS_ReceiveBill_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.ClsYS_ReceiveBill oBill = new DAL.ClsYS_ReceiveBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ 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 (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
+
+ #region 鏀舵鍗� 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�侀摱琛屻�侀摱琛岃处鎴枫�佸鎴蜂俊鐢ㄩ搴�
+ [Route("YS_ReceiveBill/getCustomerByCusID")]
+ [HttpGet]
+ public object getCustomerByCusID(long HCusID)
+ {
+ try
+ {
+ string sql = @"select
+ c.HItemID HCusID
+ ,c.HNumber HCusNumber
+ ,c.HName HCusName
+ ,c.HSSID
+ ,s.HName HSSName
+ ,c.HCurID
+ ,cur.HName HCurName
+ ,cur.HExchangeRate HExRate
+ ,c.HTaxRate
+ ,ISNULL(b.HItemID,0) HBankID
+ ,b.HName HBankName
+ ,c.HBankAccount
+ ,ISNULL(cre.HCreditRating_Now,0) HCreditRating_Now
+ from Gy_Customer as c
+ left join Gy_SettleStyle as s on c.HSSID = s.HItemID
+ left join Gy_Currency as cur on c.HCurID = cur.HItemID
+ left join Gy_Bank as b on c.HBank = b.HName
+ left join Gy_Customer_Credit as cre on c.HItemID = cre.HCusID
+ where c.HItemID = " + HCusID;
+ ds = oCN.RunProcReturn(sql, "Gy_Customer");
+
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ鎴蜂俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 6480779..4a61c07 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -95,6 +95,56 @@
#endregion
+ #region 鏍规嵁鏉＄爜锛岃繑鍥炴潯鐮佹。妗堜腑鏉＄爜淇℃伅
+
+ /// <summary>
+ /// 鏍规嵁鏉＄爜锛岃繑鍥炴潯鐮佹。妗堜腑鏉＄爜淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetBarCode_Json")]
+ [HttpGet]
+ public object GetBarCode_Json(string HBarCode)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill where HBarCode='" + HBarCode + "' order by HStopflag", "h_v_Gy_BarCodeBill");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜妗ｆ涓笉瀛樺湪璇ユ潯鐮侊紝璇风‘璁ゆ潯鐮佹槸鍚︽纭垨鏄惁宸茶鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isBool(ds.Tables[0].Rows[0]["HStopflag"]))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜宸茶绂佺敤锛屼笉鍏佽鎵弿锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖鏉＄爜淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#endregion
@@ -609,6 +659,38 @@
#endregion
+ #region 鎵爜妯″潡 鏍规嵁HItemID鍒犻櫎缂撳瓨鍒楄〃涓搴旀潯鐮佽褰�
+
+ /// <summary>
+ /// 鏍规嵁HItemID鍒犻櫎鏉＄爜鍑哄叆搴撶紦瀛樿〃涓褰�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_DelPonderationBillMain_Temp_HItemID_Json")]
+ [HttpGet]
+ public object set_DelPonderationBillMain_Temp_HItemID_Json(long HInterID, string HBillType, long HItemID)
+ {
+ try
+ {
+ oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "' and HItemID=" + HItemID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鏉＄爜鍑哄叆搴撶紦瀛樺垪琛ㄦ潯鐮佽褰曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+
#region 鎵爜妯″潡 鍒犻櫎鍔熻兘鎸夐挳璋冪敤 鍒犻櫎鏉＄爜鍑哄叆搴撲复鏃惰〃璁板綍
/// <summary>
@@ -990,7 +1072,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍏朵粬鍑哄簱鍗曚笂浼犲け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "鍏朵粬鍏ュ簱鍗曚笂浼犲け璐ワ紒" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1002,6 +1084,88 @@
#region 閿�鍞嚭搴� 涓婁紶鐢熷崟
+
+ #region 閿�鍞嚭搴� 鏂板妯″紡
+
+ /// <summary>
+ /// 閿�鍞嚭搴撴柊澧炰笂浼�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveSellOutBill_Json")]
+ [HttpPost]
+ public object set_SaveSellOutBill_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ try
+ {
+ List<Model.ClsKf_SellOutBillMain> lsmain = new List<Model.ClsKf_SellOutBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getSellOutBillMainByJson(msg1);
+ WebS.ClsKf_SellOutBillMain websLsmain = new WebS.ClsKf_SellOutBillMain();
+ string sSourceType = lsmain[0].HMainSourceBillType;
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = lsmain[0].HBillType;
+ websLsmain.HDate = lsmain[0].HDate;
+ websLsmain.HDeptID = lsmain[0].HDeptID;
+ websLsmain.HWHID = lsmain[0].HWHID;
+ websLsmain.HSCWHID = lsmain[0].HSCWHID;
+ websLsmain.HSupID = lsmain[0].HSupID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
+ websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HManagerID = lsmain[0].HManagerID;
+ websLsmain.HRemark = lsmain[0].HRemark;
+ websLsmain.HExplanation = lsmain[0].HExplanation;
+ websLsmain.HInnerBillNo = lsmain[0].HInnerBillNo;
+ websLsmain.HRedBlueFlag = lsmain[0].HRedBlueFlag;
+ websLsmain.HBillSubType = lsmain[0].HBillSubType;
+ if (lsmain[0].HMainSourceBillType == "1402")
+ {
+ websLsmain.HMainSourceBillType = "鍙戣揣閫氱煡鍗�";
+ }
+ else if (lsmain[0].HMainSourceBillType == "1401")
+ {
+ websLsmain.HMainSourceBillType = "閿�鍞鍗�";
+ }
+ else
+ {
+ websLsmain.HMainSourceBillType = "鎵嬪伐褰曞叆";
+ }
+ websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HBillerID = lsmain[0].HBillerID;
+ websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+ websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
+
+ if (oWebs.set_SaveSellOutBill_New(websLsmain, sSourceType, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿�鍞嚭搴撳崟涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
#region 閿�鍞嚭搴� 鏍￠獙妯″紡
@@ -2103,6 +2267,57 @@
#endregion
+ #region 鏍规嵁鍗曟嵁ID銆佺墿鏂橧D杩斿洖鏉＄爜涓存椂琛ㄤ腑鏉＄爜淇℃伅
+
+ /// <summary>
+ /// 鏍规嵁鍗曟嵁ID銆佺墿鏂橧D杩斿洖鏉＄爜涓存椂琛ㄤ腑鏉＄爜淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetBarCodeByMaterID_Temp_Json")]
+ [HttpGet]
+ public object GetBarCodeByMaterID_Temp_Json(Int64 HInterID, string HBillType, Int64 HMaterID)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeByMaterID_Temp " + HInterID.ToString() + ",'" + HBillType + "'," + HMaterID.ToString(), "h_p_WMS_BarCodeByMaterID_Temp");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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
+
#endregion
diff --git a/WebAPI/DLL/ClsSb_EquipDotCheckBill.cs b/WebAPI/DLL/ClsSb_EquipDotCheckBill.cs
index 5afb8c8..05e57f1 100644
--- a/WebAPI/DLL/ClsSb_EquipDotCheckBill.cs
+++ b/WebAPI/DLL/ClsSb_EquipDotCheckBill.cs
@@ -114,12 +114,12 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark,HEquipID" +
",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo" +
- ",HDeptID" +
+ ",HDeptID,HQty" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
- ",'" + omodel.HDeptID + "'" +
+ ",'" + omodel.HDeptID + "'," + omodel.HQty +
") ");
//鎻掑叆瀛愯〃
foreach (Models.ClsSb_EquipDotCheckBillSub oSub in DetailColl)
@@ -129,13 +129,13 @@
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
"HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
"HDotCheckItem,HDotCheckPart,HClaim," +
- "HManagerID,HManagerNumber" +
+ "HManagerID,HManagerNumber,HDotCheckResult " +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim +
- "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'" +
+ "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "','" + oSub.HDotCheckResult + "'" +
") ");
}
//
diff --git a/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
index b6f38de..9597e8d 100644
--- a/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
+++ b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
@@ -83,7 +83,7 @@
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HRepairID,HManagerID,HRepairExplanation,HEmpID" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HRepairID.ToString() + ",'"+ oSub.HManagerID.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
") ");
@@ -147,7 +147,7 @@
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
", " + omodel.HEquipID.ToString() + "," + omodel.HRepairID.ToString() + "," + omodel.HPlanTimes.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HTimes.ToString() +
- ", " + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HRepairBeginDate.ToShortDateString() + "','" + omodel.HRepairEndDate.ToShortDateString() + "','" + omodel.HRepairContent + "','" + omodel.HCycleUnit + "','" +
+ ", " + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HRepairBeginDate + "','" + omodel.HRepairEndDate + "','" + omodel.HRepairContent + "','" + omodel.HCycleUnit + "','" +
omodel.HMainSourceBillType+"',"+ omodel.HMainSourceInterID.ToString()+","+ omodel.HMainSourceEntryID.ToString() +
") ");
//鎻掑叆瀛愯〃
@@ -158,7 +158,7 @@
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HRepairID,HManagerID,HRepairExplanation,HEmpID" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HRepairID.ToString() + ",'" + oSub.HManagerID.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
")");
@@ -167,7 +167,7 @@
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HRepairID,HManagerID,HRepairExplanation,HEmpID" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HRepairID.ToString() + ",'"+ oSub.HManagerID.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
") ");
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 2e3d738..c234e3d 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -2666,6 +2666,181 @@
#endregion
+ #region 閿�鍞鍗�
+ /// <summary>
+ /// 閿�鍞鍗曚富琛╦son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsXs_SeOrderBillMain> getObjectByJson_Xs_SeOrderBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsXs_SeOrderBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_SeOrderBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 閿�鍞鍗曞瓙琛╦son2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsXs_SeOrderBillSub> getObjectByJson_Xs_SeOrderBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsXs_SeOrderBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_SeOrderBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
+ #region 鏀舵鍗�
+ /// <summary>
+ /// 鏀舵鍗曚富琛╦son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsYS_ReceiveBillMain> getObjectByJson_YS_ReceiveBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsYS_ReceiveBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYS_ReceiveBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 鏀舵鍗曞瓙琛╦son2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsYS_ReceiveBillSub> getObjectByJson_YS_ReceiveBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsYS_ReceiveBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYS_ReceiveBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
+ #region 淇＄敤棰濆害鐢宠鍗�
+ /// <summary>
+ /// 淇＄敤棰濆害鐢宠鍗曚富琛╦son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsXs_CusRatingChangeBillMain> getObjectByJson_Xs_CusRatingChangeBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsXs_CusRatingChangeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_CusRatingChangeBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 淇＄敤棰濆害鐢宠鍗曞瓙琛╦son2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsXs_CusRatingChangeBillSub> getObjectByJson_Xs_CusRatingChangeBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsXs_CusRatingChangeBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_CusRatingChangeBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
+ #region 鐗规壒鐢宠鍗�
+ /// <summary>
+ /// 鐗规壒鐢宠鍗曚富琛╦son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsXs_ExceptiveCheckRequestBillMain> getObjectByJson_Xs_ExceptiveCheckRequestBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsXs_ExceptiveCheckRequestBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_ExceptiveCheckRequestBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 鐗规壒鐢宠鍗曞瓙琛╦son2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsXs_ExceptiveCheckRequestBillSub> getObjectByJson_Xs_ExceptiveCheckRequestBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsXs_ExceptiveCheckRequestBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_ExceptiveCheckRequestBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
+ #region 閿�鍞鍗曞彉鏇村崟
+ /// <summary>
+ /// 閿�鍞鍗曞彉鏇村崟涓昏〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsXs_SeOrderChangeBillMain> getObjectByJson_Xs_SeOrderChangeBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsXs_SeOrderChangeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_SeOrderChangeBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 閿�鍞鍗曞彉鏇村崟瀛愯〃json2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsXs_SeOrderChangeBillSub> getObjectByJson_Xs_SeOrderChangeBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsXs_SeOrderChangeBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_SeOrderChangeBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
+ #region 鐢熶骇璁㈠崟鍙樻洿鍗�
+ /// <summary>
+ /// 鐢熶骇璁㈠崟鍙樻洿鍗曚富琛╦son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_ICMOChangeBillMain> getObjectByJson_Sc_ICMOChangeBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_ICMOChangeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOChangeBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟鍙樻洿鍗曞瓙琛╦son2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_ICMOChangeBillSub> getObjectByJson_Sc_ICMOChangeBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_ICMOChangeBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOChangeBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
+ #region 搴旀敹閫�娆惧崟
+ /// <summary>
+ /// 搴旀敹閫�娆惧崟涓昏〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsYS_ReceiveBackBillMain> getObjectByJson_YS_ReceiveBackBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsYS_ReceiveBackBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYS_ReceiveBackBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 搴旀敹閫�娆惧崟瀛愯〃json2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsYS_ReceiveBackBillSub> getObjectByJson_YS_ReceiveBackBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsYS_ReceiveBackBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYS_ReceiveBackBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
#region 宸ヤ綔鍛ㄨ鍒�
/// <summary>
/// 宸ヤ綔鍛ㄨ鍒掍富琛╦son
diff --git a/WebAPI/Models/ClsSb_EquipDotCheckBillMain.cs b/WebAPI/Models/ClsSb_EquipDotCheckBillMain.cs
index 5ea2dc6..706eb7f 100644
--- a/WebAPI/Models/ClsSb_EquipDotCheckBillMain.cs
+++ b/WebAPI/Models/ClsSb_EquipDotCheckBillMain.cs
@@ -13,6 +13,6 @@
public string HExplanation;
public string HInnerBillNo;
public long HDeptID;// int --部门ID
-
+ public decimal HQty; //数量
}
}
diff --git a/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs b/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs
index 33ad3df..59fba3c 100644
--- a/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs
+++ b/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs
@@ -25,7 +25,7 @@
public string HUnitName;
public Int64 HManagerID;
public string HManagerNumber;
- public string HManagerName;
-
+ public string HManagerName;
+ public string HDotCheckResult;
}
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 169c8a9..f6dd695 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,11 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2023-11-10T08:41:13.3633859Z;True|2023-11-10T16:33:55.5764712+08:00;True|2023-11-10T15:53:44.6570817+08:00;True|2023-11-10T14:27:07.7041235+08:00;True|2023-11-10T14:14:24.7228134+08:00;True|2023-11-10T14:05:18.2650742+08:00;True|2023-11-10T14:00:58.5003089+08:00;True|2023-11-10T11:13:33.5169725+08:00;True|2023-11-09T14:05:34.3353322+08:00;True|2023-11-09T13:23:32.4894014+08:00;True|2023-11-08T16:03:39.2153873+08:00;True|2023-11-07T16:47:26.4329853+08:00;True|2023-11-07T15:10:18.6270052+08:00;True|2023-11-07T09:41:20.4879279+08:00;True|2023-11-07T09:40:26.1598026+08:00;True|2023-11-07T09:24:14.9366263+08:00;True|2023-11-07T09:09:04.6761013+08:00;True|2023-11-06T15:49:18.8038005+08:00;True|2023-11-06T13:57:22.7632996+08:00;True|2023-11-06T09:58:43.1761013+08:00;True|2023-11-03T20:38:43.5660202+08:00;True|2023-11-03T20:33:47.8005656+08:00;True|2023-11-03T19:18:45.1406730+08:00;True|2023-11-03T14:56:44.7332321+08:00;True|2023-11-02T20:13:15.5530300+08:00;True|2023-11-02T19:22:24.9140752+08:00;True|2023-11-02T18:58:18.1198017+08:00;True|2023-11-01T18:31:39.9490440+08:00;True|2023-11-01T14:49:43.8703361+08:00;True|2023-11-01T14:38:44.8729900+08:00;True|2023-11-01T14:14:57.6507597+08:00;True|2023-11-01T13:04:09.9744075+08:00;True|2023-10-31T13:03:41.1902847+08:00;True|2023-10-31T11:29:03.3252294+08:00;True|2023-10-30T18:35:01.5128678+08:00;True|2023-10-30T18:25:01.6612244+08:00;True|2023-10-26T17:07:56.7081658+08:00;True|2023-10-18T16:20:51.8420951+08:00;True|2023-10-16T16:44:43.7908528+08:00;True|2023-10-16T11:17:09.2728375+08:00;True|2023-10-16T10:28:07.3397339+08:00;True|2023-10-16T10:26:35.6073358+08:00;True|2023-10-16T10:21:48.9925797+08:00;True|2023-10-13T11:26:05.2730047+08:00;True|2023-10-12T08:19:04.3028512+08:00;True|2023-10-11T20:40:21.6934217+08:00;True|2023-10-11T20:28:04.3302789+08:00;True|2023-10-11T20:16:51.2741909+08:00;True|2023-10-11T20:10:01.4624158+08:00;True|2023-10-11T15:32:40.9782838+08:00;True|2023-10-11T15:21:09.0531801+08:00;True|2023-10-11T15:05:59.9622196+08:00;True|2023-10-11T10:51:46.8571661+08:00;True|2023-10-11T10:41:25.5037704+08:00;True|2023-10-11T10:13:32.2604453+08:00;True|2023-10-11T10:05:52.2170423+08:00;True|2023-10-11T09:47:35.6578975+08:00;True|2023-10-11T09:44:31.2001499+08:00;True|2023-10-11T09:37:09.6904898+08:00;True|2023-10-10T10:18:33.1073992+08:00;True|2023-10-10T09:32:05.6384867+08:00;True|2023-10-10T09:15:26.4844254+08:00;True|2023-10-10T09:03:39.1497247+08:00;True|2023-10-10T08:56:14.9475607+08:00;True|2023-10-09T15:38:52.6561232+08:00;True|2023-10-09T14:22:16.0301342+08:00;True|2023-10-09T13:24:40.4941388+08:00;True|2023-10-09T10:30:48.0015664+08:00;True|2023-10-09T09:52:47.4626658+08:00;True|2023-10-08T14:21:13.7960780+08:00;True|2023-10-08T10:31:55.0337899+08:00;True|2023-10-08T08:24:13.2663041+08:00;True|2023-10-07T10:40:04.1716715+08:00;True|2023-10-07T09:51:11.1928375+08:00;True|2023-10-07T09:43:13.8042516+08:00;True|2023-09-28T15:45:01.2865878+08:00;True|2023-09-28T15:32:23.8179822+08:00;True|2023-09-28T14:37:03.1119806+08:00;True|2023-09-28T14:30:07.0877531+08:00;True|2023-09-28T14:01:36.5862373+08:00;True|2023-09-28T08:29:16.5989163+08:00;True|2023-09-28T08:12:23.3924898+08:00;True|2023-09-27T17:04:09.2538198+08:00;True|2023-09-27T16:38:03.8237948+08:00;True|2023-09-27T16:12:28.7977056+08:00;True|2023-09-27T15:56:03.7725704+08:00;True|2023-09-27T15:12:31.1298921+08:00;True|2023-09-27T15:05:14.4058045+08:00;True|2023-09-27T14:55:43.4423114+08:00;True|2023-09-27T14:33:26.2272014+08:00;True|2023-09-22T13:26:44.6246077+08:00;True|2023-09-22T11:14:50.9067626+08:00;True|2023-09-22T09:36:50.6912928+08:00;True|2023-09-22T09:26:38.2305802+08:00;True|2023-09-22T09:02:22.5400635+08:00;True|2023-09-20T17:20:27.9780370+08:00;True|2023-09-19T09:20:00.1269897+08:00;True|2023-09-19T09:10:18.4900723+08:00;True|2023-09-19T08:30:20.1709390+08:00;True|2023-09-18T15:43:28.1580264+08:00;True|2023-09-15T10:08:50.6367258+08:00;True|2023-09-14T17:17:10.7002185+08:00;True|2023-09-14T16:55:47.7782477+08:00;True|2023-09-14T14:05:25.9485449+08:00;False|2023-09-14T14:04:51.9423918+08:00;True|2023-09-12T09:37:17.5430590+08:00;True|2023-09-11T16:38:00.9834961+08:00;True|2023-09-11T13:04:08.1338596+08:00;True|2023-09-11T09:33:03.5400174+08:00;True|2023-09-08T15:34:46.6427039+08:00;True|2023-09-08T15:32:26.7896155+08:00;True|2023-09-08T14:07:16.6283055+08:00;True|2023-09-08T08:21:08.8368055+08:00;True|2023-09-08T08:07:29.5992984+08:00;True|2023-09-07T13:03:24.6924914+08:00;True|2023-09-07T11:02:02.9462467+08:00;True|2023-09-07T08:57:36.4913496+08:00;True|2023-09-07T08:55:57.3245545+08:00;True|2023-09-06T13:47:04.0563026+08:00;True|2023-09-06T13:42:27.3031938+08:00;True|2023-09-05T08:28:44.6193871+08:00;True|2023-09-04T20:42:09.4672710+08:00;True|2023-09-03T14:06:37.5079909+08:00;True|2023-09-02T18:58:24.1492192+08:00;True|2023-09-01T13:19:28.2779978+08:00;True|2023-09-01T08:40:54.0577358+08:00;True|2023-08-31T16:47:34.8462721+08:00;True|2023-08-31T14:49:39.9056564+08:00;True|2023-08-31T14:20:01.4071384+08:00;True|2023-08-31T11:25:29.0233052+08:00;True|2023-08-31T10:28:13.4933678+08:00;True|2023-08-31T10:21:52.6638820+08:00;True|2023-08-31T08:46:57.8782261+08:00;True|2023-08-31T08:46:08.4791004+08:00;True|2023-08-30T09:06:17.4001684+08:00;True|2023-08-30T08:52:06.9481657+08:00;True|2023-08-29T17:11:33.7851914+08:00;True|2023-08-29T16:58:52.7298807+08:00;True|2023-08-29T15:58:23.4205277+08:00;True|2023-08-29T15:56:40.3534593+08:00;True|2023-08-29T15:54:29.1188567+08:00;True|2023-08-29T15:53:27.9719983+08:00;True|2023-08-29T15:52:38.7670005+08:00;True|2023-08-29T15:51:32.3703092+08:00;True|2023-08-29T15:47:38.5198946+08:00;True|2023-08-29T15:46:17.4698017+08:00;True|2023-08-29T15:42:04.1853400+08:00;True|2023-08-29T15:29:28.1098681+08:00;True|2023-08-29T15:18:40.8587286+08:00;True|2023-08-29T14:47:50.3088948+08:00;True|2023-08-29T14:47:27.6552611+08:00;False|2023-08-28T13:59:37.8725670+08:00;True|2023-08-18T13:23:38.9937084+08:00;True|2023-08-18T10:09:51.5247737+08:00;True|2023-08-18T08:26:21.8473123+08:00;True|2023-08-17T08:31:37.8696349+08:00;True|2023-08-17T08:23:59.5658185+08:00;True|2023-08-17T08:07:38.2174684+08:00;True|2023-08-16T16:49:44.2549852+08:00;True|2023-08-16T16:33:59.9298792+08:00;True|2023-08-16T15:35:29.6092783+08:00;True|2023-08-16T11:17:28.1086751+08:00;True|2023-08-16T11:17:22.3814672+08:00;True|2023-08-16T08:44:16.0941179+08:00;True|2023-08-15T15:29:15.8118269+08:00;True|2023-08-15T14:47:06.4963591+08:00;True|2023-08-11T16:49:35.8718314+08:00;True|2023-08-11T14:22:59.9440967+08:00;True|2023-08-11T14:16:25.0940743+08:00;True|2023-08-11T13:27:25.4148450+08:00;True|2023-08-11T09:08:31.5437265+08:00;True|2023-08-11T09:04:38.4540336+08:00;True|2023-08-10T14:11:07.0042283+08:00;True|2023-08-08T13:48:19.2402267+08:00;True|2023-08-08T13:44:15.6796969+08:00;True|2023-07-27T09:46:14.1491814+08:00;True|2023-07-21T11:13:10.0843656+08:00;True|2023-07-21T10:56:47.5835580+08:00;True|2023-07-21T10:30:33.0113443+08:00;True|2023-07-20T19:16:37.4936135+08:00;True|2023-07-20T19:00:41.0636578+08:00;True|2023-07-19T13:28:27.8671371+08:00;True|2023-07-19T13:23:42.1880500+08:00;True|2023-07-19T13:19:18.7201227+08:00;True|2023-07-19T13:06:38.9897249+08:00;True|2023-07-19T12:13:11.2061059+08:00;True|2023-07-19T11:45:20.0391356+08:00;True|2023-07-19T11:24:02.5425841+08:00;True|2023-07-19T10:32:06.7915754+08:00;True|2023-07-19T09:51:08.4553434+08:00;True|2023-07-19T09:48:11.2977426+08:00;True|2023-07-18T08:47:44.1724897+08:00;True|2023-07-17T16:25:10.8982872+08:00;True|2023-07-17T14:50:44.3708198+08:00;True|2023-07-17T14:20:26.4686898+08:00;True|2023-07-17T14:18:16.6127136+08:00;True|2023-07-17T14:16:34.9116950+08:00;True|2023-07-17T14:14:44.7988846+08:00;True|2023-07-17T14:06:18.1123806+08:00;True|2023-07-17T14:03:38.5290433+08:00;True|2023-07-17T13:48:54.3096778+08:00;True|2023-07-17T13:23:13.6097762+08:00;True|2023-07-17T09:54:25.9375716+08:00;True|2023-07-17T09:40:22.2531559+08:00;True|2023-07-17T09:21:15.0786649+08:00;True|2023-07-17T09:03:37.2081513+08:00;True|2023-07-16T21:20:45.3036514+08:00;True|2023-07-16T21:09:16.1559694+08:00;True|2023-07-16T21:05:22.2504644+08:00;True|2023-07-16T20:41:26.5956030+08:00;True|2023-07-16T20:19:33.5726613+08:00;True|2023-07-16T19:46:38.6493518+08:00;True|2023-07-14T10:33:17.6270692+08:00;True|2023-07-11T14:34:22.8852169+08:00;True|2023-07-11T14:27:22.7851108+08:00;True|2023-07-11T14:13:21.6512172+08:00;True|2023-07-11T14:06:33.9865646+08:00;True|2023-07-11T13:52:46.2830836+08:00;True|2023-07-11T13:38:56.3165889+08:00;True|2023-07-11T13:29:40.9636697+08:00;True|2023-07-11T13:25:23.0633788+08:00;True|2023-07-11T10:17:40.8002359+08:00;True|2023-07-11T10:15:47.5472709+08:00;True|2023-07-11T10:12:25.6440547+08:00;True|2023-07-11T10:07:39.3716167+08:00;True|2023-07-11T09:22:07.4191357+08:00;True|2023-07-04T13:07:10.1209516+08:00;True|2023-06-30T16:11:25.7541580+08:00;True|2023-06-30T15:39:26.6678989+08:00;True|2023-06-30T15:26:40.6581344+08:00;True|2023-06-30T15:12:57.9906312+08:00;True|2023-06-29T16:39:15.6477820+08:00;True|2023-06-28T17:01:51.9542466+08:00;True|2023-06-27T15:03:28.1320450+08:00;True|2023-06-27T13:36:39.6707848+08:00;True|2023-06-26T09:40:01.1754706+08:00;True|2023-06-25T12:16:28.9080024+08:00;True|2023-06-25T11:51:59.9238461+08:00;True|2023-06-25T11:50:29.3100358+08:00;True|2023-06-25T11:29:28.5338563+08:00;True|2023-06-25T09:10:26.2420288+08:00;True|2023-06-25T09:08:15.0702872+08:00;True|2023-06-25T08:43:15.0806611+08:00;True|2023-06-25T08:41:41.8156616+08:00;True|2023-06-25T08:39:30.6818013+08:00;True|2023-06-25T08:38:18.5996529+08:00;True|2023-06-25T08:36:34.1479706+08:00;True|2023-06-25T08:34:53.9856289+08:00;True|2023-06-25T08:31:24.0298080+08:00;True|2023-06-25T08:15:45.7453280+08:00;True|2023-06-25T08:01:52.7609075+08:00;True|2023-06-24T21:25:23.8938665+08:00;True|2023-06-22T03:02:26.7305758+08:00;True|2023-06-22T02:10:48.8222890+08:00;True|2023-06-22T01:57:41.7875184+08:00;True|2023-06-22T01:52:19.4217362+08:00;True|2023-06-21T16:27:15.1464129+08:00;True|2023-06-21T16:11:46.6111817+08:00;True|2023-06-21T13:14:00.6869253+08:00;True|2023-06-21T13:09:28.2689225+08:00;True|2023-06-21T12:24:02.6762426+08:00;True|2023-06-21T12:18:06.2748924+08:00;True|2023-06-21T11:18:02.6754143+08:00;True|2023-06-21T11:08:34.2149469+08:00;True|2023-06-21T08:20:50.0079906+08:00;True|2023-06-20T15:56:03.2638713+08:00;True|2023-06-20T15:48:38.2419545+08:00;True|2023-06-20T15:35:26.6615171+08:00;True|2023-06-20T15:20:31.9284860+08:00;True|2023-06-20T15:18:39.8265469+08:00;True|2023-06-20T15:09:16.7617272+08:00;True|2023-06-20T09:53:23.2658672+08:00;True|2023-06-16T10:00:58.0337616+08:00;True|2023-06-16T09:47:58.8912904+08:00;True|2023-06-16T09:26:36.4914832+08:00;True|2023-06-15T16:22:21.4509393+08:00;True|2023-06-12T13:21:12.0491357+08:00;True|2023-06-12T10:18:32.9287587+08:00;True|2023-06-09T16:22:24.1132267+08:00;True|2023-06-08T18:12:42.4814009+08:00;True|2023-06-08T11:08:48.0533571+08:00;True|2023-06-08T10:41:43.0121701+08:00;False|2023-06-08T10:40:19.2093235+08:00;True|2023-06-06T13:03:50.8124200+08:00;True|2023-06-05T10:12:24.1858209+08:00;True|2023-06-02T17:02:57.5817094+08:00;True|2023-05-26T13:54:40.2272218+08:00;True|2023-05-24T12:43:50.2427994+08:00;True|2023-05-24T12:34:24.3922836+08:00;True|2023-05-24T10:07:19.4995219+08:00;True|2023-05-24T09:21:29.1960080+08:00;True|2023-05-23T22:34:23.3220912+08:00;True|2023-05-23T22:01:14.4175449+08:00;True|2023-05-23T17:02:53.0308400+08:00;True|2023-05-23T16:30:11.7138623+08:00;True|2023-05-23T15:51:50.0152484+08:00;True|2023-05-23T15:50:52.0657433+08:00;True|2023-05-23T15:28:25.5802377+08:00;True|2023-05-23T15:25:56.4633020+08:00;True|2023-05-23T14:52:29.8759921+08:00;True|2023-05-23T14:48:44.6519763+08:00;True|2023-05-20T04:28:10.3108871+08:00;True|2023-05-20T03:56:22.7233820+08:00;True|2023-05-20T03:47:38.4405026+08:00;True|2023-05-20T03:46:40.6056451+08:00;True|2023-05-20T03:44:25.0883888+08:00;True|2023-05-20T03:41:10.1148691+08:00;True|2023-05-20T02:34:14.3757035+08:00;True|2023-05-20T02:27:50.5595075+08:00;True|2023-05-20T02:23:04.2256041+08:00;True|2023-05-20T01:46:59.9534021+08:00;True|2023-05-20T01:42:33.5106065+08:00;True|2023-05-20T01:40:39.6918060+08:00;True|2023-05-20T01:11:47.7436847+08:00;True|2023-05-20T01:03:58.9476094+08:00;True|2023-05-19T22:59:47.4591129+08:00;True|2023-05-19T22:34:44.7988447+08:00;True|2023-05-19T22:24:55.2320279+08:00;True|2023-05-19T21:40:19.5285575+08:00;True|2023-05-19T21:38:21.2073338+08:00;True|2023-05-19T20:54:59.2058809+08:00;True|2023-05-19T16:08:15.0151080+08:00;True|2023-05-19T15:26:16.2836301+08:00;True|2023-05-19T13:09:06.1592914+08:00;True|2023-05-19T12:24:23.6252771+08:00;True|2023-05-19T11:50:53.8948740+08:00;True|2023-05-19T11:43:57.9296933+08:00;True|2023-05-19T10:44:34.9904463+08:00;True|2023-05-19T09:32:02.1216663+08:00;False|2023-05-19T09:31:06.4251757+08:00;True|2023-05-18T22:34:36.5292968+08:00;True|2023-05-18T20:37:59.7940567+08:00;True|2023-05-18T20:36:35.2790349+08:00;True|2023-05-18T20:34:10.7400457+08:00;True|2023-05-18T20:32:43.8790879+08:00;True|2023-05-18T20:31:13.5389643+08:00;True|2023-05-18T20:29:19.6206139+08:00;True|2023-05-18T20:07:25.5074263+08:00;True|2023-05-18T18:19:43.5324315+08:00;True|2023-05-18T18:15:36.4290026+08:00;True|2023-05-18T18:12:31.8703551+08:00;True|2023-05-18T18:10:52.9289531+08:00;True|2023-05-18T18:09:23.9118797+08:00;True|2023-05-18T17:58:30.8068228+08:00;True|2023-05-18T17:56:55.8055382+08:00;False|2023-05-18T17:54:54.7950789+08:00;False|2023-05-18T17:11:18.2325105+08:00;True|2023-05-18T17:09:24.4186482+08:00;True|2023-05-18T17:06:32.0699130+08:00;False|2023-05-18T17:01:41.8164925+08:00;False|2023-05-18T16:59:32.1112741+08:00;True|2023-05-18T16:58:34.1784100+08:00;True|2023-05-18T16:56:36.9460541+08:00;True|2023-05-18T16:55:00.9843495+08:00;True|2023-05-18T16:49:04.0161640+08:00;True|2023-05-18T16:48:28.9011382+08:00;True|2023-05-18T16:44:52.0675900+08:00;False|2023-05-18T16:44:37.3514214+08:00;False|2023-05-18T16:43:23.3343369+08:00;True|2023-05-18T16:41:35.8818611+08:00;True|2023-05-18T16:25:43.5167900+08:00;False|2023-05-18T16:24:46.6646890+08:00;False|2023-05-18T16:19:55.4153618+08:00;False|2023-05-18T16:16:18.0052881+08:00;False|2023-05-18T16:14:32.3377278+08:00;True|2023-05-17T15:43:45.1868569+08:00;True|2023-05-17T15:35:42.2476880+08:00;True|2023-05-17T14:23:28.2390957+08:00;True|2023-05-17T13:54:00.6756387+08:00;True|2023-05-17T13:45:46.1115068+08:00;True|2023-05-17T07:57:34.7129429+08:00;True|2023-05-16T16:04:20.3198005+08:00;False|2023-05-16T16:03:52.0737233+08:00;True|2023-05-16T15:28:45.4945726+08:00;True|2023-05-16T15:14:10.4952128+08:00;True|2023-05-16T15:04:46.5706346+08:00;True|2023-05-16T14:46:48.7034492+08:00;True|2023-05-16T14:45:29.4047499+08:00;True|2023-05-16T14:42:47.3507679+08:00;True|2023-05-16T14:30:47.9199224+08:00;True|2023-05-16T14:29:10.9147184+08:00;True|2023-05-16T14:27:48.3632687+08:00;True|2023-05-16T14:24:44.6240034+08:00;True|2023-05-16T14:19:41.2962188+08:00;True|2023-05-16T13:41:13.3366211+08:00;True|2023-05-16T13:26:44.1532655+08:00;True|2023-05-16T13:23:40.2882422+08:00;True|2023-05-16T13:11:41.5416792+08:00;True|2023-05-16T13:08:41.6341863+08:00;True|2023-05-16T13:04:35.6916867+08:00;True|2023-05-16T13:00:34.6889598+08:00;True|2023-05-16T12:57:48.4561274+08:00;True|2023-05-16T12:50:57.7405833+08:00;True|2023-05-16T12:49:33.8394829+08:00;True|2023-05-16T12:44:28.6906226+08:00;True|2023-05-16T12:41:08.3554032+08:00;True|2023-05-16T12:32:32.3448036+08:00;True|2023-05-16T11:32:04.4504376+08:00;True|2023-05-15T18:39:28.9172042+08:00;True|2023-05-15T18:35:41.5268755+08:00;True|2023-05-15T18:16:16.2900985+08:00;True|2023-04-28T16:24:40.7430596+08:00;False|2023-04-28T16:21:34.8499384+08:00;True|2023-04-28T15:43:40.3023318+08:00;True|2023-04-28T15:41:18.8228620+08:00;True|2023-04-28T14:16:21.1595325+08:00;True|2023-04-28T10:27:55.2150739+08:00;True|2023-04-12T16:25:26.5218825+08:00;True|2023-04-12T15:45:29.3993255+08:00;True|2023-04-12T14:00:18.1960878+08:00;True|2023-04-12T13:16:39.0804178+08:00;True|2023-04-11T11:02:27.5200402+08:00;True|2023-04-11T09:57:11.5903829+08:00;True|2023-04-10T09:58:01.1775220+08:00;True|2023-03-13T11:19:32.0927720+08:00;True|2023-03-13T10:39:50.9250037+08:00;True|2023-03-13T08:54:57.5891390+08:00;True|2023-03-10T09:00:31.2441735+08:00;True|2023-03-08T08:25:11.1877416+08:00;True|2023-03-06T09:18:03.5502956+08:00;True|2023-03-06T09:14:57.8192971+08:00;True|2023-01-11T13:30:27.8190489+08:00;True|2023-01-06T14:29:14.6067256+08:00;True|2022-12-23T17:06:52.0688439+08:00;True|2022-12-23T16:12:04.4155951+08:00;True|2022-12-23T13:35:44.6439326+08:00;True|2022-11-30T08:24:02.9999976+08:00;True|2022-11-30T08:01:51.4579972+08:00;True|2022-11-29T21:32:14.4359673+08:00;True|2022-11-29T19:30:22.9466023+08:00;True|2022-11-29T19:24:30.1630119+08:00;True|2022-11-29T17:31:43.1926801+08:00;True|2022-11-29T17:14:32.5869985+08:00;True|2022-11-29T10:42:57.1877576+08:00;True|2022-11-27T14:40:28.4784748+08:00;True|2022-11-26T20:49:34.2789400+08:00;True|2022-11-26T19:24:58.9988205+08:00;True|2022-11-26T15:33:08.6274944+08:00;True|2022-11-26T14:37:46.3953592+08:00;True|2022-11-26T09:16:41.7487240+08:00;True|2022-11-24T09:49:50.7302637+08:00;True|2022-11-23T16:24:56.5946914+08:00;True|2022-11-23T16:19:57.5570583+08:00;True|2022-11-23T15:05:13.8032246+08:00;True|2022-11-22T20:24:39.7324815+08:00;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2023-11-10T04:25:28.8978413Z;True|2023-11-10T12:04:30.4991249+08:00;True|2023-11-10T11:55:52.1921552+08:00;True|2023-11-10T11:39:33.1910863+08:00;True|2023-11-10T11:17:17.2050570+08:00;True|2023-11-10T10:31:48.8350379+08:00;True|2023-11-09T13:11:02.1210376+08:00;True|2023-11-09T11:04:23.6279742+08:00;True|2023-11-09T09:52:39.0767165+08:00;True|2023-11-09T09:45:47.5629254+08:00;True|2023-11-09T09:41:09.1121998+08:00;True|2023-11-09T09:34:16.8133121+08:00;True|2023-11-08T16:33:38.3080500+08:00;True|2023-11-08T16:14:37.9282566+08:00;True|2023-11-08T15:31:46.8084522+08:00;True|2023-11-08T14:27:48.2352711+08:00;True|2023-11-08T12:23:56.5235127+08:00;True|2023-11-08T11:41:12.7035010+08:00;True|2023-11-08T11:38:42.5318310+08:00;True|2023-11-08T10:18:43.5798164+08:00;True|2023-11-08T09:06:35.6712939+08:00;True|2023-11-08T08:57:36.1174660+08:00;True|2023-11-08T00:07:44.2585670+08:00;True|2023-11-06T23:28:53.2559097+08:00;True|2023-11-06T23:00:40.3059201+08:00;True|2023-11-06T21:14:59.0505998+08:00;True|2023-11-03T22:08:06.7984691+08:00;True|2023-11-03T20:33:47.8005656+08:00;True|2023-11-03T19:18:45.1406730+08:00;True|2023-11-03T14:56:44.7332321+08:00;True|2023-11-02T20:13:15.5530300+08:00;True|2023-11-02T19:22:24.9140752+08:00;True|2023-11-02T18:58:18.1198017+08:00;True|2023-11-01T18:31:39.9490440+08:00;True|2023-11-01T14:49:43.8703361+08:00;True|2023-11-01T14:38:44.8729900+08:00;True|2023-11-01T14:14:57.6507597+08:00;True|2023-11-01T13:04:09.9744075+08:00;True|2023-10-31T13:03:41.1902847+08:00;True|2023-10-31T11:29:03.3252294+08:00;True|2023-10-30T18:35:01.5128678+08:00;True|2023-10-30T18:25:01.6612244+08:00;True|2023-10-26T17:07:56.7081658+08:00;True|2023-10-18T16:20:51.8420951+08:00;True|2023-10-16T16:44:43.7908528+08:00;True|2023-10-16T11:17:09.2728375+08:00;True|2023-10-16T10:28:07.3397339+08:00;True|2023-10-16T10:26:35.6073358+08:00;True|2023-10-16T10:21:48.9925797+08:00;True|2023-10-13T11:26:05.2730047+08:00;True|2023-10-12T08:19:04.3028512+08:00;True|2023-10-11T20:40:21.6934217+08:00;True|2023-10-11T20:28:04.3302789+08:00;True|2023-10-11T20:16:51.2741909+08:00;True|2023-10-11T20:10:01.4624158+08:00;True|2023-10-11T15:32:40.9782838+08:00;True|2023-10-11T15:21:09.0531801+08:00;True|2023-10-11T15:05:59.9622196+08:00;True|2023-10-11T10:51:46.8571661+08:00;True|2023-10-11T10:41:25.5037704+08:00;True|2023-10-11T10:13:32.2604453+08:00;True|2023-10-11T10:05:52.2170423+08:00;True|2023-10-11T09:47:35.6578975+08:00;True|2023-10-11T09:44:31.2001499+08:00;True|2023-10-11T09:37:09.6904898+08:00;True|2023-10-10T10:18:33.1073992+08:00;True|2023-10-10T09:32:05.6384867+08:00;True|2023-10-10T09:15:26.4844254+08:00;True|2023-10-10T09:03:39.1497247+08:00;True|2023-10-10T08:56:14.9475607+08:00;True|2023-10-09T15:38:52.6561232+08:00;True|2023-10-09T14:22:16.0301342+08:00;True|2023-10-09T13:24:40.4941388+08:00;True|2023-10-09T10:30:48.0015664+08:00;True|2023-10-09T09:52:47.4626658+08:00;True|2023-10-08T14:21:13.7960780+08:00;True|2023-10-08T10:31:55.0337899+08:00;True|2023-10-08T08:24:13.2663041+08:00;True|2023-10-07T10:40:04.1716715+08:00;True|2023-10-07T09:51:11.1928375+08:00;True|2023-10-07T09:43:13.8042516+08:00;True|2023-09-28T15:45:01.2865878+08:00;True|2023-09-28T15:32:23.8179822+08:00;True|2023-09-28T14:37:03.1119806+08:00;True|2023-09-28T14:30:07.0877531+08:00;True|2023-09-28T14:01:36.5862373+08:00;True|2023-09-28T08:29:16.5989163+08:00;True|2023-09-28T08:12:23.3924898+08:00;True|2023-09-27T17:04:09.2538198+08:00;True|2023-09-27T16:38:03.8237948+08:00;True|2023-09-27T16:12:28.7977056+08:00;True|2023-09-27T15:56:03.7725704+08:00;True|2023-09-27T15:12:31.1298921+08:00;True|2023-09-27T15:05:14.4058045+08:00;True|2023-09-27T14:55:43.4423114+08:00;True|2023-09-27T14:33:26.2272014+08:00;True|2023-09-22T13:26:44.6246077+08:00;True|2023-09-22T11:14:50.9067626+08:00;True|2023-09-22T09:36:50.6912928+08:00;True|2023-09-22T09:26:38.2305802+08:00;True|2023-09-22T09:02:22.5400635+08:00;True|2023-09-20T17:20:27.9780370+08:00;True|2023-09-19T09:20:00.1269897+08:00;True|2023-09-19T09:10:18.4900723+08:00;True|2023-09-19T08:30:20.1709390+08:00;True|2023-09-18T15:43:28.1580264+08:00;True|2023-09-15T10:08:50.6367258+08:00;True|2023-09-14T17:17:10.7002185+08:00;True|2023-09-14T16:55:47.7782477+08:00;True|2023-09-14T14:05:25.9485449+08:00;False|2023-09-14T14:04:51.9423918+08:00;True|2023-09-12T09:37:17.5430590+08:00;True|2023-09-11T16:38:00.9834961+08:00;True|2023-09-11T13:04:08.1338596+08:00;True|2023-09-11T09:33:03.5400174+08:00;True|2023-09-08T15:34:46.6427039+08:00;True|2023-09-08T15:32:26.7896155+08:00;True|2023-09-08T14:07:16.6283055+08:00;True|2023-09-08T08:21:08.8368055+08:00;True|2023-09-08T08:07:29.5992984+08:00;True|2023-09-07T13:03:24.6924914+08:00;True|2023-09-07T11:02:02.9462467+08:00;True|2023-09-07T08:57:36.4913496+08:00;True|2023-09-07T08:55:57.3245545+08:00;True|2023-09-06T13:47:04.0563026+08:00;True|2023-09-06T13:42:27.3031938+08:00;True|2023-09-05T08:28:44.6193871+08:00;True|2023-09-04T20:42:09.4672710+08:00;True|2023-09-03T14:06:37.5079909+08:00;True|2023-09-02T18:58:24.1492192+08:00;True|2023-09-01T13:19:28.2779978+08:00;True|2023-09-01T08:40:54.0577358+08:00;True|2023-08-31T16:47:34.8462721+08:00;True|2023-08-31T14:49:39.9056564+08:00;True|2023-08-31T14:20:01.4071384+08:00;True|2023-08-31T11:25:29.0233052+08:00;True|2023-08-31T10:28:13.4933678+08:00;True|2023-08-31T10:21:52.6638820+08:00;True|2023-08-31T08:46:57.8782261+08:00;True|2023-08-31T08:46:08.4791004+08:00;True|2023-08-30T09:06:17.4001684+08:00;True|2023-08-30T08:52:06.9481657+08:00;True|2023-08-29T17:11:33.7851914+08:00;True|2023-08-29T16:58:52.7298807+08:00;True|2023-08-29T15:58:23.4205277+08:00;True|2023-08-29T15:56:40.3534593+08:00;True|2023-08-29T15:54:29.1188567+08:00;True|2023-08-29T15:53:27.9719983+08:00;True|2023-08-29T15:52:38.7670005+08:00;True|2023-08-29T15:51:32.3703092+08:00;True|2023-08-29T15:47:38.5198946+08:00;True|2023-08-29T15:46:17.4698017+08:00;True|2023-08-29T15:42:04.1853400+08:00;True|2023-08-29T15:29:28.1098681+08:00;True|2023-08-29T15:18:40.8587286+08:00;True|2023-08-29T14:47:50.3088948+08:00;True|2023-08-29T14:47:27.6552611+08:00;False|2023-08-28T13:59:37.8725670+08:00;True|2023-08-18T13:23:38.9937084+08:00;True|2023-08-18T10:09:51.5247737+08:00;True|2023-08-18T08:26:21.8473123+08:00;True|2023-08-17T08:31:37.8696349+08:00;True|2023-08-17T08:23:59.5658185+08:00;True|2023-08-17T08:07:38.2174684+08:00;True|2023-08-16T16:49:44.2549852+08:00;True|2023-08-16T16:33:59.9298792+08:00;True|2023-08-16T15:35:29.6092783+08:00;True|2023-08-16T11:17:28.1086751+08:00;True|2023-08-16T11:17:22.3814672+08:00;True|2023-08-16T08:44:16.0941179+08:00;True|2023-08-15T15:29:15.8118269+08:00;True|2023-08-15T14:47:06.4963591+08:00;True|2023-08-11T16:49:35.8718314+08:00;True|2023-08-11T14:22:59.9440967+08:00;True|2023-08-11T14:16:25.0940743+08:00;True|2023-08-11T13:27:25.4148450+08:00;True|2023-08-11T09:08:31.5437265+08:00;True|2023-08-11T09:04:38.4540336+08:00;True|2023-08-10T14:11:07.0042283+08:00;True|2023-08-08T13:48:19.2402267+08:00;True|2023-08-08T13:44:15.6796969+08:00;True|2023-07-27T09:46:14.1491814+08:00;True|2023-07-21T11:13:10.0843656+08:00;True|2023-07-21T10:56:47.5835580+08:00;True|2023-07-21T10:30:33.0113443+08:00;True|2023-07-20T19:16:37.4936135+08:00;True|2023-07-20T19:00:41.0636578+08:00;True|2023-07-19T13:28:27.8671371+08:00;True|2023-07-19T13:23:42.1880500+08:00;True|2023-07-19T13:19:18.7201227+08:00;True|2023-07-19T13:06:38.9897249+08:00;True|2023-07-19T12:13:11.2061059+08:00;True|2023-07-19T11:45:20.0391356+08:00;True|2023-07-19T11:24:02.5425841+08:00;True|2023-07-19T10:32:06.7915754+08:00;True|2023-07-19T09:51:08.4553434+08:00;True|2023-07-19T09:48:11.2977426+08:00;True|2023-07-18T08:47:44.1724897+08:00;True|2023-07-17T16:25:10.8982872+08:00;True|2023-07-17T14:50:44.3708198+08:00;True|2023-07-17T14:20:26.4686898+08:00;True|2023-07-17T14:18:16.6127136+08:00;True|2023-07-17T14:16:34.9116950+08:00;True|2023-07-17T14:14:44.7988846+08:00;True|2023-07-17T14:06:18.1123806+08:00;True|2023-07-17T14:03:38.5290433+08:00;True|2023-07-17T13:48:54.3096778+08:00;True|2023-07-17T13:23:13.6097762+08:00;True|2023-07-17T09:54:25.9375716+08:00;True|2023-07-17T09:40:22.2531559+08:00;True|2023-07-17T09:21:15.0786649+08:00;True|2023-07-17T09:03:37.2081513+08:00;True|2023-07-16T21:20:45.3036514+08:00;True|2023-07-16T21:09:16.1559694+08:00;True|2023-07-16T21:05:22.2504644+08:00;True|2023-07-16T20:41:26.5956030+08:00;True|2023-07-16T20:19:33.5726613+08:00;True|2023-07-16T19:46:38.6493518+08:00;True|2023-07-14T10:33:17.6270692+08:00;True|2023-07-11T14:34:22.8852169+08:00;True|2023-07-11T14:27:22.7851108+08:00;True|2023-07-11T14:13:21.6512172+08:00;True|2023-07-11T14:06:33.9865646+08:00;True|2023-07-11T13:52:46.2830836+08:00;True|2023-07-11T13:38:56.3165889+08:00;True|2023-07-11T13:29:40.9636697+08:00;True|2023-07-11T13:25:23.0633788+08:00;True|2023-07-11T10:17:40.8002359+08:00;True|2023-07-11T10:15:47.5472709+08:00;True|2023-07-11T10:12:25.6440547+08:00;True|2023-07-11T10:07:39.3716167+08:00;True|2023-07-11T09:22:07.4191357+08:00;True|2023-07-04T13:07:10.1209516+08:00;True|2023-06-30T16:11:25.7541580+08:00;True|2023-06-30T15:39:26.6678989+08:00;True|2023-06-30T15:26:40.6581344+08:00;True|2023-06-30T15:12:57.9906312+08:00;True|2023-06-29T16:39:15.6477820+08:00;True|2023-06-28T17:01:51.9542466+08:00;True|2023-06-27T15:03:28.1320450+08:00;True|2023-06-27T13:36:39.6707848+08:00;True|2023-06-26T09:40:01.1754706+08:00;True|2023-06-25T12:16:28.9080024+08:00;True|2023-06-25T11:51:59.9238461+08:00;True|2023-06-25T11:50:29.3100358+08:00;True|2023-06-25T11:29:28.5338563+08:00;True|2023-06-25T09:10:26.2420288+08:00;True|2023-06-25T09:08:15.0702872+08:00;True|2023-06-25T08:43:15.0806611+08:00;True|2023-06-25T08:41:41.8156616+08:00;True|2023-06-25T08:39:30.6818013+08:00;True|2023-06-25T08:38:18.5996529+08:00;True|2023-06-25T08:36:34.1479706+08:00;True|2023-06-25T08:34:53.9856289+08:00;True|2023-06-25T08:31:24.0298080+08:00;True|2023-06-25T08:15:45.7453280+08:00;True|2023-06-25T08:01:52.7609075+08:00;True|2023-06-24T21:25:23.8938665+08:00;True|2023-06-22T03:02:26.7305758+08:00;True|2023-06-22T02:10:48.8222890+08:00;True|2023-06-22T01:57:41.7875184+08:00;True|2023-06-22T01:52:19.4217362+08:00;True|2023-06-21T16:27:15.1464129+08:00;True|2023-06-21T16:11:46.6111817+08:00;True|2023-06-21T13:14:00.6869253+08:00;True|2023-06-21T13:09:28.2689225+08:00;True|2023-06-21T12:24:02.6762426+08:00;True|2023-06-21T12:18:06.2748924+08:00;True|2023-06-21T11:18:02.6754143+08:00;True|2023-06-21T11:08:34.2149469+08:00;True|2023-06-21T08:20:50.0079906+08:00;True|2023-06-20T15:56:03.2638713+08:00;True|2023-06-20T15:48:38.2419545+08:00;True|2023-06-20T15:35:26.6615171+08:00;True|2023-06-20T15:20:31.9284860+08:00;True|2023-06-20T15:18:39.8265469+08:00;True|2023-06-20T15:09:16.7617272+08:00;True|2023-06-20T09:53:23.2658672+08:00;True|2023-06-16T10:00:58.0337616+08:00;True|2023-06-16T09:47:58.8912904+08:00;True|2023-06-16T09:26:36.4914832+08:00;True|2023-06-15T16:22:21.4509393+08:00;True|2023-06-12T13:21:12.0491357+08:00;True|2023-06-12T10:18:32.9287587+08:00;True|2023-06-09T16:22:24.1132267+08:00;True|2023-06-08T18:12:42.4814009+08:00;True|2023-06-08T11:08:48.0533571+08:00;True|2023-06-08T10:41:43.0121701+08:00;False|2023-06-08T10:40:19.2093235+08:00;True|2023-06-06T13:03:50.8124200+08:00;True|2023-06-05T10:12:24.1858209+08:00;True|2023-06-02T17:02:57.5817094+08:00;True|2023-05-26T13:54:40.2272218+08:00;True|2023-05-24T12:43:50.2427994+08:00;True|2023-05-24T12:34:24.3922836+08:00;True|2023-05-24T10:07:19.4995219+08:00;True|2023-05-24T09:21:29.1960080+08:00;True|2023-05-23T22:34:23.3220912+08:00;True|2023-05-23T22:01:14.4175449+08:00;True|2023-05-23T17:02:53.0308400+08:00;True|2023-05-23T16:30:11.7138623+08:00;True|2023-05-23T15:51:50.0152484+08:00;True|2023-05-23T15:50:52.0657433+08:00;True|2023-05-23T15:28:25.5802377+08:00;True|2023-05-23T15:25:56.4633020+08:00;True|2023-05-23T14:52:29.8759921+08:00;True|2023-05-23T14:48:44.6519763+08:00;True|2023-05-20T04:28:10.3108871+08:00;True|2023-05-20T03:56:22.7233820+08:00;True|2023-05-20T03:47:38.4405026+08:00;True|2023-05-20T03:46:40.6056451+08:00;True|2023-05-20T03:44:25.0883888+08:00;True|2023-05-20T03:41:10.1148691+08:00;True|2023-05-20T02:34:14.3757035+08:00;True|2023-05-20T02:27:50.5595075+08:00;True|2023-05-20T02:23:04.2256041+08:00;True|2023-05-20T01:46:59.9534021+08:00;True|2023-05-20T01:42:33.5106065+08:00;True|2023-05-20T01:40:39.6918060+08:00;True|2023-05-20T01:11:47.7436847+08:00;True|2023-05-20T01:03:58.9476094+08:00;True|2023-05-19T22:59:47.4591129+08:00;True|2023-05-19T22:34:44.7988447+08:00;True|2023-05-19T22:24:55.2320279+08:00;True|2023-05-19T21:40:19.5285575+08:00;True|2023-05-19T21:38:21.2073338+08:00;True|2023-05-19T20:54:59.2058809+08:00;True|2023-05-19T16:08:15.0151080+08:00;True|2023-05-19T15:26:16.2836301+08:00;True|2023-05-19T13:09:06.1592914+08:00;True|2023-05-19T12:24:23.6252771+08:00;True|2023-05-19T11:50:53.8948740+08:00;True|2023-05-19T11:43:57.9296933+08:00;True|2023-05-19T10:44:34.9904463+08:00;True|2023-05-19T09:32:02.1216663+08:00;False|2023-05-19T09:31:06.4251757+08:00;True|2023-05-18T22:34:36.5292968+08:00;True|2023-05-18T20:37:59.7940567+08:00;True|2023-05-18T20:36:35.2790349+08:00;True|2023-05-18T20:34:10.7400457+08:00;True|2023-05-18T20:32:43.8790879+08:00;True|2023-05-18T20:31:13.5389643+08:00;True|2023-05-18T20:29:19.6206139+08:00;True|2023-05-18T20:07:25.5074263+08:00;True|2023-05-18T18:19:43.5324315+08:00;True|2023-05-18T18:15:36.4290026+08:00;True|2023-05-18T18:12:31.8703551+08:00;True|2023-05-18T18:10:52.9289531+08:00;True|2023-05-18T18:09:23.9118797+08:00;True|2023-05-18T17:58:30.8068228+08:00;True|2023-05-18T17:56:55.8055382+08:00;False|2023-05-18T17:54:54.7950789+08:00;False|2023-05-18T17:11:18.2325105+08:00;True|2023-05-18T17:09:24.4186482+08:00;True|2023-05-18T17:06:32.0699130+08:00;False|2023-05-18T17:01:41.8164925+08:00;False|2023-05-18T16:59:32.1112741+08:00;True|2023-05-18T16:58:34.1784100+08:00;True|2023-05-18T16:56:36.9460541+08:00;True|2023-05-18T16:55:00.9843495+08:00;True|2023-05-18T16:49:04.0161640+08:00;True|2023-05-18T16:48:28.9011382+08:00;True|2023-05-18T16:44:52.0675900+08:00;False|2023-05-18T16:44:37.3514214+08:00;False|2023-05-18T16:43:23.3343369+08:00;True|2023-05-18T16:41:35.8818611+08:00;True|2023-05-18T16:25:43.5167900+08:00;False|2023-05-18T16:24:46.6646890+08:00;False|2023-05-18T16:19:55.4153618+08:00;False|2023-05-18T16:16:18.0052881+08:00;False|2023-05-18T16:14:32.3377278+08:00;True|2023-05-17T15:43:45.1868569+08:00;True|2023-05-17T15:35:42.2476880+08:00;True|2023-05-17T14:23:28.2390957+08:00;True|2023-05-17T13:54:00.6756387+08:00;True|2023-05-17T13:45:46.1115068+08:00;True|2023-05-17T07:57:34.7129429+08:00;True|2023-05-16T16:04:20.3198005+08:00;False|2023-05-16T16:03:52.0737233+08:00;True|2023-05-16T15:28:45.4945726+08:00;True|2023-05-16T15:14:10.4952128+08:00;True|2023-05-16T15:04:46.5706346+08:00;True|2023-05-16T14:46:48.7034492+08:00;True|2023-05-16T14:45:29.4047499+08:00;True|2023-05-16T14:42:47.3507679+08:00;True|2023-05-16T14:30:47.9199224+08:00;True|2023-05-16T14:29:10.9147184+08:00;True|2023-05-16T14:27:48.3632687+08:00;True|2023-05-16T14:24:44.6240034+08:00;True|2023-05-16T14:19:41.2962188+08:00;True|2023-05-16T13:41:13.3366211+08:00;True|2023-05-16T13:26:44.1532655+08:00;True|2023-05-16T13:23:40.2882422+08:00;True|2023-05-16T13:11:41.5416792+08:00;True|2023-05-16T13:08:41.6341863+08:00;True|2023-05-16T13:04:35.6916867+08:00;True|2023-05-16T13:00:34.6889598+08:00;True|2023-05-16T12:57:48.4561274+08:00;True|2023-05-16T12:50:57.7405833+08:00;True|2023-05-16T12:49:33.8394829+08:00;True|2023-05-16T12:44:28.6906226+08:00;True|2023-05-16T12:41:08.3554032+08:00;True|2023-05-16T12:32:32.3448036+08:00;True|2023-05-16T11:32:04.4504376+08:00;True|2023-05-15T18:39:28.9172042+08:00;True|2023-05-15T18:35:41.5268755+08:00;True|2023-05-15T18:16:16.2900985+08:00;True|2023-04-28T16:24:40.7430596+08:00;False|2023-04-28T16:21:34.8499384+08:00;True|2023-04-28T15:43:40.3023318+08:00;True|2023-04-28T15:41:18.8228620+08:00;True|2023-04-28T14:16:21.1595325+08:00;True|2023-04-28T10:27:55.2150739+08:00;True|2023-04-12T16:25:26.5218825+08:00;True|2023-04-12T15:45:29.3993255+08:00;True|2023-04-12T14:00:18.1960878+08:00;True|2023-04-12T13:16:39.0804178+08:00;True|2023-04-11T11:02:27.5200402+08:00;True|2023-04-11T09:57:11.5903829+08:00;True|2023-04-10T09:58:01.1775220+08:00;True|2023-03-13T11:19:32.0927720+08:00;True|2023-03-13T10:39:50.9250037+08:00;True|2023-03-13T08:54:57.5891390+08:00;True|2023-03-10T09:00:31.2441735+08:00;True|2023-03-08T08:25:11.1877416+08:00;True|2023-03-06T09:18:03.5502956+08:00;True|2023-03-06T09:14:57.8192971+08:00;True|2023-01-11T13:30:27.8190489+08:00;True|2023-01-06T14:29:14.6067256+08:00;True|2022-12-23T17:06:52.0688439+08:00;True|2022-12-23T16:12:04.4155951+08:00;True|2022-12-23T13:35:44.6439326+08:00;True|2022-11-30T08:24:02.9999976+08:00;True|2022-11-30T08:01:51.4579972+08:00;True|2022-11-29T21:32:14.4359673+08:00;True|2022-11-29T19:30:22.9466023+08:00;True|2022-11-29T19:24:30.1630119+08:00;True|2022-11-29T17:31:43.1926801+08:00;True|2022-11-29T17:14:32.5869985+08:00;True|2022-11-29T10:42:57.1877576+08:00;True|2022-11-27T14:40:28.4784748+08:00;True|2022-11-26T20:49:34.2789400+08:00;True|2022-11-26T19:24:58.9988205+08:00;True|2022-11-26T15:33:08.6274944+08:00;True|2022-11-26T14:37:46.3953592+08:00;True|2022-11-26T09:16:41.7487240+08:00;True|2022-11-24T09:49:50.7302637+08:00;True|2022-11-23T16:24:56.5946914+08:00;True|2022-11-23T16:19:57.5570583+08:00;True|2022-11-23T15:05:13.8032246+08:00;True|2022-11-22T20:24:39.7324815+08:00;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 16:43:40</publishTime>
@@ -20,12 +20,12 @@
<File Include="bin/BLL.dll">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>11/10/2023 16:40:57</publishTime>
+ <publishTime>11/10/2023 12:25:12</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>11/10/2023 16:40:57</publishTime>
+ <publishTime>11/10/2023 12:25:12</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@@ -33,12 +33,12 @@
<File Include="bin/DAL.dll">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>11/10/2023 16:40:54</publishTime>
+ <publishTime>11/10/2023 12:25:09</publishTime>
</File>
<File Include="bin/DAL.pdb">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>11/10/2023 16:40:54</publishTime>
+ <publishTime>11/10/2023 12:25:09</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
@@ -46,12 +46,12 @@
<File Include="bin/DBUtility.dll">
<publishTime>11/02/2022 22:02:56</publishTime>
<publishTime>11/15/2022 13:55:23</publishTime>
- <publishTime>11/10/2023 16:40:50</publishTime>
+ <publishTime>11/10/2023 12:25:05</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>11/09/2022 16:01:58</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/10/2023 16:40:50</publishTime>
+ <publishTime>11/10/2023 12:25:05</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -81,7 +81,7 @@
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>09/25/2023 09:42:56</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -107,15 +107,15 @@
<File Include="bin/Model.dll">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/10/2023 16:40:51</publishTime>
+ <publishTime>11/10/2023 12:25:05</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/10/2023 16:40:51</publishTime>
+ <publishTime>11/10/2023 12:25:05</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/04/2014 04:33:56</publishTime>
@@ -147,33 +147,33 @@
<File Include="bin/Pub_Class.dll">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>11/10/2023 16:40:47</publishTime>
+ <publishTime>11/10/2023 12:25:01</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>11/10/2023 16:40:47</publishTime>
+ <publishTime>11/10/2023 12:25:01</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/10/2023 16:40:49</publishTime>
+ <publishTime>11/10/2023 12:25:02</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/10/2023 16:40:49</publishTime>
+ <publishTime>11/10/2023 12:25:02</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/10/2023 16:40:49</publishTime>
+ <publishTime>11/10/2023 12:25:03</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/10/2023 16:40:49</publishTime>
+ <publishTime>11/10/2023 12:25:03</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -251,7 +251,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>09/25/2023 09:42:57</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>
@@ -286,7 +286,7 @@
<File Include="bin/WebAPI.dll">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>11/10/2023 16:41:03</publishTime>
+ <publishTime>11/10/2023 12:25:20</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
@@ -294,7 +294,7 @@
<File Include="bin/WebAPI.pdb">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>11/10/2023 16:41:03</publishTime>
+ <publishTime>11/10/2023 12:25:20</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -306,58 +306,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>09/25/2023 09:42:56</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>09/25/2023 09:42:56</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>09/25/2023 09:42:56</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>09/25/2023 09:42:56</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>09/25/2023 09:42:56</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>09/25/2023 09:42:56</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>09/25/2023 09:42:56</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>09/25/2023 09:42:56</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>09/25/2023 09:42:56</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>09/25/2023 09:42:56</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>09/25/2023 09:42:57</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>
@@ -366,7 +366,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>09/25/2023 09:42:57</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>
@@ -375,121 +375,121 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>07/12/2023 08:14:21</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="packages.config">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>09/25/2023 09:42:57</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>11/01/2023 11:13:09</publishTime>
+ <publishTime>11/03/2023 22:05:51</publishTime>
</File>
<File Include="Web References/WebS/WebService1.disco">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -503,7 +503,7 @@
<File Include="Web.config">
<publishTime>11/14/2022 11:24:08</publishTime>
<publishTime>11/02/2022 22:03:20</publishTime>
- <publishTime>11/10/2023 16:41:11</publishTime>
+ <publishTime>11/10/2023 12:25:26</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index b3b6310..e339306 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<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.63.20/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
+ <add key="sUrl" value="http://192.168.63.20/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"/> 鍗氭棩绉戞妧-->
@@ -34,7 +34,7 @@
<!--<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://localhost:8082/WEBS/WebService1.asmx"/> 鏈湴-->
- <add key="sUrl" value="http://192.168.56.1:81/web/WebService1.asmx"/> <!--闄堥洴闈欐湰鍦伴厤缃�-->
+ <!--<add key="sUrl" value="http://192.168.56.1:81/web/WebService1.asmx"/> 闄堥洴闈欐湰鍦伴厤缃�-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 26f7db0..9b4b711 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -423,6 +423,7 @@
<Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" />
<Compile Include="Controllers\SCGL\Gy_SourceWorkStationSetController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_ICMOChangeBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
@@ -463,6 +464,11 @@
<Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\Sc_ProcessReportController.cs" />
+ <Compile Include="Controllers\XSGL\Xs_SeOrderChangeBillController.cs" />
+ <Compile Include="Controllers\XSGL\Xs_ExceptiveCheckRequestBillController.cs" />
+ <Compile Include="Controllers\XSGL\Xs_CusRatingChangeBillController.cs" />
+ <Compile Include="Controllers\XSGL\YS_ReceiveBackBillController.cs" />
+ <Compile Include="Controllers\XSGL\YS_ReceiveBillController.cs" />
<Compile Include="Controllers\XSGL\Kf_SellOutBillController.cs" />
<Compile Include="Controllers\浜轰簨绠＄悊\鍏ヨ亴鐢宠\HR_EmpEngageRequestBillController.cs" />
<Compile Include="Controllers\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 315ec51..18436bc 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\涔斾竴璁￠噺鍗曚綅鍒楄〃\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\GIT浠撳簱\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1