From baca1376c502e0de5bf3962ebeb533372febd43f Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 27 十二月 2022 09:45:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/生产管理/设备管理/ClsSb_EquipSparepartsBillSub.cs | 18
WebAPI/WebAPI.csproj.user | 2
BLL/公用模块/Xt_File.cs | 4
WorkM/报表分析/Sc_WorkShopReport.cs | 40
DAL/基础资料/其他基础资料/ClsGy_MatePriceSup_Ctl.cs | 62
WebAPI/Models/Cls_InventoryAnalysisList.cs | 18
Model/生产管理/ClsSc_ICMOBillSub.cs | 12
WebAPI/Models/ClsGy_Material_Model.cs | 11
WebAPI/Properties/Settings.Designer.cs | 4
WebAPI/Controllers/基础资料/基础资料/Gy_TaxMIXController.cs | 416 +
Model/销售管理/ClsXs_SeOutStockBillSub.cs | 11
Model/基础资料/基础资料/ClsGy_TaxMIXMain_Model.cs | 21
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 103
WebAPI/Controllers/仓存管理/条码生成/Gy_BarCodeBill_OutController.cs | 389 +
Model/基础资料/基础资料/ClsGy_Operator_Model.cs | 20
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 25
WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs | 79
WebAPI/Controllers/基础资料/基础资料/Gy_SettleStyleController.cs | 393 +
Model/仓库管理/ClsKf_StockOutRequestBillSub.cs | 23
WebAPI/ListModels.cs | 143
Model/仓库管理/条码管理/ClsKF_BarCodeStatusChangeBillSub.cs | 19
Model/生产管理/设备管理/ClsSb_EquipSparepartsChangeBillMain.cs | 15
WebAPI/WebAPI.csproj | 32
Model/基础资料/其他基础资料/ClsGy_MatePriceSup_Model.cs | 2
DAL/基础资料/公用基础资料/ClsGy_Operator_Ctl.cs | 97
WebAPI/Web References/WebS/WebService1.wsdl | 1175 ++--
WebAPI/Controllers/条码管理/WEBSController.cs | 229
WebAPI/Controllers/基础资料/基础资料/Gy_StaffController.cs | 395 +
Model/Model.csproj | 18
Model/生产管理/设备管理/ClsSb_EquipSparepartsBillMain.cs | 15
Model/生产管理/设备管理/ClsSb_EquipSparepartsChangeBillSub.cs | 19
DAL/仓库管理/条码管理/ClsKF_BarCodeStatusChangeBill.cs | 224
WebAPI/Controllers/BaseSet/Gy_PropertyController.cs | 324 +
WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs | 16
WebAPI/Web References/WebS/Reference.cs | 2946 +++++++-----
WebAPI/Web.config | 12
Model/仓库管理/ClsKf_EntrustOutBillMain.cs | 2
DAL/基础资料/公用基础资料/ClsGy_CustLocation_Ctl.cs | 103
WebAPI/Models/基础资料/WorkDay.cs | 4
Model/基础资料/基础资料/ClsGy_RateType_Model.cs | 20
WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs | 45
WebAPI/Controllers/BaseSet/Gy_UnitController.cs | 9
DAL/生产管理/设备管理/ClsSb_EquipSparepartsBill.cs | 229
Model/基础资料/基础资料/ClsGy_TaxMIXSub_Model.cs | 16
Model/生产管理/设备管理/ClsSc_ICMOBillMain.cs | 3
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 137
WebAPI/DLL/ClsSc_ICMOReportBill.cs | 19
DAL/生产管理/模具管理/ClsSc_MouldMaintainPlanBill.cs | 49
WebAPI/Models/ClsSc_ICMOReportBillMain.cs | 4
Model/仓库管理/条码管理/ClsKF_BarCodeStatusChangeBillMain.cs | 13
WebAPI/Controllers/BLL/Xt_BillTypeController.cs | 44
Model/系统公用/ClsXt_BillType_Model.cs | 18
Model/基础资料/基础资料/ClsGy_Work_Model.cs | 16
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 58
Model/仓库管理/ClsKf_EntrustReplenishOutBillMain.cs | 23
Model/生产管理/ClsSc_PPBomBillSub.cs | 2
WebAPI/Controllers/基础资料/基础资料/Gy_TaxRateBillController.cs | 56
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs | 99
WebAPI/Models/基础资料/Warehouse.cs | 8
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 93
Model/仓库管理/条码管理/Gy_BarCodeBill_Out.cs | 127
WebAPI/Controllers/SCGL/日计划管理/DataHelper.cs | 79
Pub_Class/CustomerCls/ClsSqlHelper.cs | 72
WebAPI/Controllers/基础资料/基础资料/Gy_RecConditionBillController.cs | 50
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 8
Model/采购管理/ClsCg_POInStockBillSub.cs | 3
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 67
WebAPI/Controllers/WebAPIController.cs | 118
WebAPI/Controllers/基础资料/基础资料/Gy_CustLocationController.cs | 346 +
WebAPI/Models/基础资料/Gy_StockPlace.cs | 34
WebAPI/Web References/WebS/WebService1.disco | 6
WebAPI/Controllers/仓存管理/调拨盘点/Kf_MoveStockRequestBillController.cs | 264 +
DAL/基础资料/公用基础资料/ClsGy_Work_Ctl.cs | 98
WebAPI/Controllers/仓存管理/领料发货/Kf_StockOutRequestBillController.cs | 322 +
WebAPI/Controllers/基础资料/基础资料/Gy_StockStatusBillController.cs | 50
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 23
DAL/DAL.csproj | 8
Model/仓库管理/ClsKf_MoveStockRequestBillSub.cs | 20
Model/生产管理/模具管理/ClsSc_MouldMaintainPlanBillMain.cs | 1
DAL/生产管理/设备管理/ClsSb_EquipSparepartsChangeBill.cs | 230
WebAPI/Controllers/BaseSet/Gy_WorkDayController.cs | 16
WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs | 84
Model/基础资料/基础资料/ClsGy_Employee_Model.cs | 2
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 223
WebAPI/Controllers/基础资料/基础资料/Gy_PaymentConditionListBillController.cs | 50
WebAPI/Properties/Settings.settings | 2
.gitignore | 19
WebAPI/Controllers/基础资料/基础资料/Gy_MatePriceSupController.cs | 332 +
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 76
DAL/基础资料/公用基础资料/ClsGy_Staff_Ctl.cs | 99
WebAPI/Controllers/基础资料/基础资料/Gy_OperatorController.cs | 639 ++
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 20
Model/基础资料/基础资料/ClsGy_Property_Model.cs | 5
WebAPI/Controllers/LMESController.cs | 12
Model/仓库管理/ClsKf_EntrustReplenishOutBillSub.cs | 36
WebAPI/Controllers/仓存管理/条码生成/KF_BarCodeStatusChangeBillController.cs | 285 +
BaseSet/公用资料/其他基础资料/Gy_MatePriceSup.cs | 2
WebAPI/Controllers/SBGL/Sb_EquipSparepartsBillController.cs | 290 +
Model/销售管理/ClsXs_SeOutStockBillMain.cs | 17
Model/采购管理/ClsCg_POOrderBillSub.cs | 73
WebAPI/Controllers/基础资料/基础资料/Gy_WorkController.cs | 392 +
DAL/基础资料/公用基础资料/ClsGy_Property_Ctl.cs | 4
WebAPI/Models/ClsSc_ICMOReportBillSub.cs | 46
WebAPI/Controllers/SBGL/Sb_EquipSparepartsChangeBillController.cs | 290 +
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 138
Model/采购管理/ClsCg_POOrderBillMain.cs | 31
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 20
WebAPI/Web References/WebS/Reference.map | 4
Model/基础资料/基础资料/ClsGy_Unit_Model.cs | 1
Model/基础资料/基础资料/ClsGy_Staff_Model.cs | 20
Model/仓库管理/ClsKf_MoveStockRequestBillMain.cs | 10
Model/仓库管理/ClsKf_StockOutRequestBillMain.cs | 7
Model/基础资料/基础资料/ClsGy_CustLocation_Model.cs | 21
Model/生产管理/模具管理/ClsSc_MouldMaintainPlanBillSub_Item.cs | 17
WebAPI/Controllers/基础资料/基础资料/Gy_RateTypeController.cs | 396 +
DAL/基础资料/公用基础资料/ClsGy_RateType_Ctl.cs | 103
WebAPI/Controllers/Sc_ProcessMangementController.cs | 33
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 39
WebAPI/DLL/ClsGy_Material_Ctl.cs | 23
119 files changed, 12,049 insertions(+), 2,156 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9c0164d..b7fe30c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -142,3 +142,22 @@
/WebAPI/Sc_MouldProdOutBill/Log
/PayM/bin/Debug
/PayM/obj/x86/Debug
+/APSM/bin/Release
+/BaseSet/bin/Release
+/BLL/bin/Release
+/DBUtility/obj/Release
+/EAM/bin/Release
+/Kanban/bin/Release
+/Model/obj/Release
+/PlanM/bin/Release
+/ProM/bin/Release
+/SCM/bin/Release
+/SelM/bin/Release
+/SQLHelper/obj/Release
+/WorkM/bin/Release
+/WarM/bin/Release
+/OAM/bin/Release
+/LMES/bin/Release
+/PayM/bin/Release
+/SQLHelper/obj/x86/Release
+/Model/obj/x86/Release
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Xt_File.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Xt_File.cs"
index 2363644..7f18c08 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Xt_File.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Xt_File.cs"
@@ -128,8 +128,8 @@
Process p = new Process();
p.StartInfo.FileName = sHPath;
p.Start();
- p.WaitForExit();
- File.Delete(sHPath);
+ //p.WaitForExit();
+ //File.Delete(sHPath);
}
private Int32 Fun_GetCol(string sCol)
{
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSup.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSup.cs"
index 37a7e56..6516ad6 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSup.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSup.cs"
@@ -553,7 +553,7 @@
oSub.HPrice = ClsPub.isDoule(grdMain.Rows[i].Cells[HPriceCol].Value);
oSub.HBeginDate = ClsPub.isDate(grdMain.Rows[i].Cells[HBeginDateCol].Value);
oSub.HEndDate = ClsPub.isDate(grdMain.Rows[i].Cells[HEndDateCol].Value);
- oSub.HUsed = true;
+ oSub.HUsed = 1;
oSub.HMaker = ClsPub.CurUserName;
oSub.HMakeDate = DBUtility.ClsPub.isDate(ClsPub.GetServerDate(-1));
BillNew.DetailColl.Add(oSub);
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 3ef8b22..18fd31d 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -83,7 +83,12 @@
<Compile Include="浜轰簨绠＄悊\ClsHR_EmpFosterBill.cs" />
<Compile Include="浜轰簨绠＄悊\ClsHR_EmpUpChangeBill.cs" />
<Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\ClsGy_BarCodeBill_ChaiMa.cs" />
+ <Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\ClsKF_BarCodeStatusChangeBill.cs" />
<Compile Include="鍩虹璧勬枡\InterFace鍩虹璧勬枡\ClsIF_ORGANIZATIONS_View.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CustLocation_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Operator_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RateType_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Staff_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_TaxRate_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RecCondition_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_FactoryDayOff_Ctl.cs" />
@@ -92,6 +97,7 @@
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_PaymentCondition_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_SupplierContact_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_StockStatus_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Work_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MateMould_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProject_View.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_StdWorkTimes_Ctl.cs" />
@@ -594,6 +600,8 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldProdOutInBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairInBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairOutBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsChangeBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_FirstPieceCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_LastPieceCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdCheckBill.cs" />
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsKF_BarCodeStatusChangeBill.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsKF_BarCodeStatusChangeBill.cs"
new file mode 100644
index 0000000..e4e6663
--- /dev/null
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsKF_BarCodeStatusChangeBill.cs"
@@ -0,0 +1,224 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace DAL
+{
+ public class ClsKF_BarCodeStatusChangeBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsKF_BarCodeStatusChangeBillMain omodel = new Model.ClsKF_BarCodeStatusChangeBillMain();
+ public List<Model.ClsKF_BarCodeStatusChangeBillSub> DetailColl = new List<Model.ClsKF_BarCodeStatusChangeBillSub>();
+
+ public ClsKF_BarCodeStatusChangeBill()
+ {
+ base.MvarItemKeySub = "KF_BarCodeStatusChangeBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "KF_BarCodeStatusChangeBillMain";
+ base.MvarReportTitle = "鏉＄爜鐘舵�佸彉鏇村崟";
+ base.BillType = "1288";
+ base.HBillSubType = "1288";
+ }
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate KF_BarCodeStatusChangeBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HBillStatus=" + omodel.HBillStatus.ToString() +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsKF_BarCodeStatusChangeBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into KF_BarCodeStatusChangeBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HBillNo_bak" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HBarCode,HBarCodeStatus_Old,HBarCodeStatus_New,HAuxPropID_Old,HAuxPropID_New,HMTONo_Old,HMTONo_New" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + omodel.HBillNo + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ",'" + oSub.HBarCode + "','" + oSub.HBarCodeStatus_Old + "','" + oSub.HBarCodeStatus_New + "'," + oSub.HAuxPropID_Old.ToString() + "," + oSub.HAuxPropID_New.ToString() + ",'" + oSub.HMTONo_Old +
+ "','" + oSub.HMTONo_New + "'" + ") ");
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
+ {
+ omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ }
+ if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ //
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into KF_BarCodeStatusChangeBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HEmpID,HDeptID" +
+ ",HBillStatus,HBackRemark,HMaker,HMakeDate,HMainSourceBillType" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HPrintQty" +
+ ") " +
+ " 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.HEmpID.ToString() + "," + omodel.HDeptID.ToString() + "," + 1 + ",'" + omodel.HBackRemark +
+ "','" + omodel.HMaker + "','" + omodel.HMakeDate + "','" + omodel.HMainSourceBillType + "'," + omodel.HMainSourceInterID +
+ "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "'," + omodel.HPrintQty + ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsKF_BarCodeStatusChangeBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into KF_BarCodeStatusChangeBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HBillNo_bak" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HHBarCode,HBarCodeStatus_Old,HBarCodeStatus_New,HAuxPropID_Old,HAuxPropID_New,HMTONo_Old,HMTONo_New" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + omodel.HBillNo + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ",'" + oSub.HBarCode + "','" + oSub.HBarCodeStatus_Old + "','" + oSub.HBarCodeStatus_New + "'," + oSub.HAuxPropID_Old.ToString() + "," + oSub.HAuxPropID_New.ToString() + ",'" + oSub.HMTONo_Old +
+ "','" + oSub.HMTONo_New + "'" + ") ");
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("Select * from KF_BarCodeStatusChangeBillMain Where HInterID=" + lngBillKey.ToString(), "KF_BarCodeStatusChangeBillMain");
+ 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 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillNo"]);
+ omodel.HBillStatus = 1;
+ 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 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ omodel.HBackDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackDate"]);
+ omodel.HBacker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBacker"]);
+ omodel.HCheckDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckDate"]);
+ omodel.HChecker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HChecker"]);
+ omodel.HMaker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaker"]);
+ omodel.HMakeDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMakeDate"]);
+ omodel.HUpDateDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUpDateDate"]);
+ omodel.HUpDater = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUpDater"]);
+ omodel.HCloseDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCloseDate"]);
+ omodel.HCloseMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCloseMan"]);
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeleteDate"]);
+ omodel.HDeleteMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeleteMan"]);
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+ 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.HPrintQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPrintQty"]);
+ //========================================================
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from KF_BarCodeStatusChangeBillSub Where HInterID=" + lngBillKey.ToString(), "KF_BarCodeStatusChangeBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsKF_BarCodeStatusChangeBillSub oSub = new Model.ClsKF_BarCodeStatusChangeBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ 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 = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceBillType"]);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceBillNo"]);
+ 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 = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRemark"]);
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBillNo_bak"]);
+ //===================================================
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBarCode"]);
+ oSub.HBarCodeStatus_Old = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBarCodeStatus_Old"]);
+ oSub.HBarCodeStatus_New = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBarCodeStatus_New"]);
+ oSub.HAuxPropID_Old = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HAuxPropID_Old"]);
+ oSub.HAuxPropID_New = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HAuxPropID_New"]);
+ oSub.HMTONo_Old = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMTONo_Old"]);
+ oSub.HMTONo_New = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMTONo_New"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ }
+}
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CustLocation_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CustLocation_Ctl.cs"
new file mode 100644
index 0000000..148470c
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CustLocation_Ctl.cs"
@@ -0,0 +1,103 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_CustLocation_Ctl : DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_CustLocation_Model oModel = new Model.ClsGy_CustLocation_Model();
+ //鏂板
+ public override bool AddNew()
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc($@"insert into Gy_CustLocation(HNumber,HName,HShortNumber,HParentID ,HLevel
+ ,HEndFlag ,HStopflag ,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values('{oModel.HNumber}','{oModel.HName}','{oModel.HShortNumber}',{oModel.HParentID},{oModel.HLevel}
+ ,{(oModel.HEndFlag == true ? 1 : 0)},{(oModel.HStopflag == true ? 1 : 0)},'{oModel.HRemark}','{oModel.HHelpCode}','{oModel.HUseFlag}'
+ ,GETDATE(),'{oModel.HMakeEmp}','','',''
+ ,'','','',{oModel.HUSEORGID},{oModel.HCREATEORGID})"
+ , ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HParentID=" + oModel.HParentID.ToString() +
+ ",HLevel=" + oModel.HLevel.ToString() +
+ ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HModifyEmp ='" + oModel.HMakeEmp + "'" +
+ ",HModifyTime =getdate()" +
+ " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_CustLocation_Ctl()
+ {
+ MvarItemKey = "Gy_CustLocation";
+ MvarReportTitle = "姹囩巼";
+ oModel = new Model.ClsGy_CustLocation_Model();
+ }
+ }
+}
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Operator_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Operator_Ctl.cs"
new file mode 100644
index 0000000..6e2329f
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Operator_Ctl.cs"
@@ -0,0 +1,97 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_Operator_Ctl : DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_Operator_Model oModel = new Model.ClsGy_Operator_Model();
+ //鏂板
+ public override bool AddNew()
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Insert into " + MvarItemKey + " " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID" +
+ ",HOperatorId,HOperatorType,HSEQ,HStaffId,HIsUse) " +
+ " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
+ "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "','" + oModel.HUseFlag + "'," + oModel.HUSEORGID + "," + oModel.HOperatorId +
+ ",'" + oModel.HOperatorType + "'," + oModel.HSEQ + "," + oModel.HStaffId + "," + oModel.HIsUse + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HLevel=" + oModel.HLevel.ToString() +
+ ",HParentID=" + oModel.HParentID.ToString() +
+ ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_Operator_Ctl()
+ {
+ MvarItemKey = "Gy_Operator";
+ MvarReportTitle = "涓氬姟鍛樿缃�";
+ oModel = new Model.ClsGy_Operator_Model();
+ }
+ }
+}
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Property_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Property_Ctl.cs"
index 261e10f..77f8c31 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Property_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Property_Ctl.cs"
@@ -20,9 +20,9 @@
oCn.BeginTran();
oCn.RunProc("Insert into " + MvarItemKey + " " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HPropertyTypeID) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HPropertyTypeID,HUSEORGID,HCREATEORGID) " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
- "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'," + oModel.HPropertyTypeID.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HUSEORGID + "," + oModel.HCREATEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_RateType_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_RateType_Ctl.cs"
new file mode 100644
index 0000000..287a640
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_RateType_Ctl.cs"
@@ -0,0 +1,103 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_RateType_Ctl : DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_RateType_Model oModel = new Model.ClsGy_RateType_Model();
+ //鏂板
+ public override bool AddNew()
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc($@"insert into Gy_RateType(HNumber,HName,HShortNumber ,HParentID ,HLevel
+ ,HEndFlag ,HStopflag ,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values('{oModel.HNumber}','{oModel.HName}','{oModel.HShortNumber}',{oModel.HParentID},{oModel.HLevel}
+ ,{(oModel.HEndFlag == true ? 1 : 0)},{(oModel.HStopflag == true ? 1 : 0)},'{oModel.HRemark}','{oModel.HHelpCode}','{oModel.HUseFlag}'
+ ,GETDATE(),'{oModel.HMakeEmp}','','',''
+ ,'','','',{oModel.HUSEORGID},{oModel.HCREATEORGID})"
+ , ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HParentID=" + oModel.HParentID.ToString() +
+ ",HLevel=" + oModel.HLevel.ToString() +
+ ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HModifyEmp ='" + oModel.HMakeEmp + "'" +
+ ",HModifyTime =getdate()" +
+ " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_RateType_Ctl()
+ {
+ MvarItemKey = "Gy_RateType";
+ MvarReportTitle = "姹囩巼";
+ oModel = new Model.ClsGy_RateType_Model();
+ }
+ }
+}
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Staff_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Staff_Ctl.cs"
new file mode 100644
index 0000000..895d1f7
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Staff_Ctl.cs"
@@ -0,0 +1,99 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_Staff_Ctl : DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_Staff_Model oModel = new Model.ClsGy_Staff_Model();
+ //鏂板
+ public override bool AddNew()
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Insert into " + MvarItemKey + " " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID" +
+ ",HCREATEORGID,HPERSONID,HPOSTID,HFIRSTCARDID,HDEPTID,HSTAFFNUMBER) " +
+ " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
+ "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "','" + oModel.HUseFlag + "'," + oModel.HUSEORGID + "," + oModel.HCREATEORGID +
+ "," + oModel.HPERSONID + "," + oModel.HPOSTID + "," + oModel.HFIRSTCARDID + "," + oModel.HDEPTID +
+ ",'" + oModel.HSTAFFNUMBER + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HLevel=" + oModel.HLevel.ToString() +
+ ",HParentID=" + oModel.HParentID.ToString() +
+ ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "'" +
+ ",HDEPTID=" + oModel.HDEPTID + " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_Staff_Ctl()
+ {
+ MvarItemKey = "Gy_Staff";
+ MvarReportTitle = "鍛樺伐璁剧疆";
+ oModel = new Model.ClsGy_Staff_Model();
+ }
+ }
+}
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Work_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Work_Ctl.cs"
new file mode 100644
index 0000000..9bab672
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Work_Ctl.cs"
@@ -0,0 +1,98 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_Work_Ctl : DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_Work_Model oModel = new Model.ClsGy_Work_Model();
+ //鏂板
+ public override bool AddNew()
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Insert into " + MvarItemKey + " " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID" +
+ ",HCREATEORGID,HWORKCENTERID) " +
+ " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
+ "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "','" + oModel.HUseFlag + "'," + oModel.HUSEORGID + "," + oModel.HCREATEORGID +
+ "," + oModel.HWORKCENTERID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HLevel=" + oModel.HLevel.ToString() +
+ ",HParentID=" + oModel.HParentID.ToString() +
+ ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "'" +
+ ",HWORKCENTERID=" + oModel.HWORKCENTERID + " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_Work_Ctl()
+ {
+ MvarItemKey = "Gy_Work";
+ MvarReportTitle = "浣滀笟璁剧疆";
+ oModel = new Model.ClsGy_Work_Model();
+ }
+ }
+}
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Ctl.cs"
index 8ac0595..32c854b 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Ctl.cs"
@@ -11,6 +11,7 @@
//鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
public string HOldNumber;
public List<Model.ClsGy_MatePriceSup_Model> DetailColl = new List<Model.ClsGy_MatePriceSup_Model>();
+ public Model.ClsGy_MatePriceSup_Model oModel = new Model.ClsGy_MatePriceSup_Model();
@@ -58,17 +59,26 @@
try
{
oCn.BeginTran();
- //鎻掑叆瀛愯〃
- foreach (Model.ClsGy_MatePriceSup_Model oSub in DetailColl)
- {
- oCn.RunProc("Insert into Gy_MatePriceSup " +
- " (HInterID,HEntryID,HMaterID,HRelationID" +
+ //鎻掑叆琛�
+ //foreach (Model.ClsGy_MatePriceSup_Model oSub in DetailColl)
+ //{
+ // oCn.RunProc("Insert into Gy_MatePriceSup " +
+ // " (HInterID,HEntryID,HMaterID,HRelationID" +
+ // ",HUnitID,HBeginQty,HEndQty,HCurID,HType" +
+ // ",HPrice,HBeginDate,HEndDate,HUsed,HRemark,HMaker,HMakeDate)" +
+ // " values(" + oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HRelationID.ToString() +
+ // "," + oSub.HUnitID.ToString() + "," + oSub.HBeginQty.ToString() + "," + oSub.HEndQty.ToString() + "," + oSub.HCurID.ToString() + ",'" + oSub.HType + "'" +
+ // "," + oSub.HPrice.ToString() + ",'" + "GETDATE()" + "','" + "GETDATE()" + "'," + Convert.ToString(oSub.HUsed ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HMaker + "','" + oSub.HMakeDate + "') ");
+ //}
+ oCn.RunProc("Insert into " + MvarItemKey + " " +
+ " (HInterID,HEntryID,HMaterID,HRelationID" +
",HUnitID,HBeginQty,HEndQty,HCurID,HType" +
- ",HPrice,HBeginDate,HEndDate,HUsed,HRemark,HMaker,HMakeDate)" +
- " values(" + oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HRelationID.ToString() +
- "," + oSub.HUnitID.ToString() + "," + oSub.HBeginQty.ToString() + "," + oSub.HEndQty.ToString() + "," + oSub.HCurID.ToString() + ",'" + oSub.HType + "'" +
- "," + oSub.HPrice.ToString() + ",'" + oSub.HBeginDate + "','" + oSub.HEndDate + "'," + Convert.ToString(oSub.HUsed ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HMaker + "','" + oSub.HMakeDate + "') ");
- }
+ ",HPrice,HBeginDate,HEndDate,HUsed,HRemark,HMaker,HMakeDate) " +
+ " values(" + oModel.HInterID.ToString() + "," + oModel.HEntryID.ToString() + "," + oModel.HMaterID.ToString() + "," + oModel.HRelationID.ToString() +
+ "," + oModel.HUnitID.ToString() + "," + oModel.HBeginQty.ToString() + "," + oModel.HEndQty.ToString() + "," + oModel.HCurID.ToString() + ",'" + oModel.HType + "'" +
+ "," + oModel.HPrice.ToString() + ",'" + oModel.HBeginDate + "','" + oModel.HEndDate + "'," + oModel.HUsed + ",'" + oModel.HRemark + "','" + oModel.HMaker + "','" + oModel.HMakeDate + "') ");
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ //oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
return true;
}
@@ -85,18 +95,25 @@
try
{
oCn.BeginTran();
- DeleteByID(sItemID); //鍒犻櫎璁板綍
- //鎻掑叆琛�
- foreach (Model.ClsGy_MatePriceSup_Model oSub in DetailColl)
- {
- oCn.RunProc("Insert into Gy_MatePriceSup " +
- " (HInterID,HEntryID,HMaterID,HRelationID" +
- ",HUnitID,HBeginQty,HEndQty,HCurID,HType" +
- ",HPrice,HBeginDate,HEndDate,HUsed,HRemark,HMaker,HMakeDate)" +
- " values(" + oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HRelationID.ToString() +
- "," + oSub.HUnitID.ToString() + "," + oSub.HBeginQty.ToString() + "," + oSub.HEndQty.ToString() + "," + oSub.HCurID.ToString() + ",'" + oSub.HType + "'" +
- "," + oSub.HPrice.ToString() + ",'" + oSub.HBeginDate + "','" + oSub.HEndDate + "'," + Convert.ToString(oSub.HUsed ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HMaker + "','" + oSub.HMakeDate + "') ");
- }
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HPrice='" + oModel.HPrice + "'" +
+ ",HRemark='" + oModel.HRemark + "'" +
+ ",HMaterID=" + oModel.HMaterID.ToString() +
+ ",HUnitID=" + oModel.HUnitID.ToString() +
+ ",HCurID=" + oModel.HCurID.ToString() +
+ " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //DeleteByID(sItemID); //鍒犻櫎璁板綍
+ ////鎻掑叆琛�
+ //foreach (Model.ClsGy_MatePriceSup_Model oSub in DetailColl)
+ //{
+ // oCn.RunProc("Insert into Gy_MatePriceSup " +
+ // " (HInterID,HEntryID,HMaterID,HRelationID" +
+ // ",HUnitID,HBeginQty,HEndQty,HCurID,HType" +
+ // ",HPrice,HBeginDate,HEndDate,HUsed,HRemark,HMaker,HMakeDate)" +
+ // " values(" + oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HRelationID.ToString() +
+ // "," + oSub.HUnitID.ToString() + "," + oSub.HBeginQty.ToString() + "," + oSub.HEndQty.ToString() + "," + oSub.HCurID.ToString() + ",'" + oSub.HType + "'" +
+ // "," + oSub.HPrice.ToString() + ",'" + oSub.HBeginDate + "','" + oSub.HEndDate + "'," + Convert.ToString(oSub.HUsed ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HMaker + "','" + oSub.HMakeDate + "') ");
+ //}
oCn.Commit();
return true;
}
@@ -190,6 +207,7 @@
{
MvarItemKey = "Gy_MatePriceSup";
MvarReportTitle = "閲囪喘浠锋牸璧勬枡璁剧疆";
+ oModel = new Model.ClsGy_MatePriceSup_Model();
}
}
}
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBill.cs"
index f81c082..266ffc0 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBill.cs"
@@ -9,6 +9,7 @@
{
public Model.ClsSc_MouldMaintainPlanBillMain omodel = new Model.ClsSc_MouldMaintainPlanBillMain();
public List<Model.ClsSc_MouldMaintainPlanBillSub> DetailColl = new List<Model.ClsSc_MouldMaintainPlanBillSub>();
+ public List<Model.ClsSc_MouldMaintainPlanBillSub_Item> DetailCol = new List<Model.ClsSc_MouldMaintainPlanBillSub_Item>();
public ClsSc_MouldMaintainPlanBill()
{
@@ -56,7 +57,7 @@
//",HGroupID=" + omodel.HGroupID.ToString() +
//",HWHID=" + omodel.HWHID.ToString() +
//",HSCWHID=" + omodel.HSCWHID.ToString() +
-
+ ",HEquipDotCheckRuleInterID='" + omodel.HEquipDotCheckRuleInterID + "'" +
",HCycleUnit='" + omodel.HCycleUnit + "'" +
",HCheckCycle=" + omodel.HCheckCycle.ToString() +
",HBeginDate='" + omodel.HBeginDate + "'" +
@@ -69,8 +70,10 @@
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
- //鎻掑叆瀛愯〃
+ oCn.RunProc("delete from Sc_MouldMaintainPlanBillSub_Item where HInterID=" + lngBillKey);
+
omodel.HInterID = lngBillKey;
+ //鎻掑叆瀛愯〃閰嶄欢淇℃伅
foreach (Model.ClsSc_MouldMaintainPlanBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_MouldMaintainPlanBillSub " +
@@ -84,6 +87,24 @@
",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
") ");
+ }
+
+ //鎻掑叆淇濆吇椤瑰瓙琛�
+ foreach (Model.ClsSc_MouldMaintainPlanBillSub_Item Item in DetailCol)
+ {
+ oCn.RunProc("Insert into Sc_MouldMaintainPlanBillSub_Item" +
+ " (HInterID,HEntryID,HMaintainItemID" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaintainItem" +
+ ") 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.HMaintainItem.ToString() +
+ ") ");
}
//
//foreach (Model.ClsSc_MouldMaintainPlanBillSub oSub in DetailColl)
@@ -122,14 +143,14 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
",HCycleUnit,HCheckCycle,HBeginDate,HEndDate"+
- ",HInnerBillNo,HExplanation" +
+ ",HInnerBillNo,HExplanation,HEquipDotCheckRuleInterID" +
") " +
" 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.HCycleUnit + "'," + omodel.HCheckCycle.ToString() + ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "'" +
- ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'" +
+ ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'" + "','" + omodel.HEquipDotCheckRuleInterID + "'" +
") ");
- //鎻掑叆瀛愯〃
+ //鎻掑叆瀛愯〃閰嶄欢淇℃伅
foreach (Model.ClsSc_MouldMaintainPlanBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_MouldMaintainPlanBillSub " +
@@ -144,6 +165,24 @@
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
") ");
}
+
+ //鎻掑叆淇濆吇椤瑰瓙琛�
+ foreach (Model.ClsSc_MouldMaintainPlanBillSub_Item Item in DetailCol)
+ {
+ oCn.RunProc("Insert into Sc_MouldMaintainPlanBillSub_Item" +
+ " (HInterID,HEntryID,HMaintainItemID" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaintainItem" +
+ ") 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.HMaintainItem.ToString() +
+ ") ");
+ }
//
//foreach (Model.ClsSc_MouldMaintainPlanBillSub oSub in DetailColl)
//{
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_EquipSparepartsBill.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_EquipSparepartsBill.cs"
new file mode 100644
index 0000000..4083c5a
--- /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/ClsSb_EquipSparepartsBill.cs"
@@ -0,0 +1,229 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace DAL
+{
+ public class ClsSb_EquipSparepartsBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSb_EquipSparepartsBillMain omodel = new Model.ClsSb_EquipSparepartsBillMain();
+ public List<Model.ClsSb_EquipSparepartsBillSub> DetailColl = new List<Model.ClsSb_EquipSparepartsBillSub>();
+
+ public ClsSb_EquipSparepartsBill()
+ {
+ base.MvarItemKeySub = "Sb_EquipSparepartsBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Sb_EquipSparepartsBillMain";
+ base.MvarReportTitle = "璁惧澶囧搧澶囦欢";
+ base.BillType = "3980";
+ base.HBillSubType = "3980";
+ }
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sb_EquipSparepartsBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HBillStatus=" + omodel.HBillStatus.ToString() +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HEquipID=" + omodel.HEquipID.ToString() +
+ ",HOrgID=" + omodel.HOrgID.ToString() +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSb_EquipSparepartsBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipSparepartsBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HCloseType,HRemark,HBillNo_bak" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HItemSubID,HMaterID,HQty,HPartAddr,HSNFlag,HBeginDate,HEndDate" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + omodel.HBillNo + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + 0 + "," + oSub.HMaterID + "," + oSub.HQty + ",'" + oSub.HPartAddr + "'," + 0 + ",'" + oSub.HBeginDate +
+ "','" + oSub.HEndDate + "'" + ") ");
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
+ {
+ omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ }
+ if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ //
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Sb_EquipSparepartsBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HEmpID,HDeptID" +
+ ",HBillStatus,HBackRemark,HMaker,HMakeDate,HMainSourceBillType" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HPrintQty" +
+ ",HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HBacker,HChecker,HUpDater,HCloseMan,HCloseType,HDeleteMan,HEquipID,HOrgID" +
+ ") " +
+ " 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.HEmpID.ToString() + "," + omodel.HDeptID.ToString() + "," + 1 + ",'" + omodel.HBackRemark +
+ "','" + omodel.HMaker + "','" + omodel.HMakeDate + "','" + omodel.HMainSourceBillType + "'," + omodel.HMainSourceInterID +
+ "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "'," + omodel.HPrintQty + ",0,0,0" + ",'" + omodel.HBacker +
+ "','" + omodel.HChecker + "','" + omodel.HUpDater + "','" + omodel.HCloseMan + "'," + 0 + ",'" + omodel.HDeleteMan +
+ "'," + omodel.HEquipID + "," + omodel.HOrgID + ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsSb_EquipSparepartsBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipSparepartsBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HCloseType,HRemark,HBillNo_bak" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HItemSubID,HMaterID,HQty,HPartAddr,HSNFlag,HBeginDate,HEndDate" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + omodel.HBillNo + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + 0 + "," + oSub.HMaterID + "," + oSub.HQty + ",'" + oSub.HPartAddr + "'," + 0 + ",'" + oSub.HBeginDate +
+ "','" + oSub.HEndDate + "'" + ") ");
+ }
+ 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 Sb_EquipSparepartsBillMain Where HInterID=" + lngBillKey.ToString(), "Sb_EquipSparepartsBillMain");
+ 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 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillNo"]);
+ omodel.HBillStatus = 1;
+ 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 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ omodel.HBackDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackDate"]);
+ omodel.HBacker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBacker"]);
+ omodel.HCheckDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckDate"]);
+ omodel.HChecker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HChecker"]);
+ omodel.HMaker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaker"]);
+ omodel.HMakeDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMakeDate"]);
+ omodel.HUpDateDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUpDateDate"]);
+ omodel.HUpDater = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUpDater"]);
+ omodel.HCloseDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCloseDate"]);
+ omodel.HCloseMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCloseMan"]);
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeleteDate"]);
+ omodel.HDeleteMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeleteMan"]);
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+ 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.HPrintQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPrintQty"]);
+ //========================================================
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HEquipID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipID"]);
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Sb_EquipSparepartsBillSub Where HInterID=" + lngBillKey.ToString(), "Sb_EquipSparepartsBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSb_EquipSparepartsBillSub oSub = new Model.ClsSb_EquipSparepartsBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ 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 = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceBillType"]);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceBillNo"]);
+ 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 = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRemark"]);
+ 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.HQty = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HQty"]);
+ oSub.HPartAddr = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPartAddr"]);
+ oSub.HSNFlag = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSNFlag"]);
+ oSub.HBeginDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HBeginDate"]);
+ oSub.HEndDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEndDate"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ }
+}
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_EquipSparepartsChangeBill.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_EquipSparepartsChangeBill.cs"
new file mode 100644
index 0000000..5aee2fd
--- /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/ClsSb_EquipSparepartsChangeBill.cs"
@@ -0,0 +1,230 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace DAL
+{
+ public class ClsSb_EquipSparepartsChangeBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSb_EquipSparepartsChangeBillMain omodel = new Model.ClsSb_EquipSparepartsChangeBillMain();
+ public List<Model.ClsSb_EquipSparepartsChangeBillSub> DetailColl = new List<Model.ClsSb_EquipSparepartsChangeBillSub>();
+
+ public ClsSb_EquipSparepartsChangeBill()
+ {
+ base.MvarItemKeySub = "Sb_EquipSparepartsChangeBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Sb_EquipSparepartsChangeBillMain";
+ base.MvarReportTitle = "璁惧澶囧搧澶囦欢鍙樻洿鍗�";
+ base.BillType = "3981";
+ base.HBillSubType = "3981";
+ }
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sb_EquipSparepartsChangeBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HBillStatus=" + omodel.HBillStatus.ToString() +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HEquipID=" + omodel.HEquipID.ToString() +
+ ",HOrgID=" + omodel.HOrgID.ToString() +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSb_EquipSparepartsChangeBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipSparepartsChangeBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HCloseType,HRemark,HBillNo_bak" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HItemSubID,HMaterID_Old,HMaterID_New,HQty,HPartAddr,HSNFlag,HBeginDate,HEndDate" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + omodel.HBillNo + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + 0 + "," + oSub.HMaterID_Old + "," + oSub.HMaterID_New + "," + oSub.HQty + ",'" + oSub.HPartAddr + "'," + 0 + ",'" + oSub.HBeginDate +
+ "','" + oSub.HEndDate + "'" + ") ");
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
+ {
+ omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ }
+ if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ //
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Sb_EquipSparepartsChangeBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HEmpID,HDeptID" +
+ ",HBillStatus,HBackRemark,HMaker,HMakeDate,HMainSourceBillType" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HPrintQty" +
+ ",HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HBacker,HChecker,HUpDater,HCloseMan,HCloseType,HDeleteMan,HEquipID,HOrgID" +
+ ") " +
+ " 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.HEmpID.ToString() + "," + omodel.HDeptID.ToString() + "," + 1 + ",'" + omodel.HBackRemark +
+ "','" + omodel.HMaker + "','" + omodel.HMakeDate + "','" + omodel.HMainSourceBillType + "'," + omodel.HMainSourceInterID +
+ "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "'," + omodel.HPrintQty + ",0,0,0" + ",'" + omodel.HBacker +
+ "','" + omodel.HChecker + "','" + omodel.HUpDater + "','" + omodel.HCloseMan + "'," + 0 + ",'" + omodel.HDeleteMan +
+ "'," + omodel.HEquipID + "," + omodel.HOrgID + ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsSb_EquipSparepartsChangeBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipSparepartsChangeBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HCloseType,HRemark,HBillNo_bak" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HItemSubID,HMaterID_Old,HMaterID_New,HQty,HPartAddr,HSNFlag,HBeginDate,HEndDate" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + omodel.HBillNo + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + 0 + "," + oSub.HMaterID_Old + "," + oSub.HMaterID_New + "," + oSub.HQty + ",'" + oSub.HPartAddr + "'," + 0 + ",'" + oSub.HBeginDate +
+ "','" + oSub.HEndDate + "'" + ") ");
+ }
+ 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 Sb_EquipSparepartsChangeBillMain Where HInterID=" + lngBillKey.ToString(), "Sb_EquipSparepartsChangeBillMain");
+ 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 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillNo"]);
+ omodel.HBillStatus = 1;
+ 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 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ omodel.HBackDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackDate"]);
+ omodel.HBacker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBacker"]);
+ omodel.HCheckDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckDate"]);
+ omodel.HChecker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HChecker"]);
+ omodel.HMaker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaker"]);
+ omodel.HMakeDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMakeDate"]);
+ omodel.HUpDateDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUpDateDate"]);
+ omodel.HUpDater = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUpDater"]);
+ omodel.HCloseDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCloseDate"]);
+ omodel.HCloseMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCloseMan"]);
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeleteDate"]);
+ omodel.HDeleteMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeleteMan"]);
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+ 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.HPrintQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPrintQty"]);
+ //========================================================
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HEquipID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipID"]);
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Sb_EquipSparepartsChangeBillSub Where HInterID=" + lngBillKey.ToString(), "Sb_EquipSparepartsChangeBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSb_EquipSparepartsChangeBillSub oSub = new Model.ClsSb_EquipSparepartsChangeBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ 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 = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceBillType"]);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceBillNo"]);
+ 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 = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRemark"]);
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBillNo_bak"]);
+ //===================================================
+ oSub.HMaterID_Old = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID_Old"]);
+ oSub.HMaterID_New = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID_New"]);
+ oSub.HQty = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HQty"]);
+ oSub.HPartAddr = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPartAddr"]);
+ oSub.HSNFlag = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSNFlag"]);
+ oSub.HBeginDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HBeginDate"]);
+ oSub.HEndDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEndDate"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ }
+}
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 0b380f5..175151e 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -219,9 +219,11 @@
<Compile Include="浠撳簱绠＄悊\ClsKf_EntrustInBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_EntrustOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_EntrustOutBillSub.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_EntrustReplenishOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateReplenishOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutBillScheme.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_EntrustReplenishOutBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateReplenishOutBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutRequestBillMain.cs" />
@@ -255,6 +257,9 @@
<Compile Include="浠撳簱绠＄悊\ClsKf_ICStockBillScheme.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_ICStockBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\ClsGy_BarCodeEdit_Model.cs" />
+ <Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\ClsKF_BarCodeStatusChangeBillMain.cs" />
+ <Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\ClsKF_BarCodeStatusChangeBillSub.cs" />
+ <Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\Gy_BarCodeBill_Out.cs" />
<Compile Include="浠撳簱绠＄悊\铏氫粨绠＄悊\ClsKf_VirtualStockInBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\铏氫粨绠＄悊\ClsKf_VirtualStockInBillScheme.cs" />
<Compile Include="浠撳簱绠＄悊\铏氫粨绠＄悊\ClsKf_VirtualStockInBillSub.cs" />
@@ -324,6 +329,12 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Carbook_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CareFor_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CheckToolsType_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CustLocation_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Operator_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RateType_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Staff_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaxMIXMain_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaxMIXSub_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaxRate_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PaymentCondition_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Company_Model.cs" />
@@ -397,6 +408,7 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BarCodeCheckType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Item30JiTai_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_User_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Work_Model.cs" />
<Compile Include="宸ヤ綅鐪嬫澘\ClsGy_SOPBillMain.cs" />
<Compile Include="宸ヤ綅鐪嬫澘\ClsGy_SOPBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsHR_EmpDimissionBillMain.cs" />
@@ -522,6 +534,7 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub_Item.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainRuleBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainRuleBillSub.cs" />
@@ -575,6 +588,10 @@
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSendWorkBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSendWorkBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairWorkBillSub_Mater.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsChangeBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsChangeBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSc_EquipMaintainBillSub_Item.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSc_EquipMaintainPlanBillSub_Item.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSc_ICMOBillMain.cs" />
@@ -582,6 +599,7 @@
<Compile Include="绯荤粺鍏敤\ClsOA_EmpMessageBillModSub.cs" />
<Compile Include="绯荤粺鍏敤\ClsOA_FieldToChangeMain.cs" />
<Compile Include="绯荤粺鍏敤\ClsOA_FieldToChangeSub.cs" />
+ <Compile Include="绯荤粺鍏敤\ClsXt_BillType_Model.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_ModuleParameterMain.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_ModuleParameterSub.cs" />
<Compile Include="琛屾斂绠＄悊\ClsOF_DormCheckBookBillMain.cs" />
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_EntrustOutBillMain.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_EntrustOutBillMain.cs"
index 9ef62ad..3bb78d3 100644
--- "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_EntrustOutBillMain.cs"
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_EntrustOutBillMain.cs"
@@ -17,5 +17,7 @@
public string HExplanation;// --摘要
public string HInnerBillNo;// --内部单据号
public bool HRedBlueFlag;// --红蓝单
+ public Int64 HSTOCKORGID; //int --库存组织
+ public Int64 HOWNERID; //int --货主
}
}
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_EntrustReplenishOutBillMain.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_EntrustReplenishOutBillMain.cs"
new file mode 100644
index 0000000..39b139a
--- /dev/null
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_EntrustReplenishOutBillMain.cs"
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsKf_EntrustReplenishOutBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HSupID; //int --供应商
+ public Int64 HWHID; //int --仓库
+ public Int64 HSCWHID; //int --调出仓库
+ public Int64 HEmpID; //int --业务员
+ public Int64 HManagerID; //int --负责人
+ public Int64 HSecManagerID; //int --验收
+ public Int64 HKeeperID; //int --保管员
+ public Int64 HDeptID; //int --部门
+ public string HExplanation; //varchar(200) --摘要
+ public string HInnerBillNo; //varchar(50) --内部单据号
+ public bool HRedBlueFlag; //bit --红蓝单
+ public Int64 HSTOCKORGID; //int --库存组织
+ public Int64 HOWNERID; //int --货主
+ }
+}
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_EntrustReplenishOutBillSub.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_EntrustReplenishOutBillSub.cs"
new file mode 100644
index 0000000..327ff7c
--- /dev/null
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_EntrustReplenishOutBillSub.cs"
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsKf_EntrustReplenishOutBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
+ public string HRemark; // varchar(200)--备注
+ public Int64 HMaterID; // int --物料ID
+ public Int64 HUnitID; // int --计量单位
+ public Int64 HPropertyID; // int --辅助属性
+ public Int64 HSecUnitID; // int --辅助计量单位
+ public Single HSecUnitRate; // money --换算率
+ public double HQtyMust; // dec(18,8) --应收数量
+ public double HQty; // dec(18,8) --实收数量
+ public double HWasterQty; // dec(18,8) --报废数量
+ public double HPrice; // dec(18,8) --单价
+ public double HMoney; // dec(18,8) --金额
+ public Int64 HWHID; // int --收料仓库
+ public Int64 HSCWHID; // int --调出仓库ID
+ public Int64 HSPID; // int --仓位ID
+ public Int64 HSCSPID; // int --调出仓位ID
+ public Int64 HSPGroupID; // int --仓位组ID(仓库选择完自动带出)
+ public string HBatchNo; // varchar(50) --批次
+ public Int64 HDeptSubID; // int --车间
+ public Int64 HPOOrderInterID; // int --采购订单主内码
+ public Int64 HPOOrderEntryID; // int --采购订单子内码
+ public string HPOOrderBillNo; // varchar(50) --采购订单号
+ public Int64 HSeOrderInterID; // int --销售订单主内码
+ public Int64 HSeOrderEntryID; // int --销售订单子内码
+ public string HSeOrderBillNo; // varchar(50) --销售订单号
+
+ }
+}
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockRequestBillMain.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockRequestBillMain.cs"
index d48ace6..1f8a818 100644
--- "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockRequestBillMain.cs"
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockRequestBillMain.cs"
@@ -20,5 +20,15 @@
public Int64 HDeptID; // int --部门
public string HExplanation; // varchar(200) --摘要
public string HInnerBillNo; // varchar(50) --内部单据号
+
+ public Int64 HERPInterID;
+ public string HERPBillType;
+ public Int64 HSTOCKINORGID;
+ public Int64 HSTOCKOUTORGID;
+ public string HStockStyle;
+ public string HOWNERTYPEHEADID;
+ public string HTRANSTYPE;
+ public string HOWNERTYPEINID;
+ public string HBUSINESSTYPE;
}
}
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockRequestBillSub.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockRequestBillSub.cs"
index 8d836e6..5195f2b 100644
--- "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockRequestBillSub.cs"
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockRequestBillSub.cs"
@@ -33,5 +33,25 @@
public Int64 HICMOInterID; // int --生产订单ID
public Int64 HICMOEntryID; // int --生产订单子内码
public string HICMOBillNo; // varchar(100)--生产订单号
+
+ public string HMTONo;
+ public Int64 HPlanMode;
+ public Int64 HERPInterID;
+ public Int64 HERPEntryID;
+ public Int64 HAuxPropID;
+ public string HBatchNO;
+ public Int64 HSPID;
+ public Int64 HSCSPID;
+ public Int64 HSTOCKORGID;
+ public Int64 HOWNERID;
+ public string HOWNERTYPEID;
+ public Int64 HSTOCKORGINID;
+ public Int64 HOWNERINID;
+ public string HOWNERTYPEINID;
+ public string HPRODUCEDATE;
+ public string HExpiryDate;
+ public Int64 HBASEUNITID;
+ public Int64 HEXTAUXUNITID;
+ public double HSECQTY;
}
}
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_StockOutRequestBillMain.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_StockOutRequestBillMain.cs"
index 53828ab..196e63e 100644
--- "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_StockOutRequestBillMain.cs"
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_StockOutRequestBillMain.cs"
@@ -19,5 +19,12 @@
public Int64 HDeptID; // int --部门
public string HExplanation; // varchar(200) --摘要
public string HInnerBillNo; // varchar(50) --内部单据号
+
+ public Int64 HERPInterID;//--ERP主内码
+ public string HERPBillType;//--ERP单据类型
+ public Int64 HSTOCKORGID;//--申请组织
+ public string HAPPLYTYPE;
+ public Int64 HOWNERTYPEIDHEAD;//--货主类型
+ public string HBIZTYPE;//--业务类型
}
}
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_StockOutRequestBillSub.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_StockOutRequestBillSub.cs"
index 5effe7b..99e9051 100644
--- "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_StockOutRequestBillSub.cs"
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_StockOutRequestBillSub.cs"
@@ -30,5 +30,28 @@
public Int64 HICMOInterID; // int --生产订单ID
public Int64 HICMOEntryID; // int --生产订单子内码
public string HICMOBillNo; // varchar(100)--生产订单号
+
+ public string HMTONo;
+ public Int64 HPlanMode;
+ public Int64 HERPInterID;
+ public Int64 HERPEntryID;
+ public Int64 HAuxPropID;
+ public string HBatchNO;
+ public Int64 HSPID;
+ public Int64 HSCSPID;
+ public Int64 HSTOCKORGID;
+ public Int64 HOWNERID;
+ public string HOWNERTYPEID;
+ public Int64 HSTOCKORGINID;
+ public Int64 HOWNERINID;
+ public string HOWNERTYPEINID;
+ public string HPRODUCEDATE;
+ public string HEXPIRYDATE;
+ public Int64 HBASEUNITID;
+ public Int64 HEXTAUXUNITID;
+ public double HSECQTY;
+ public Int64 HSEQ;
+ public Int64 HSTOCKSTATUSID;
+ public Int64 HBOMID;
}
}
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsKF_BarCodeStatusChangeBillMain.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsKF_BarCodeStatusChangeBillMain.cs"
new file mode 100644
index 0000000..ac8990a
--- /dev/null
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsKF_BarCodeStatusChangeBillMain.cs"
@@ -0,0 +1,13 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+namespace Model
+{
+ public class ClsKF_BarCodeStatusChangeBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+
+ public Int64 HPrintQty; //鎵撳嵃娆℃暟
+ public Int64 HEmpID; //鍙樻洿浜�(Gy_Employee)
+ public Int64 HDeptID; //璐熻矗閮ㄩ棬锛圙y_Department锛�
+ }
+}
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsKF_BarCodeStatusChangeBillSub.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsKF_BarCodeStatusChangeBillSub.cs"
new file mode 100644
index 0000000..ada7156
--- /dev/null
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/ClsKF_BarCodeStatusChangeBillSub.cs"
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsKF_BarCodeStatusChangeBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public string HBillNo_bak; //鍗曟嵁鍙凤紙澶囦唤锛屼互鍏嶅唴鐮佷涪澶憋紝鎵句笉鍒板搴斾富琛級
+ public string HBarCode; //鏉″舰鐮�
+ public string HBarCodeStatus_Old; //鍘熺姸鎬侊紙姝ｅ父锛屽湪搴擄紝鍑哄簱锛屼綔搴燂紝闅旂锛屼笉鑹紝鎶ュ簾锛�
+ public string HBarCodeStatus_New; //鏂扮姸鎬侊紙姝ｅ父锛屽湪搴擄紝鍑哄簱锛屼綔搴燂紝闅旂锛屼笉鑹紝鎶ュ簾锛�
+ public Int64 HAuxPropID_Old; //鍘熻緟鍔╁睘鎬�
+ public Int64 HAuxPropID_New; //鏂拌緟鍔╁睘鎬�
+ public string HMTONo_Old; //鍘烳TO鍙�
+ public string HMTONo_New; //鏂癕TO鍙�
+ public Int64 HItemSubID;
+ }
+}
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/Gy_BarCodeBill_Out.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/Gy_BarCodeBill_Out.cs"
new file mode 100644
index 0000000..3bce82f
--- /dev/null
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/\346\235\241\347\240\201\347\256\241\347\220\206/Gy_BarCodeBill_Out.cs"
@@ -0,0 +1,127 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class Gy_BarCodeBill_Out : DBUtility.ClsGy_Base_Model
+ {
+ public Int64 HItemID;//锛堟爣璇嗗垪锛� //鏍囪瘑鍒�
+ public Int64 HInterID; //涓诲唴鐮�
+ public Int64 HEntryID; //瀛愬唴鐮�
+ public string HBillType; //绫诲瀷
+ public Int64 HProcID; //宸ュ簭
+ public string HBarCode;//锛堣仛闆嗙储寮曪級 //鏉″舰鐮�
+ public string HBarCodeType; //鏉＄爜绫诲瀷锛堢墿鏂欐潯鐮侊紝绠卞彿鏉＄爜锛屾墭鍙锋潯鐮侊級
+ public Int64 HItemSubID; //瀵瑰簲鏍哥畻椤圭洰
+ public Int64 HMaterID; //瀵瑰簲鐗╂枡鍐呯爜
+ public Int64 HUnitID; //璁￠噺鍗曚綅
+ public Int64 HPieceQty; //浠舵暟
+ public decimal HQty; //鏁伴噺
+ public string HBatchNo; //鎵规鍙�
+ public Int64 HSupID; //寰�鏉ュ崟浣�
+ public Int64 HGroupID; //鐢熶骇鐝粍锛圙y_Group锛�
+ public Int64 HDeptID; //閮ㄩ棬
+ public Int64 HEmpID; //涓氬姟鍛�
+ public string HMaker; //鍒朵綔浜�
+ public string HMakeDate; // 鍒朵綔鏃ユ湡
+ public Int64 HPrintQty; //鎵撳嵃娆℃暟
+ public Int64 HSourceInterID; //婧愬崟ID
+ public Int64 HSourceEntryID; //婧愬崟瀛怚D 锛堝鏋滄湁DETAILID 鍒欏～DETAILID锛�
+ public string HSourceBillNo; //婧愬崟鍗曞彿
+ public string HSourceBillType; //婧愬崟绫诲瀷
+ public string HRemark; //澶囨敞
+ public string HUseFlag; //浣跨敤鐘舵��
+ public string HEndQty; //灏剧鏁伴噺
+ public string HWei; //灏剧鏍囪
+ public Int64 HStopflag; //鏄惁浣滃簾
+ public string HBarCodeStatus; //鏉＄爜鐘舵��
+ public decimal HReadyQty; //
+ public decimal HInitQty; //鍒濆鍖栨暟閲�
+ public Int64 HBarcodeQtys; //鎬绘墭鏁�
+ public Int64 HBarcodeNo; //褰撳墠鎵樺彿
+ public Int64 HInstructID; //
+ public string HInstructNo; //
+ public Int64 HSeOrderBillID; //閿�鍞鍗曞唴鐮�
+ public string HSeOrderBillNo; //瀹㈡埛璁㈠崟鍙�
+ public Int64 HWhID; //榛樿浠撳簱
+ public Int64 HSPID; //榛樿浠撲綅
+ public Int64 HAuxPropID; //鐗╂枡杈呭姪灞炴��
+ public string HMaterName; //浜у搧瑙勬牸鍚嶇О
+ public string HMaterModel; //浜у搧瑙勬牸鍨嬪彿
+ public string HPinfan; //鍝佺暘
+ public string HMTONo; //MTO鍙�
+ public Int64 HSupflag; //渚涘簲鍟嗘爣绛炬爣璁�
+ public DateTime HBeginDate; //寮�濮嬫棩鏈�
+ public DateTime HEndDate; //缁撴潫鏃ユ湡
+ public Int64 HExpirationDateFlag; //淇濊川鏈熸爣璁�
+ public Int64 HSourceID; //鐢熶骇璧勬簮
+ public string HCusType; //
+ public string HWorkLineName; //鐢熶骇绾�
+ public Int64 HCusID; //瀹㈡埛鍐呯爜
+ public Int64 HSTOCKORGID; //搴撳瓨缁勭粐
+ public Int64 HOWNERID; //璐т富
+ public string HJiaYe; //鍔犳恫浠ｇ爜
+ public string HPressModel; //鍨嬪彿锛堥煩鐢碉級
+ public string HCusModel; //瀹㈡埛鍨嬪彿
+ public string HMaterialModel; //浜у搧瑙勬牸
+ public string HColor; //棰滆壊
+ public string HLogo; //鍝佺墝
+ public string HPackageSize; //鍖呰灏哄
+ public decimal HMaterialJQty; //鍑�閲�
+ public decimal HMaterialMQty; //姣涢噸
+ public string HCustomBatchNo; //瀹㈡埛鎵规鍙�
+ public DateTime HBarCodeDate; //鏉＄爜鏍囩鏃ユ湡
+ public string HGBBarCode; //鍥芥爣鐮�
+ public Int64 HOldBarCodeFlag; //鏃ф潯鐮佹爣璁�
+ public Int64 HOldSourceInterID; //鑰佹簮鍗曞唴鐮�
+ public Int64 HOldSourceEntryID; //鑰佹簮鍗曞瓙鍐呯爜
+ public string HOldSourceBillNo; //鑰佹簮鍗曞崟鍙�
+ public Int64 HOrderInterID; //璁㈠崟鍐呯爜
+ public Int64 HOrderEntryID; //璁㈠崟瀛愬唴鐮侊紙濡傛灉鏈塂ETAILID 鍒欏～DETAILID锛�
+ public string HOrderBillNo; //璁㈠崟鍗曞彿
+ public string HOrderBillType; //璁㈠崟鍗曟嵁绫诲瀷
+ public string HRelationNum;//瀵瑰簲缂栧彿
+ public decimal HLabelQty; //鎵撳嵃鏍囩鏁伴噺
+ public decimal HMinQty; //鏈�灏忓寘瑁呮暟閲�
+ public decimal HNowQty; //褰撳墠鏁伴噺
+ public string HStopMan; //绂佺敤浜�
+ public string HStopManDate; //绂佺敤鏃ユ湡
+ public DateTime HInStockDate;
+ public DateTime HOutStockDate;
+ public string HInStockDate_XF;
+ public string HExpressNumber;
+ public string POOrderBillNo;
+ public string HICMOReportBillNo;
+ public DateTime HICMOReportDate;
+ public Int64 HInStockCounts;
+ public Int64 HReportCounts;
+ public Int64 HOutStockCounts;
+ public string HInStockBillNo;
+ public string HOutStockBillNo;
+ public string HSendGoodsBillNo;
+ public string HKFDate;
+ public Int64 HKFPeriod;
+ public string HKFDQDate;
+ public Int64 HServerItemID;
+ public string HBadReasonList;
+ public string HProdLev;
+ public Int64 HSeOrderInterID;
+ public Int64 HSeOrderEntryID;
+ public string HInnerBillNo;
+ public string HCusBarCode;
+ public string HStatus;
+ public Int64 HInitSourceEntryID;
+ public string HOldSourceBillType;
+ public decimal HMZ;
+ public Int64 HGiveAwayFlag; //璧犲搧鏍囪
+ public Int64 HSeOrderSEQ;
+ public Int64 HMaterID_OLD;
+ public string HDeleteMan;
+ public DateTime HDeleteDate;
+ public string HBarCode_Pack;
+ public Int64 HCustomQty1;
+ public DateTime HProduceDate; //鐢熶骇鏃ユ湡锛堜繚璐ㄦ湡鐢級
+ public DateTime HExpiryDate; //淇濊川鏈熻嚦锛堜繚璐ㄦ湡鐢級
+ }
+}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Model.cs"
index 2f59f77..2f53708 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Model.cs"
@@ -16,7 +16,7 @@
public DateTime HMakeDate;// datetime
public string HChecker;// varchar(50) --审核人（列表可批量审核）
public DateTime HCheckDate;// datetime
- public bool HUsed;// bit //使用标记
+ public long HUsed;// bit //使用标记
//--------------------------------------------
public long HMaterID;// int --物料内码
public long HRelationID;// int --关联内码（供应商，客户，供应商大类，客户大类，等等）
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CustLocation_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CustLocation_Model.cs"
new file mode 100644
index 0000000..d841d7a
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CustLocation_Model.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_CustLocation_Model : DBUtility.ClsGy_Base_Model
+ {
+ public DateTime HMakeTime { get; set; }
+ public DateTime HCheckTime { get; set; }
+ public DateTime HModifyTime { get; set; }
+ public DateTime HStopTime { get; set; }
+ public string HMakeEmp { get; set; }
+ public string HCheckEmp { get; set; }
+ public string HModifyEmp { get; set; }
+ public string HStopEmp { get; set; }
+ public int HUSEORGID { get; set; }
+ public int HCREATEORGID { get; set; }
+ public int HENTRYID { get; set; }
+ }
+}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Employee_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Employee_Model.cs"
index 35c4fd6..340f1f3 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Employee_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Employee_Model.cs"
@@ -99,5 +99,7 @@
public string HAddress ; //家庭地址 varchar(300)
public Int64 HProcID; //int 所作工序(关联出生产资源)
public string HBarCode;
+
+ public long HUSEORGID;
}
}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Operator_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Operator_Model.cs"
new file mode 100644
index 0000000..4dad853
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Operator_Model.cs"
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_Operator_Model : DBUtility.ClsGy_Base_Model
+ {
+ public string HHelpCode;//鍔╄鐮�
+ public string HUseFlag; //浣跨敤鐘舵�侊紙鏈娴嬶紝鏈娇鐢紝宸蹭娇鐢級
+ public Int64 HUSEORGID;//涓氬姟缁勭粐
+ public Int64 HOperatorId;//涓氬姟鍛樺唴鐮�
+ public string HOperatorType;//涓氬姟鍛樼被鍨�
+ public Int64 HSEQ;//搴忓彿
+ public Int64 HStaffId;//鑱屽憳
+ public Int64 HIsUse;//鍚敤
+ public Int64 HIsPseDel;//鏄惁浼垹闄�
+ }
+}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Property_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Property_Model.cs"
index 9514bbb..ec04e8d 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Property_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Property_Model.cs"
@@ -9,5 +9,10 @@
//
public Int64 HPropertyTypeID;// int 所属类别
public string HBarCode;
+ public Int64 HERPItemID;
+ public string HMakeTime;
+
+ public Int64 HUSEORGID;//使用组织
+ public Int64 HCREATEORGID;//创建组织
}
}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_RateType_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_RateType_Model.cs"
new file mode 100644
index 0000000..51b9d7e
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_RateType_Model.cs"
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_RateType_Model : DBUtility.ClsGy_Base_Model
+ {
+ public DateTime HMakeTime { get; set; }
+ public DateTime HCheckTime { get; set; }
+ public DateTime HModifyTime { get; set; }
+ public DateTime HStopTime { get; set; }
+ public string HMakeEmp { get; set; }
+ public string HCheckEmp { get; set; }
+ public string HModifyEmp { get; set; }
+ public string HStopEmp { get; set; }
+ public int HUSEORGID { get; set; }
+ public int HCREATEORGID { get; set; }
+ }
+}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Staff_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Staff_Model.cs"
new file mode 100644
index 0000000..38e7217
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Staff_Model.cs"
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_Staff_Model : DBUtility.ClsGy_Base_Model
+ {
+
+ public Int64 HUSEORGID; //浣跨敤缁勭粐锛圶t_ORGANIZATIONS锛�
+ public Int64 HCREATEORGID; //鍒涘缓缁勭粐锛圶t_ORGANIZATIONS锛�
+ public Int64 HPERSONID; //浜哄憳鍐呯爜
+ public Int64 HPOSTID; //宀椾綅鍐呯爜
+ public Int64 HFIRSTCARDID; //涓昏瘉浠跺唴鐮�
+ public Int64 HDEPTID; //閮ㄩ棬鍐呯爜
+ public string HSTAFFNUMBER; //鍛樺伐缂栧彿
+
+ }
+}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaxMIXMain_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaxMIXMain_Model.cs"
new file mode 100644
index 0000000..8cc2a7a
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaxMIXMain_Model.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_TaxMIXMain_Model : DBUtility.ClsGy_Base_Model
+ {
+ public DateTime HMakeTime { get; set; }
+ public DateTime HCheckTime { get; set; }
+ public DateTime HModifyTime { get; set; }
+ public DateTime HStopTime { get; set; }
+ public string HMakeEmp { get; set; }
+ public string HCheckEmp { get; set; }
+ public string HModifyEmp { get; set; }
+ public string HStopEmp { get; set; }
+ public int HUSEORGID { get; set; }
+ public int HCREATEORGID { get; set; }
+ }
+}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaxMIXSub_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaxMIXSub_Model.cs"
new file mode 100644
index 0000000..f6454ab
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaxMIXSub_Model.cs"
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_TaxMIXSub_Model : DBUtility.ClsGy_Base_Model
+ {
+ public Int64 HItemID; //涓婚敭 int
+ public string HTAXBENCHMARK;
+ public Int64 FTAXRATEID;
+ public double FTAXBENCHMARKCORRVALUE;
+ public Int64 HTAXMIXID;
+ }
+}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Unit_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Unit_Model.cs"
index ca71b4e..7772327 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Unit_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Unit_Model.cs"
@@ -11,5 +11,6 @@
public bool HStandard;// '默认
public string HBarCode;
public int HUSEORGID;
+ public int HCREATEORGID;
}
}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Work_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Work_Model.cs"
new file mode 100644
index 0000000..9d6f07e
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Work_Model.cs"
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_Work_Model : DBUtility.ClsGy_Base_Model
+ {
+
+ public Int64 HUSEORGID; //浣跨敤缁勭粐锛圶t_ORGANIZATIONS锛�
+ public Int64 HCREATEORGID;//鍒涘缓缁勭粐锛圶t_ORGANIZATIONS锛�
+ public Int64 HWORKCENTERID;//宸ヤ綔涓績
+
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
index ec51d91..31eaf60 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
@@ -20,5 +20,17 @@
public DateTime? HEndDate;
public Int64 HBomID;
public Int64 HCusID;
+
+ public string HINSTOCKTYPE; //入库类型,
+ public Int64 HCHECKPRODUCT; //产品检验,
+ public string HQAIP; //紧急放行,
+ public Int64 HISBACKFLUSH; //倒冲领料,
+ public string HREQSRC; //需求来源,
+ public double HSTOCKINQUASELAUXQTY; //合格品入库选单数量,
+ public Int64 HSeOrderEntrySEQ; //销售订单行号,
+ public string HPROJECTNO; //项目编号,
+ public Int64 HPRODUCTTYPE; //产品类型,
+ public Int64 HCOSTRATE; // 权重,
+ public Int64 HBASEUNITID; //基本计量单位,
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_PPBomBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_PPBomBillSub.cs"
index 34ee220..5a06100 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_PPBomBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_PPBomBillSub.cs"
@@ -18,7 +18,7 @@
public string HRemark; //澶囨敞
- public Int64 HQtyMust; //搴斿彂鏁伴噺
+ public decimal HQtyMust; //搴斿彂鏁伴噺
public double HNumerator; //鍒嗗瓙
public double HDenominator; //鍒嗘瘝
public double HQtyScrap; //鎹熻�楃巼
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBillMain.cs"
index 47ac138..f26ed86 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBillMain.cs"
@@ -14,5 +14,6 @@
public string HEndDate;// datetime --计划结束日期
public string HExplanation;// varchar(500) --摘要
public string HInnerBillNo;// varchar(50) --内部单据号
+ public int HEquipDotCheckRuleInterID; //器具保养规程id
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBillSub_Item.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBillSub_Item.cs"
new file mode 100644
index 0000000..22e8182
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBillSub_Item.cs"
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_MouldMaintainPlanBillSub_Item : DBUtility.ClsXt_BaseBillSub
+ {
+ //============
+
+ public Int64 HMaintainItemID;// int --保养项目ID
+ public string HMaintainItem;// varchar(100) --保养项目
+ public string HMaintainPart;// varchar(100) --保养部位
+ public string HClaim;// varchar(100) --具体要求
+ public Int64 HManagerID;// int --负责人id(职员表)
+ }
+}
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/ClsSb_EquipSparepartsBillMain.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/ClsSb_EquipSparepartsBillMain.cs"
new file mode 100644
index 0000000..e2a4bed
--- /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/ClsSb_EquipSparepartsBillMain.cs"
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSb_EquipSparepartsBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HPrintQty; //鎵撳嵃娆℃暟
+ public Int64 HEquipID; //璁惧涓绘。(Gy_EquipFileBillMain)
+ public Int64 HOrgID; //浣跨敤缁勭粐(Xt_ORGANIZATIONS)
+ public Int64 HDeptID; //浣跨敤閮ㄩ棬(Gy_Deparment)
+ public Int64 HEmpID; //璐熻矗浜猴紙Gy_Employee锛�
+ }
+}
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/ClsSb_EquipSparepartsBillSub.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/ClsSb_EquipSparepartsBillSub.cs"
new file mode 100644
index 0000000..c90f96e
--- /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/ClsSb_EquipSparepartsBillSub.cs"
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSb_EquipSparepartsBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public string HBillNo_bak; //鍗曟嵁鍙凤紙澶囦唤锛屼互鍏嶅唴鐮佷涪澶憋紝鎵句笉鍒板搴斾富琛級
+ public Int64 HItemSubID; //鑷鍒�(GUID)
+ public Int64 HMaterID; //鍣ㄥ叿(Gy_MouldFileMain)
+ public decimal HQty; //鏁伴噺
+ public string HPartAddr; //閮ㄤ綅
+ public Int64 HSNFlag; //SN鐮佺鎺�
+ public DateTime HBeginDate; //寮�濮嬫椂闂�
+ public DateTime HEndDate; //鏈夋晥鏈熻嚦
+ }
+}
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/ClsSb_EquipSparepartsChangeBillMain.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/ClsSb_EquipSparepartsChangeBillMain.cs"
new file mode 100644
index 0000000..f2e9f65
--- /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/ClsSb_EquipSparepartsChangeBillMain.cs"
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSb_EquipSparepartsChangeBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HPrintQty; //鎵撳嵃娆℃暟
+ public Int64 HEquipID; //璁惧涓绘。(Gy_EquipFileBillMain)
+ public Int64 HOrgID; //浣跨敤缁勭粐(Xt_ORGANIZATIONS)
+ public Int64 HDeptID; //浣跨敤閮ㄩ棬(Gy_Deparment)
+ public Int64 HEmpID; //璐熻矗浜猴紙Gy_Employee锛�
+ }
+}
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/ClsSb_EquipSparepartsChangeBillSub.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/ClsSb_EquipSparepartsChangeBillSub.cs"
new file mode 100644
index 0000000..9097280
--- /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/ClsSb_EquipSparepartsChangeBillSub.cs"
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSb_EquipSparepartsChangeBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public string HBillNo_bak; //鍗曟嵁鍙凤紙澶囦唤锛屼互鍏嶅唴鐮佷涪澶憋紝鎵句笉鍒板搴斾富琛級
+ public Int64 HItemSubID; //鑷鍒�(GUID)
+ public Int64 HMaterID_Old; //鍘熷櫒鍏�(Gy_MouldFileMain)
+ public Int64 HMaterID_New; //鏂板櫒鍏�(Gy_MouldFileMain)
+ public decimal HQty; //鏁伴噺
+ public string HPartAddr; //閮ㄤ綅
+ public Int64 HSNFlag; //SN鐮佺鎺�
+ public DateTime HBeginDate; //寮�濮嬫椂闂�
+ public DateTime HEndDate; //鏈夋晥鏈熻嚦
+ }
+}
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_ICMOBillMain.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_ICMOBillMain.cs"
index a0a7293..0b1ba82 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_ICMOBillMain.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_ICMOBillMain.cs"
@@ -36,5 +36,8 @@
public double HRelationQty;
public string HOrderProcNo;//订单跟踪号
+ public Int64 HISENTRUST; //组织受托加工
+ public Int64 HISREWORK; //是否返工
+
}
}
diff --git "a/Model/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_BillType_Model.cs" "b/Model/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_BillType_Model.cs"
new file mode 100644
index 0000000..c5e7656
--- /dev/null
+++ "b/Model/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_BillType_Model.cs"
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Model
+{
+ public class ClsXt_BillType_Model : DBUtility.ClsGy_Base_Model
+ {
+ public string HTemplate; //妯″潡鍚�
+ public string HHeadTable; //鏁版嵁搴撲富琛�
+ public string HEntryTable; //鏁版嵁搴撳瓙琛�
+ public string HViewName;
+ public string HRightName;
+
+ public string HBilltypeID;
+ }
+}
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs"
index f16bd74..065c6e4 100644
--- "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs"
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillSub.cs"
@@ -18,6 +18,9 @@
public double HMoney;// dec(18,8) --原币金额
public double HTaxPrice;// dec(18,8) --含税单价
public double HTaxMoney;// dec(18,8) --含税金额
+ public double HTaxRate;// dec(18,8) --含税金额
+ public double HTaxMoney_TAX;// dec(18,8) --含税金额
+ public double HTaxRate_TAX;// dec(18,8) --含税金额
public Int64 HWHID;// --收料仓库
public Int64 HPOOrderInterID;//
public Int64 HPOOrderEntryID;//
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs"
index 19c3d92..5366e8e 100644
--- "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs"
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs"
@@ -6,17 +6,17 @@
{
public class ClsCg_POOrderBillMain:DBUtility.ClsXt_BaseBillMain
{
- public string HAddress;// varchar(200) --交货地点
- public Int64 HSSID;// int --结算方式 (Gy_SettleStyle)
- public Int64 HPSStyleID;// int --采购方式 (Gy_PoStockStyle) new
- public Int64 HSupID;// 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 string HAddress;// varchar(200) //交货地点
+ public Int64 HSSID;// int //结算方式 (Gy_SettleStyle)
+ public Int64 HPSStyleID;// int //采购方式 (Gy_PoStockStyle) new
+ public Int64 HSupID;// 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; //结算日期
public string HRemark; //备注
@@ -37,5 +37,14 @@
public string HERPBillType;
public Int64 HPURCHASEORGID;
+ public Int64 HPURCHASERGROUPID; //采购组
+ public Int64 HPROVIDERID; //供货方
+ public Int64 HSETTLEID;//结算方
+ public Int64 HCHARGEID;//收款方
+ public string HBUSINESSTYPE; //业务类型
+ public string HPROVIDERADDRESS; //供货方地址
+ public Int64 HCORRESPONDORGID; //对应组织
+ public Int64 HPROVIDERCONTACTID;//供货方联系人
+
}
}
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillSub.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillSub.cs"
index ad0ee62..2be65a6 100644
--- "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillSub.cs"
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillSub.cs"
@@ -6,26 +6,28 @@
{
public class ClsCg_POOrderBillSub: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 Single HTaxRate;// money --税率
+ 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 Single HTaxRate;// money //税率
+ public Single HTaxRate_TAX;// money //税率
+ public Single HTaxMoney_TAX;// money //税率
public double HTaxPrice; //含税单价
- 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 HDiscountRate;// money --折扣率（可编辑） --addnew
- public double HRelTaxPrice;// dec(18,8) --实际含税单价（不可编辑） --addnew
- public double HInStockQty;// dec(18,8) --入库数量（不可编辑） --addnew
- public double HInvoiceQty;// dec(18,8) --开票数量（不可编辑） --addnew
- public string HSeOrderBillNo;// varchar(50) --销售订单号（不可编辑） --addnew
- public Int64 HSeOrderInterID;// int --销售订单主内码(隐藏) --addnew
- public Int64 HSeOrderEntryID;// int --销售订单子内码(隐藏) --addnew
+ 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 HDiscountRate;// money //折扣率（可编辑） //addnew
+ public double HRelTaxPrice;// dec(18,8) //实际含税单价（不可编辑） //addnew
+ public double HInStockQty;// dec(18,8) //入库数量（不可编辑） //addnew
+ public double HInvoiceQty;// dec(18,8) //开票数量（不可编辑） //addnew
+ public string HSeOrderBillNo;// varchar(50) //销售订单号（不可编辑） //addnew
+ public Int64 HSeOrderInterID;// int //销售订单主内码(隐藏) //addnew
+ public Int64 HSeOrderEntryID;// int //销售订单子内码(隐藏) //addnew
public string HSourceInterID;
public string HSourceEntryID;
@@ -45,5 +47,38 @@
public Int64 HERPInterID;
public Int64 HERPEntryID;
+ public Int64 HSEQ;//行号
+ public Int64 HRECEIVEDEPTID;//收料部门
+ public string HSUPPLIERLOT;//供应商批号
+ public Int64 HBOMID;//BOM版本
+ public Int64 HSTOCKUNITID;//库存单位
+ public Int64 HBASEUNITID;//基本单位
+ public string HBFLOWID; //业务流程
+ public Int64 HGIVEAWAY; //是否赠品
+ public string HROWTYPE;//产品类型
+ public double HBASEUNITQTY;//基本单位数量
+ public double HSTOCKBASEQTY; //库存基本数量
+ public string HREQTRACENO;//需求跟踪号
+ public double HTAXNETPRICE; //含税净价
+ public double HPRICECOEFFICIENT;//价格系数
+ public Int64 HTAXCOMBINATION;//税组合
+ public Int64 HPRICEUNITID;//计价单位
+ public Int64 HPRICELISTENTRY;//分录价目表
+ public Int64 HPAYORGID;//付款组织
+ public Int64 HSETTLEMODEID;//结算方式
+ public Int64 HSETTLECURRID;//结算币别
+ public Int64 HEXCHANGETYPEID;//汇率类型
+ public Int64 HPAYCONDITIONID;//付款条件
+ public double HEXCHANGERATE;//汇率
+ public Int64 HLOCALCURRID;//本位币
+ public Int64 HISINCLUDEDTAX;//是否含税
+ public Int64 HISPRICEEXCLUDETAX;//价外税
+ public Int64 HTAXRATEID;//税率名称
+ public double HCOSTPERCENT;//计入成本比例%
+ public double HCOSTAMOUNT;//计入成本金额
+ public Int64 HVAT;//增值税
+ public Int64 HSELLERWITHHOLDING;//卖方代扣代缴
+ public Int64 HBUYERWITHHOLDING;//买方代扣代缴
+ public string HMATERIALDESC; //物料说明
}
}
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs"
index 6e0f860..28018b5 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs"
@@ -11,19 +11,26 @@
public Int64 HManagerID;// int --主管 (Gy_Employee)
public string HAddress;// varchar(200) --交货地点
public Int64 HSSID;// int --结算方式 (Gy_SettleStyle)
- public Int64 HCusID;//
+ public Int64 HCusID;// 客户
public Int64 HCurID;// int --币别 (Gy_Currency)
public Single HExRate;// money --汇率 (选择完币别带出)
- public Int64 HWHID;//
+ public Int64 HWHID;// 仓库
public string HExplanation;// varchar(200) --摘要
public string HInnerBillNo;// varchar(50) --内部单据号
- public Int64 HConveyTypeID;//
- public Int64 HConveyCompID;//
- public double HConveyMoney;//
+ public Int64 HConveyTypeID;// 运输方式
+ public Int64 HConveyCompID;// 运输公司
+ public double HConveyMoney;// 运费
public bool HDFflag; //是否垫付
public string HLinkMan;// varchar(50) //联系人 new
public string HLinkPhone;// varchar(100) //联系电话 new
+ public Int64 HSALEORGID;
+ public Int64 HDELIVERYORGID;
+ public Int64 HOWNERID;
+ public string HOWNERTYPEID;
+ public Int64 HERPInterID;
+ public string HERPBillType;
+
}
}
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillSub.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillSub.cs"
index 11e67b9..378a743 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillSub.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillSub.cs"
@@ -18,5 +18,16 @@
public Int64 HSeOrderEntryID;// int --销售订单子内码
public string HSeOrderBillNo;// varchar(50) --销售订单号
+ public Int64 HSPID;
+ public Int64 HOWNERID;
+ public string HOWNERTYPEID;
+ public Int64 HSETTLEORGID;
+ public double HMoveStockQty;
+ public Int64 HAuxPropID;
+ public string HBatchNO;
+ public string HMTONo;
+ public Int64 HERPInterID;
+ public Int64 HERPEntryID;
+ public string HSeORderBillNo;
}
}
diff --git a/Pub_Class/CustomerCls/ClsSqlHelper.cs b/Pub_Class/CustomerCls/ClsSqlHelper.cs
index 2420e00..1e8b508 100644
--- a/Pub_Class/CustomerCls/ClsSqlHelper.cs
+++ b/Pub_Class/CustomerCls/ClsSqlHelper.cs
@@ -7,23 +7,23 @@
namespace Pub_Class
{
- public class ClsSqlHelper:IDisposable
+ public class ClsSqlHelper : IDisposable
{
private SqlConnection MainCn;//鍒涘缓杩炴帴瀵硅薄
public string strCon;
SqlTransaction MainTran;
public string sServer;
- public string sDataBase ;
+ public string sDataBase;
public string sUser;
public string sPassword;
//public string sTextBox = "HXErp_Test.ini";
public string sTextBox = "HXErp.ini";
//寮�濮嬩簨鍔�
- public void BeginTran()
+ public void BeginTran()
{
if (!this.CnOpen())
return;
- MainTran=MainCn.BeginTransaction();
+ MainTran = MainCn.BeginTransaction();
}
//缁撴潫浜嬪姟
public void Commit()
@@ -45,7 +45,7 @@
ClsPub.AppPath = System.Environment.CurrentDirectory;
//ClsPub.AppPath = @"C:\Windows\System32";
}
- sServer = ClsIni.ReadIni("Erp", "Server", ClsPub.AppPath + @"\"+sTextBox);
+ sServer = ClsIni.ReadIni("Erp", "Server", ClsPub.AppPath + @"\" + sTextBox);
sDataBase = ClsIni.ReadIni("Erp", "DataBase", ClsPub.AppPath + @"\" + sTextBox);
sUser = ClsIni.ReadIni("Erp", "UserName", ClsPub.AppPath + @"\" + sTextBox);
sPassword = ClsIni.ReadIni("Erp", "PassWord", ClsPub.AppPath + @"\" + sTextBox);
@@ -54,13 +54,13 @@
public bool CheckOpen()
{
- if (sServer == "" || sServer == "娌℃湁鎵惧埌锛�" )
+ if (sServer == "" || sServer == "娌℃湁鎵惧埌锛�")
{
throw new Exception("閿欒鐨勬湇鍔″櫒鍚�!!" + System.Environment.CurrentDirectory);
}
if (sDataBase == "" || sDataBase == "娌℃湁鎵惧埌锛�")
{
- throw new Exception("閿欒鐨勬暟鎹簱鍚�!!" +System.Environment.CurrentDirectory);
+ throw new Exception("閿欒鐨勬暟鎹簱鍚�!!" + System.Environment.CurrentDirectory);
}
SqlConnection oCn = new SqlConnection("Data Source=" + sServer + ";DataBase=master;User ID=" + sUser + ";PWD=" + sPassword + ";max pool size=32767");
try
@@ -78,7 +78,7 @@
}
}
- private bool CnOpen()//OPEN鏁版嵁搴撹繛鎺�
+ private bool CnOpen()//OPEN鏁版嵁搴撹繛鎺�
{
if (sServer == "" || sServer == "娌℃湁鎵惧埌锛�")
{
@@ -88,7 +88,7 @@
{
throw new Exception("閿欒鐨勬暟鎹簱鍚�!");
}
- if (MainCn==null)
+ if (MainCn == null)
{
MainCn = new SqlConnection("Data Source=" + sServer + ";DataBase=" + sDataBase + ";User ID=" + sUser + ";PWD=" + sPassword + ";max pool size=32767");
}
@@ -117,10 +117,10 @@
public void CnDispose()//閲婃斁璧勬簮
{
- if(MainCn!=null)
- {
+ if (MainCn != null)
+ {
MainCn.Dispose();
- MainCn=null;
+ MainCn = null;
}
}
/// <summary>
@@ -133,7 +133,7 @@
/// <returns>鏂扮殑 parameter 瀵硅薄</returns>
public SqlParameter MakeInParam(string ParamName, SqlDbType DbType, int Size, object Value)
{
- return MakeParam(ParamName, DbType, Size, ParameterDirection.Input, Value);
+ return MakeParam(ParamName, DbType, Size, ParameterDirection.Input, Value);
}
/// <summary>
/// 鍒濆鍖栧弬鏁板��
@@ -192,13 +192,13 @@
/// <param name="procName"></param>
/// <param name="sErrMessage"></param>
/// <returns></returns>
- public void RunProc(string procName,ref string sErr)
+ public void RunProc(string procName, ref string sErr)
{
if (!this.CnOpen())
{
sErr = "杩炴帴鏁版嵁搴撳け璐ワ紒";
return;
-
+
}
try
{
@@ -211,7 +211,7 @@
}
catch (Exception e)
{
- sErr =e.Message;
+ sErr = e.Message;
ClsPub.sErrInfo = e.Message;
throw (e);
//return;
@@ -226,7 +226,7 @@
/// <param name="tbName">琛ㄥ悕</param>
/// <param name="sErrMessage">寮傚父淇℃伅</param>
/// <returns></returns>
- public DataSet RunProcReturn(string procName, SqlParameter[] prams, string tbName )
+ public DataSet RunProcReturn(string procName, SqlParameter[] prams, string tbName)
{
SqlDataAdapter dap = CreateDataAdaper(procName, prams);
if (dap == null)
@@ -252,7 +252,7 @@
/// <param name="tbName">琛ㄥ悕</param>
/// <param name="sErrMessage">寮傚父淇℃伅</param>
/// <returns></returns>
- public DataSet RunProcReturn(string procName, string tbName )
+ public DataSet RunProcReturn(string procName, string tbName)
{
SqlDataAdapter dap = CreateDataAdaper(procName, null);
DataSet ds = new DataSet();
@@ -276,7 +276,7 @@
/// <param name="tbName">琛ㄥ悕</param>
/// <param name="sErrMessage">寮傚父淇℃伅</param>
/// <returns></returns>
- public DataSet RunProcReturn(string procName, string tbName,ref string sErr)
+ public DataSet RunProcReturn(string procName, string tbName, ref string sErr)
{
SqlDataAdapter dap = CreateDataAdaper(procName, null);
DataSet ds = new DataSet();
@@ -366,7 +366,7 @@
}
- public SqlDataReader RunReader(string sSQL,string tbName,ref string sErr)
+ public SqlDataReader RunReader(string sSQL, string tbName, ref string sErr)
{
if (!this.CnOpen())
{
@@ -384,12 +384,42 @@
catch (Exception e)
{
ClsPub.sErrInfo = e.Message;
- sErr = e.Message;
+ sErr = e.Message;
return null;
}
}
+ /// <summary>
+ /// 鎵归噺鎻掑叆鏁版嵁搴�
+ /// </summary>
+ /// <param name="TableName">鐩爣琛�</param>
+ /// <param name="dt">婧愭暟鎹�</param>
+ public bool SqlBulkCopyByDatatable(string TableName, DataTable dt)
+ {
+ string connectionString = $"Data Source={sServer};DataBase={sDataBase};User ID={sUser};PWD={sPassword}";
+ using (SqlConnection conn = new SqlConnection(connectionString))
+ {
+ using (SqlBulkCopy sqlbulkcopy = new SqlBulkCopy(connectionString, SqlBulkCopyOptions.UseInternalTransaction))
+ {
+ try
+ {
+ sqlbulkcopy.DestinationTableName = TableName;
+ for (int i = 0; i < dt.Columns.Count; i++)
+ {
+ sqlbulkcopy.ColumnMappings.Add(dt.Columns[i].ColumnName, dt.Columns[i].ColumnName);
+ }
+ sqlbulkcopy.WriteToServer(dt);
+ return true;
+ }
+ catch (System.Exception ex)
+ {
+ //ex.Message;
+ return false;
+ }
+ }
+ }
+ }
#region IDisposable 鎴愬憳
public void Dispose()
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index b56d9e9..8197121 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -583,6 +583,19 @@
{
omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //委外领料单 校验
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_EntrustOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_WHSPCtl")
+ {
+ omodel.Kf_EntrustOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MultilineCtl")
+ {
+ omodel.Kf_EntrustOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//生产补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
@@ -633,6 +646,57 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_MultilineCtl")
{
omodel.Kf_MateReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //委外补料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoCheck")
+ {
+ omodel.Kf_EntrustReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_ERPMode")
+ {
+ omodel.Kf_EntrustReplenishOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MustQtyCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MulSourceBill")
+ {
+ omodel.Kf_EntrustReplenishOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_BillTypeOneScan")
+ {
+ omodel.Kf_EntrustReplenishOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_BatchNoCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MultilineCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MaterWHSPCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_SourceWHSPCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //委外补料单 校验
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_WHSPCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MultilineCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//直接调拨单
@@ -1175,6 +1239,11 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_MouldManagerCtl")
{
omodel.WMS_MouldManagerCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //是否为私有云模式
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_CloudMode")
+ {
+ omodel.WMS_CloudMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//桌面条码模块
@@ -1926,6 +1995,19 @@
{
omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //委外领料单 校验
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_EntrustOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_WHSPCtl")
+ {
+ omodel.Kf_EntrustOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MultilineCtl")
+ {
+ omodel.Kf_EntrustOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//生产补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
@@ -1976,6 +2058,57 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_MultilineCtl")
{
omodel.Kf_MateReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //委外补料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoCheck")
+ {
+ omodel.Kf_EntrustReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_ERPMode")
+ {
+ omodel.Kf_EntrustReplenishOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MustQtyCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MulSourceBill")
+ {
+ omodel.Kf_EntrustReplenishOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_BillTypeOneScan")
+ {
+ omodel.Kf_EntrustReplenishOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_BatchNoCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MultilineCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MaterWHSPCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_SourceWHSPCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //委外补料单 校验
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_WHSPCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MultilineCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//直接调拨单
@@ -2519,6 +2652,11 @@
{
omodel.WMS_MouldManagerCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //是否为私有云模式
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_CloudMode")
+ {
+ omodel.WMS_CloudMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//桌面条码模块
//有源单生成条码，生成条码数量可否超源单数量控制
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index fea6760..a48fe1b 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -150,6 +150,10 @@
public string Kf_EntrustOutBill_FIFOList; //先进先出下架清单
public string Kf_EntrustOutBill_FIFOCtl; //先进先出控制
public string Kf_EntrustOutBill_SimpleMode; //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
+ //委外领料 校验
+ public string Kf_EntrustOutBillCheck_MustQtyCtl; //校验数量控制
+ public string Kf_EntrustOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
+ public string Kf_EntrustOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
//生产补料
public string Kf_MateReplenishOutBill_AutoCheck; //是否自动审核
@@ -165,6 +169,21 @@
public string Kf_MateReplenishOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_MateReplenishOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
public string Kf_MateReplenishOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
+
+ //委外补料
+ public string Kf_EntrustReplenishOutBill_AutoCheck; //是否自动审核
+ public string Kf_EntrustReplenishOutBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD）
+ public string Kf_EntrustReplenishOutBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
+ public string Kf_EntrustReplenishOutBill_MulSourceBill; //多源单模式
+ public string Kf_EntrustReplenishOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码（唯一码，含缓存列表）
+ public string Kf_EntrustReplenishOutBill_BatchNoCtl; //是否进行批号核对（'Y'为核对批号）
+ public string Kf_EntrustReplenishOutBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行（'Y'为自动拆分）
+ public string Kf_EntrustReplenishOutBill_MaterWHSPCtl; //是否取物料默认仓库仓位（'Y'为是）
+ public string Kf_EntrustReplenishOutBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
+ //委外补料 校验
+ public string Kf_EntrustReplenishOutBillCheck_MustQtyCtl; //校验数量控制
+ public string Kf_EntrustReplenishOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
+ public string Kf_EntrustReplenishOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
//直接调拨
public string Kf_MoveStockBill_AutoCheck; //是否自动审核
@@ -316,6 +335,7 @@
public string WMS_OneScanMode; //一次扫码模式
public string WMS_UserByOrgRelation; //扫码枪用户登入时判断用户对应组织权限控制，Y为控制
public string WMS_MouldManagerCtl; //是否启用器具管理(Y,N)
+ public string WMS_CloudMode; //是否为私有云模式
//桌面条码模块
diff --git a/WebAPI/Controllers/BLL/Xt_BillTypeController.cs b/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
index 00d594e..c8947ff 100644
--- a/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
+++ b/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
@@ -268,7 +268,49 @@
}
}
+ #region 鍗曟嵁绫诲瀷 閲戣澏鍚屾
+ [Route("Xt_BillType/SaveXt_BillTypeListApi")]
+ [HttpPost]
+ public object SaveXt_BillTypeListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsXt_BillType_Model> lsmain = new List<Model.ClsXt_BillType_Model>();
+ lsmain = oListModels.getObjectByJson_Xt_BillType(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Xt_BillType where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ //sql = "set identity_insert Xt_BillType on";
+ //oCN.RunProc(sql);
- //
+ oCN.RunProc($@"insert into Xt_BillType(HBilltypeID,HNumber,HName,HTemplate,HHeadTable,HEntryTable,HViewName,HRightName)
+ values('{lsmain[0].HBilltypeID}','{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HTemplate}','{lsmain[0].HHeadTable}','{lsmain[0].HEntryTable}','{lsmain[0].HViewName}','{lsmain[0].HRightName}' )", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Xt_BillType off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs b/WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs
index 997909f..a50383f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs
@@ -394,6 +394,51 @@
}
}
+ #region 甯佸埆 閲戣澏鍚屾
+ [Route("Gy_Currency/SaveGy_CurrencyListApi")]
+ [HttpPost]
+ public object SaveGy_CurrencyListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_Currency_Model> lsmain = new List<Model.ClsGy_Currency_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_Currency(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_Currency where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_Currency on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_Currency(HItemID,HNumber,HName,HShortNumber,HParentID
+ ,HLevel,HEndFlag,HStopflag,HRemark,HHelpCode,HScale,HExchangeRate)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}','{lsmain[0].HScale}','{lsmain[0].HExchangeRate}')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_Currency off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 83bade0..4962247 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -323,16 +323,18 @@
try
{
var model = oMain["model"].ToString();
+ var custLocationModel = oMain["model"]["HCustLocationEntry"].ToString();
//鍙嶅簭鍒楀寲
model = "[" + model + "]";
List<Customer> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Customer>>(model);
+ List<Model.ClsGy_CustLocation_Model> custLocationls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CustLocation_Model>>(custLocationModel);
string sql = string.Empty;
oCN.BeginTran();
sql = $"delete gy_Customer where HItemID = {lsmain[0].HItemID}";
oCN.RunProc(sql);
sql = "set identity_insert gy_Customer on";
oCN.RunProc(sql);
- //涓昏〃
+ //涓昏〃_瀹㈡埛
oCN.RunProc("Insert into Gy_Customer " +
" (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark" +
@@ -356,6 +358,25 @@
", " + lsmain[0].HCusTypeID + ")");
sql = "set identity_insert gy_Customer off";
oCN.RunProc(sql);
+ //瀹㈡埛_浜よ揣鍦扮偣
+ sql = $"delete Gy_CustLocation where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_CustLocation on";
+ oCN.RunProc(sql);
+ foreach (var item in custLocationls)
+ {
+ sql = $@"insert into Gy_CustLocation(HItemID,HEntryID,HNumber,HName ,HShortNumber,HParentID ,HLevel
+ ,HEndFlag,HStopflag,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values({item.HItemID},{item.HENTRYID},'{item.HNumber}','{item.HName}','{item.HShortNumber}',{item.HParentID},{item.HLevel}
+ ,{Convert.ToString(item.HEndFlag ? 1 : 0)},{Convert.ToString(item.HStopflag ? 1 : 0) },'{item.HRemark}','{item.HHelpCode}','{item.HUseFlag}'
+ ,'{item.HMakeTime}','{item.HMakeEmp}','{item.HCheckEmp}','{item.HCheckTime}','{item.HModifyEmp}'
+ ,'{item.HModifyTime}','{item.HStopEmp}',null,{item.HUSEORGID},{item.HCREATEORGID})";
+ oCN.RunProc(sql);
+ }
+ sql = "set identity_insert Gy_CustLocation off";
+ oCN.RunProc(sql);
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index f993172..23aa552 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -891,7 +891,65 @@
}
}
+ #region 鑱屽憳 閲戣澏鍚屾
+ [Route("Gy_Employee/SaveGy_EmployeeListApi")]
+ [HttpPost]
+ public object SaveGy_EmployeeListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_Employee_Model> lsmain = new List<Model.ClsGy_Employee_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_Employee(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_Employee where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_Employee on";
+ oCN.RunProc(sql);
+ oCN.RunProc($@"insert into Gy_Employee(HItemID,HNumber, HName, HShortNumber, HEmpRate, HExamRate
+ ,HLevel,HParentID,HEndflag,HHighestPay,HOverPayRate
+ ,HStopflag,HRemark,HHelpCode,HInsuranceSubsidy
+ ,HBirthday,HGradDate,HInsuranceDate,HContractBDate,HContractEDate
+ ,HJobCardEDate,HCheckCardEDate,HStayCardEDate,HHealthCardEDate
+ ,HAge,HSalaryLev,HContractYear,HInsuranceStatus,HSignStatus
+ ,HSex,HMarr,HBlighty,HNation,HBlightyType
+ ,HGovStatus,HBloodType,HStature,HAvoird,HKnowLev
+ ,HProTitleID,HGradSchool,HEngLev,HCompLev,HSpec
+ ,HEmail,HNowAdd,HHomeAdd,HIDCard,HLinkPhone,HMobilePhone,HFax
+ ,HOldCompany,HInsuranceNo,HJobCardNo,HArchivesNo,HWorkType,HDimissionReason
+ ,HDimissionDate,HInComDate,HSignDate,HRelDate
+ ,HPostID,HDormID,HDutyID,HLeftMoneyRate
+ ,HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag
+ ,HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID
+ ,HOtherDeduct3,HInsurance,HMedicare,HDrydock
+ ,HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HUSEORGID,HAddress)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HShortNumber}',{lsmain[0].HEmpRate},{lsmain[0].HExamRate},{lsmain[0].HLevel},{lsmain[0].HParentID},{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{lsmain[0].HHighestPay},{lsmain[0].HOverPayRate},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}',{lsmain[0].HInsuranceSubsidy},'{lsmain[0].HBirthDay}','{lsmain[0].HGradDate}','{lsmain[0].HInsuranceDate}','{lsmain[0].HContractBDate}','{lsmain[0].HContractEDate}','{lsmain[0].HJobCardEDate}','{lsmain[0].HCheckCardEDate}','{lsmain[0].HStayCardEDate}','{lsmain[0].HHealthCardEDate}',{lsmain[0].HAge},'{lsmain[0].HSalaryLev}',{lsmain[0].HContractYear},{lsmain[0].HInsuranceStatus},{lsmain[0].HSignStatus},'{lsmain[0].HSex}','{lsmain[0].HMarr}','{lsmain[0].HBlighty}','{lsmain[0].HNation}','{lsmain[0].HBlightyType}','{lsmain[0].HGovStatus}','{lsmain[0].HBloodType}','{lsmain[0].HStature}','{lsmain[0].HAvoird}','{lsmain[0].HKnowLev}','{lsmain[0].HProTitleID}','{lsmain[0].HGradSchool}','{lsmain[0].HEngLev}','{lsmain[0].HCompLev}','{lsmain[0].HSpec}','{lsmain[0].HEmail}','{lsmain[0].HNowAdd}','{lsmain[0].HHomeAdd}','{lsmain[0].HIDCard}','{lsmain[0].HLinkPhone}','{lsmain[0].HMobilePhone}','{lsmain[0].HFax}','{lsmain[0].HOldCompany}','{lsmain[0].HInsuranceNo}','{lsmain[0].HJobCardNo}','{lsmain[0].HArchivesNo}','{lsmain[0].HWorkType}','{lsmain[0].HDimissionReason}','{lsmain[0].HDimissionDate}','{lsmain[0].HInComDate}','{lsmain[0].HSignDate}','{lsmain[0].HRelDate}',{lsmain[0].HPostID},{lsmain[0].HDormID},{lsmain[0].HDutyID},{lsmain[0].HLeftMoneyRate},'{lsmain[0].HEmpType}','{lsmain[0].HPayType}','{lsmain[0].HOverType}',{lsmain[0].HNoBrushFlag},{lsmain[0].HShiftFlag},{lsmain[0].HStopwagesFlag},'{lsmain[0].HPostalCode}','{lsmain[0].HBank}',{lsmain[0].HBasePay},{lsmain[0].HExamLevPostMoney},{lsmain[0].HBSTDeptID},{lsmain[0].HOtherDeduct3},{lsmain[0].HInsurance},{lsmain[0].HMedicare},{lsmain[0].HDrydock},'{lsmain[0].HBankAccount}',{lsmain[0].HGroupID},{lsmain[0].HDeptID},{lsmain[0].HWorkTypeID},{lsmain[0].HCTPrjID},{lsmain[0].HUSEORGID},'{lsmain[0].HAddress}')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_Employee off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs b/WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs
new file mode 100644
index 0000000..a70b248
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs
@@ -0,0 +1,84 @@
+锘縰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
+{
+ public class Gy_ICBomBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ [Route("Gy_ICBomBill/Gy_ICBomBillaveApi")]
+ [HttpPost]
+ public object Gy_ICBomBillaveApi([FromBody] JObject oMain)
+ {
+ try
+ {
+ var model = oMain["model"].ToString();
+ var subModel = oMain["model"]["HENTRY"].ToString();
+ //鍙嶅簭鍒楀寲
+ model = "[" + model + "]";
+ List<Model.ClsGy_ICBomBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ICBomBillMain>>(model);
+ List<Model.ClsGy_ICBomBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ICBomBillSub>>(subModel);
+ string sql = string.Empty;
+ oCN.BeginTran();
+ sql = $"delete Gy_ICBomBillMain where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ sql = $"delete Gy_ICBomBillSub where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ oCN.RunProc("Insert Into Gy_ICBomBillMain " +
+ "(HBillType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HMaterTypeID,HStatus" +
+ ",HMaterID,HParentID,HVersion,HPicNo,HPropertyID" +
+ ",HUnitID,HQty,HProdRate,HJump" +
+ ") " +
+ " values('" + mainList[0].HBillType + "'," + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "'" +
+ "," + mainList[0].HYear.ToString() + "," + mainList[0].HPeriod.ToString() + ",'" + mainList[0].HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate(),'" + mainList[0].HMaterTypeID.ToString() + "','" + mainList[0].HStatus +
+ "','" + mainList[0].HMaterID.ToString() + "'," + mainList[0].HParentID.ToString() + ",'" + mainList[0].HVersion + "','" + mainList[0].HPicNo + "'," + mainList[0].HPropertyID.ToString() +
+ "," + mainList[0].HUnitID.ToString() + "," + mainList[0].HQty.ToString() + "," + mainList[0].HProdRate.ToString() + ",'" + mainList[0].HJump + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsGy_ICBomBillSub oSub in subList)
+ {
+ oCN.RunProc("Insert into Gy_ICBomBillSub " +
+ " (HInterID,HEntryID,HMaterID,HRemark2" +
+ ",HQty,HUnitID,HRemark3,HRelQty,HWasteRate" +
+ ",HProcID,HWhID,HRemark4,HChildType," +
+ "HCloseMan,HCloseType,HRemark," +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HRemark2 + "'" +
+ "," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HRemark3 + "'," + oSub.HRelQty.ToString() + "," + oSub.HWasteRate.ToString() +
+ "," + oSub.HProcID.ToString() + "," + oSub.HWhID.ToString() + ",'" + oSub.HRemark4 + "','" + oSub.HChildType.ToString() + "'" +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ") ");
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index b638e39..e23fc22 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -328,6 +328,7 @@
[HttpPost]
public object SaveGy_MaterialListApi([FromBody] JObject msg)
{
+ LogService.Write("鐗╂枡鍚屾鎻掍欢,post 寮�濮嬶細" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
var _value = msg["model"].ToString();
string msg3 = _value.ToString();
string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -341,9 +342,11 @@
msg1 = msg1.Replace("\\", "");
msg1 = msg1.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
+ LogService.Write("鐗╂枡鍚屾鎻掍欢,鐗╂枡json鍙嶅簭鍒楀寲缁撴潫 寮�濮嬶細" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
oBill.oModel = lsmain[0];
//淇濆瓨
bool bResult = oBill.AddNewApi();
+ LogService.Write("鐗╂枡鍚屾鎻掍欢,淇濆瓨鏂规硶鎵ц瀹屾垚 寮�濮嬶細" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
if (bResult)
{
objJsonResult.code = "1";
@@ -480,22 +483,11 @@
ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
}
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception e)
{
@@ -915,7 +907,7 @@
Double HProdQty = mainList[0].HProdQty;
Double HProdWeight = mainList[0].HProdWeight;
string HRemark = mainList[0].HRemark;
- string HMaker = mainList[0].HMaker;
+ string HUpDater = mainList[0].HUpDater;
string HMaterNumber = mainList[0].HMaterNumber;
string HSupNumber = mainList[0].HSupNumber;
long HPrintQty = mainList[0].HPrintQty;
@@ -936,7 +928,7 @@
",HYear='" + HYear.ToString() + "'" +
",HPeriod='" + HPeriod.ToString() + "'" +
",HRemark='" + HRemark + "'" +
- ",HUpDater='" + HMaker + "'" +
+ ",HUpDater='" + HUpDater + "'" +
",HUpDateDate=getdate()" +
//========================================
",HMouldNo='" + HMouldNo + "'" +
@@ -977,7 +969,7 @@
",HNowSupID=" + HNowSupID.ToString() +
",HNowSupTypeID=" + HNowSupTypeID.ToString() +
",HProdWeight=" + HProdWeight.ToString() +
- ",HBarCode=" + HBarCode.ToString() +
+ ",HBarCode='" + HBarCode.ToString() + "'" +
" where HInterID=" + HInterID.ToString());
//淇敼瀛愰」鐩唬鐮�
diff --git a/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs b/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs
index dc4674d..9da9f99 100644
--- a/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs
@@ -26,7 +26,7 @@
/// </summary>
[Route("Gy_Property/list")]
[HttpGet]
- public object list(string sWhere,string user)
+ public object list(string sWhere,string user, string Organization)
{
try
{
@@ -87,8 +87,328 @@
}
}
+ #region 杈呭姪灞炴�� 缂栬緫
+ [Route("Gy_Property/PropertyEdit")]
+ [HttpPost]
+ public object PropertyEdit([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+ //string msg_HUSEORGID = sArray[2].ToString();
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Edit", 1, false, msg2))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ //DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxRate ", "Gy_TaxRate");
+ //if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ //{
+ // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // var maxid = Convert.ToInt32((Maxds.Tables[0].Rows[0]["HItemID"].ToString()==""?0: Maxds.Tables[0].Rows[0]["HItemID"]));
+ // maxid += 1;
+ // HItemID = maxid;
+ //}
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ DAL.ClsGy_Property_Ctl oBill = new DAL.ClsGy_Property_Ctl();
+ List<Model.ClsGy_Property_Model> lsmain = new List<Model.ClsGy_Property_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_Property(msg1);
+ foreach (Model.ClsGy_Property_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("select * from Gy_Property where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Property");
+ if (oItem.HItemID == 0)
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HItemID"].ToString() != oItem.HItemID.ToString())
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
- //
+ //鏂板鏃跺垽鏂�
+ #region 鐖剁骇鏍￠獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級
+ /*
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else//缂栬緫鏃跺垽鏂�
+ {
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ */
+ #endregion
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = 1; //绛夌骇 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
+ oBill.oModel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "1";
+ 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("Gy_Property/Delete")]
+ [HttpGet]
+ public object Delete(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ 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_Property where HItemID=" + HItemID, "Gy_Property");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ if (HStopflag)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from Gy_Property 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;
+ }
+ }
+ #endregion
+
+ //#region 杈呭姪灞炴�� 閲戣澏鍚屾
+ //[Route("Gy_Property/SaveGy_PropertyListApi")]
+ //[HttpPost]
+ //public object SaveGy_PropertyListApi([FromBody] JObject msg)
+ //{
+ // try
+ // {
+ // var _value = msg["model"].ToString();
+ // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ // ListModels oListModels = new ListModels();
+ // List<Model.ClsGy_Property_Model> lsmain = new List<Model.ClsGy_Property_Model>();
+ // lsmain = oListModels.getObjectByJson_Gy_Property(_value);
+ // string sql = string.Empty;
+ // //淇濆瓨
+ // oCN.BeginTran();
+ // sql = $"delete Gy_Property where HItemID = {lsmain[0].HItemID}";
+ // oCN.RunProc(sql);
+ // sql = "set identity_insert Gy_Property on";
+ // oCN.RunProc(sql);
+
+ // oCN.RunProc($@"insert into Gy_Property(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID
+ // ,HLevel,HEndFlag,HStopflag,HRemark,HPropertyTypeID,HUseFlag,HERPItemID,HMakeTime)
+ // values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HHelpCode}','{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ // ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}',{lsmain[0].HPropertyTypeID},'{lsmain[0].HUseFlag}',{lsmain[0].HERPItemID},'{lsmain[0].HMakeTime}')", ref DBUtility.ClsPub.sExeReturnInfo);
+ // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ // sql = "set identity_insert Gy_Property off";
+ // oCN.RunProc(sql);
+ // oCN.Commit();
+
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // catch (Exception e)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ //}
+ //#endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
index fb7252d..801f5dc 100644
--- a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
@@ -1,5 +1,7 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing Model;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using NPOI.SS.Formula.Functions;
using Pub_Class;
using System;
using System.Collections;
@@ -7,6 +9,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
using WebAPI.Service;
@@ -332,10 +335,10 @@
oCN.RunProc(sql);
oCN.RunProc("Insert into Gy_Unit" +
" (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HRate,HStandard,HUSEORGID) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HRate,HStandard,HUSEORGID,HCREATEORGID) " +
" Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID.ToString() +
"," + lsmain[0].HLevel.ToString() + "," + Convert.ToString(lsmain[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(lsmain[0].HStopflag ? 1 : 0) + ",'" + lsmain[0].HRemark +
- "'," + lsmain[0].HRate.ToString() + "," + DBUtility.ClsPub.BoolToString(lsmain[0].HStandard) + "," + lsmain[0].HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ "'," + lsmain[0].HRate.ToString() + "," + DBUtility.ClsPub.BoolToString(lsmain[0].HStandard) + "," + lsmain[0].HUSEORGID + "," + lsmain[0].HCREATEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
sql = "set identity_insert Gy_Unit off";
oCN.RunProc(sql);
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index dff852c..f1f268d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing Model;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
@@ -7,6 +8,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
namespace WebAPI.Controllers
{
@@ -17,8 +19,6 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
-
/// <summary>
/// 杩斿洖浠撳簱鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -221,7 +221,7 @@
long HParentID = list[0].HParentID;
long HLevel = list[0].HLevel;
bool HEndFlag = list[0].HEndFlag;
- bool HStopflag = list[0].HStopflag;
+ bool HStopflag = list[0].HStopFlag;
string HRemark = list[0].HRemark;
string HBarCode = list[0].HBarCode;
long HEmpID = list[0].HEmpID;
@@ -304,7 +304,7 @@
long HParentID = list[0].HParentID;
long HLevel = list[0].HLevel;
bool HEndFlag = list[0].HEndFlag;
- bool HStopflag = list[0].HStopflag;
+ bool HStopflag = list[0].HStopFlag;
string HRemark = list[0].HRemark;
string HBarCode = list[0].HBarCode;
long HEmpID = list[0].HEmpID;
@@ -405,12 +405,16 @@
{
try
{
- var _value = msg["model"].ToString();
+ var model = msg["model"].ToString();
+ var stockplaceModel = msg["model"]["HStockplaceEntry"].ToString();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鍙嶅簭鍒楀寲
- _value = "[" + _value.ToString() + "]";
- List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(_value);
+ model = "[" + model.ToString() + "]";
+ List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(model);//浠撳簱
+ List<Gy_StockPlace> stockplaceList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_StockPlace>>(stockplaceModel);//浠撲綅
string sql = string.Empty;
+ //DataTable dt = DataHelper.ListToDataTable<Warehouse>(list);
+ //oCN.SqlBulkCopyByDatatable("Gy_Warehouse", dt);
//淇濆瓨
oCN.BeginTran();
sql = $"delete Gy_Warehouse where HItemID = {list[0].HItemID}";
@@ -419,11 +423,25 @@
oCN.RunProc(sql);
oCN.RunProc("Insert into Gy_Warehouse " +
" (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID,HCREATEORGID,HSPFlag,HSPGroupID,HUnderStock,HSTOCKPROPERTY) " +
" Values('" + list[0].HItemID + "','" + list[0].HNumber + "','" +list[0].HName + "','" + list[0].HHelpCode + "','" + list[0].HShortNumber + "'," + list[0].HParentID.ToString() +
- "," + list[0].HLevel.ToString() + "," + Convert.ToString(list[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(list[0].HStopflag ? 1 : 0) + ",'" + list[0].HRemark + "'," + list[0].HEmpID.ToString() + ",'" + list[0].HAddress + "','" + list[0].HPhone + "','" + list[0].HUSEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + list[0].HLevel.ToString() + "," + Convert.ToString(list[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(list[0].HStopFlag ? 1 : 0) + ",'" + list[0].HRemark + "'," + list[0].HEmpID.ToString() + ",'" + list[0].HAddress + "','" + list[0].HPhone + "','" + list[0].HUSEORGID + "','" + list[0].HCREATEORGID + "','" + list[0].HSPFlag + "','" + list[0].HSPGroupID + "','" + list[0].HUnderStock + "','" + list[0].HSTOCKPROPERTY + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
sql = "set identity_insert Gy_Warehouse off";
+ oCN.RunProc(sql);
+ sql = $"delete gy_stockplace where HSPGroupID in ({list[0].HItemID})";
+ oCN.RunProc(sql);
+ sql = "set identity_insert gy_stockplace on";
+ oCN.RunProc(sql);
+ foreach (var item in stockplaceList)
+ {
+ oCN.RunProc("Insert into gy_stockplace " +
+ " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUSEORGID,HCREATEORGID,HSPGroupID,HSPType,HSrcSPType,HDesSPType) " +
+ " Values('" + item.HItemID + "','" + item.HNumber + "','" + item.HName + "','" + item.HHelpCode + "','" + item.HShortNumber + "'," + item.HParentID.ToString() +
+ "," + item.HLevel.ToString() + "," + Convert.ToString(item.HEndFlag ? 1 : 0) + "," + Convert.ToString(item.HStopFlag ? 1 : 0) + ",'" + item.HRemark + "','" + item.HUSEORGID + "','" + item.HCREATEORGID + "','" + item.HSPGroupID + "','" + item.HSPType + "','" + item.HSrcSPType + "','" + item.HDesSPType + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ sql = "set identity_insert gy_stockplace off";
oCN.RunProc(sql);
oCN.Commit();
@@ -435,6 +453,7 @@
}
catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkDayController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkDayController.cs
index 2ccd2ff..a0fd6b2 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkDayController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkDayController.cs
@@ -95,16 +95,14 @@
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<WorkDay> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WorkDay>>(msg2);
-
long HItemID = list[0].HItemID;
-
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
if (HItemID == 0)
{
oCN.BeginTran();
- string sql = string.Format(@"insert into Gy_WorkDay (HDate,HWorkBegin,HWorkEnd,HNoonbreakBegin,HNoonbreakEnd,HNightbreakBegin,HNightbreakEnd)
-values ('{0}','{1}','{2}','{3}','{4}','{5}','{6}')", list[0].HDate, list[0].HWorkBegin, list[0].HWorkEnd, list[0].HNoonbreakBegin, list[0].HNoonbreakEnd, list[0].HNightbreakBegin, list[0].HNightbreakEnd);
+ string sql = string.Format(@"insert into Gy_WorkDay (HDate,HWorkBegin,HWorkEnd,HNoonbreakBegin,HNoonbreakEnd,HNightbreakBegin,HNightbreakEnd,HNoonbreakBegin2,HNoonbreakEnd2,HNightbreakBegin2,HNightbreakEnd2)
+values ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}','{10}')", list[0].HDate, list[0].HWorkBegin, list[0].HWorkEnd, list[0].HNoonbreakBegin, list[0].HNoonbreakEnd, list[0].HNightbreakBegin, list[0].HNightbreakEnd, list[0].HNoonbreakBegin2, list[0].HNoonbreakEnd2, list[0].HNightbreakBegin2, list[0].HNightbreakEnd2);
oCN.RunProc(sql);
oCN.Commit();
}
@@ -118,9 +116,13 @@
",HWorkBegin='" + list[0].HWorkBegin + "'" +
",HWorkEnd='" + list[0].HWorkEnd + "'" +
",HNoonbreakBegin='" + list[0].HNoonbreakBegin + "'" +
- ",HNoonbreakEnd=" + list[0].HNoonbreakEnd +
- ",HNightbreakBegin=" + list[0].HNightbreakBegin +
- ",HNightbreakEnd=" + list[0].HNightbreakEnd +
+ ",HNoonbreakEnd='" + list[0].HNoonbreakEnd + "'" +
+ ",HNightbreakBegin='" + list[0].HNightbreakBegin + "'" +
+ ",HNightbreakEnd='" + list[0].HNightbreakEnd + "'" +
+ ",HNoonbreakBegin2='" + list[0].HNoonbreakBegin2 + "'" +
+ ",HNoonbreakEnd2='" + list[0].HNoonbreakEnd2 + "'" +
+ ",HNightbreakBegin2='" + list[0].HNightbreakBegin2 + "'" +
+ ",HNightbreakEnd2='" + list[0].HNightbreakEnd2 + "'" +
" Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//
oCN.Commit();
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index bc0ad82..b791307 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -68,7 +68,7 @@
/// </summary>
[Route("Cg_POInStockBill/list")]
[HttpGet]
- public object list(string sWhere,string user)
+ public object list(string sWhere, string user)
{
try
{
@@ -84,12 +84,12 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList order by hmainid desc" , "h_v_IF_POInStockBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList order by hmainid desc", "h_v_IF_POInStockBillList");
}
else
{
string sql1 = "select * from h_v_IF_POInStockBillList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by 鏃ユ湡 desc,hmainid desc";
+ string sql = sql1 + sWhere + " order by 鏃ユ湡 desc,hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_POInStockBillList");
}
@@ -119,14 +119,14 @@
return objJsonResult;
}
}
-
+
/// <summary>
///鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
[Route("Cg_POInStockBill/DeltetPOInStockBill")]
[HttpGet]
- public object DeltetPOInStockBill(string HInterID,string user)
+ public object DeltetPOInStockBill(string HInterID, string user)
{
try
{
@@ -171,7 +171,7 @@
/// </summary>
[Route("Cg_POInStockBill/DeAuditPOInStockBill")]
[HttpGet]
- public object DeAuditPOInStockBill(string HInterID,string user)
+ public object DeAuditPOInStockBill(string HInterID, string user)
{
try
{
@@ -224,7 +224,7 @@
Ids = ""
};
var loginRet = InvokeHelper.Login();
-
+
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
if (isSuccess == 0)
{
@@ -527,14 +527,14 @@
,HMoney,HWHID,HSPID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HPOOrderInterID
,HPOOrderEntryID,HPOORderBillNo,HAuxPropID,HBatchNO,HMTONo,HPlanMode,HERPInterID,HERPEntryID
,HRelationQty,HGiveAwayFlag,HReceiveQty,HSEQ,HPRODUCEDATE,HEXPIRYDATE,HSUPPLYLOT,HREQTRACENO,HBOMID,HSTOCKUNITID
- ,HBASEUNITID,HSTOCKSTATUSID,HKEEPERTYPEID,HPROJECTNO,HGIVEAWAY,HCHECKINCOMING,HTAXPRICE,HDISCOUNTRATE
+ ,HBASEUNITID,HSTOCKSTATUSID,HKEEPERTYPEID,HPROJECTNO,HCHECKINCOMING,HTAXPRICE,HDISCOUNTRATE
,HPRICECOEFFICIENT,HPRICEUNITID,HPRICELISTENTRY,HSAMPLEDAMAGEQTY,HSAMPLEDAMAGEBASEQTY
,HPAYORGID,HSETTLEORGID,HSETTLECURRID,HSETTLEMODEID,HEXCHANGETYPEID,HPAYCONDITONID
,HEXCHANGERATE,HLOCALCURRID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX
,HTAXRATEID,HCOSTPERCENT,HCOSTAMOUNT,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HSecUnitID)
values({HInterID},{NewHEntryID},{oSub.HMaterID},{oSub.HUnitID},{(oSub.HQty == null ? 0 : oSub.HQty)}
,{oSub.HPrice},{oSub.HMoney},{oSub.HWHID},{oSub.HSPID},'{HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},{HSourceBillNo},{HSourceBillType},{oSub.HPOOrderInterID},{oSub.HPOOrderEntryID},{HPOOrderBillNo},{HAuxPropID},{HBatchNO},{HMTONo},{HPlanMode},{HERPInterID},{HERPEntryID},{HRelationQty},{HGiveAwayFlag},{HReceiveQty},{HSEQ},{HPRODUCEDATE},{HEXPIRYDATE},
- {HSUPPLYLOT},{HREQTRACENO},{HBOMID},{HSTOCKUNITID},{HBASEUNITID},{HSTOCKSTATUSID},'{HKEEPERTYPEID}',{HPROJECTNO},{HGIVEAWAY},{HCHECKINCOMING},{oSub.HTaxPrice},{HDISCOUNTRATE},{HPRICECOEFFICIENT},{HPRICEUNITID},{HPRICELISTENTRY},{HSAMPLEDAMAGEQTY},{HSAMPLEDAMAGEBASEQTY},{HPAYORGID},{HSETTLEORGID},{HSETTLECURRID},{HSETTLEMODEID},{HEXCHANGETYPEID},{HPAYCONDITONID},{oSub.HEXCHANGERATE},{HLOCALCURRID},{HISINCLUDEDTAX},{HISPRICEEXCLUDETAX},{HTAXRATEID},{HCOSTPERCENT},{HCOSTAMOUNT},{HVAT},{HSELLERWITHHOLDING},{HBUYERWITHHOLDING},{oSub.HSecUnitID})");
+ {HSUPPLYLOT},{HREQTRACENO},{HBOMID},{HSTOCKUNITID},{HBASEUNITID},{HSTOCKSTATUSID},'{HKEEPERTYPEID}',{HPROJECTNO},{HCHECKINCOMING},{oSub.HTaxPrice},{HDISCOUNTRATE},{HPRICECOEFFICIENT},{HPRICEUNITID},{HPRICELISTENTRY},{HSAMPLEDAMAGEQTY},{HSAMPLEDAMAGEBASEQTY},{HPAYORGID},{HSETTLEORGID},{HSETTLECURRID},{HSETTLEMODEID},{HEXCHANGETYPEID},{HPAYCONDITONID},{oSub.HEXCHANGERATE},{HLOCALCURRID},{HISINCLUDEDTAX},{HISPRICEEXCLUDETAX},{HTAXRATEID},{HCOSTPERCENT},{HCOSTAMOUNT},{HVAT},{HSELLERWITHHOLDING},{HBUYERWITHHOLDING},{oSub.HSecUnitID})");
}
objJsonResult.code = "1";
@@ -544,7 +544,80 @@
return objJsonResult;
}
- #endregion
+ [Route("Cg_POInStockBill/Cg_POInStockBillSaveApi")]
+ [HttpPost]
+ public object Cg_POInStockBillSaveApi([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var model = sMainSub["model"].ToString();
+ var entry = sMainSub["model"]["HENTRY"].ToString();
+ model = "[" + model.ToString() + "]";
+ List<ClsCg_POInStockBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POInStockBillMain>>(model);
+ List<ClsCg_POInStockBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POInStockBillSub>>(entry);
+ string sql = string.Empty;
+ oCN.BeginTran();
+ sql = $"delete Cg_POInStockBillMain where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ sql = $"delete Cg_POInStockBillSub where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ //涓昏〃
+ sql = @"
+Insert Into Cg_POInStockBillMain
+(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate
+,HBillNo,HBillStatus,HSupID,HManagerID,HEmpID,HDeptID,HRemark
+,HMaker,HMakeDate,HChecker,HCheckDate,HOWNERTYPEID,HOWNERID
+,HERPInterID,HERPBillType,HPURCHASEORGID,HSTOCKORGID,HREQUIREORGID
+,HSTOCKGROUPID,HSENDBILLNO,HLADBILLNO,HPURDEPTID,HPURGROUPID,HSUPPLYID
+,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HSUPPLYADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID,HCurID,HExRate,HAddress,HWHID)
+values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1103 + "','" +
+mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "'," + mainList[0].HBillStatus + "," + mainList[0].HSupID +
+"," + mainList[0].HManagerID + "," + mainList[0].HEmpID + "," + mainList[0].HDeptID + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker +
+"','" + mainList[0].HMakeDate + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HOWNERTYPEID + "'," + mainList[0].HOWNERID + "," + mainList[0].HERPInterID + ",'" + mainList[0].HERPBillType + "'," + mainList[0].HPURCHASEORGID + "," + mainList[0].HSTOCKORGID + "," + mainList[0].HREQUIREORGID + "," +
+mainList[0].HSTOCKGROUPID + ",'" + mainList[0].HSENDBILLNO + "','" + mainList[0].HLADBILLNO + "'," + mainList[0].HPURDEPTID + "," + mainList[0].HPURGROUPID + "," + mainList[0].HSUPPLYID + "," +
+mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + ",'" + mainList[0].HBUSINESSTYPE + "','" + mainList[0].HSUPPLYADDRESS + "'," + mainList[0].HCORRESPONDORGID + "," + mainList[0].HPROVIDERCONTACTID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + ",'" + mainList[0].HAddress + "'," + mainList[0].HWHID + ")";
+ oCN.RunProc(sql);
+ //淇濆瓨涓昏〃
+ foreach (var oSub in subList)
+ {
+ sql = $@"
+Insert into Cg_POInStockBillSub
+(HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice
+,HMoney,HWHID,HSPID,HRemark,HTaxMoney,HTaxRate,HTaxMoney_TAX,HTaxRate_TAX
+,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HPOOrderInterID
+,HPOOrderEntryID,HPOORderBillNo,HAuxPropID,HBatchNO,HMTONo,HPlanMode,HERPInterID,HERPEntryID
+,HRelationQty,HGiveAwayFlag,HReceiveQty,HSEQ,HPRODUCEDATE,HEXPIRYDATE,HSUPPLYLOT,HREQTRACENO,HBOMID,HSTOCKUNITID
+,HBASEUNITID,HSTOCKSTATUSID,HKEEPERTYPEID,HPROJECTNO,HCHECKINCOMING,HTAXPRICE,HDISCOUNTRATE
+,HPRICECOEFFICIENT,HPRICEUNITID,HPRICELISTENTRY,HSAMPLEDAMAGEQTY,HSAMPLEDAMAGEBASEQTY
+,HPAYORGID,HSETTLEORGID,HSETTLECURRID,HSETTLEMODEID,HEXCHANGETYPEID,HPAYCONDITONID
+,HEXCHANGERATE,HLOCALCURRID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX
+,HTAXRATEID,HCOSTPERCENT,HCOSTAMOUNT,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HSecUnitID)
+values(
+'{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HUnitID}','{oSub.HQty}','{oSub.HPrice}'
+,'{oSub.HMoney}','{oSub.HWHID}','{oSub.HSPID}','{oSub.HRemark}','{oSub.HTaxMoney}','{oSub.HTaxRate}','{oSub.HTaxMoney_TAX}','{oSub.HTaxRate_TAX}'
+,'{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}','{oSub.HPOOrderInterID}','{oSub.HPOOrderEntryID}','{oSub.HPOOrderBillNo}','{oSub.HAuxPropID}','{oSub.HBatchNO}','{oSub.HMTONo}','{oSub.HPlanMode}','{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HRelationQty}','{oSub.HGiveAwayFlag}','{oSub.HReceiveQty}','{oSub.HSEQ}','{oSub.HPRODUCEDATE}','{oSub.HEXPIRYDATE}',
+'{oSub.HSUPPLYLOT}','{oSub.HREQTRACENO}','{oSub.HBOMID}','{oSub.HSTOCKUNITID}','{oSub.HBASEUNITID}','{oSub.HSTOCKSTATUSID}','{oSub.HKEEPERTYPEID}','{oSub.HPROJECTNO}','{oSub.HCHECKINCOMING}','{oSub.HTaxPrice}','{oSub.HDISCOUNTRATE}','{oSub.HPRICECOEFFICIENT}','{oSub.HPRICEUNITID}','{oSub.HPRICELISTENTRY}','{oSub.HSAMPLEDAMAGEQTY}','{oSub.HSAMPLEDAMAGEBASEQTY}','{oSub.HPAYORGID}','{oSub.HSETTLEORGID}','{oSub.HSETTLECURRID}','{oSub.HSETTLEMODEID}','{oSub.HEXCHANGETYPEID}','{oSub.HPAYCONDITONID}','{oSub.HEXCHANGERATE}','{oSub.HLOCALCURRID}','{oSub.HISINCLUDEDTAX}','{oSub.HISPRICEEXCLUDETAX}','{oSub.HTAXRATEID}','{oSub.HCOSTPERCENT}','{oSub.HCOSTAMOUNT}','{oSub.HVAT}','{oSub.HSELLERWITHHOLDING}','{oSub.HBUYERWITHHOLDING}','{oSub.HSecUnitID}')";
+ oCN.RunProc(sql);
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index dcc0ab2..e5b8fb5 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -748,6 +748,15 @@
string HERPBillType = mainList2[0].HERPBillType == null ? "''" : mainList2[0].HERPBillType;
long HPURCHASEORGID = mainList2[0].HPURCHASEORGID == null ? 0 : mainList2[0].HPURCHASEORGID;
+ long HPURCHASERGROUPID = mainList2[0].HPURCHASERGROUPID == null ? 0 : mainList2[0].HPURCHASERGROUPID; //閲囪喘缁�
+ long HPROVIDERID = mainList2[0].HPROVIDERID == null ? 0 : mainList2[0].HPROVIDERID; //渚涜揣鏂�
+ long HSETTLEID = mainList2[0].HSETTLEID == null ? 0 : mainList2[0].HSETTLEID;//缁撶畻鏂�
+ long HCHARGEID = mainList2[0].HCHARGEID == null ? 0 : mainList2[0].HCHARGEID;//鏀舵鏂�
+ string HBUSINESSTYPE = mainList2[0].HBUSINESSTYPE == null ? "''" : mainList2[0].HBUSINESSTYPE; //涓氬姟绫诲瀷
+ string HPROVIDERADDRESS = mainList2[0].HPROVIDERADDRESS == null ? "''" : mainList2[0].HPROVIDERADDRESS; //渚涜揣鏂瑰湴鍧�
+ long HCORRESPONDORGID = mainList2[0].HCORRESPONDORGID == null ? 0 : mainList2[0].HCORRESPONDORGID; //瀵瑰簲缁勭粐
+ long HPROVIDERCONTACTID = mainList2[0].HPROVIDERCONTACTID == null ? 0 : mainList2[0].HPROVIDERCONTACTID;//渚涜揣鏂硅仈绯讳汉
+
ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_POOrderBillList");
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
@@ -766,12 +775,15 @@
,HAddress,HSSID,HSSDate,HPSStyleID,HSupID,HCurID
,HExRate,HEmpID,HManagerID,HDeptID,HExplanation,HRemark,HInnerBillNo
,HChecker,HCheckDate,HMaker,HMakeDate
- ,HERPInterID,HERPBillType,HPURCHASEORGID)
+ ,HERPInterID,HERPBillType,HPURCHASEORGID
+ ,HPURCHASERGROUPID,HPROVIDERID,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HPROVIDERADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID)
values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1102 + "','" +
HBillSubType + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + HAddress +
"'," + HSSID + ",'" + HSSDate + "'," + HPSStyleID + "," + HSupID + "," + HCurID +
"," + HExRate + "," + HEmpID + "," + HManagerID + "," + HDeptID + ",'" + HExplanation + "','" + HRemark + "','" + HInnerBillNo + "','" + HChecker + "','" + HCheckDate + "','" + HMaker + "','" +
- HMakeDate + "'," + HERPInterID + ",'" + HERPBillType + "'," + HPURCHASEORGID + ")");
+ HMakeDate + "'," + HERPInterID + ",'" + HERPBillType + "'," + HPURCHASEORGID + "," + HPURCHASERGROUPID + ","
+ + HPROVIDERID + "," + HSETTLEID + "," + HCHARGEID + ",'" + HBUSINESSTYPE + "','" + HPROVIDERADDRESS + "',"
+ + HCORRESPONDORGID + "," + HPROVIDERCONTACTID + ")");
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
@@ -818,7 +830,7 @@
List<ClsCg_POOrderBillSub> DetailColl2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillSub>>(msg3);
-
+
string HSourceBillNo = DetailColl2[0].HSourceBillNo == null ? "''" : DetailColl2[0].HSourceBillNo;
string HSourceBillType = DetailColl2[0].HSourceBillType == null ? "''" : DetailColl2[0].HSourceBillType;
double HRelationQty = DetailColl2[0].HRelationQty == null ? 0 : DetailColl2[0].HRelationQty;
@@ -834,6 +846,40 @@
string HRemark = DetailColl2[0].HRemark == null ? "''" : DetailColl2[0].HRemark;
string HSourceInterID = DetailColl2[0].HSourceInterID == null ? "''" : DetailColl2[0].HSourceInterID;
string HSourceEntryID = DetailColl2[0].HSourceEntryID == null ? "''" : DetailColl2[0].HSourceEntryID;
+
+ long HSEQ = DetailColl2[0].HSEQ == null ? 0 : DetailColl2[0].HSEQ;//琛屽彿
+ long HRECEIVEDEPTID = DetailColl2[0].HRECEIVEDEPTID == null ? 0 : DetailColl2[0].HRECEIVEDEPTID;//鏀舵枡閮ㄩ棬
+ string HSUPPLIERLOT = DetailColl2[0].HSUPPLIERLOT == null ? "''" : DetailColl2[0].HSUPPLIERLOT;//渚涘簲鍟嗘壒鍙�
+ long HBOMID = DetailColl2[0].HBOMID == null ? 0 : DetailColl2[0].HBOMID;//BOM鐗堟湰
+ long HSTOCKUNITID = DetailColl2[0].HSTOCKUNITID == null ? 0 : DetailColl2[0].HSTOCKUNITID;//搴撳瓨鍗曚綅
+ long HBASEUNITID = DetailColl2[0].HBASEUNITID == null ? 0 : DetailColl2[0].HBASEUNITID;//鍩烘湰鍗曚綅
+ string HBFLOWID = DetailColl2[0].HBFLOWID == null ? "''" : DetailColl2[0].HBFLOWID; //涓氬姟娴佺▼
+ long HGIVEAWAY = DetailColl2[0].HGIVEAWAY == null ? 0 : DetailColl2[0].HGIVEAWAY; //鏄惁璧犲搧
+ string HROWTYPE = DetailColl2[0].HROWTYPE == null ? "''" : DetailColl2[0].HROWTYPE;//浜у搧绫诲瀷
+ double HBASEUNITQTY = DetailColl2[0].HBASEUNITQTY == null ? 0 : DetailColl2[0].HBASEUNITQTY;//鍩烘湰鍗曚綅鏁伴噺
+ double HSTOCKBASEQTY = DetailColl2[0].HSTOCKBASEQTY == null ? 0 : DetailColl2[0].HSTOCKBASEQTY; //搴撳瓨鍩烘湰鏁伴噺
+ string HREQTRACENO = DetailColl2[0].HREQTRACENO == null ? "''" : DetailColl2[0].HREQTRACENO;//闇�姹傝窡韪彿
+ double HTAXNETPRICE = DetailColl2[0].HTAXNETPRICE == null ? 0 : DetailColl2[0].HTAXNETPRICE; //鍚◣鍑�浠�
+ double HPRICECOEFFICIENT = DetailColl2[0].HPRICECOEFFICIENT == null ? 0 : DetailColl2[0].HPRICECOEFFICIENT;//浠锋牸绯绘暟
+ long HTAXCOMBINATION = DetailColl2[0].HTAXCOMBINATION == null ? 0 : DetailColl2[0].HTAXCOMBINATION;//绋庣粍鍚�
+ long HPRICEUNITID = DetailColl2[0].HPRICEUNITID == null ? 0 : DetailColl2[0].HPRICEUNITID;//璁′环鍗曚綅
+ long HPRICELISTENTRY = DetailColl2[0].HPRICELISTENTRY == null ? 0 : DetailColl2[0].HPRICELISTENTRY;//鍒嗗綍浠风洰琛�
+ long HPAYORGID = DetailColl2[0].HPAYORGID == null ? 0 : DetailColl2[0].HPAYORGID;//浠樻缁勭粐
+ long HSETTLEMODEID = DetailColl2[0].HSETTLEMODEID == null ? 0 : DetailColl2[0].HSETTLEMODEID;//缁撶畻鏂瑰紡
+ long HSETTLECURRID = DetailColl2[0].HSETTLECURRID == null ? 0 : DetailColl2[0].HSETTLECURRID;//缁撶畻甯佸埆
+ long HEXCHANGETYPEID = DetailColl2[0].HEXCHANGETYPEID == null ? 0 : DetailColl2[0].HEXCHANGETYPEID;//姹囩巼绫诲瀷
+ long HPAYCONDITIONID = DetailColl2[0].HPAYCONDITIONID == null ? 0 : DetailColl2[0].HPAYCONDITIONID;//浠樻鏉′欢
+ double HEXCHANGERATE = DetailColl2[0].HEXCHANGERATE == null ? 0 : DetailColl2[0].HEXCHANGERATE;//姹囩巼
+ long HLOCALCURRID = DetailColl2[0].HLOCALCURRID == null ? 0 : DetailColl2[0].HLOCALCURRID;//鏈綅甯�
+ long HISINCLUDEDTAX = DetailColl2[0].HISINCLUDEDTAX == null ? 0 : DetailColl2[0].HISINCLUDEDTAX;//鏄惁鍚◣
+ long HISPRICEEXCLUDETAX = DetailColl2[0].HISPRICEEXCLUDETAX == null ? 0 : DetailColl2[0].HISPRICEEXCLUDETAX;//浠峰绋�
+ long HTAXRATEID = DetailColl2[0].HTAXRATEID == null ? 0 : DetailColl2[0].HTAXRATEID;//绋庣巼鍚嶇О
+ double HCOSTPERCENT = DetailColl2[0].HCOSTPERCENT == null ? 0 : DetailColl2[0].HCOSTPERCENT;//璁″叆鎴愭湰姣斾緥%
+ double HCOSTAMOUNT = DetailColl2[0].HCOSTAMOUNT == null ? 0 : DetailColl2[0].HCOSTAMOUNT;//璁″叆鎴愭湰閲戦
+ long HVAT = DetailColl2[0].HVAT == null ? 0 : DetailColl2[0].HVAT;//澧炲�肩◣
+ long HSELLERWITHHOLDING = DetailColl2[0].HSELLERWITHHOLDING == null ? 0 : DetailColl2[0].HSELLERWITHHOLDING;//鍗栨柟浠ｆ墸浠ｇ即
+ long HBUYERWITHHOLDING = DetailColl2[0].HBUYERWITHHOLDING == null ? 0 : DetailColl2[0].HBUYERWITHHOLDING;//涔版柟浠ｆ墸浠ｇ即
+ string HMATERIALDESC = DetailColl2[0].HMATERIALDESC == null ? "''" : DetailColl2[0].HMATERIALDESC; //鐗╂枡璇存槑
int i = 0;
@@ -890,10 +936,14 @@
,HMoney,HTaxRate,HTaxMoney,HLineTotal,HlineTotalBB,HDate,HInStockQty,HInvoiceQty,HSeOrderBillNo,HSeOrderInterID
,HSeOrderEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo
,HSourceBillType,HRelationQty,HBackRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo
- ,HERPInterID,HERPEntryID)
+ ,HERPInterID,HERPEntryID
+ ,HSEQ,HRECEIVEDEPTID,HSUPPLIERLOT,HBOMID,HSTOCKUNITID,HBASEUNITID,HBFLOWID,HGIVEAWAY,HROWTYPE,HBASEUNITQTY,HSTOCKBASEQTY
+ ,HREQTRACENO,HTAXNETPRICE,HPRICECOEFFICIENT,HTAXCOMBINATION,HPRICEUNITID,HPRICELISTENTRY,HPAYORGID,HSETTLEMODEID,HSETTLECURRID
+ ,HEXCHANGETYPEID,HPAYCONDITIONID,HEXCHANGERATE,HLOCALCURRID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HTAXRATEID,HCOSTPERCENT,HCOSTAMOUNT
+ ,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HMATERIALDESC)
values({HInterID},{NewHEntryID},{oSub.HMaterID},{oSub.HUnitID},{(oSub.HQty == null ? 0 : oSub.HQty)}
,{oSub.HPrice},{oSub.HTaxPrice},{oSub.HDiscountRate},{oSub.HRelTaxPrice},{oSub.HMoney},{oSub.HTaxRate},{oSub.HTaxMoney},{oSub.HlineTotal},{oSub.HlineTotalBB},'{oSub.HDate}',{oSub.HInStockQty},{oSub.HInvoiceQty},{HSeOrderBillNo},{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{HRemark}',{HSourceInterID},{HSourceEntryID},{HSourceBillNo},{HSourceBillType},{HRelationQty},{HBackRelationQty},{HPropertyID},{HBatChNo},
- {HAuxPropID},{HMTONo},{HERPInterID},{HERPEntryID})");
+ {HAuxPropID},{HMTONo},{HERPInterID},{HERPEntryID},{HSEQ},{HRECEIVEDEPTID},'{HSUPPLIERLOT}',{HBOMID},{HSTOCKUNITID},{HBASEUNITID},'{HBFLOWID}',{HGIVEAWAY},{HROWTYPE},{HBASEUNITQTY},{HSTOCKBASEQTY},'{HREQTRACENO}',{HTAXNETPRICE},{HPRICECOEFFICIENT},{HTAXCOMBINATION},{HPRICEUNITID},{HPRICELISTENTRY},{HPAYORGID},{HSETTLEMODEID},{HSETTLECURRID},{HEXCHANGETYPEID},{HPAYCONDITIONID},{HEXCHANGERATE},{HLOCALCURRID},{HISINCLUDEDTAX},{HISPRICEEXCLUDETAX},{HTAXRATEID},{HCOSTPERCENT},{HCOSTAMOUNT},{HVAT},{HSELLERWITHHOLDING},{HBUYERWITHHOLDING},'{HMATERIALDESC}')");
}
objJsonResult.code = "1";
@@ -903,6 +953,83 @@
return objJsonResult;
}
+
+ [Route("Cg_POOrderBill/Cg_POOrderBillSaveApi")]
+ [HttpPost]
+ public object Cg_POOrderBillSaveApi([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var model = sMainSub["model"].ToString();
+ var entry = sMainSub["model"]["HENTRY"].ToString();
+
+ model = "[" + model.ToString() + "]";
+ List<ClsCg_POOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillMain>>(model);
+ List<ClsCg_POOrderBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillSub>>(entry);
+ string sql = string.Empty;
+ oCN.BeginTran();
+ sql = $"delete Cg_POOrderBillMain where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ sql = $"delete Cg_POOrderBillSub where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Cg_POOrderBillMain
+ (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
+ ,HAddress,HSSID,HSSDate,HPSStyleID,HSupID,HCurID
+ ,HExRate,HEmpID,HManagerID,HDeptID,HExplanation,HRemark,HInnerBillNo
+ ,HChecker,HCheckDate,HMaker,HMakeDate
+ ,HERPInterID,HERPBillType,HPURCHASEORGID
+ ,HPURCHASERGROUPID,HPROVIDERID,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HPROVIDERADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID)
+ values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1102 + "','" +
+ mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "','" + mainList[0].HBillStatus + "','" + mainList[0].HAddress +
+ "'," + mainList[0].HSSID + ",'" + mainList[0].HSSDate + "'," + mainList[0].HPSStyleID + "," + mainList[0].HSupID + "," + mainList[0].HCurID +
+ "," + mainList[0].HExRate + "," + mainList[0].HEmpID + "," + mainList[0].HManagerID + "," + mainList[0].HDeptID + ",'" + mainList[0].HExplanation + "','" + mainList[0].HRemark + "','" + mainList[0].HInnerBillNo + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HMaker + "','" +
+ mainList[0].HMakeDate + "'," + mainList[0].HERPInterID + ",'" + mainList[0].HERPBillType + "'," + mainList[0].HPURCHASEORGID + "," + mainList[0].HPURCHASERGROUPID + ","
+ + mainList[0].HPROVIDERID + "," + mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + ",'" + mainList[0].HBUSINESSTYPE + "','" + mainList[0].HPROVIDERADDRESS + "',"
+ + mainList[0].HCORRESPONDORGID + "," + mainList[0].HPROVIDERCONTACTID + ")");
+ //淇濆瓨涓昏〃
+ foreach (var oSub in subList)
+ {
+ sql = $@"
+Insert into Cg_POOrderBillSub
+(HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice,HTaxRate_TAX,HTaxMoney_TAX,HTaxPrice,HDiscountRate,HRelTaxPrice
+,HMoney,HTaxRate,HTaxMoney,HLineTotal,HlineTotalBB,HDate,HInStockQty,HInvoiceQty,HSeOrderBillNo,HSeOrderInterID
+,HSeOrderEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo
+,HSourceBillType,HRelationQty,HBackRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo
+,HERPInterID,HERPEntryID
+,HSEQ,HRECEIVEDEPTID,HSUPPLIERLOT,HBOMID,HSTOCKUNITID,HBASEUNITID,HBFLOWID,HGIVEAWAY,HROWTYPE,HBASEUNITQTY,HSTOCKBASEQTY
+,HREQTRACENO,HTAXNETPRICE,HPRICECOEFFICIENT,HTAXCOMBINATION,HPRICEUNITID,HPRICELISTENTRY,HPAYORGID,HSETTLEMODEID,HSETTLECURRID
+,HEXCHANGETYPEID,HPAYCONDITIONID,HEXCHANGERATE,HLOCALCURRID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HTAXRATEID,HCOSTPERCENT,HCOSTAMOUNT
+,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HMATERIALDESC)
+values('{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HUnitID}','{oSub.HQty}','{oSub.HPrice}','{oSub.HPrice}','{oSub.HTaxRate_TAX}','{oSub.HTaxMoney_TAX}','{oSub.HDiscountRate}','{oSub.HRelTaxPrice}',
+'{oSub.HMoney}','{oSub.HTaxRate}','{oSub.HTaxMoney}','{oSub.HlineTotal}','{oSub.HlineTotalBB}','{oSub.HDate}','{oSub.HInStockQty}','{oSub.HInvoiceQty}','{oSub.HSeOrderBillNo}','{oSub.HSeOrderInterID}',
+'{oSub.HSeOrderEntryID}','{oSub.HRemark}','{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}',
+'{oSub.HSourceBillType}','{oSub.HRelationQty}','{oSub.HBackRelationQty}','{oSub.HPropertyID}','{oSub.HBatChNo}','{oSub.HAuxPropID}','{oSub.HMTONo}',
+'{oSub.HERPInterID}','{oSub.HERPEntryID}',
+'{oSub.HSEQ}','{oSub.HRECEIVEDEPTID}','{oSub.HSUPPLIERLOT}','{oSub.HBOMID}','{oSub.HSTOCKUNITID}','{oSub.HBASEUNITID}','{oSub.HBFLOWID}','{oSub.HGIVEAWAY}','{oSub.HROWTYPE}','{oSub.HBASEUNITQTY}','{oSub.HSTOCKBASEQTY}',
+'{oSub.HREQTRACENO}','{oSub.HTAXNETPRICE}','{oSub.HPRICECOEFFICIENT}','{oSub.HTAXCOMBINATION}','{oSub.HPRICEUNITID}','{oSub.HPRICELISTENTRY}','{oSub.HPAYORGID}','{oSub.HSETTLEMODEID}','{oSub.HSETTLECURRID}',
+'{oSub.HEXCHANGETYPEID}','{oSub.HPAYCONDITIONID}','{oSub.HEXCHANGERATE}','{oSub.HLOCALCURRID}','{oSub.HISINCLUDEDTAX}','{oSub.HISPRICEEXCLUDETAX}','{oSub.HTAXRATEID}','{oSub.HCOSTPERCENT}','{oSub.HCOSTAMOUNT}',
+'{oSub.HVAT}','{oSub.HSELLERWITHHOLDING}','{oSub.HBUYERWITHHOLDING}','{oSub.HMATERIALDESC}')";
+ oCN.RunProc(sql);
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
/// <summary>
///鍒犻櫎鍔熻兘
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 3dfb55c..9f7c6c7 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -215,6 +215,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+
//if (HWorkTimes <= 0)
//{
// objJsonResult.code = "0";
@@ -255,10 +256,13 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
+ var num = 0;
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
if ("Add".Equals(eventType))
{
+ num = 1;
if (!AllowbillNo(HBillNo))
{
oCN.RollBack();
@@ -290,6 +294,7 @@
}
else if ("Modify".Equals(eventType))
{
+ num = 2;
oCN.RunProc("UpDate Sc_StationOutBillMain set " +
"HUpDater='" + HMaker + "'" +
",HUpDateDate=getdate()" +
@@ -358,7 +363,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ",1");
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ","+ num + "");
oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus " + HInterID + " ");
oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode " + HInterID + " ");
//鍒ゆ柇鏄惁鏄� 鏈亾宸ュ簭
@@ -394,6 +399,7 @@
}
catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.ToString();
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 212335f..a0df8cc 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -81,23 +81,13 @@
string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.list = columnNameList;
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
index 3e51d5e..45858ae 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
@@ -192,11 +192,11 @@
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
- string sql = "select 淇濆吇椤圭洰ID,淇濆吇椤圭洰,淇濆吇閮ㄤ綅,鍏蜂綋瑕佹眰,璐熻矗浜篒D,璐熻矗浜轰唬鐮�,璐熻矗浜哄悕绉�,瀛愬娉�2 from h_v_Sc_MouldMaintainRuleBillList where 1 = 1 " + Swhere + "";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainRuleBillList");
+ string sql = "select 淇濆吇椤圭洰ID,淇濆吇椤圭洰浠ｇ爜,淇濆吇椤圭洰,淇濆吇閮ㄤ綅,鍏蜂綋瑕佹眰,璐熻矗浜篒D,璐熻矗浜轰唬鐮�,璐熻矗浜哄悕绉�,瀛愬娉�2 from h_v_Sc_MouldMaintainRuleBillSub_Item where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainRuleBillSub_Item");
//鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
- string sql1 = "select 閰嶄欢ID,閰嶄欢浠ｇ爜,閰嶄欢鍚嶇О,鍗曚綅ID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅鍚嶇О,鐢ㄩ噺,鏍囧噯鐢ㄩ噺,瀛愬娉�1 from h_v_Sc_MouldMaintainRuleBillList where 1 = 1 " + Swhere + "";
- ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillList");
+ string sql1 = "select 閰嶄欢ID,閰嶄欢浠ｇ爜,閰嶄欢鍚嶇О,鍗曚綅ID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅鍚嶇О,鐢ㄩ噺,鏍囧噯鐢ㄩ噺,瀛愬娉�1 from h_v_Sc_MouldMaintainRuleBillSub where 1 = 1 " + Swhere + "";
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillSub");
list.Add(ds.Tables[0]);
list.Add(ds1.Tables[0]);
@@ -252,11 +252,11 @@
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
- string sql = "select 淇濆吇椤圭洰ID HMaintainItemID,淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰 HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜哄悕绉� HManagerName,瀛愬娉�2 HRemark from h_v_Sc_MouldMaintainRuleBillList where 1 = 1 " + Swhere + "";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainRuleBillList");
+ string sql = "select 淇濆吇椤圭洰ID HMaintainItemID,淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰 HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜哄悕绉� HManagerName,瀛愬娉�2 HRemark from h_v_Sc_MouldMaintainRuleBillSub_Item where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainRuleBillSub_Item");
//鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
- string sql1 = "select 閰嶄欢ID HMaterID,閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitNumber,璁￠噺鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,瀛愬娉�1 HRemark from h_v_Sc_MouldMaintainRuleBillList where 1 = 1 " + Swhere + "";
- ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillList");
+ string sql1 = "select 閰嶄欢ID HMaterID,閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitNumber,璁￠噺鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,瀛愬娉�1 HRemark from h_v_Sc_MouldMaintainRuleBillSub where 1 = 1 " + Swhere + "";
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillSub");
list.Add(ds.Tables[0]);
list.Add(ds1.Tables[0]);
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipSparepartsBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipSparepartsBillController.cs
new file mode 100644
index 0000000..73d37cd
--- /dev/null
+++ b/WebAPI/Controllers/SBGL/Sb_EquipSparepartsBillController.cs
@@ -0,0 +1,290 @@
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.SBGL
+{
+ public class Sb_EquipSparepartsBillController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region [璁惧澶囧搧澶囦欢鍒楄〃]
+ [Route("Sb_EquipSparepartsBill/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipSparepartsBillList order by HMainID asc", "h_v_Sb_EquipSparepartsBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipSparepartsBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by HMainID asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipSparepartsBillList");
+ }
+
+ 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 [鏍规嵁ID鏌ユ壘璁板綍]
+ [Route("Sb_EquipSparepartsBill/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipSparepartsBillList where HMainID =" + HInterID, "h_v_Sb_EquipSparepartsBillList");
+ 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("Sb_EquipSparepartsBill/EquipSparepartsBillEdit")]
+ [HttpPost]
+ public object EquipSparepartsBillEdit([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[3].ToString();
+
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsSb_EquipSparepartsBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSb_EquipSparepartsBillMain>>(msg2);
+
+ long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ long HBillStatus = 1;//鍗曟嵁鍙�
+ long HPRDORGID = mainList[0].HPRDORGID;//缁勭粐
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ string HRemark = mainList[0].HRemark;//澶囨敞
+ long HEmpID = mainList[0].HEmpID;//鍙樻洿浜�
+ long HDeptID = mainList[0].HDeptID;//閮ㄩ棬
+ long HEquipID = mainList[0].HEquipID;//璁惧涓绘。
+ long HOrgID = mainList[0].HOrgID;//浣跨敤缁勭粐
+ string HMaker = user;//鍒跺崟浜�
+
+ DateTime dt = DateTime.Now;
+
+
+
+ //ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_POOrderBillList");
+
+ if ((OperationType == 1 || OperationType == 2))//鏂板 && ds.Tables[0].Rows.Count == 0
+ {
+ //DataSet Ds;
+ //Int64 NewHInterID = 1;
+ //Ds = oCN.RunProcReturn("select MAX(HInterID)HInterID from Cg_POOrderBillMain", "Cg_POOrderBillMain");
+ //if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()) != 0)
+ //{
+ // NewHInterID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString());
+ // NewHInterID += 1;
+ //}
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Sb_EquipSparepartsBillMain
+ (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
+ ,HRemark,HBackRemark,HMaker,HMakeDate,HMainSourceBillType,HMainSourceInterID
+ ,HMainSourceEntryID,HMainSourceBillNo,HPrintQty,HEmpID,HDeptID,HCheckItemNowID
+ ,HCheckItemNextID,HCheckFlowID,HBacker,HChecker,HUpDater,HCloseMan,HCloseType,HDeleteMan,HEquipID,HOrgID)
+ values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 3980 + "','" +
+ mainList[0].HBillSubType + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + mainList[0].HRemark +
+ "','" + mainList[0].HBackRemark + "','" + mainList[0].HMaker + "','" + dt + "','" + mainList[0].HMainSourceBillType + "'," + mainList[0].HMainSourceInterID +
+ "," + mainList[0].HMainSourceEntryID + ",'" + mainList[0].HMainSourceBillNo + "'," + mainList[0].HPrintQty + "," + mainList[0].HEmpID + "," + mainList[0].HDeptID + ",0,0,0" + ",'" + mainList[0].HBacker + "','" + mainList[0].HChecker + "','" + mainList[0].HUpDater + "','" + mainList[0].HCloseMan + "'," + 0 + ",'" + mainList[0].HDeleteMan + "'," + HEquipID + "," + HOrgID + ")");
+ }
+ else if (OperationType == 3)//|| ds.Tables[0].Rows.Count != 0
+ { //淇敼
+ oCN.RunProc("update Sb_EquipSparepartsBillMain set " +
+ "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" +
+ ",HEmpID=" + HEmpID + ",HDeptID=" + HDeptID + ",HEquipID=" + HEquipID +
+ ",HOrgID=" + HOrgID + " where HInterID=" + HInterID);
+
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Sb_EquipSparepartsBillSub where HInterID='" + HInterID + "'");
+ }
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, HInterID, OperationType);
+
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string msg3, long HInterID, int OperationType)
+ {
+ List<ClsSb_EquipSparepartsBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSb_EquipSparepartsBillSub>>(msg3);
+
+
+
+ int i = 0;
+ foreach (ClsSb_EquipSparepartsBillSub oSub in DetailColl)
+ {
+ i++;
+
+ DataSet Cs;
+ Int64 NewHEntryID = 1;
+ Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Sb_EquipSparepartsBillSub", "Sb_EquipSparepartsBillSub");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+ {
+ NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
+ NewHEntryID += 1;
+ }
+
+ oCN.RunProc($@"Insert into Sb_EquipSparepartsBillSub
+ (HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty
+ ,HRelationMoney,HCloseMan,HCloseType,HItemSubID,HMaterID,HQty,HPartAddr,HSNFlag,HBeginDate,HEndDate)
+ values({HInterID},{NewHEntryID},'{oSub.HBillNo_bak}','{oSub.HRemark}',{oSub.HSourceInterID}
+ ,{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney},'{oSub.HCloseMan}',0,0,{oSub.HMaterID},{oSub.HQty},'{oSub.HPartAddr}',
+ {oSub.HSNFlag},'{oSub.HBeginDate}','{oSub.HEndDate}')");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
+ #region [鍒犻櫎]
+ [Route("Sb_EquipSparepartsBill/Delete")]
+ [HttpGet]
+ public object Delete(string HInterID, string user)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Delete From Sb_EquipSparepartsBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From Sb_EquipSparepartsBillSub where HInterID = " + HInterID);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipSparepartsChangeBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipSparepartsChangeBillController.cs
new file mode 100644
index 0000000..0619b04
--- /dev/null
+++ b/WebAPI/Controllers/SBGL/Sb_EquipSparepartsChangeBillController.cs
@@ -0,0 +1,290 @@
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.SBGL
+{
+ public class Sb_EquipSparepartsChangeBillController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region [璁惧澶囧搧澶囦欢鍙樻洿鍒楄〃]
+ [Route("Sb_EquipSparepartsChangeBill/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipSparepartsChangeBillList order by HMainID asc", "h_v_Sb_EquipSparepartsChangeBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipSparepartsChangeBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by HMainID asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipSparepartsChangeBillList");
+ }
+
+ 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 [鏍规嵁ID鏌ユ壘璁板綍]
+ [Route("Sb_EquipSparepartsChangeBill/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipSparepartsChangeBillList where HMainID =" + HInterID, "h_v_Sb_EquipSparepartsChangeBillList");
+ 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("Sb_EquipSparepartsChangeBill/EquipSparepartsChangeBillEdit")]
+ [HttpPost]
+ public object EquipSparepartsBillEdit([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[3].ToString();
+
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsSb_EquipSparepartsChangeBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSb_EquipSparepartsChangeBillMain>>(msg2);
+
+ long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ long HBillStatus = 1;//鍗曟嵁鍙�
+ long HPRDORGID = mainList[0].HPRDORGID;//缁勭粐
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ string HRemark = mainList[0].HRemark;//澶囨敞
+ long HEmpID = mainList[0].HEmpID;//鍙樻洿浜�
+ long HDeptID = mainList[0].HDeptID;//閮ㄩ棬
+ long HEquipID = mainList[0].HEquipID;//璁惧涓绘。
+ long HOrgID = mainList[0].HOrgID;//浣跨敤缁勭粐
+ string HMaker = user;//鍒跺崟浜�
+
+ DateTime dt = DateTime.Now;
+
+
+
+ //ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_POOrderBillList");
+
+ if ((OperationType == 1 || OperationType == 2))//鏂板 && ds.Tables[0].Rows.Count == 0
+ {
+ //DataSet Ds;
+ //Int64 NewHInterID = 1;
+ //Ds = oCN.RunProcReturn("select MAX(HInterID)HInterID from Cg_POOrderBillMain", "Cg_POOrderBillMain");
+ //if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()) != 0)
+ //{
+ // NewHInterID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString());
+ // NewHInterID += 1;
+ //}
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Sb_EquipSparepartsChangeBillMain
+ (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
+ ,HRemark,HBackRemark,HMaker,HMakeDate,HMainSourceBillType,HMainSourceInterID
+ ,HMainSourceEntryID,HMainSourceBillNo,HPrintQty,HEmpID,HDeptID,HCheckItemNowID
+ ,HCheckItemNextID,HCheckFlowID,HBacker,HChecker,HUpDater,HCloseMan,HCloseType,HDeleteMan,HEquipID,HOrgID)
+ values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 3981 + "','" +
+ mainList[0].HBillSubType + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + mainList[0].HRemark +
+ "','" + mainList[0].HBackRemark + "','" + mainList[0].HMaker + "','" + dt + "','" + mainList[0].HMainSourceBillType + "'," + mainList[0].HMainSourceInterID +
+ "," + mainList[0].HMainSourceEntryID + ",'" + mainList[0].HMainSourceBillNo + "'," + mainList[0].HPrintQty + "," + mainList[0].HEmpID + "," + mainList[0].HDeptID + ",0,0,0" + ",'" + mainList[0].HBacker + "','" + mainList[0].HChecker + "','" + mainList[0].HUpDater + "','" + mainList[0].HCloseMan + "'," + 0 + ",'" + mainList[0].HDeleteMan + "'," + HEquipID + "," + HOrgID + ")");
+ }
+ else if (OperationType == 3)//|| ds.Tables[0].Rows.Count != 0
+ { //淇敼
+ oCN.RunProc("update Sb_EquipSparepartsChangeBillMain set " +
+ "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" +
+ ",HEmpID=" + HEmpID + ",HDeptID=" + HDeptID + ",HEquipID=" + HEquipID +
+ ",HOrgID=" + HOrgID + " where HInterID=" + HInterID);
+
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Sb_EquipSparepartsChangeBillSub where HInterID='" + HInterID + "'");
+ }
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, HInterID, OperationType);
+
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string msg3, long HInterID, int OperationType)
+ {
+ List<ClsSb_EquipSparepartsChangeBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSb_EquipSparepartsChangeBillSub>>(msg3);
+
+
+
+ int i = 0;
+ foreach (ClsSb_EquipSparepartsChangeBillSub oSub in DetailColl)
+ {
+ i++;
+
+ DataSet Cs;
+ Int64 NewHEntryID = 1;
+ Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Sb_EquipSparepartsChangeBillSub", "Sb_EquipSparepartsChangeBillSub");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+ {
+ NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
+ NewHEntryID += 1;
+ }
+
+ oCN.RunProc($@"Insert into Sb_EquipSparepartsChangeBillSub
+ (HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty
+ ,HRelationMoney,HCloseMan,HCloseType,HItemSubID,HMaterID_Old,HMaterID_New,HQty,HPartAddr,HSNFlag,HBeginDate,HEndDate)
+ values({HInterID},{NewHEntryID},'{oSub.HBillNo_bak}','{oSub.HRemark}',{oSub.HSourceInterID}
+ ,{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney},'{oSub.HCloseMan}',0,0,{oSub.HMaterID_Old},{oSub.HMaterID_New},{oSub.HQty},'{oSub.HPartAddr}',
+ {oSub.HSNFlag},'{oSub.HBeginDate}','{oSub.HEndDate}')");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
+ #region [鍒犻櫎]
+ [Route("Sb_EquipSparepartsChangeBill/Delete")]
+ [HttpGet]
+ public object Delete(string HInterID, string user)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Delete From Sb_EquipSparepartsChangeBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From Sb_EquipSparepartsChangeBillSub where HInterID = " + HInterID);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
index e751558..35d43ef 100644
--- a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
@@ -31,7 +31,7 @@
/// </summary>
[Route("Sc_ICMOReportBill/list")]
[HttpGet]
- public object list(string sWhere,string user)
+ public object list(string sWhere, string user)
{
try
{
@@ -52,7 +52,7 @@
else
{
string sql1 = "select * from h_v_IF_ICMOReportBillList_Edit where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc ";
+ string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOReportBillList_Edit");
}
@@ -189,10 +189,10 @@
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Gy_ICMOReportBillMain(msg2);
-
+
foreach (Models.ClsSc_ICMOReportBillMain oItem in lsmain)
{
- if (refSav == "Add")
+ if (refSav == "Add")
{
//鍗曟嵁鍙锋槸鍚﹂噸澶�
if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
@@ -215,7 +215,7 @@
return objJsonResult;
}
//鍒ゆ柇鏄惁鍙紪杈�
- if (BillOld.omodel.HChecker != ""&& BillOld.omodel.HChecker != null)
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -295,7 +295,7 @@
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
//oItemSub.HRemark = ""; //澶囨敞
- oItemSub.HSourceInterID =0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
//oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
@@ -348,6 +348,91 @@
}
#endregion
+ #region 鐢熶骇姹囨姤鍗曚繚瀛榓pi
+ [Route("Sc_ICMOReportBill/Sc_ICMOReportBillSaveApi")]
+ [HttpPost]
+ public object Sc_ICMOReportBillSaveApi([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var model = sMainSub["model"].ToString();
+ var entry = sMainSub["model"]["HENTRY"].ToString();
+
+ model = "[" + model.ToString() + "]";
+ List<ClsSc_ICMOReportBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_ICMOReportBillMain>>(model);
+ List<ClsSc_ICMOReportBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_ICMOReportBillSub>>(entry);
+ string sql = string.Empty;
+ oCN.BeginTran();
+ sql = $"delete Sc_ICMOReportBillMain where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ sql = $"delete Sc_ICMOReportBillSub where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ //涓昏〃
+ sql = "Insert Into Sc_ICMOReportBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
+ ",HGroupID,HDeptID,HDeptNumber" +
+ ",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
+ ",HChecker,HCheckDate,HUpDater,HUpDateDate,HDeleteMan,HDeleteDate,HPrintQty,HCheckType" +
+ ",HERPInterID,HERPBillType,HPRDORGID" +
+ ") " +
+ " values('" + mainList[0].HBillType + "','" + mainList[0].HBillSubType + "'," + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "','" + mainList[0].HMaker + "',getdate()" +
+ "," + mainList[0].HYear.ToString() + "," + mainList[0].HPeriod.ToString() + ",'" + mainList[0].HRemark + "','" + mainList[0].HEmpID.ToString() + "','" + mainList[0].HEmpNumber +
+ "','" + mainList[0].HGroupID.ToString() + "'," + mainList[0].HDeptID.ToString() + ",'" + mainList[0].HDeptNumber +
+ "','" + mainList[0].HMainSourceBillNo.ToString() + "'," + mainList[0].HMainSourceInterID.ToString() + ",'" + mainList[0].HMainSourceEntryID + "','" + mainList[0].HMainSourceBillType + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HUpDater +
+ "','" + mainList[0].HUpDateDate + "','" + mainList[0].HDeleteMan + "','" + mainList[0].HDeleteDate + "'," + mainList[0].HPrintQty +
+ ",'" + mainList[0].HCheckType + "'," + mainList[0].HERPInterID + ",'" + mainList[0].HERPBillType + "'," + mainList[0].HPRDORGID +
+ ") ";
+ oCN.RunProc(sql);
+ //淇濆瓨涓昏〃
+ foreach (var oSub in subList)
+ {
+ sql = "Insert into Sc_ICMOReportBillSub " +
+ " (HInterID,HEntryID,HMaterID,HMaterNumber" +
+ ",HQty,HUnitID,HUnitNumber,HTimes,HSourceID" +
+ ",HQtyMust,HWorkerID,HWorkerNumber,HBadCount,HWasterQty," +
+ "HCloseMan,HCloseType,HRemark," +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ",HICMOInterID,HICMOBillNo,HBarCode" +
+ ",HOWNERTYPEID,HISENTRUST,HSTOCKINORGID,HOWNERID,HCHECKPRODUCT,HQAIP,HCOSTRATE,HISBACKFLUSH" +
+ ",HREQSRC,HREQBILLNO,HREQBILLID,HREQENTRYSEQ,HREQENTRYID,HMOMAINENTRYID,HSTOCKINQUASELQTY" +
+ ",HPRODUCTTYPE,HPROJECTNO,HICMOENTRYSEQ,HSEQ,HPRODUCEDATE,HEXPIRYDATE,HBASEUNITID,HDEPTID" +
+ ",HGroupID,HDESCRIPTION" +
+ ",HSourceNumber,HQPQty,HICMOEntryID" +
+ ",HWhID,HSPID,HBatChNo,HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID" +
+ ") values("
+ + oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'" +
+ "," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HTimes.ToString() + "," + oSub.HSourceID.ToString() +
+ "," + oSub.HQtyMust.ToString() + "," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HBadCount.ToString() + "," + oSub.HWasterQty.ToString() +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
+ "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "','" + oSub.HOWNERTYPEID + "'," +
+ oSub.HISENTRUST + "," + oSub.HSTOCKINORGID + "," + oSub.HOWNERID + "," + oSub.HCHECKPRODUCT + ",'" + oSub.HQAIP + "'," +
+ oSub.HCOSTRATE + "," + oSub.HISBACKFLUSH + ",'" + oSub.HREQSRC + "','" + oSub.HREQBILLNO + "'," + oSub.HREQBILLID + "," +
+ oSub.HREQENTRYSEQ + "," + oSub.HREQENTRYID + "," + oSub.HMOMAINENTRYID + "," + oSub.HSTOCKINQUASELQTY + "," + oSub.HPRODUCTTYPE + ",'" + oSub.HPROJECTNO + "'," + oSub.HICMOENTRYSEQ + "," + oSub.HSEQ + ",'" + oSub.HPRODUCEDATE + "','" + oSub.HEXPIRYDATE + "'," + oSub.HBASEUNITID + "," + oSub.HDEPTID + "," + oSub.HGroupID + ",'" + oSub.HDESCRIPTION + "','" + oSub.HSourceNumber + "'," + oSub.HQPQty + "," + oSub.HICMOEntryID + "," + oSub.HWhID + "," + oSub.HSPID + ",'" + oSub.HBatChNo + "'," + oSub.HAuxPropID + ",'" + oSub.HMTONo + "'," + oSub.HPlanMode + "," + oSub.HERPInterID + "," + oSub.HERPEntryID + ") ";
+ oCN.RunProc(sql);
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#region 鐢熶骇姹囨姤鍗曞垹闄ゅ姛鑳�
/// <summary>
/// 妯″叿澶勭悊棰嗙敤鍗曞垹闄ゅ姛鑳�
@@ -355,7 +440,7 @@
/// <returns></returns>
[Route("Sc_ICMOReportBill/DeltetICMOReportBill")]
[HttpGet]
- public object DeltetMouldLifeChangeBill(string HInterID,string user)
+ public object DeltetMouldLifeChangeBill(string HInterID, string user)
{
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("Sc_ICMOReportBill_Drop", 1, false, user))
diff --git a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
index cddfdaf..8b1b9bb 100644
--- a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
@@ -28,7 +28,7 @@
/// </summary>
[Route("Sc_PPBomBill/list")]
[HttpGet]
- public object list(string sWhere,string user)
+ public object list(string sWhere, string user)
{
try
{
@@ -49,7 +49,7 @@
else
{
string sql1 = "select * from h_v_IF_PPBomBillList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc ";
+ string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_IF_PPBomBillList");
}
@@ -79,9 +79,6 @@
return objJsonResult;
}
}
-
-
-
#region 鐢熶骇鐢ㄦ枡娓呭崟 瀹℃牳/鍙嶅鏍�
[Route("Sc_PPBomBill/DeOrAuditBill")]
[HttpGet]
@@ -148,7 +145,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�,鍘熷洜:"+DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�,鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -219,7 +216,7 @@
catch (Exception e)
{
sReturn = e.Message;
- throw(e);
+ throw (e);
}
}
//鍙嶅鏍�
@@ -357,12 +354,12 @@
(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus,HICMOInterID
,HICMOEntryID,HMaterID,HUnitID,HQty,HDeptID,HMaker,HMakeDate,HChecker,HCheckDate
,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HPRDORGID,HENTRUSTORGID,HPARENTOWNERID
- ,HPARENTOWNERTYPEID,HERPInterID,HERPBillType,HSeOrderEntrySEQ,HICMOEntrySEQ)
+ ,HPARENTOWNERTYPEID,HERPInterID,HERPBillType,HSeOrderEntrySEQ,HICMOEntrySEQ,HREQSRC)
values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 3720 + "','" +
HBillSubType + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "'," + HICMOInterID +
"," + HICMOEntryID + ",'" + HMaterID + "'," + HUnitID + "," + HQty + "," + HDeptID +
",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HCheckDate + "','" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HPRDORGID + "," + HENTRUSTORGID + "," + HPARENTOWNERID + "," +
- HPARENTOWNERTYPEID + "," + HERPInterID + ",'" + HERPBillType + "'," + HSeOrderEntrySEQ + "," + HICMOEntrySEQ + ")");
+ HPARENTOWNERTYPEID + "," + HERPInterID + ",'" + HERPBillType + "'," + HSeOrderEntrySEQ + "," + HICMOEntrySEQ + ",'" + HREQSRC + "')");
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
@@ -409,7 +406,7 @@
DateTime dt = DateTime.Now;
- long HQtyMust = DetailColl2[0].HQtyMust == null ? 0 : DetailColl2[0].HQtyMust; //搴斿彂鏁伴噺
+ decimal HQtyMust = DetailColl2[0].HQtyMust == null ? 0 : DetailColl2[0].HQtyMust; //搴斿彂鏁伴噺
double HNumerator = DetailColl2[0].HNumerator == null ? 0 : DetailColl2[0].HNumerator; //鍒嗗瓙
double HDenominator = DetailColl2[0].HDenominator == null ? 0 : DetailColl2[0].HDenominator; //鍒嗘瘝
double HQtyScrap = DetailColl2[0].HQtyScrap == null ? 0 : DetailColl2[0].HQtyScrap; //鎹熻�楃巼
@@ -514,7 +511,7 @@
{
NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
NewHEntryID += 1;
- }
+ }
oCN.RunProc($@"Insert into Sc_PPBomBillSub
@@ -536,6 +533,66 @@
return objJsonResult;
}
+ [Route("Sc_PPBomBill/Sc_PPBomBillSaveApi")]
+ [HttpPost]
+ public object Sc_PPBomBillSaveApi([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var model = sMainSub["model"].ToString();
+ var entry = sMainSub["model"]["HENTRY"].ToString();
+
+ model = "[" + model.ToString() + "]";
+ List<ClsSc_PPBomBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_PPBomBillMain>>(model);
+ List<ClsSc_PPBomBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_PPBomBillSub>>(entry);
+ string sql = string.Empty;
+ oCN.BeginTran();
+ sql = $"delete Sc_PPBomBillMain where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ sql = $"delete Sc_PPBomBillSub where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Sc_PPBomBillMain
+ (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus,HICMOInterID
+ ,HICMOEntryID,HMaterID,HUnitID,HQty,HDeptID,HMaker,HMakeDate,HChecker,HCheckDate
+ ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HPRDORGID,HENTRUSTORGID,HPARENTOWNERID
+ ,HPARENTOWNERTYPEID,HERPInterID,HERPBillType,HSeOrderEntrySEQ,HICMOEntrySEQ,HREQSRC)
+ values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 3720 + "','" +
+ mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "','" + mainList[0].HBillStatus + "'," + mainList[0].HICMOInterID +
+ "," + mainList[0].HICMOEntryID + ",'" + mainList[0].HMaterID + "'," + mainList[0].HUnitID + "," + mainList[0].HQty + "," + mainList[0].HDeptID +
+ ",'" + mainList[0].HMaker + "','" + mainList[0].HMakeDate + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HSeOrderBillNo + "'," + mainList[0].HSeOrderInterID + "," + mainList[0].HSeOrderEntryID + "," + mainList[0].HPRDORGID + "," + mainList[0].HENTRUSTORGID + "," + mainList[0].HPARENTOWNERID + ",'" +
+ mainList[0].HPARENTOWNERTYPEID + "'," + mainList[0].HERPInterID + ",'" + mainList[0].HERPBillType + "'," + mainList[0].HSeOrderEntrySEQ + "," + mainList[0].HICMOEntrySEQ + ",'" + mainList[0].HREQSRC + "')");
+ //淇濆瓨涓昏〃
+ foreach (var oSub in subList)
+ {
+ oCN.RunProc($@"Insert into Sc_PPBomBillSub
+ (HInterID,HEntryID,HMaterID,HMaterNumber,HUnitID,HUnitNumber,HSPID,HQty,HQtyMust,HWHID,HRemark
+ ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HICMOInterID,HICMOEntryID,HICMOBillNo
+ ,HCHILDSUPPLYORGID,HSUPPLYORGID,HENTRUSTPICKORGID,HSRCTRANSORGID,HGROUPBYOWNERID,HOWNERID,HOWNERTYPEID
+ ,HRelationQty,HMoveStockQty,HAuxPropID,HBatchNO,HMTONo,HQtyScrap,HERPInterID,HERPEntryID
+ ,HBackRelationQty,HNumerator,HDenominator,HBASEUNITID,HProcessID,HICMOENTRYSEQ,HPROJECTNO
+ ,HOPERID,HSEQ,HSTOCKSTATUSID,HLOT,HOPTQUEUE,HRESERVETYPE,HSelPickedQty,HSELPRCDRETURNQTY)
+ values('{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HMaterNumber}','{oSub.HUnitID}','{oSub.HUnitNumber}','{oSub.HSPID}','{oSub.HQty}'
+ ,'{oSub.HQtyMust}','{oSub.HWHID}','{oSub.HRemark}','{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}','{oSub.HICMOInterID}','{oSub.HICMOEntryID}','{oSub.HICMOBillNo}','{oSub.HCHILDSUPPLYORGID}','{oSub.HSUPPLYORGID}','{oSub.HENTRUSTPICKORGID}','{oSub.HSRCTRANSORGID}','{oSub.HGROUPBYOWNERID}','{oSub.HOWNERID}','{oSub.HOWNERTYPEID}','{oSub.HRelationQty}','{oSub.HMoveStockQty}','{oSub.HAuxPropID}','{oSub.HBatchNO}','{oSub.HMTONo}','{oSub.HQtyScrap}','{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HBackRelationQty}','{oSub.HNumerator}','{oSub.HDenominator}','{oSub.HBASEUNITID}','{oSub.HProcessID}','{oSub.HICMOENTRYSEQ}','{oSub.HPROJECTNO}','{oSub.HOPERID}','{oSub.HSEQ}','{oSub.HSTOCKSTATUSID}','{oSub.HLOT}','{oSub.HOPTQUEUE}','{oSub.HRESERVETYPE}','{oSub.HSelPickedQty}','{oSub.HSELPRCDRETURNQTY}')");
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
/// <summary>
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/DataHelper.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/DataHelper.cs"
index b9adbec..ed0e600 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/DataHelper.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/DataHelper.cs"
@@ -1,5 +1,8 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json;
+using System;
+using System.Collections;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Data;
using System.Linq;
using System.Reflection;
@@ -19,7 +22,7 @@
List<T> list = new List<T>();
if (ds.Tables[0].Rows.Count > 0)
{
- foreach (DataRow row in ds.Tables[0].Rows)
+ foreach (DataRow row in ds.Tables[0].Rows)
{
list.Add(row.Put(new T()));
}
@@ -167,5 +170,77 @@
}
return $"update {table} set {strSet} where 1=1 {condition}";
}
+
+
+
+
+ /// <summary>
+ /// 灏哃ist杞崲鎴怐ataTable
+ /// </summary>
+ /// <typeparam name="T"></typeparam>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ public static DataTable ToDataTable<T>(this IList<T> data)
+ {
+ PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(typeof(T));
+ DataTable dt = new DataTable();
+ for (int i = 0; i < properties.Count; i++)
+ {
+ PropertyDescriptor property = properties[i];
+ dt.Columns.Add(property.Name, property.PropertyType);
+ }
+ object[] values = new object[properties.Count];
+ foreach (T item in data)
+ {
+ for (int i = 0; i < values.Length; i++)
+ {
+ values[i] = properties[i].GetValue(item);
+ }
+ dt.Rows.Add(values);
+ }
+ return dt;
+ }
+
+
+ /// <summary>
+ /// 灏哃ist杞崲涓篋ataTable
+ /// </summary>
+ /// <param name="list">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ public static DataTable ListToDataTable<T>(List<T> list)
+ {
+ //鍒涘缓涓�涓悕涓�"tableName"鐨勭┖琛�
+ DataTable dt = new DataTable("tableName");
+
+ //鍒涘缓浼犲叆瀵硅薄鍚嶇О鐨勫垪
+ foreach (var item in list.FirstOrDefault().GetType().GetProperties())
+ {
+ dt.Columns.Add(item.Name);
+ }
+ //寰幆瀛樺偍
+ foreach (var item in list)
+ {
+ //鏂板姞琛�
+ DataRow value = dt.NewRow();
+ //鏍规嵁DataTable涓殑鍊硷紝杩涜瀵瑰簲鐨勮祴鍊�
+ foreach (DataColumn dtColumn in dt.Columns)
+ {
+ int i = dt.Columns.IndexOf(dtColumn);
+ //鍩哄厓鍏冪礌锛岀洿鎺ュ鍒讹紝瀵硅薄绫诲瀷绛夛紝杩涜搴忓垪鍖�
+ if (value.GetType().IsPrimitive)
+ {
+ value[i] = item.GetType().GetProperty(dtColumn.ColumnName).GetValue(item);
+ }
+ else
+ {
+ value[i] = JsonConvert.SerializeObject(item.GetType().GetProperty(dtColumn.ColumnName).GetValue(item));
+ }
+ }
+ dt.Rows.Add(value);
+ }
+ return dt;
+ }
+
}
+
}
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index ad6be8f..2d63c29 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -2505,6 +2505,7 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
string UserName = "";
@@ -2558,6 +2559,34 @@
}
oBill.omodel = oItem;
}
+
+ //淇濆吇椤硅〃浣撴暟鎹�
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg5 = msg5.Substring(1, msg5.Length - 2);
+ msg5 = msg5.Replace("\\", "");
+ msg5 = msg5.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSc_MouldMaintainPlanBillSub_Item> ls1 = new List<Model.ClsSc_MouldMaintainPlanBillSub_Item>();
+ ls1 = oListModels.getObjectByJson_Gy_MouldMaintainPlanBillSub_Item(msg5);
+ int j = 0;
+ foreach (Model.ClsSc_MouldMaintainPlanBillSub_Item item in ls1)
+ {
+
+ j++;
+ item.HEntryID = j;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ item.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ item.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ item.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ item.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ item.HRelationQty = 0; //鍏宠仈鏁伴噺
+ oBill.DetailCol.Add(item);
+
+ }
+
//琛ㄤ綋鏁版嵁
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
msg3 = msg3.Substring(1, msg3.Length - 2);
@@ -2653,28 +2682,28 @@
[HttpGet]
public object Sc_MouldMaintainPlanBillListProjectDetai(string sqlWhere)
{
- DataSet ds;
+ DataSet ds, ds1;
+ List<object> list = new List<object>();
+
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sqlWhere == null || sqlWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select a.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,a.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,a.HQty,a.HQtyMust,a.HRemark from Sc_MouldMaintainPlanBillSub a left join Gy_Unit u on a.HUnitID=u.HItemID left join h_v_IF_Material m on a.HMaterID=m.HItemID", "Sc_MouldMaintainPlanBillSub");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- }
- else
- {
- string sql1 = "select a.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,a.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,a.HQty,a.HQtyMust,a.HRemark from Sc_MouldMaintainPlanBillSub a left join Gy_Unit u on a.HUnitID=u.HItemID left join h_v_IF_Material m on a.HMaterID=m.HItemID where 1 = 1 ";
- string sql = sql1 + sqlWhere;
- ds = oCN.RunProcReturn(sql, "Sc_MouldMaintainPlanBillSub");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- }
+ //鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
+ string sql = "select 淇濆吇椤圭洰ID HMaintainItemID, 淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰 HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,璐熻矗浜篒D,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜哄悕绉� HManagerName,瀛愬娉�2 HRemark from h_v_Sc_MouldMaintainPlanBillSub_Item where 1 = 1 " + sqlWhere + "";
+
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainPlanBillSub_Item");
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ string sql1 = "select 閰嶄欢ID HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitNumber,璁￠噺鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,瀛愬娉�1 HRemark from h_v_Sc_MouldMaintainPlanBillSub where 1 = 1 " + sqlWhere + "";
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainPlanBillSub");
+
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = list;
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index bb1b19e..74861e0 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -167,16 +167,26 @@
//鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
DataRow dr = ds.Tables[0].Rows[0];
+
//淇濆瓨
oCN.BeginTran();
- //鐢熶骇姹囨姤鍗曚富琛�
- oCN.RunProc("Insert Into Sc_ICMOReportBillMain " +
+ DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain where HBillNo='{HBillNo}'" , "Sc_ICMOReportBillMain");
+ if (DsTable.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸插叆搴�,璇蜂笉瑕侀噸澶嶅叆搴�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鐢熶骇姹囨姤鍗曚富琛�
+ oCN.RunProc("Insert Into Sc_ICMOReportBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" +
",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
",HGroupID,HDeptID,HDeptNumber" +
",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
") " +
- " values('3711','3711'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
+ " values('3711','3711'," + HInterID.ToString() + ",'" + BillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
",DATENAME(YEAR,GETDATE()),0,'','" + dr["HEmpID"].ToString() + "','" + dr["鎿嶄綔鍛樹唬鐮�"].ToString() +
"','" + dr["HGroupID"].ToString() + "',0,''" +
",'" + BillNo.ToString() + "'," + InterID.ToString() + ", 0,'3791'" +
@@ -220,7 +230,7 @@
model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //鐢熶骇缁勭粐1
model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡1
model.Add("FHZYMESFLAG", "鏄�");// 鏄惁涓篗ES鍚屾
- model.Add("FBillNo", HBillNo);
+ model.Add("FBillNo", BillNo);
JArray Fentity = new JArray();
@@ -260,19 +270,6 @@
FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //鍖呰鏍囪瘑
FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //鎵瑰彿
FentityModel.Add("F_bsv_Text", dr1["宸ュ簭娴佽浆鍗″彿"].ToString()); //娴佽浆鍗″彿
- //鎵瑰彿
- //FFLOWID FFLOWLINEID FRULEID FSTABLENAME
- //f6e6eec3 - 5267 - 4f02 - 8593 - b633da508a72 3 PRD_MO2MORPT T_PRD_MOENTRY
- //涓氬姟娴佺▼鍥撅細FEntity_Link_FFlowId
- //鎺ㄨ繘璺嚎锛欶Entity_Link_FFlowLineId
- //杞崲瑙勫垯锛欶Entity_Link_FRuleId
- //婧愬崟琛ㄥ唴鐮侊細FEntity_Link_FSTableId
- //婧愬崟琛細FEntity_Link_FSTableName
- //婧愬崟鍐呯爜锛欶Entity_Link_FSBillId
- //婧愬崟鍒嗗綍鍐呯爜锛欶Entity_Link_FSId
- //鍘熷鎼哄甫閲忥細FEntity_Link_FBaseQuaQtyOld
- //淇敼鎼哄甫閲忥細FEntity_Link_FBaseQuaQty
-
JArray Fentity2 = new JArray();
JObject FentityModel2 = new JObject();
FentityModel2.Add("FEntity_Link_FFlowId", "f6e6eec3-5267-4f02-8593-b633da508a72");
@@ -439,7 +436,7 @@
model.Add("FOwnerId0", new JObject() { ["FNumber"] = dr1["HPrdOrgNumber"].ToString() }); //
model.Add("FIsEntrust", "false");//
model.Add("FCurrId", new JObject() { ["FNumber"] = "PRE001" }); //
- model.Add("FBillNo", HBillNo);
+ model.Add("FBillNo", BillNo);
JArray Fentity = new JArray();
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index d5525cd..2f17948 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -2788,6 +2788,124 @@
}
/// <summary>
+ /// 鑾峰彇璁惧涓绘。鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetGy_EquipFileBillMainList_Json")]
+ [HttpGet]
+ public object GetGy_EquipFileBillMainList_Json(string EquipFileBill)
+ {
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (EquipFileBill != "")
+ {
+ sWhere = sWhere + " and ( HEquipFileNumber like '%" + EquipFileBill + "%' or HName like '%" + EquipFileBill + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain where 0=0 Order by HInterID ", "Gy_EquipFileBillMain");
+ }
+ else
+ {
+ string sql1 = "Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain where 0=0 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_EquipFileBillMain");
+ }
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ 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 = "0";
+ 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/GetGy_MouldFileMainList_Json")]
+ [HttpGet]
+ public object GetGy_MouldFileMainList_Json(string MouldFileMain)
+ {
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (MouldFileMain != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + MouldFileMain + "%' or HName like '%" + MouldFileMain + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select HInterID,HNumber,HName from Gy_MouldFileMain where 0=0 Order by HInterID ", "Gy_MouldFileMain");
+ }
+ else
+ {
+ string sql1 = "Select HInterID,HNumber,HName from Gy_MouldFileMain where 0=0 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_MouldFileMain");
+ }
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ 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 = "0";
+ 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>
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
index bd3e253..d45f65f 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Model;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -158,6 +159,226 @@
}
}
+ #region 鍙戣揣閫氱煡鍗� 淇濆瓨/缂栬緫鍔熻兘
+ [Route("Xs_SeOutStockBill/SeOutStockBillEdit")]
+ [HttpPost]
+ public object SeOutStockBillEdit([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[3].ToString();
+ string msg_allVal = sArray[4].ToString(); //涓昏〃+瀛愯〃鎵�鏈夋暟鎹�
+
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsXs_SeOutStockBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOutStockBillMain>>(msg2);
+
+ long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ long HPRDORGID = mainList[0].HPRDORGID;//缁勭粐
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ string HRemark = mainList[0].HRemark;//澶囨敞
+ long HEmpID = mainList[0].HEmpID;//涓氬姟鍛�
+ long HDeptID = mainList[0].HDeptID;//閮ㄩ棬
+ long HWHID = mainList[0].HWHID;//浠撳簱
+ long HManagerID = mainList[0].HManagerID;//涓荤
+ long HCurID = mainList[0].HCurID;//甯佸埆
+ Single HExRate = mainList[0].HExRate;//姹囩巼
+ string HMaker = user;//鍒跺崟浜�
+ string HExplanation = mainList[0].HExplanation;//鎽樿
+ string HInnerBillNo = mainList[0].HInnerBillNo;//鍐呴儴鍗曟嵁鍙�
+ long HCusID = mainList[0].HCusID; //瀹㈡埛
+ string HAddress = mainList[0].HAddress;//鍦板潃
+ long HSSID = mainList[0].HSSID;//缁撶畻鏂瑰紡
+
+ long HDFflag = Convert.ToInt32(mainList[0].HDFflag); //鏄惁鍨粯
+
+
+ string HBillType = mainList[0].HBillType;
+ string HBillSubType = mainList[0].HBillSubType;
+ long HBillStatus = mainList[0].HBillStatus;
+ string HMakeDate = mainList[0].HMakeDate;
+ string HChecker = mainList[0].HChecker;
+ string HCheckDate = mainList[0].HCheckDate;
+ string HUpDater = mainList[0].HUpDater;
+ string HUpDateDate = mainList[0].HUpDateDate;
+ string HDeleteMan = mainList[0].HDeleteMan;
+ string HDeleteDate = mainList[0].HDeleteDate;
+ string HCloseMan = mainList[0].HCloseMan;
+ string HCloseDate = mainList[0].HCloseDate;
+ long HERPInterID = mainList[0].HERPInterID;
+ string HERPBillType = mainList[0].HERPBillType;
+ long HSALEORGID = mainList[0].HSALEORGID;
+ long HDELIVERYORGID = mainList[0].HDELIVERYORGID;
+ long HOWNERID = mainList[0].HOWNERID;
+ string HOWNERTYPEID = mainList[0].HOWNERTYPEID;
+
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_SeOutStockBillList");
+
+ if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
+ {
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Xs_SeOutStockBillMain
+ (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
+ ,HCusID,HManagerID,HDeptID,HRemark,HMaker,HMakeDate
+ ,HAddress,HSSID,HCurID,HWHID,HExRate,HEmpID,HExplanation,HInnerBillNo
+ ,HSALEORGID,HDELIVERYORGID,HOWNERID,HOWNERTYPEID
+ ,HChecker,HCheckDate,HCloseMan,HCloseDate,HERPInterID,HERPBillType,HDFflag)
+ values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1402 + "','" +
+ 1402 + "','" + HDate + "','" + HBillNo + "'," + HBillStatus + "," + HCusID +
+ "," + HManagerID + "," + HDeptID + ",'" + HRemark + "','" + HMaker + "','" + HMakeDate +
+ "','" + HAddress + "'," + HSSID + "," + HCurID + "," + HWHID + "," + HExRate + "," + HEmpID + ",'" +
+ HExplanation + "','" + HInnerBillNo + "'," + HSALEORGID + "," + HDELIVERYORGID + "," + HOWNERID + ",'"
+ + HOWNERTYPEID + "','" + HChecker + "','" + HCheckDate + "','" + HCloseMan + "','" + HCloseDate + "'," + HERPInterID +
+ ",'" + HERPBillType + "'," + HDFflag + ")");
+ }
+ else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
+ { //淇敼
+ oCN.RunProc("update Xs_SeOutStockBillMain set " +
+ "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" + "' where HInterID=" + HInterID);
+
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Xs_SeOutStockBillSub where HInterID='" + HInterID + "'");
+ }
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, HInterID, OperationType);
+
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string msg3, long HInterID, int OperationType)
+ {
+ List<ClsXs_SeOutStockBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOutStockBillSub>>(msg3);
+
+ int i = 0;
+ foreach (ClsXs_SeOutStockBillSub oSub in DetailColl)
+ {
+ i++;
+ if (oSub.HQty <= 0 || oSub.HQty == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oSub.HMaterID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝鐗╂枡涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //if (oSub.HSourceID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + i + "琛岋紝鐢熶骇璧勬簮涓嶈兘涓虹┖";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ if (oSub.HUnitID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝璁￠噺鍗曚綅涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DataSet Cs;
+ Int64 NewHEntryID = 1;
+ Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Xs_SeOutStockBillSub", "Xs_SeOutStockBillSub");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+ {
+ NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
+ NewHEntryID += 1;
+ }
+
+ oCN.RunProc($@"Insert into Xs_SeOutStockBillSub
+ (HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice,HMoney,HWHID,HSPID,HRemark
+ ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HSeOrderInterID,HSeOrderEntryID,HSeORderBillNo
+ ,HOWNERID,HOWNERTYPEID,HSETTLEORGID,HMoveStockQty
+ ,HRelationQty,HAuxPropID,HBatchNO,HMTONo,HERPInterID,HERPEntryID)
+ values({HInterID},{NewHEntryID},{oSub.HMaterID},{oSub.HUnitID},{oSub.HQty}
+ ,{oSub.HPrice},{oSub.HMoney},{oSub.HWHID},{oSub.HSPID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{oSub.HSeORderBillNo}',{oSub.HOWNERID},'{oSub.HOWNERTYPEID}',{oSub.HSETTLEORGID},{oSub.HMoveStockQty},{oSub.HRelationQty}
+ ,{oSub.HAuxPropID},'{oSub.HBatchNO}','{oSub.HMTONo}',{oSub.HERPInterID},{oSub.HERPEntryID})");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ #endregion
//
}
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_OutController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_OutController.cs"
new file mode 100644
index 0000000..8c1e782
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_OutController.cs"
@@ -0,0 +1,389 @@
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.浠撳瓨绠＄悊.鏉＄爜鐢熸垚
+{
+ public class Gy_BarCodeBill_OutController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region [鏉＄爜褰掓。鍒楄〃]
+ [Route("Gy_BarCodeBill_Out/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_BarCodeBill_OutList order by HMainID asc", "h_v_Gy_BarCodeBill_OutList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_BarCodeBill_OutList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by HMainID asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_BarCodeBill_OutList");
+ }
+
+ 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 [鏍规嵁ID鏌ユ壘璁板綍]
+ [Route("Gy_BarCodeBill_Out/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_BarCodeBill_OutList where HMainID =" + HInterID, "h_v_Gy_BarCodeBill_OutList");
+ 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("Gy_BarCodeBill_Out/ModifyByID")]
+ [HttpPost]
+ public object ModifyByID([FromBody] JObject oMain)
+ {
+ try
+ {
+ DAL.ClsGy_Employee_Ctl oDept = new DAL.ClsGy_Employee_Ctl();
+ DAL.ClsGy_Employee_View oDeptHlp = new DAL.ClsGy_Employee_View();
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[1].ToString();
+ //string msg4 = sArray[2].ToString();
+ //string msg5 = sArray[3].ToString();
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Gy_BarCodeBill_Out> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_BarCodeBill_Out>>(msg2);
+
+ long HItemID = list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HParentID = list[0].HParentID;
+ long HLevel = 1;
+ string HHelpCode = list[0].HHelpCode ?? "";
+ bool HEndFlag = list[0].HEndFlag;
+ long HStopflag = list[0].HStopflag;
+ string HRemark = list[0].HRemark;
+ string HUseFlag = list[0].HUseFlag ?? "";
+
+ long HInterID = list[0].HInterID; //涓诲唴鐮�
+ long HEntryID = list[0].HEntryID; //瀛愬唴鐮�
+ string HBillType = list[0].HBillType; //绫诲瀷
+ long HProcID = list[0].HProcID; //宸ュ簭
+ string HBarCode = list[0].HBarCode;//锛堣仛闆嗙储寮曪級 //鏉″舰鐮�
+ string HBarCodeType = list[0].HBarCodeType; //鏉＄爜绫诲瀷锛堢墿鏂欐潯鐮侊紝绠卞彿鏉＄爜锛屾墭鍙锋潯鐮侊級
+ long HItemSubID = list[0].HItemSubID; //瀵瑰簲鏍哥畻椤圭洰
+ long HMaterID = list[0].HMaterID; //瀵瑰簲鐗╂枡鍐呯爜
+ long HUnitID = list[0].HUnitID; //璁￠噺鍗曚綅
+ long HPieceQty = list[0].HPieceQty; //浠舵暟
+ decimal HQty = list[0].HQty; //鏁伴噺
+ string HBatchNo = list[0].HBatchNo; //鎵规鍙�
+ long HSupID = list[0].HSupID; //寰�鏉ュ崟浣�
+ long HGroupID = list[0].HGroupID; //鐢熶骇鐝粍锛圙y_Group锛�
+ long HDeptID = list[0].HDeptID; //閮ㄩ棬
+ long HEmpID = list[0].HEmpID; //涓氬姟鍛�
+ string HMaker = list[0].HMaker; //鍒朵綔浜�
+ string HMakeDate = list[0].HMakeDate; // 鍒朵綔鏃ユ湡
+ long HPrintQty = list[0].HPrintQty; //鎵撳嵃娆℃暟
+ long HSourceInterID = list[0].HSourceInterID; //婧愬崟ID
+ long HSourceEntryID = list[0].HSourceEntryID; //婧愬崟瀛怚D 锛堝鏋滄湁DETAILID 鍒欏～DETAILID锛�
+ string HSourceBillNo = list[0].HSourceBillNo; //婧愬崟鍗曞彿
+ string HSourceBillType = list[0].HSourceBillType; //婧愬崟绫诲瀷
+ string HEndQty = list[0].HEndQty; //灏剧鏁伴噺
+ string HWei = list[0].HWei; //灏剧鏍囪
+ string HBarCodeStatus = list[0].HBarCodeStatus; //鏉＄爜鐘舵��
+ decimal HReadyQty = list[0].HReadyQty; //
+ decimal HInitQty = list[0].HInitQty; //鍒濆鍖栨暟閲�
+ long HBarcodeQtys = list[0].HBarcodeQtys; //鎬绘墭鏁�
+ long HBarcodeNo = list[0].HBarcodeNo; //褰撳墠鎵樺彿
+ long HInstructID = list[0].HBarcodeNo; //
+ string HInstructNo = list[0].HInstructNo; //
+ long HSeOrderBillID = list[0].HSeOrderBillID; //閿�鍞鍗曞唴鐮�
+ string HSeOrderBillNo = list[0].HSeOrderBillNo; //瀹㈡埛璁㈠崟鍙�
+ long HWhID = list[0].HWhID; //榛樿浠撳簱
+ long HSPID = list[0].HSPID; //榛樿浠撲綅
+ long HAuxPropID = list[0].HAuxPropID; //鐗╂枡杈呭姪灞炴��
+ string HMaterName = list[0].HMaterName; //浜у搧瑙勬牸鍚嶇О
+ string HMaterModel = list[0].HMaterModel; //浜у搧瑙勬牸鍨嬪彿
+ string HPinfan = list[0].HPinfan; //鍝佺暘
+ string HMTONo = list[0].HMTONo; //MTO鍙�
+ long HSupflag = list[0].HSupflag; //渚涘簲鍟嗘爣绛炬爣璁�
+ DateTime HBeginDate = list[0].HBeginDate; //寮�濮嬫棩鏈�
+ DateTime HEndDate = list[0].HEndDate; //缁撴潫鏃ユ湡
+ long HExpirationDateFlag = list[0].HExpirationDateFlag; //淇濊川鏈熸爣璁�
+ long HSourceID = list[0].HSourceID; //鐢熶骇璧勬簮
+ string HCusType = list[0].HCusType; //
+ string HWorkLineName = list[0].HWorkLineName; //鐢熶骇绾�
+ long HCusID = list[0].HCusID; //瀹㈡埛鍐呯爜
+ long HSTOCKORGID = list[0].HSTOCKORGID; //搴撳瓨缁勭粐
+ long HOWNERID = list[0].HOWNERID; //璐т富
+ string HJiaYe = list[0].HJiaYe; //鍔犳恫浠ｇ爜
+ string HPressModel = list[0].HPressModel; //鍨嬪彿锛堥煩鐢碉級
+ string HCusModel = list[0].HCusModel; //瀹㈡埛鍨嬪彿
+ string HMaterialModel = list[0].HMaterialModel; //浜у搧瑙勬牸
+ string HColor = list[0].HColor; //棰滆壊
+ string HLogo = list[0].HLogo; //鍝佺墝
+ string HPackageSize = list[0].HPackageSize; //鍖呰灏哄
+ decimal HMaterialJQty = list[0].HMaterialJQty; //鍑�閲�
+ decimal HMaterialMQty = list[0].HMaterialMQty; //姣涢噸
+ string HCustomBatchNo = list[0].HCustomBatchNo; //瀹㈡埛鎵规鍙�
+ DateTime HBarCodeDate = list[0].HBarCodeDate; //鏉＄爜鏍囩鏃ユ湡
+ string HGBBarCode = list[0].HGBBarCode; //鍥芥爣鐮�
+ long HOldBarCodeFlag = list[0].HOldBarCodeFlag; //鏃ф潯鐮佹爣璁�
+ long HOldSourceInterID = list[0].HOldSourceInterID; //鑰佹簮鍗曞唴鐮�
+ long HOldSourceEntryID = list[0].HOldSourceEntryID; //鑰佹簮鍗曞瓙鍐呯爜
+ string HOldSourceBillNo = list[0].HOldSourceBillNo; //鑰佹簮鍗曞崟鍙�
+ long HOrderInterID = list[0].HOrderInterID; //璁㈠崟鍐呯爜
+ long HOrderEntryID = list[0].HOrderEntryID; //璁㈠崟瀛愬唴鐮侊紙濡傛灉鏈塂ETAILID 鍒欏～DETAILID锛�
+ string HOrderBillNo = list[0].HOrderBillNo; //璁㈠崟鍗曞彿
+ string HOrderBillType = list[0].HOrderBillType; //璁㈠崟鍗曟嵁绫诲瀷
+ string HRelationNum = list[0].HRelationNum;//瀵瑰簲缂栧彿
+ decimal HLabelQty = list[0].HLabelQty; //鎵撳嵃鏍囩鏁伴噺
+ decimal HMinQty = list[0].HMinQty; //鏈�灏忓寘瑁呮暟閲�
+ decimal HNowQty = list[0].HNowQty; //褰撳墠鏁伴噺
+ string HStopMan = list[0].HStopMan; //绂佺敤浜�
+ string HStopManDate = list[0].HStopManDate; //绂佺敤鏃ユ湡
+ DateTime HInStockDate = list[0].HInStockDate;
+ DateTime HOutStockDate = list[0].HOutStockDate;
+ string HInStockDate_XF = list[0].HInStockDate_XF;
+ string HExpressNumber = list[0].HExpressNumber;
+ string POOrderBillNo = list[0].POOrderBillNo;
+ string HICMOReportBillNo = list[0].HICMOReportBillNo;
+ DateTime HICMOReportDate = list[0].HICMOReportDate;
+ long HInStockCounts = list[0].HInStockCounts;
+ long HReportCounts = list[0].HReportCounts;
+ long HOutStockCounts = list[0].HOutStockCounts;
+ string HInStockBillNo = list[0].HInStockBillNo;
+ string HOutStockBillNo = list[0].HOutStockBillNo;
+ string HSendGoodsBillNo = list[0].HSendGoodsBillNo;
+ string HKFDate = list[0].HKFDate;
+ long HKFPeriod = list[0].HKFPeriod;
+ string HKFDQDate = list[0].HKFDQDate;
+ long HServerItemID = list[0].HServerItemID;
+ string HBadReasonList = list[0].HBadReasonList;
+ string HProdLev = list[0].HProdLev;
+ long HSeOrderInterID = list[0].HSeOrderInterID;
+ long HSeOrderEntryID = list[0].HSeOrderEntryID;
+ string HInnerBillNo = list[0].HInnerBillNo;
+ string HCusBarCode = list[0].HCusBarCode;
+ string HStatus = list[0].HStatus;
+ long HInitSourceEntryID = list[0].HInitSourceEntryID;
+ string HOldSourceBillType = list[0].HOldSourceBillType;
+ decimal HMZ = list[0].HMZ;
+ long HGiveAwayFlag = list[0].HGiveAwayFlag; //璧犲搧鏍囪
+ long HSeOrderSEQ = list[0].HSeOrderSEQ;
+ long HMaterID_OLD = list[0].HMaterID_OLD;
+ string HDeleteMan = list[0].HDeleteMan;
+ DateTime HDeleteDate = list[0].HDeleteDate;
+ string HBarCode_Pack = list[0].HBarCode_Pack;
+ long HCustomQty1 = list[0].HCustomQty1;
+ DateTime HProduceDate = list[0].HProduceDate; //鐢熶骇鏃ユ湡锛堜繚璐ㄦ湡鐢級
+ DateTime HExpiryDate = list[0].HExpiryDate; //淇濊川鏈熻嚦锛堜繚璐ㄦ湡鐢級
+
+
+ ////鍒ゆ柇鏉冮檺
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //if (oDept.HavSameNumber(HItemID, HNumber))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ oCN.BeginTran();
+
+ DateTime dt = DateTime.Now;
+ //42
+ oCN.RunProc(@"Insert into Gy_BarCodeBill_Out
+ (HInterID, HEntryID, HBillType, HProcID, HBarCode, HBarCodeType, HItemSubID, HMaterID, HUnitID,
+ HPieceQty, HQty, HBatchNo, HSupID, HGroupID, HDeptID, HEmpID, HMaker, HPrintQty, HSourceInterID, HSourceEntryID,
+ HSourceBillNo, HSourceBillType, HRemark, HUseFlag, HEndQty, HWei, HStopflag, HBarCodeStatus, HReadyQty, HInitQty,
+ HWhID, HSPID, HAuxPropID, HMTONo, HSupflag, HBeginDate, HEndDate, HExpirationDateFlag, HSourceID, HCusType,
+ HWorkLineName, HCusID, HSTOCKORGID, HOWNERID, HJiaYe, HPressModel, HCusModel, HMaterialModel, HColor, HLogo,
+ HPackageSize, HMaterialJQty, HMaterialMQty, HCustomBatchNo, HBarCodeDate, HGBBarCode, HOldBarCodeFlag, HOldSourceInterID,
+ HOldSourceEntryID, HOldSourceBillNo, HOrderInterID, HOrderEntryID, HOrderBillNo, HOrderBillType, HRelationNum,
+ HLabelQty, HMinQty, HNowQty, HStopMan, HInStockDate_XF, HExpressNumber, POOrderBillNo, HICMOReportBillNo, HInStockCounts,
+ HReportCounts, HOutStockCounts, HInStockBillNo, HOutStockBillNo, HSendGoodsBillNo, HServerItemID, HBadReasonList, HProdLev,
+ HInnerBillNo, HCusBarCode, HStatus, HInitSourceEntryID, HOldSourceBillType, HMZ, HGiveAwayFlag, HSeOrderSEQ, HMaterID_OLD,
+ HDeleteMan, HBarCode_Pack, HCustomQty1)
+ Values(" + 0 + "," + 0 + "," + 3330 + "," + HProcID + ",'" + HBarCode +
+ "','" + HBarCodeType + "'," + 0 + "," + HMaterID + "," + HUnitID + "," + HPieceQty +
+ "," + HQty + ",'" + HBatchNo + "'" + "," + HSupID + "," + HGroupID +
+ "," + HDeptID + "," + HEmpID + ",'" + HMaker + "'," + HPrintQty + "," + 0 +
+ "," + 0 + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HRemark + "'" +
+ ",'" + HUseFlag + "','" + HEndQty + "','" + HWei + "'," + HStopflag + ",'" + HBarCodeStatus +
+ "'," + HReadyQty + "," + HInitQty + "," + HWhID + "," + HSPID + "," + HAuxPropID +
+ ",'" + HMTONo + "'," + HSupflag + ",'" + dt + "','" + dt + "'," + HExpirationDateFlag +
+ "," + HSourceID + ",'" + HCusType + "','" + HWorkLineName + "'," + HCusID + "," + HSTOCKORGID +
+ "," + HOWNERID + ",'" + HJiaYe + "','" + HPressModel + "','" + HCusModel + "','" + HMaterialModel + "','" + HColor + "','" + HLogo + "'" +
+ ",'" + HPackageSize + "'," + HMaterialJQty + "," + HMaterialMQty + ",'" + HCustomBatchNo + "','" + dt + "','" + HGBBarCode + "'" +
+ "," + HOldBarCodeFlag + "," + HOldSourceInterID + "," + HOldSourceEntryID + ",'" + HOldSourceBillNo + "'" +
+ "," + HOrderInterID + "," + HOrderEntryID + ",'" + HOrderBillNo + "','" + HOrderBillType +
+ "','" + HRelationNum + "'" + "," + HLabelQty + "," + HMinQty + "," + HNowQty + ",'" + HStopMan + "','" + dt +
+ "','" + HExpressNumber + "','" + POOrderBillNo + "','" + HICMOReportBillNo + "'," + HInStockCounts + "," + HReportCounts +
+ "," + HOutStockCounts + ",'" + HInStockBillNo + "','" + HOutStockBillNo + "','" + HSendGoodsBillNo +
+ "'," + HServerItemID + ",'" + HBadReasonList + "','" + HProdLev + "','" + HInnerBillNo + "','" + HCusBarCode + "','" + HStatus + "'," + HInitSourceEntryID + ",'" + HOldSourceBillType + "','" + HMZ + "'," + HGiveAwayFlag + "," + HSeOrderSEQ +
+ "," + HMaterID_OLD + ",'" + HDeleteMan + "','" + HBarCode_Pack + "'," + HCustomQty1 + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_BarCodeBill_Out set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ oCN.RunProc("Update Gy_BarCodeBill_Out set " +
+ " HBarCode='" + HBarCode + "'" +
+ ",HProcID=" + HProcID +
+ ",HBarCodeType='" + HBarCodeType + "'" +
+ ",HMaterID=" + HMaterID +
+ ",HUnitID=" + HUnitID +
+
+ ",HPieceQty=" + HPieceQty +
+ ",HQty=" + HQty +
+ ",HBatchNo='" + HBatchNo + "'" +
+ ",HSupID=" + HSupID +
+ ",HGroupID=" + HGroupID +
+ ",HDeptID=" + HDeptID +
+ ",HEmpID=" + HEmpID +
+ ",HEndQty=" + HEndQty +
+ ",HWhID=" + HWhID +
+ ",HSPID=" + HSPID +
+ ",HAuxPropID=" + HAuxPropID +
+ ",HCusID=" + HCusID +
+ ",HSTOCKORGID=" + HSTOCKORGID +
+ //",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
+ ",HRemark= '" + HRemark.ToString() + "' Where HItemID=" + HItemID);
+ oCN.Commit();
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ //oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [鍒犻櫎]
+ [Route("Gy_BarCodeBill_Out/Delete")]
+ [HttpGet]
+ public object Delete(string HItemID, string user)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Delete From Gy_BarCodeBill_Out where HItemID = " + HItemID);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/KF_BarCodeStatusChangeBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/KF_BarCodeStatusChangeBillController.cs"
new file mode 100644
index 0000000..c6343bc
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/KF_BarCodeStatusChangeBillController.cs"
@@ -0,0 +1,285 @@
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.浠撳瓨绠＄悊.鏉＄爜鐢熸垚
+{
+ public class KF_BarCodeStatusChangeBillController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region [鏉＄爜鐘舵�佸彉鏇村崟鍒楄〃]
+ [Route("KF_BarCodeStatusChangeBill/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_KF_BarCodeStatusChangeBillList order by HMainID asc", "h_v_KF_BarCodeStatusChangeBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_KF_BarCodeStatusChangeBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by HMainID asc";
+ ds = oCN.RunProcReturn(sql, "h_v_KF_BarCodeStatusChangeBillList");
+ }
+
+ 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 [鏍规嵁ID鏌ユ壘璁板綍]
+ [Route("KF_BarCodeStatusChangeBill/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_KF_BarCodeStatusChangeBillList where HMainID =" + HInterID, "h_v_KF_BarCodeStatusChangeBillList");
+ 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("KF_BarCodeStatusChangeBill/BarCodeStatusChangeBillEdit")]
+ [HttpPost]
+ public object BarCodeStatusChangeBillEdit([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[3].ToString();
+
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsKF_BarCodeStatusChangeBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsKF_BarCodeStatusChangeBillMain>>(msg2);
+
+ long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ long HBillStatus = 1;//鍗曟嵁鍙�
+ long HPRDORGID = mainList[0].HPRDORGID;//缁勭粐
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ string HRemark = mainList[0].HRemark;//澶囨敞
+ long HEmpID = mainList[0].HEmpID;//鍙樻洿浜�
+ long HDeptID = mainList[0].HDeptID;//閮ㄩ棬
+ string HMaker = user;//鍒跺崟浜�
+
+ DateTime dt = DateTime.Now;
+
+
+
+ //ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_POOrderBillList");
+
+ if ((OperationType == 1 || OperationType == 2))//鏂板 && ds.Tables[0].Rows.Count == 0
+ {
+ //DataSet Ds;
+ //Int64 NewHInterID = 1;
+ //Ds = oCN.RunProcReturn("select MAX(HInterID)HInterID from Cg_POOrderBillMain", "Cg_POOrderBillMain");
+ //if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()) != 0)
+ //{
+ // NewHInterID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString());
+ // NewHInterID += 1;
+ //}
+ //涓昏〃
+ oCN.RunProc(@"Insert Into KF_BarCodeStatusChangeBillMain
+ (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
+ ,HRemark,HBackRemark,HMaker,HMakeDate,HMainSourceBillType,HMainSourceInterID
+ ,HMainSourceEntryID,HMainSourceBillNo,HPrintQty,HEmpID,HDeptID)
+ values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1288 + "','" +
+ mainList[0].HBillSubType + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + mainList[0].HRemark +
+ "','" + mainList[0].HBackRemark + "','" + mainList[0].HMaker + "','" + dt + "','" + mainList[0].HMainSourceBillType + "'," + mainList[0].HMainSourceInterID +
+ "," + mainList[0].HMainSourceEntryID + ",'" + mainList[0].HMainSourceBillNo + "'," + mainList[0].HPrintQty + "," + mainList[0].HEmpID + "," + mainList[0].HDeptID + ")");
+ }
+ else if (OperationType == 3)//|| ds.Tables[0].Rows.Count != 0
+ { //淇敼
+ oCN.RunProc("update KF_BarCodeStatusChangeBillMain set " +
+ "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" + ",HBillStatus=" + HBillStatus +
+ ",HEmpID=" + HEmpID + ",HDeptID=" + HDeptID + " where HInterID=" + HInterID);
+
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from KF_BarCodeStatusChangeBillSub where HInterID='" + HInterID + "'");
+ }
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, HInterID, OperationType);
+
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string msg3, long HInterID, int OperationType)
+ {
+ List<ClsKF_BarCodeStatusChangeBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsKF_BarCodeStatusChangeBillSub>>(msg3);
+
+
+
+ int i = 0;
+ foreach (ClsKF_BarCodeStatusChangeBillSub oSub in DetailColl)
+ {
+ i++;
+
+ DataSet Cs;
+ Int64 NewHEntryID = 1;
+ Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from KF_BarCodeStatusChangeBillSub", "KF_BarCodeStatusChangeBillSub");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+ {
+ NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
+ NewHEntryID += 1;
+ }
+
+ oCN.RunProc($@"Insert into KF_BarCodeStatusChangeBillSub
+ (HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty
+ ,HRelationMoney,HBarCode,HBarCodeStatus_Old,HBarCodeStatus_New,HAuxPropID_Old,HAuxPropID_New,HMTONo_Old,HMTONo_New)
+ values({HInterID},{NewHEntryID},'{oSub.HBillNo_bak}','{oSub.HRemark}',{oSub.HSourceInterID}
+ ,{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney},'{oSub.HBarCode}','{oSub.HBarCodeStatus_Old}','{oSub.HBarCodeStatus_New}','{oSub.HAuxPropID_Old}','{oSub.HAuxPropID_New}','{oSub.HMTONo_Old}','{oSub.HMTONo_New}')");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
+ #region [鍒犻櫎]
+ [Route("KF_BarCodeStatusChangeBill/Delete")]
+ [HttpGet]
+ public object Delete(string HInterID,string user)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Delete From KF_BarCodeStatusChangeBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From KF_BarCodeStatusChangeBillSub where HInterID = " + HInterID);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
index f4c442a..d4c6f2c 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
@@ -1,4 +1,7 @@
-锘縰sing System;
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json.Linq;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
@@ -59,5 +62,264 @@
}
}
#endregion
+
+ #region 璋冩嫧鍗� 淇濆瓨/缂栬緫鍔熻兘
+ [Route("Kf_MoveStockRequestBill/Kf_MoveStockRequestBillEdit")]
+ [HttpPost]
+ public object MoveStockRequestBillEdit([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCn.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[3].ToString();
+ string msg_allVal = sArray[4].ToString(); //涓昏〃+瀛愯〃鎵�鏈夋暟鎹�
+
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsKf_MoveStockRequestBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsKf_MoveStockRequestBillMain>>(msg2);
+
+ long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ long HPRDORGID = mainList[0].HPRDORGID;//缁勭粐
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ string HRemark = mainList[0].HRemark;//澶囨敞
+ long HSupID = mainList[0].HSupID;//寰�鏉ュ崟浣�
+ long HEmpID = mainList[0].HEmpID;//涓氬姟鍛�
+ long HDeptID = mainList[0].HDeptID;//閮ㄩ棬
+ long HWHID = mainList[0].HWHID;//璋冨叆浠撳簱
+ long HSCWHID = mainList[0].HSCWHID;//璋冨嚭浠撳簱
+ long HMangerID = mainList[0].HMangerID;//涓荤
+ long HSecManagerID = mainList[0].HSecManagerID;//楠屾敹鍛�
+ long HKeeperID = mainList[0].HKeeperID;//淇濈鍛�
+ string HMaker = user;//鍒跺崟浜�
+ string HExplanation = mainList[0].HExplanation;//鎽樿
+ string HInnerBillNo = mainList[0].HInnerBillNo;//鍐呴儴鍗曟嵁鍙�
+
+ string HBillType = mainList[0].HBillType;
+ string HBillSubType = mainList[0].HBillSubType;
+ long HBillStatus = mainList[0].HBillStatus;
+ string HMakeDate = mainList[0].HMakeDate;
+ string HChecker = mainList[0].HChecker;
+ string HCheckDate = mainList[0].HCheckDate;
+ string HUpDater = mainList[0].HUpDater;
+ string HUpDateDate = mainList[0].HUpDateDate;
+ string HDeleteMan = mainList[0].HDeleteMan;
+ string HDeleteDate = mainList[0].HDeleteDate;
+ string HCloseMan = mainList[0].HCloseMan;
+ string HCloseDate = mainList[0].HCloseDate;
+ long HERPInterID = mainList[0].HERPInterID;
+ string HERPBillType = mainList[0].HERPBillType;
+ long HSTOCKINORGID = mainList[0].HSTOCKINORGID;
+ long HSTOCKOUTORGID = mainList[0].HSTOCKOUTORGID;
+ string HStockStyle = mainList[0].HStockStyle;
+ string HOWNERTYPEHEADID = mainList[0].HOWNERTYPEHEADID;
+ string HTRANSTYPE = mainList[0].HTRANSTYPE;
+ string HOWNERTYPEINID = mainList[0].HOWNERTYPEINID;
+ string HBUSINESSTYPE = mainList[0].HBUSINESSTYPE;
+
+ ds = oCn.RunProcReturn("select * from h_v_IF_MoveStockRequestBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_MoveStockRequestBillList");
+
+ if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
+ {
+ //涓昏〃
+ oCn.RunProc(@"Insert Into Kf_MoveStockRequestBillMain
+ (HInterID,HBillNo,HDate,HBillType,HBillSubType,HBillStatus,HYear,HPeriod
+ ,HSupID,HWHID,HSCWHID,HEmpID,HMangerID,HSecManagerID,HKeeperID,HDeptID
+ ,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate
+ ,HDeleteMan,HDeleteDate,HCloseMan,HCloseDate
+ ,HRemark,HExplanation,HInnerBillNo,HERPInterID,HERPBillType
+ ,HSTOCKINORGID,HSTOCKOUTORGID,HStockStyle
+ ,HOWNERTYPEHEADID,HTRANSTYPE,HOWNERTYPEINID,HBUSINESSTYPE)
+ values(" + HInterID + ",'" + HBillNo + "','" + HDate + "','" + 1243 + "','" +
+ HBillSubType + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
+ "," + HWHID + "," + HSCWHID + "," + HEmpID + "," + HMangerID + "," + HSecManagerID +
+ "," + HKeeperID + "," + HDeptID + ",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HCheckDate + "','" + HUpDater + "','" +
+ HUpDateDate + "','" + HDeleteMan + "','" + HDeleteDate + "','" + HCloseMan + "','" + HCloseDate + "','"
+ + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HERPInterID + ",'" + HERPBillType + "',"
+ + HSTOCKINORGID + "," + HSTOCKOUTORGID + ",'" + HStockStyle + "','" + HOWNERTYPEHEADID + "','" + HTRANSTYPE + "','"
+ + HOWNERTYPEINID + "','" + HBUSINESSTYPE + "'" + ")");
+ }
+ else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
+ { //淇敼
+ oCn.RunProc("update Kf_MoveStockRequestBillMain set " +
+ "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" + "' where HInterID=" + HInterID);
+
+ //鍒犻櫎瀛愯〃
+ oCn.RunProc("delete from Kf_MoveStockRequestBillSub where HInterID='" + HInterID + "'");
+ }
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, HInterID, OperationType);
+
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string msg3, long HInterID, int OperationType)
+ {
+ List<ClsKf_MoveStockRequestBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsKf_MoveStockRequestBillSub>>(msg3);
+
+ int i = 0;
+ foreach (ClsKf_MoveStockRequestBillSub oSub in DetailColl)
+ {
+ i++;
+ if (oSub.HQty <= 0 || oSub.HQty == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oSub.HMaterID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝鐗╂枡涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //if (oSub.HSourceID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + i + "琛岋紝鐢熶骇璧勬簮涓嶈兘涓虹┖";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ if (oSub.HUnitID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝璁￠噺鍗曚綅涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DataSet Cs;
+ Int64 NewHEntryID = 1;
+ Cs = oCn.RunProcReturn("select MAX(HEntryID)HEntryID from Kf_MoveStockRequestBillSub", "Kf_MoveStockRequestBillSub");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+ {
+ NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
+ NewHEntryID += 1;
+ }
+
+ oCn.RunProc($@"Insert into Kf_MoveStockRequestBillSub
+ (HInterID,HEntryID,HBillNo_bak,HRemark,HMTONo,HPlanMode,HERPInterID,HERPEntryID
+ ,HMaterID,HUnitID,HSecUnitID,HPropertyID,HAuxPropID,HBatchNO
+ ,HWHID,HSCWHID,HSPID,HSCSPID
+ ,HQtyMust,HQty,HRelationQty,HRelationMoney,HSecUnitRate,HPrice,HMoney,HOutPrice,HOutMoney
+ ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
+ ,HICMOInterID,HICMOEntryID,HICMOBillNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo
+ ,HSTOCKORGID,HOWNERID,HOWNERTYPEID,HSTOCKORGINID,HOWNERINID,HOWNERTYPEINID,HPRODUCEDATE,HExpiryDate,HBASEUNITID,HEXTAUXUNITID,HSECQTY)
+ values({HInterID},{NewHEntryID},'{oSub.HBillNo_bak}','{oSub.HRemark}','{oSub.HMTONo}'
+ ,'{oSub.HPlanMode}',{oSub.HERPInterID},{oSub.HERPEntryID},{oSub.HMaterID},{oSub.HUnitID},{oSub.HSecUnitID},{oSub.HPropertyID},{oSub.HAuxPropID},'{oSub.HBatchNO}',{oSub.HWHID},{oSub.HSCWHID},{oSub.HSPID},{oSub.HSCSPID},{oSub.HQtyMust},{(oSub.HQty == null ? 0 : oSub.HQty)},{oSub.HRelationQty},{oSub.HRelationMoney},{oSub.HSecUnitRate},{oSub.HPrice},{oSub.HMoney},{oSub.HOutPrice},{oSub.HOutMoney}
+ ,{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HICMOInterID},{oSub.HICMOEntryID},'{oSub.HICMOBillNo}',{oSub.HPOOrderInterID},{oSub.HPOOrderEntryID}
+ ,'{oSub.HPOOrderBillNo}',{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{oSub.HSeOrderBillNo}',{oSub.HSTOCKORGID},{oSub.HOWNERID},'{oSub.HOWNERTYPEID}',{oSub.HSTOCKORGINID},{oSub.HOWNERINID}
+ ,'{oSub.HOWNERTYPEINID}','{oSub.HPRODUCEDATE}','{oSub.HExpiryDate}',{oSub.HBASEUNITID},{oSub.HEXTAUXUNITID},{oSub.HSECQTY})");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ #endregion
+
+ /// <summary>
+ ///鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill")]
+ [HttpGet]
+ public object DeltetKf_MoveStockRequestBill(string HInterID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Delete From Kf_MoveStockRequestBillMain where HInterID = " + HInterID);
+ oCn.RunProc("Delete From Kf_MoveStockRequestBillSub where HInterID = " + HInterID);
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs"
new file mode 100644
index 0000000..28a3b9c
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs"
@@ -0,0 +1,322 @@
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+
+namespace WebAPI.Controllers.浠撳瓨绠＄悊.棰嗘枡鍙戣揣
+{
+ public class Kf_StockOutRequestBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ #region 鍑哄簱鐢宠鍗曞垪琛�
+ [Route("Kf_StockOutRequestBill/GetStockOutRequestBillList")]
+ [HttpGet]
+ public object GetMoveStockRequestBillList(string sWhere, string user)
+ {
+ try
+ {
+ ////鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ //if (!DBUtility.ClsPub.Security_Log("Kf_MoveStockRequestBill_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ string sql1 = string.Format("select * from h_v_IF_StockOutRequestBillList where 1=1 ");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn(sql1 + " order by hmainid desc", "h_v_IF_StockOutRequestBillList");
+ }
+ else
+ {
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCn.RunProcReturn(sql, "h_v_IF_StockOutRequestBillList");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍑哄簱鐢宠鍗� 淇濆瓨/缂栬緫鍔熻兘
+ [Route("Kf_StockOutRequestBill/StockOutRequestBillEdit")]
+ [HttpPost]
+ public object StockOutRequestBillEdit([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCn.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[3].ToString();
+ string msg_allVal = sArray[4].ToString(); //涓昏〃+瀛愯〃鎵�鏈夋暟鎹�
+
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsKf_StockOutRequestBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsKf_StockOutRequestBillMain>>(msg2);
+
+ long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ long HPRDORGID = mainList[0].HPRDORGID;//缁勭粐
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ string HRemark = mainList[0].HRemark;//澶囨敞
+ long HSupID = mainList[0].HSupID;//寰�鏉ュ崟浣�
+ long HEmpID = mainList[0].HEmpID;//涓氬姟鍛�
+ long HDeptID = mainList[0].HDeptID;//閮ㄩ棬
+ long HWHID = mainList[0].HWHID;//浠撳簱
+ long HMangerID = mainList[0].HMangerID;//涓荤
+ long HSecManagerID = mainList[0].HSecManagerID;//楠屾敹
+ long HKeeperID = mainList[0].HKeeperID;//淇濈鍛�
+ string HMaker = user;//鍒跺崟浜�
+ string HExplanation = mainList[0].HExplanation;//鎽樿
+ string HInnerBillNo = mainList[0].HInnerBillNo;//鍐呴儴鍗曟嵁鍙�
+
+ string HBillType = mainList[0].HBillType;
+ string HBillSubType = mainList[0].HBillSubType;
+ long HBillStatus = mainList[0].HBillStatus;
+ string HMakeDate = mainList[0].HMakeDate;
+ string HChecker = mainList[0].HChecker;
+ string HCheckDate = mainList[0].HCheckDate;
+ string HUpDater = mainList[0].HUpDater;
+ string HUpDateDate = mainList[0].HUpDateDate;
+ string HDeleteMan = mainList[0].HDeleteMan;
+ string HDeleteDate = mainList[0].HDeleteDate;
+ string HCloseMan = mainList[0].HCloseMan;
+ string HCloseDate = mainList[0].HCloseDate;
+ long HERPInterID = mainList[0].HERPInterID;
+ string HERPBillType = mainList[0].HERPBillType;
+ long HSTOCKORGID = mainList[0].HSTOCKORGID;
+ string HAPPLYTYPE = mainList[0].HAPPLYTYPE;
+ long HOWNERTYPEIDHEAD = mainList[0].HOWNERTYPEIDHEAD;
+ string HBIZTYPE = mainList[0].HBIZTYPE;
+
+ ds = oCn.RunProcReturn("select * from h_v_IF_StockOutRequestBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_StockOutRequestBillList");
+
+ if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
+ {
+ //涓昏〃
+ oCn.RunProc(@"Insert Into Kf_StockOutRequestBillMain
+ (HInterID,HBillNo,HDate,HBillType,HBillSubType,HBillStatus,HYear,HPeriod
+ ,HSupID,HWHID,HEmpID,HMangerID,HSecManagerID,HKeeperID,HDeptID
+ ,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate
+ ,HDeleteMan,HDeleteDate,HCloseMan,HCloseDate
+ ,HRemark,HExplanation,HInnerBillNo,HERPInterID,HERPBillType
+ ,HSTOCKORGID,HAPPLYTYPE,HOWNERTYPEIDHEAD,HBIZTYPE)
+ values(" + HInterID + ",'" + HBillNo + "','" + HDate + "','" + 1242 + "','" +
+ 1242 + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
+ "," + HWHID + "," + HEmpID + "," + HMangerID + "," + HSecManagerID + "," + HKeeperID +
+ "," + HDeptID + ",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HCheckDate + "','" + HUpDater + "','" +
+ HUpDateDate + "','" + HDeleteMan + "','" + HDeleteDate + "','" + HCloseMan + "','" + HCloseDate + "','"
+ + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HERPInterID + ",'" + HERPBillType + "',"
+ + HSTOCKORGID + ",'" + HAPPLYTYPE + "'," + HOWNERTYPEIDHEAD + ",'" + HBIZTYPE + "'" + ")");
+ }
+ else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
+ { //淇敼
+ oCn.RunProc("update Kf_StockOutRequestBillMain set " +
+ "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" + "' where HInterID=" + HInterID);
+
+ //鍒犻櫎瀛愯〃
+ oCn.RunProc("delete from Kf_StockOutRequestBillSub where HInterID='" + HInterID + "'");
+ }
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, HInterID, OperationType);
+
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string msg3, long HInterID, int OperationType)
+ {
+ List<ClsKf_StockOutRequestBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsKf_StockOutRequestBillSub>>(msg3);
+
+ int i = 0;
+ foreach (ClsKf_StockOutRequestBillSub oSub in DetailColl)
+ {
+ i++;
+ if (oSub.HQty <= 0 || oSub.HQty == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oSub.HMaterID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝鐗╂枡涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //if (oSub.HSourceID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + i + "琛岋紝鐢熶骇璧勬簮涓嶈兘涓虹┖";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ if (oSub.HUnitID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛岋紝璁￠噺鍗曚綅涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DataSet Cs;
+ Int64 NewHEntryID = 1;
+ Cs = oCn.RunProcReturn("select MAX(HEntryID)HEntryID from Kf_StockOutRequestBillSub", "Kf_StockOutRequestBillSub");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+ {
+ NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
+ NewHEntryID += 1;
+ }
+
+ oCn.RunProc($@"Insert into Kf_StockOutRequestBillSub
+ (HInterID,HEntryID,HBillNo_bak,HRemark,HMTONo,HPlanMode,HERPInterID,HERPEntryID
+ ,HMaterID,HUnitID,HSecUnitID,HPropertyID,HAuxPropID,HBatchNO,HWHID,HSPID
+ ,HQtyMust,HQty,HRelationQty,HRelationMoney,HSecUnitRate,HPrice,HMoney
+ ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
+ ,HICMOInterID,HICMOEntryID,HICMOBillNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo
+ ,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo
+ ,HSEQ,HSTOCKORGID,HSTOCKSTATUSID,HOWNERTYPEID,HEXTAUXUNITID
+ ,HOWNERID,HBOMID,HBASEUNITID,HPRODUCEDATE,HEXPIRYDATE)
+ values({HInterID},{NewHEntryID},'{oSub.HBillNo_bak}','{oSub.HRemark}','{oSub.HMTONo}'
+ ,'{oSub.HPlanMode}',{oSub.HERPInterID},{oSub.HERPEntryID},{oSub.HMaterID},{oSub.HUnitID},{oSub.HSecUnitID},{oSub.HPropertyID},{oSub.HAuxPropID},'{oSub.HBatchNO}',{oSub.HWHID},{oSub.HSPID},{oSub.HQtyMust},{(oSub.HQty == null ? 0 : oSub.HQty)},{oSub.HRelationQty},{oSub.HRelationMoney},{oSub.HSecUnitRate},{oSub.HPrice},{oSub.HMoney}
+ ,{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HICMOInterID},{oSub.HICMOEntryID},'{oSub.HICMOBillNo}',{oSub.HPOOrderInterID},{oSub.HPOOrderEntryID}
+ ,'{oSub.HPOOrderBillNo}',{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{oSub.HSeOrderBillNo}',{oSub.HSEQ},{oSub.HSTOCKORGID},{oSub.HSTOCKSTATUSID},'{oSub.HOWNERTYPEID}',{oSub.HEXTAUXUNITID},{oSub.HOWNERID}
+ ,{oSub.HBOMID},{oSub.HBASEUNITID},'{oSub.HPRODUCEDATE}','{oSub.HEXPIRYDATE}')");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ #endregion
+
+ /// <summary>
+ ///鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("Kf_StockOutRequestBill/DeltetKf_StockOutRequestBill")]
+ [HttpGet]
+ public object DeltetKf_StockOutRequestBill(string HInterID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Delete From Kf_StockOutRequestBillMain where HInterID = " + HInterID);
+ oCn.RunProc("Delete From Kf_StockOutRequestBillSub where HInterID = " + HInterID);
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CustLocationController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CustLocationController.cs"
new file mode 100644
index 0000000..12c083a
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CustLocationController.cs"
@@ -0,0 +1,346 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_CustLocationController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 浜よ揣鍦扮偣 鍒楄〃
+ [Route("Gy_CustLocation/CustLocationList")]
+ [HttpGet]
+ public object CustLocationList(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ string sql1 = string.Format(@"select * from h_v_Gy_CustLocationList where 浣跨敤缁勭粐='" + Organization + "'");
+
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_CustLocationList");
+
+ //娣诲姞鍒楀悕
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浜よ揣鍦扮偣 缂栬緫
+ [Route("Gy_CustLocation/CustLocationEdit")]
+ [HttpPost]
+ public object CustLocationEdit([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+ //string msg_HUSEORGID = sArray[2].ToString();
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Edit", 1, false, msg2))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ //DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxRate ", "Gy_TaxRate");
+ //if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ //{
+ // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // var maxid = Convert.ToInt32((Maxds.Tables[0].Rows[0]["HItemID"].ToString()==""?0: Maxds.Tables[0].Rows[0]["HItemID"]));
+ // maxid += 1;
+ // HItemID = maxid;
+ //}
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ DAL.ClsGy_CustLocation_Ctl oBill = new DAL.ClsGy_CustLocation_Ctl();
+ List<Model.ClsGy_CustLocation_Model> lsmain = new List<Model.ClsGy_CustLocation_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_CustLocation(msg1);
+ foreach (Model.ClsGy_CustLocation_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("select * from Gy_CustLocation where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CustLocation");
+ if (oItem.HItemID == 0)
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HItemID"].ToString() != oItem.HItemID.ToString())
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+
+ //鏂板鏃跺垽鏂�
+ #region 鐖剁骇鏍￠獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級
+ /*
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else//缂栬緫鏃跺垽鏂�
+ {
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ */
+ #endregion
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = 1; //绛夌骇 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
+ oBill.oModel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "1";
+ 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("Gy_CustLocation/Delete")]
+ [HttpGet]
+ public object Delete(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ 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_CustLocation where HItemID=" + HItemID, "Gy_CustLocation");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ if (HStopflag)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from Gy_CustLocation 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;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSupController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSupController.cs"
new file mode 100644
index 0000000..c2dd857
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSupController.cs"
@@ -0,0 +1,332 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_MatePriceSupController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 閲囪喘浠锋牸 鍒楄〃
+ [Route("Gy_MatePriceSup/MatePriceSupList")]
+ [HttpGet]
+ public object MatePriceSupList(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ string sql1 = string.Format(@"select * from h_v_Gy_MatePriceSupList where 1 = 1 ");
+
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_MatePriceSupList");
+
+ //娣诲姞鍒楀悕
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閲囪喘浠锋牸 缂栬緫
+ [Route("Gy_MatePriceSup/MatePriceSupEdit")]
+ [HttpPost]
+ public object MatePriceSupEdit([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+ //string msg_HUSEORGID = sArray[2].ToString();
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Edit", 1, false, msg2))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ //DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxRate ", "Gy_TaxRate");
+ //if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ //{
+ // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // var maxid = Convert.ToInt32((Maxds.Tables[0].Rows[0]["HItemID"].ToString()==""?0: Maxds.Tables[0].Rows[0]["HItemID"]));
+ // maxid += 1;
+ // HItemID = maxid;
+ //}
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ DAL.ClsGy_MatePriceSup_Ctl oBill = new DAL.ClsGy_MatePriceSup_Ctl();
+ List<Model.ClsGy_MatePriceSup_Model> lsmain = new List<Model.ClsGy_MatePriceSup_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_MatePriceSup(msg1);
+ foreach (Model.ClsGy_MatePriceSup_Model oItem in lsmain)
+ {
+ //鏂板鏃跺垽鏂�
+ #region 鐖剁骇鏍￠獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級
+ /*
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else//缂栬緫鏃跺垽鏂�
+ {
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ */
+ #endregion
+ //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
+ oBill.oModel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "1";
+ 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("Gy_MatePriceSup/Delete")]
+ [HttpGet]
+ public object Delete(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ 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_MatePriceSup where HItemID=" + HItemID, "Gy_MatePriceSup");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ //if (HStopflag)
+ //{
+ // oCN.RollBack();//鍥炴粴浜嬪姟
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ oCN.RunProc("delete from Gy_MatePriceSup 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;
+ }
+ }
+ #endregion
+
+ #region 閲囪喘浠锋牸 閲戣澏鍚屾
+ [Route("Gy_MatePriceSup/SaveGy_MatePriceSupListApi")]
+ [HttpPost]
+ public object SaveGy_MatePriceSupListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_MatePriceSup_Model> lsmain = new List<Model.ClsGy_MatePriceSup_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_MatePriceSup(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_MatePriceSup where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_MatePriceSup on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_MatePriceSup(HItemID,HInterID,HEntryID,HMaterID,HRelationID,HUnitID,HBeginQty,HEndQty,HCurID,HType
+ ,HPrice,HBeginDate,HEndDate,HUsed,HRemark,HMaker,HMakeDate)
+ values({lsmain[0].HItemID},{lsmain[0].HInterID},{lsmain[0].HEntryID},{lsmain[0].HMaterID},{lsmain[0].HRelationID},{lsmain[0].HUnitID},{lsmain[0].HBeginQty},{lsmain[0].HEndQty},{lsmain[0].HCurID},'{lsmain[0].HType}',{lsmain[0].HPrice},'{lsmain[0].HBeginDate}','{lsmain[0].HEndDate}','{lsmain[0].HUsed}','{lsmain[0].HRemark}','{lsmain[0].HMaker}','{lsmain[0].HMakeDate}')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_MatePriceSup off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OperatorController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OperatorController.cs"
new file mode 100644
index 0000000..277f0fe
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OperatorController.cs"
@@ -0,0 +1,639 @@
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_OperatorController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 涓氬姟鍛� 鍒楄〃
+ [Route("Gy_Operator/OperatorList")]
+ [HttpGet]
+ public object OperatorList(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ #region 杩欓噷灏嗕负鍒犻櫎鐨勬暟鎹� HIsPseDel 鎭㈠涓�0
+ DataSet Cs;
+ Cs = oCN.RunProcReturn("select HItemID from Gy_Operator where HIsPseDel = 1", "Gy_Operator");
+ string sqlupdate = string.Empty;
+ for (var i = 0; i< Cs.Tables[0].Rows.Count; i++)
+ {
+ sqlupdate = $"update Gy_Operator set HIsPseDel = 0 where HItemID = {Cs.Tables[0].Rows[i]["HItemID"]} ";
+ oCN.RunProc(sqlupdate);
+ }
+ #endregion
+
+
+
+ string sql1 = string.Format(@"select * from h_v_Gy_OperatorList where 1 = 1 ");
+
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_OperatorList");
+
+ //娣诲姞鍒楀悕
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 涓氬姟鍛� 淇濆瓨/缂栬緫鍔熻兘
+ [Route("Gy_Operator/OperatorEdit")]
+ [HttpPost]
+ public object OperatorEdit([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨琛�
+ objJsonResult = AddBill(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBill(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<ClsGy_Operator_Model> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_Operator_Model>>(msg2);
+
+ string HOperatorType = mainList[0].HOperatorType;//涓氬姟鍛樼被鍨�
+
+
+ List<ClsGy_Operator_Model> mainList2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_Operator_Model>>(msg3);
+
+ long HItemID = mainList2[0].HItemID;
+ string HNumber = mainList2[0].HNumber;
+ string HName = mainList2[0].HName;
+ string HHelpCode = mainList2[0].HHelpCode;
+ string HShortNumber = mainList2[0].HShortNumber;
+ long HParentID = mainList2[0].HParentID;
+ long HLevel = mainList2[0].HLevel;
+ bool HEndFlag = mainList2[0].HEndFlag;
+ bool HStopflag = mainList2[0].HStopflag;
+ string HRemark = mainList2[0].HRemark;
+ string HUseFlag = mainList2[0].HUseFlag;
+ long HUSEORGID = mainList2[0].HUSEORGID;
+ long HOperatorId = mainList2[0].HOperatorId;
+ long HSEQ = mainList2[0].HSEQ;
+ long HStaffId = mainList2[0].HStaffId;
+ long HIsUse = mainList2[0].HIsUse;
+ long HIsPseDel = mainList2[0].HIsPseDel;
+
+ int i = 0;
+ string sql = string.Empty;
+ sql = "set identity_insert Gy_Operator on";
+ oCN.RunProc(sql);
+ foreach (ClsGy_Operator_Model oSub in mainList2)
+ {
+ i++;
+
+ sql = $"delete Gy_Operator where HItemID = {oSub.HItemID}";
+ oCN.RunProc(sql);
+
+ if(oSub.HItemID == 0)
+ {
+ DataSet Cs;
+ Cs = oCN.RunProcReturn("select MAX(HItemID)HItemID from Gy_Operator", "Gy_Operator");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HItemID"].ToString()) != 0)
+ {
+ oSub.HItemID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HItemID"].ToString());
+ oSub.HItemID += 1;
+ }
+ }
+ //杩欓噷杩涜鏁版嵁鐨勭湡鍒犻櫎
+ if(oSub.HIsPseDel == 1)
+ {
+ sql = $"delete Gy_Operator where HItemID = {oSub.HItemID} and HIsPseDel = 1 ";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc($@"Insert into Gy_Operator
+ (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID,HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID
+ ,HOperatorId,HOperatorType,HSEQ,HStaffId,HIsUse)
+ values({oSub.HItemID},'{oSub.HNumber}','{oSub.HName}','{oSub.HHelpCode}','{oSub.HShortNumber}',{oSub.HParentID},{oSub.HLevel},'{oSub.HEndFlag}','{oSub.HStopflag}','{oSub.HRemark}','{oSub.HUseFlag}',{oSub.HUSEORGID},{oSub.HOperatorId},'{HOperatorType}',{oSub.HSEQ},{oSub.HStaffId},{oSub.HIsUse})");
+ }
+ }
+ sql = "set identity_insert Gy_Operator off";
+ oCN.RunProc(sql);
+
+
+
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ ////#region 涓氬姟鍛� 缂栬緫
+ //[Route("Gy_Operator/OperatorEdit")]
+ //[HttpPost]
+ //public object OperatorEdit([FromBody] JObject msg)
+ //{
+ // DataSet ds;
+ // var _value = msg["msg"].ToString();
+ // string msg3 = _value.ToString();
+ // string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ // string msg1 = sArray[0].ToString();
+ // string msg2 = sArray[1].ToString();
+ // //string msg_HUSEORGID = sArray[2].ToString();
+ // Int64 HItemID = 0;
+ // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ // //缂栬緫鏉冮檺
+ // //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Edit", 1, false, msg2))
+ // //{
+ // // objJsonResult.code = "0";
+ // // objJsonResult.count = 0;
+ // // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // // objJsonResult.data = null;
+ // // return objJsonResult;
+ // //}
+
+ // //鑾峰彇鏈�澶D鍊艰祴鍊�
+ // //DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxRate ", "Gy_TaxRate");
+ // //if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ // //{
+ // // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // // var maxid = Convert.ToInt32((Maxds.Tables[0].Rows[0]["HItemID"].ToString()==""?0: Maxds.Tables[0].Rows[0]["HItemID"]));
+ // // maxid += 1;
+ // // HItemID = maxid;
+ // //}
+ // ListModels oListModels = new ListModels();
+ // List<ClsGy_Operator_Model> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_Operator_Model>>(msg2);
+ // List<ClsGy_Operator_Model> mainList22 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_Operator_Model>>(msg3);
+ // string main = mainList + ";" + mainList22;
+
+ // try
+ // {
+ // DAL.ClsGy_Operator_Ctl oBill = new DAL.ClsGy_Operator_Ctl();
+ // List<Model.ClsGy_Operator_Model> lsmain = new List<Model.ClsGy_Operator_Model>();
+ // msg1 = msg1.Replace("\\", "");
+ // msg1 = msg1.Replace("\n", ""); //\n
+ // lsmain = oListModels.getObjectByJson_Gy_Operator(msg1);
+ // foreach (Model.ClsGy_Operator_Model oItem in lsmain)
+ // {
+ // if (oItem.HNumber.Trim() == "")
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // if (oItem.HName.Trim() == "")
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+
+ // //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ // ds = oCN.RunProcReturn("select * from Gy_Operator where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Operator");
+ // if (oItem.HItemID == 0)
+ // {
+ // if (ds.Tables[0].Rows.Count > 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // }
+ // else
+ // {
+ // if (ds.Tables[0].Rows.Count > 0)
+ // {
+ // if (ds.Tables[0].Rows[0]["HItemID"].ToString() != oItem.HItemID.ToString())
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // }
+ // }
+
+
+ // //鏂板鏃跺垽鏂�
+ // #region 鐖剁骇鏍￠獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級
+ // /*
+ // if (oItem.HItemID == 0)
+ // {
+ // if (ds == null || ds.Tables[0].Rows.Count > 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ // string sParent;
+ // sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ // if (sParent.Trim() == "")
+ // {
+ // oBill.oModel.HParentID = 0;
+ // }
+ // else
+ // {
+ // if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ // {
+ // oBill.oModel.HParentID = oBill.oModel.HItemID;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // }
+ // }
+ // else//缂栬緫鏃跺垽鏂�
+ // {
+ // //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ // string sParent;
+ // sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ // if (sParent.Trim() == "")
+ // {
+ // oBill.oModel.HParentID = 0;
+ // }
+ // else
+ // {
+ // if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ // {
+ // oBill.oModel.HParentID = oBill.oModel.HItemID;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // }
+ // }
+ // */
+ // #endregion
+ // //寰楀埌鐭唬鐮�
+ // string sShortNumber;
+ // sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ // if (sShortNumber.Trim() == "")
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
+ // oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ // oItem.HEndFlag = true;//鏈骇鏍囧織
+ // oItem.HLevel = 1; //绛夌骇 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
+ // oBill.oModel = oItem;
+ // }
+ // //淇濆瓨
+ // //淇濆瓨瀹屾瘯鍚庡鐞�
+ // bool bResult;
+ // if (oBill.oModel.HItemID == 0)
+ // {
+ // bResult = oBill.AddNew();
+ // }
+ // else
+ // {
+ // bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ // }
+ // if (bResult)
+ // {
+ // objJsonResult.code = "1";
+ // 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("Gy_Operator/Delete")]
+ [HttpGet]
+ public object Delete(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ 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_Operator where HItemID=" + HItemID, "Gy_Operator");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ if (HStopflag)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from Gy_Operator 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;
+ }
+ }
+ #endregion
+
+ #region 涓氬姟鍛� 浼垹闄�
+ [Route("Gy_Operator/Delete2")]
+ [HttpGet]
+ public object Delete2(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ 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_Operator where HItemID=" + HItemID, "Gy_Operator");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ if (HStopflag)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍥犱负灏嗘暟鎹鐢ㄥ悗灏嗘棤娉曞垹闄わ紝鎵�浠ヨ繖閲屽皢浣跨敤鏍囪鏇存柊涓� 1 浠ｈ〃涓轰吉鍒犻櫎鐘舵�侊紝
+ //鐢ㄦ埛鍦ㄨ繘琛屼繚瀛樻搷浣滄椂锛屽皢浣跨敤鏍囪涓� 1 鐨勬暟鎹湡鍒犻櫎锛�
+ //濡傝嫢鐢ㄦ埛鍦ㄧ紪杈�/鏂板椤甸潰杩樹负杩涜淇濆瓨鎿嶄綔灏卞埛鏂伴〉闈紝浣跨敤鏍囪灏嗚鎭㈠涓�0
+ oCN.RunProc("update Gy_Operator set HIsPseDel = 1 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;
+ }
+ }
+ #endregion
+
+ #region 涓氬姟鍛� 閲戣澏鍚屾
+ [Route("Gy_Operator/SaveGy_OperatorListApi")]
+ [HttpPost]
+ public object SaveGy_OperatorListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ var operatorInfoModel = msg["model"]["HOperatorInfoEntry"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_Operator_Model> lsmain = new List<Model.ClsGy_Operator_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_Operator(_value);
+ string sql = string.Empty;
+
+ List<Model.ClsGy_Operator_Model> operatorInfos = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Operator_Model>>(operatorInfoModel);
+ //淇濆瓨
+ oCN.BeginTran();
+ //sql = $"delete Gy_Operator where HItemID = {lsmain[0].HItemID}";
+ //oCN.RunProc(sql);
+ //sql = "set identity_insert Gy_Operator on";
+ //oCN.RunProc(sql);
+ //oCN.RunProc($@"insert into Gy_Operator(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID
+ // ,HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HOperatorId,HOperatorType,HSEQ,HStaffId,HIsUse)
+ // values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HHelpCode}','{lsmain[0].HShortNumber}',
+ // {lsmain[0].HParentID},{lsmain[0].HLevel},{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },
+ // '{lsmain[0].HRemark}','{lsmain[0].HUseFlag}',{lsmain[0].HUSEORGID},{lsmain[0].HOperatorId},'{lsmain[0].HOperatorType}',
+ // {lsmain[0].HSEQ},{lsmain[0].HStaffId},{lsmain[0].HIsUse})", ref DBUtility.ClsPub.sExeReturnInfo);
+ sql = "set identity_insert Gy_Operator on";
+ oCN.RunProc(sql);
+ foreach (var item in operatorInfos)
+ {
+ sql = $"delete Gy_Operator where HItemID = {item.HItemID}";
+ oCN.RunProc(sql);
+
+ sql = $@"insert into Gy_Operator(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID
+ ,HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HOperatorId,HOperatorType,HSEQ,HStaffId,HIsUse)
+ values({item.HItemID},'{item.HNumber}','{item.HName}','{item.HHelpCode}','{item.HShortNumber}',
+ {item.HParentID},{item.HLevel},{Convert.ToString(item.HEndFlag ? 1 : 0)},{Convert.ToString(item.HStopflag ? 1 : 0) },
+ '{item.HRemark}','{item.HUseFlag}',{item.HUSEORGID},{item.HOperatorId},'{item.HOperatorType}',
+ {item.HSEQ},{item.HStaffId},{item.HIsUse})";
+ oCN.RunProc(sql);
+ }
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_Operator off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PaymentConditionListBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PaymentConditionListBillController.cs"
index 585b001..08405ee 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PaymentConditionListBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PaymentConditionListBillController.cs"
@@ -341,5 +341,55 @@
}
}
#endregion
+
+ #region 浠樻鏉′欢 閲戣澏鍚屾
+ [Route("Gy_PaymentCondition/SaveGy_PaymentConditionListApi")]
+ [HttpPost]
+ public object SaveGy_PaymentConditionListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_PaymentCondition_Model> lsmain = new List<Model.ClsGy_PaymentCondition_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_PaymentCondition(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_PaymentCondition where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_PaymentCondition on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_PaymentCondition(HItemID,HNumber,HName ,HShortNumber ,HParentID ,HLevel
+ ,HEndFlag ,HStopflag ,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}','{lsmain[0].HUseFlag}'
+ ,'{lsmain[0].HMakeTime}','{lsmain[0].HMakeEmp}','{lsmain[0].HCheckEmp}','{lsmain[0].HCheckTime}','{lsmain[0].HModifyEmp}'
+ ,'{lsmain[0].HModifyTime}','{lsmain[0].HStopEmp}',null,{lsmain[0].HUSEORGID},{lsmain[0].HCREATEORGID})", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_PaymentCondition off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RateTypeController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RateTypeController.cs"
new file mode 100644
index 0000000..4a3490c
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RateTypeController.cs"
@@ -0,0 +1,396 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_RateTypeController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 姹囩巼 鍒楄〃
+ [Route("Gy_RateType/RateTypeList")]
+ [HttpGet]
+ public object RateTypeList(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ string sql1 = string.Format(@"select * from h_v_Gy_RateTypeList where 浣跨敤缁勭粐='" + Organization + "'");
+
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_RateTypeList");
+
+ //娣诲姞鍒楀悕
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 姹囩巼 缂栬緫
+ [Route("Gy_RateType/RateTypeEdit")]
+ [HttpPost]
+ public object RateTypeEdit([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+ //string msg_HUSEORGID = sArray[2].ToString();
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Edit", 1, false, msg2))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ //DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxRate ", "Gy_TaxRate");
+ //if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ //{
+ // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // var maxid = Convert.ToInt32((Maxds.Tables[0].Rows[0]["HItemID"].ToString()==""?0: Maxds.Tables[0].Rows[0]["HItemID"]));
+ // maxid += 1;
+ // HItemID = maxid;
+ //}
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ DAL.ClsGy_RateType_Ctl oBill = new DAL.ClsGy_RateType_Ctl();
+ List<Model.ClsGy_RateType_Model> lsmain = new List<Model.ClsGy_RateType_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_RateType(msg1);
+ foreach (Model.ClsGy_RateType_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("select * from Gy_RateType where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_RateType");
+ if (oItem.HItemID == 0)
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HItemID"].ToString() != oItem.HItemID.ToString())
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+
+ //鏂板鏃跺垽鏂�
+ #region 鐖剁骇鏍￠獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級
+ /*
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else//缂栬緫鏃跺垽鏂�
+ {
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ */
+ #endregion
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = 1; //绛夌骇 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
+ oBill.oModel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "1";
+ 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("Gy_RateType/Delete")]
+ [HttpGet]
+ public object Delete(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ 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_RateType where HItemID=" + HItemID, "Gy_RateType");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ if (HStopflag)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from Gy_RateType 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;
+ }
+ }
+ #endregion
+
+ #region 姹囩巼 閲戣澏鍚屾
+ [Route("Gy_RateType/SaveGy_RateTypeListApi")]
+ [HttpPost]
+ public object SaveGy_RateTypeListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_RateType_Model> lsmain = new List<Model.ClsGy_RateType_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_RateType(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_RateType where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_RateType on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_RateType(HItemID,HNumber,HName ,HShortNumber,HParentID ,HLevel
+ ,HEndFlag,HStopflag,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}','{lsmain[0].HUseFlag}'
+ ,'{lsmain[0].HMakeTime}','{lsmain[0].HMakeEmp}','{lsmain[0].HCheckEmp}','{lsmain[0].HCheckTime}','{lsmain[0].HModifyEmp}'
+ ,'{lsmain[0].HModifyTime}','{lsmain[0].HStopEmp}',null,{lsmain[0].HUSEORGID},{lsmain[0].HCREATEORGID})", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_RateType off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RecConditionBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RecConditionBillController.cs"
index 3b04503..88a487c 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RecConditionBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RecConditionBillController.cs"
@@ -342,5 +342,55 @@
}
}
#endregion
+
+ #region 鏀舵鏉′欢 閲戣澏鍚屾
+ [Route("Gy_RecCondition/SaveGy_RecConditionListApi")]
+ [HttpPost]
+ public object SaveGy_RecConditionListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_RecCondition_Model> lsmain = new List<Model.ClsGy_RecCondition_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_RecCondition(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_RecCondition where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_RecCondition on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_RecCondition(HItemID,HNumber,HName ,HShortNumber ,HParentID ,HLevel
+ ,HEndFlag ,HStopflag ,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}','{lsmain[0].HUseFlag}'
+ ,'{lsmain[0].HMakeTime}','{lsmain[0].HMakeEmp}','{lsmain[0].HCheckEmp}','{lsmain[0].HCheckTime}','{lsmain[0].HModifyEmp}'
+ ,'{lsmain[0].HModifyTime}','{lsmain[0].HStopEmp}',null,{lsmain[0].HUSEORGID},{lsmain[0].HCREATEORGID})", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_RecCondition off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyleController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyleController.cs"
new file mode 100644
index 0000000..8d79356
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyleController.cs"
@@ -0,0 +1,393 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_SettleStyleController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 缁撶畻鏂瑰紡 鍒楄〃
+ [Route("Gy_SettleStyle/SettleStyleList")]
+ [HttpGet]
+ public object SettleStyleList(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ string sql1 = string.Format(@"select * from h_v_Gy_SettleStyleList where 1 = 1 ");
+
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_SettleStyleList");
+
+ //娣诲姞鍒楀悕
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 缁撶畻鏂瑰紡 缂栬緫
+ [Route("Gy_SettleStyle/SettleStyleEdit")]
+ [HttpPost]
+ public object SettleStyleEdit([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+ //string msg_HUSEORGID = sArray[2].ToString();
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Edit", 1, false, msg2))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ //DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxRate ", "Gy_TaxRate");
+ //if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ //{
+ // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // var maxid = Convert.ToInt32((Maxds.Tables[0].Rows[0]["HItemID"].ToString()==""?0: Maxds.Tables[0].Rows[0]["HItemID"]));
+ // maxid += 1;
+ // HItemID = maxid;
+ //}
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ DAL.ClsGy_SettleStyle_Ctl oBill = new DAL.ClsGy_SettleStyle_Ctl();
+ List<Model.ClsGy_SettleStyle_Model> lsmain = new List<Model.ClsGy_SettleStyle_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_SettleStyle(msg1);
+ foreach (Model.ClsGy_SettleStyle_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("select * from Gy_SettleStyle where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_SettleStyle");
+ if (oItem.HItemID == 0)
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HItemID"].ToString() != oItem.HItemID.ToString())
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+
+ //鏂板鏃跺垽鏂�
+ #region 鐖剁骇鏍￠獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級
+ /*
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else//缂栬緫鏃跺垽鏂�
+ {
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ */
+ #endregion
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = 1; //绛夌骇 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
+ oBill.oModel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "1";
+ 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("Gy_SettleStyle/Delete")]
+ [HttpGet]
+ public object Delete(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ 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_SettleStyle where HItemID=" + HItemID, "Gy_SettleStyle");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ if (HStopflag)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from Gy_SettleStyle 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;
+ }
+ }
+ #endregion
+
+ #region 缁撶畻鏂瑰紡 閲戣澏鍚屾
+ [Route("Gy_SettleStyle/SaveGy_SettleStyleListApi")]
+ [HttpPost]
+ public object SaveGy_SettleStyleListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_SettleStyle_Model> lsmain = new List<Model.ClsGy_SettleStyle_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_SettleStyle(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_SettleStyle where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_SettleStyle on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_SettleStyle(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID
+ ,HLevel,HEndFlag,HStopflag,HRemark)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HHelpCode}','{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_SettleStyle off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StaffController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StaffController.cs"
new file mode 100644
index 0000000..1475243
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StaffController.cs"
@@ -0,0 +1,395 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_StaffController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鍛樺伐 鍒楄〃
+ [Route("Gy_Staff/StaffList")]
+ [HttpGet]
+ public object StaffList(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ string sql1 = string.Format(@"select * from h_v_Gy_StaffList where 1 = 1 ");
+
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_StaffList");
+
+ //娣诲姞鍒楀悕
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍛樺伐 缂栬緫
+ [Route("Gy_Staff/StaffEdit")]
+ [HttpPost]
+ public object StaffEdit([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+ //string msg_HUSEORGID = sArray[2].ToString();
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Edit", 1, false, msg2))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ //DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxRate ", "Gy_TaxRate");
+ //if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ //{
+ // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // var maxid = Convert.ToInt32((Maxds.Tables[0].Rows[0]["HItemID"].ToString()==""?0: Maxds.Tables[0].Rows[0]["HItemID"]));
+ // maxid += 1;
+ // HItemID = maxid;
+ //}
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ DAL.ClsGy_Staff_Ctl oBill = new DAL.ClsGy_Staff_Ctl();
+ List<Model.ClsGy_Staff_Model> lsmain = new List<Model.ClsGy_Staff_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_Staff(msg1);
+ foreach (Model.ClsGy_Staff_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("select * from Gy_Staff where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Staff");
+ if (oItem.HItemID == 0)
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HItemID"].ToString() != oItem.HItemID.ToString())
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+
+ //鏂板鏃跺垽鏂�
+ #region 鐖剁骇鏍￠獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級
+ /*
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else//缂栬緫鏃跺垽鏂�
+ {
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ */
+ #endregion
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = 1; //绛夌骇 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
+ oBill.oModel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "1";
+ 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("Gy_Staff/Delete")]
+ [HttpGet]
+ public object Delete(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ 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_Staff where HItemID=" + HItemID, "Gy_Staff");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ if (HStopflag)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from Gy_Staff 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;
+ }
+ }
+ #endregion
+
+ #region 鍛樺伐 閲戣澏鍚屾
+ [Route("Gy_Staff/SaveGy_StaffListApi")]
+ [HttpPost]
+ public object SaveGy_StaffListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_Staff_Model> lsmain = new List<Model.ClsGy_Staff_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_Staff(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_Staff where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_Staff on";
+ oCN.RunProc(sql);
+ oCN.RunProc($@"insert into Gy_Staff(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID
+ ,HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID
+ ,HCREATEORGID,HPERSONID,HPOSTID,HFIRSTCARDID,HDEPTID,HSTAFFNUMBER)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HHelpCode}','{lsmain[0].HShortNumber}',
+ {lsmain[0].HParentID},{lsmain[0].HLevel},{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },
+ '{lsmain[0].HRemark}','{lsmain[0].HUseFlag}',{lsmain[0].HUSEORGID},{lsmain[0].HCREATEORGID},{lsmain[0].HPERSONID},
+ {lsmain[0].HPOSTID},{lsmain[0].HFIRSTCARDID},{lsmain[0].HDEPTID},'{lsmain[0].HSTAFFNUMBER}')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_Staff off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
index b9c63e6..239bcc1 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
@@ -298,11 +298,11 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- //oCn.BeginTran();
-
- //oCN.RunProc("exec h_p_StockItemSubDel " + sID);
+ oCn.BeginTran();
- //oCn.Commit();
+ oCN.RunProc("exec h_p_StockItemSubDel " + sID);
+
+ oCn.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -336,20 +336,29 @@
//鍒ゆ柇鏄惁閫夋嫨鐩樼偣鏂规锛屾槸=>锛堢敤鐩樼偣鏂规瀛愯〃鍋氬姣旓級锛屽惁=>锛堢敤鍣ㄥ叿妗ｆ鍋氬姣旓級
if (sID == null || sID == "")
{
- if (sWhere == "pk")
- {
- sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisPK");
- }
- else
- {
- sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisList2 '{sWhere}'");
- }
+ //if (sWhere == "pk")
+ //{
+ // sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisPK");
+ //}
+ //else
+ //{
+ // sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisList2 '{sWhere}'");
+ //}
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨鐩樼偣鏂规!";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
if (sWhere == "pk")
{
sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisPK '{sID}'");
+ }
+ else if (sWhere == "py")
+ {
+ sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisPY '{sID}'");
}
else
{
@@ -385,22 +394,13 @@
{
ds = MouldStockBillMainTemp(sWhere);
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
+
}
catch (Exception ex)
{
@@ -478,10 +478,10 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
string user = sArray[1].ToString();//user
- string userID = sArray[2].ToString();//userID
+ string HOrgID = sArray[2].ToString();//HOrgID
string sName = sArray[3].ToString();//鐩樼偣鏂规
//鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
- DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");
+ DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName+"'", "Gy_StockCheckItem");
string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();
//杞寲鏍煎紡
@@ -522,7 +522,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',0,0,'',''," +
"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
//涓昏〃
oCn.BeginTran();
@@ -567,10 +567,10 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
string user = sArray[1].ToString();//user
- string userID = sArray[2].ToString();//userID
+ string HOrgID = sArray[2].ToString();//HOrgID
string sName = sArray[3].ToString();//鐩樼偣鏂规
//鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
- DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");
+ DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName + "'", "Gy_StockCheckItem");
string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();
//杞寲鏍煎紡
@@ -591,19 +591,32 @@
ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
DataRow dr = ds.Tables[0].Rows[0];
DataRow dr1 = ds1.Tables[0].Rows[0];
- HInterID = DBUtility.ClsPub.CreateBillID("3827", ref DBUtility.ClsPub.sExeReturnInfo);
- HBillNo = DBUtility.ClsPub.CreateBillCode("3827", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ string HBillType = "";
+ if (item.HRealPotType == "浠撳簱" )
+ {
+ HBillType = "3827";
+ HInterID = DBUtility.ClsPub.CreateBillID("3827", ref DBUtility.ClsPub.sExeReturnInfo);
+ HBillNo = DBUtility.ClsPub.CreateBillCode("3827", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ }
+ else if (item.HRealPotType != "浠撳簱")
+ {
+ HBillType = "3802";
+ HInterID = DBUtility.ClsPub.CreateBillID("3802", ref DBUtility.ClsPub.sExeReturnInfo);
+ HBillNo = DBUtility.ClsPub.CreateBillCode("3802", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ }
+
string sql = "Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HMaker,HMakeDate,HRemark" +
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3827','3827'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- ", '" + user + "','" +HDate + "','" + sName + "'" +
+ " values('"+ HBillType + "','" + HBillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ ", '" + user + "','" + HDate + "','" + sName + "'" +
", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + ",isnull('" + dr["HNowSupID"].ToString() + "',0),0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",'',0" +
") ";
+
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
@@ -611,7 +624,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',0,0,'',''," +
"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
//涓昏〃
oCn.BeginTran();
@@ -657,10 +670,10 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
string user = sArray[1].ToString();//user
- string userID = sArray[2].ToString();//userID
+ string HOrgID = sArray[2].ToString();//HOrgID
string sName = sArray[3].ToString();//鐩樼偣鏂规
//鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
- DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");
+ DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName+"'", "Gy_StockCheckItem");
string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();
@@ -701,7 +714,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',0,0,'',''," +
"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + ",0,0," +
"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + ",0,0,0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
}
else
{
@@ -724,7 +737,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',0,0,'',''," +
"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
}
//涓昏〃
@@ -770,10 +783,10 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
string user = sArray[1].ToString();//user
- string userID = sArray[2].ToString();//userID
+ string HOrgID = sArray[2].ToString();//HOrgID
string sName = sArray[3].ToString();//鐩樼偣鏂规
//鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
- DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");
+ DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName + "'", "Gy_StockCheckItem");
string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();
//杞寲鏍煎紡
@@ -813,7 +826,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',0,0,'',''," +
"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + ",'1548785'," + dr["HNowSupID"].ToString() + ",0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
//涓昏〃
oCn.BeginTran();
@@ -858,10 +871,10 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
string user = sArray[1].ToString();//user
- string userID = sArray[2].ToString();//userID
+ string HOrgID = sArray[2].ToString();//HOrgID
string sName = sArray[3].ToString();//鐩樼偣鏂规
//鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
- DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");
+ DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName + "'", "Gy_StockCheckItem");
string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();
//杞寲鏍煎紡
@@ -891,9 +904,9 @@
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
" values('3803','3803'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- ", '" + user + "','" +HDate + "','" + sName + "'" +
+ ", '" + user + "','"+ HDate + "','" + sName + "'" +
", " + dr["HNowSupID"].ToString() + "," + dr["HNowSupTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
+ ", 0," + dr["HDeptID"].ToString() + ",getdate(),0" +
") ";
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
@@ -901,7 +914,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',0,0,'',''," +
"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
//涓昏〃
oCn.BeginTran();
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockStatusBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockStatusBillController.cs"
index 186748c..3951971 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockStatusBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockStatusBillController.cs"
@@ -342,5 +342,55 @@
}
}
#endregion
+
+ #region 搴撳瓨鐘舵�� 閲戣澏鍚屾
+ [Route("Gy_StockStatus/SaveGy_StockStatusListApi")]
+ [HttpPost]
+ public object SaveGy_StockStatusListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_StockStatus_Model> lsmain = new List<Model.ClsGy_StockStatus_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_StockStatus(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_StockStatus where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_StockStatus on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_StockStatus(HItemID,HNumber,HName ,HShortNumber ,HParentID ,HLevel
+ ,HEndFlag ,HStopflag ,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}','{lsmain[0].HUseFlag}'
+ ,'{lsmain[0].HMakeTime}','{lsmain[0].HMakeEmp}','{lsmain[0].HCheckEmp}','{lsmain[0].HCheckTime}','{lsmain[0].HModifyEmp}'
+ ,'{lsmain[0].HModifyTime}','{lsmain[0].HStopEmp}',null,{lsmain[0].HUSEORGID},{lsmain[0].HCREATEORGID})", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_StockStatus off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXController.cs"
new file mode 100644
index 0000000..5873a83
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXController.cs"
@@ -0,0 +1,416 @@
+锘縰sing Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_TaxMIXController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ //#region 绋庣巼缁勫悎 鍒楄〃
+ //[Route("Gy_TaxMIX/TaxMIXList")]
+ //[HttpGet]
+ //public object TaxMIXList(string sWhere, string user, string Organization)
+ //{
+ // try
+ // {
+ // List<object> columnNameList = new List<object>();
+ // //缂栬緫鏉冮檺
+ // //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Query", 1, false, user))
+ // //{
+ // // objJsonResult.code = "0";
+ // // objJsonResult.count = 0;
+ // // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // // objJsonResult.data = null;
+ // // return objJsonResult;
+ // //}
+ // string sql1 = string.Format(@"select * from h_v_Gy_TaxMIXList where 浣跨敤缁勭粐='" + Organization + "'");
+
+ // string sql = sql1 + sWhere;
+ // ds = oCN.RunProcReturn(sql, "h_v_Gy_TaxMIXList");
+
+ // //娣诲姞鍒楀悕
+ // 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.list = columnNameList;
+ // objJsonResult.data = ds.Tables[0];
+ // return objJsonResult;
+ // }
+ // catch (Exception e)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+ //#endregion
+
+ //#region 绋庣巼缁勫悎 缂栬緫
+ //[Route("Gy_TaxMIX/TaxMIXEdit")]
+ //[HttpPost]
+ //public object TaxMIXEdit([FromBody] JObject msg)
+ //{
+ // DataSet ds;
+ // var _value = msg["msg"].ToString();
+ // string msg3 = _value.ToString();
+ // string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ // string msg1 = sArray[0].ToString();
+ // string msg2 = sArray[1].ToString();
+ // //string msg_HUSEORGID = sArray[2].ToString();
+ // Int64 HItemID = 0;
+ // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ // //缂栬緫鏉冮檺
+ // //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Edit", 1, false, msg2))
+ // //{
+ // // objJsonResult.code = "0";
+ // // objJsonResult.count = 0;
+ // // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // // objJsonResult.data = null;
+ // // return objJsonResult;
+ // //}
+
+ // //鑾峰彇鏈�澶D鍊艰祴鍊�
+ // //DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxRate ", "Gy_TaxRate");
+ // //if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ // //{
+ // // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // // var maxid = Convert.ToInt32((Maxds.Tables[0].Rows[0]["HItemID"].ToString()==""?0: Maxds.Tables[0].Rows[0]["HItemID"]));
+ // // maxid += 1;
+ // // HItemID = maxid;
+ // //}
+ // ListModels oListModels = new ListModels();
+
+ // try
+ // {
+ // DAL.ClsGy_TaxMIX_Ctl oBill = new DAL.ClsGy_TaxMIX_Ctl();
+ // List<Model.ClsGy_TaxMIX_Model> lsmain = new List<Model.ClsGy_TaxMIX_Model>();
+ // msg1 = msg1.Replace("\\", "");
+ // msg1 = msg1.Replace("\n", ""); //\n
+ // lsmain = oListModels.getObjectByJson_Gy_TaxMIX(msg1);
+ // foreach (Model.ClsGy_TaxMIX_Model oItem in lsmain)
+ // {
+ // if (oItem.HNumber.Trim() == "")
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // if (oItem.HName.Trim() == "")
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+
+ // //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ // ds = oCN.RunProcReturn("select * from Gy_TaxMIX where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_TaxMIX");
+ // if (oItem.HItemID == 0)
+ // {
+ // if (ds.Tables[0].Rows.Count > 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // }
+ // else
+ // {
+ // if (ds.Tables[0].Rows.Count > 0)
+ // {
+ // if (ds.Tables[0].Rows[0]["HItemID"].ToString() != oItem.HItemID.ToString())
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // }
+ // }
+
+
+ // //鏂板鏃跺垽鏂�
+ // #region 鐖剁骇鏍￠獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級
+ // /*
+ // if (oItem.HItemID == 0)
+ // {
+ // if (ds == null || ds.Tables[0].Rows.Count > 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ // string sParent;
+ // sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ // if (sParent.Trim() == "")
+ // {
+ // oBill.oModel.HParentID = 0;
+ // }
+ // else
+ // {
+ // if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ // {
+ // oBill.oModel.HParentID = oBill.oModel.HItemID;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // }
+ // }
+ // else//缂栬緫鏃跺垽鏂�
+ // {
+ // //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ // string sParent;
+ // sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ // if (sParent.Trim() == "")
+ // {
+ // oBill.oModel.HParentID = 0;
+ // }
+ // else
+ // {
+ // if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ // {
+ // oBill.oModel.HParentID = oBill.oModel.HItemID;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // }
+ // }
+ // */
+ // #endregion
+ // //寰楀埌鐭唬鐮�
+ // string sShortNumber;
+ // sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ // if (sShortNumber.Trim() == "")
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
+ // oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ // oItem.HEndFlag = true;//鏈骇鏍囧織
+ // oItem.HLevel = 1; //绛夌骇 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
+ // oBill.oModel = oItem;
+ // }
+ // //淇濆瓨
+ // //淇濆瓨瀹屾瘯鍚庡鐞�
+ // bool bResult;
+ // if (oBill.oModel.HItemID == 0)
+ // {
+ // bResult = oBill.AddNew();
+ // }
+ // else
+ // {
+ // bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ // }
+ // if (bResult)
+ // {
+ // objJsonResult.code = "1";
+ // 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("Gy_TaxMIX/Delete")]
+ //[HttpGet]
+ //public object Delete(string HItemID, string user)
+ //{
+ // DataSet ds;
+ // try
+ // {
+ // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ // //鍒犻櫎鏉冮檺
+ // //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
+ // //{
+ // // objJsonResult.code = "0";
+ // // objJsonResult.count = 0;
+ // // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // // objJsonResult.data = null;
+ // // return objJsonResult;
+ // //}
+ // 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_TaxMIX where HItemID=" + HItemID, "Gy_TaxMIX");
+ // if (ds == null || ds.Tables[0].Rows.Count == 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult; ;
+ // }
+ // var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ // if (HStopflag)
+ // {
+ // oCN.RollBack();//鍥炴粴浜嬪姟
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+
+ // oCN.RunProc("delete from Gy_TaxMIX 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;
+ // }
+ //}
+ //#endregion
+
+ #region 绋庣巼缁勫悎 閲戣澏鍚屾
+ [Route("Gy_TaxMIXMain/SaveGy_TaxMIXMainListApi")]
+ [HttpPost]
+ public object SaveGy_TaxMIXListApi([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var model = sMainSub["model"].ToString();
+ var entry = sMainSub["model"]["HENTRY"].ToString();
+
+ model = "[" + model.ToString() + "]";
+ List<ClsGy_TaxMIXMain_Model> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_TaxMIXMain_Model>>(model);
+ List<ClsGy_TaxMIXSub_Model> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_TaxMIXSub_Model>>(entry);
+ string sql = string.Empty;
+ oCN.BeginTran();
+ sql = $"delete Gy_TaxMIXMain where HItemID = {mainList[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = $"delete Gy_TaxMIXSub where HItemID = {mainList[0].HItemID}";
+ oCN.RunProc(sql);
+
+ sql = "set identity_insert Gy_TaxMIXMain on";
+ oCN.RunProc(sql);
+ //涓昏〃
+ oCN.RunProc($@"insert into Gy_TaxMIXMain(HItemID,HNumber,HName ,HShortNumber,HParentID ,HLevel
+ ,HEndFlag,HStopflag,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values({mainList[0].HItemID},'{mainList[0].HNumber}','{mainList[0].HName}','{mainList[0].HShortNumber}',{mainList[0].HParentID},{mainList[0].HLevel}
+ ,{Convert.ToString(mainList[0].HEndFlag ? 1 : 0)},{Convert.ToString(mainList[0].HStopflag ? 1 : 0) },'{mainList[0].HRemark}','{mainList[0].HHelpCode}','{mainList[0].HUseFlag}'
+ ,'{mainList[0].HMakeTime}','{mainList[0].HMakeEmp}','{mainList[0].HCheckEmp}','{mainList[0].HCheckTime}','{mainList[0].HModifyEmp}'
+ ,'{mainList[0].HModifyTime}','{mainList[0].HStopEmp}',null,{mainList[0].HUSEORGID},{mainList[0].HCREATEORGID})", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ sql = "set identity_insert Gy_TaxMIXMain off";
+ oCN.RunProc(sql);
+
+ sql = "set identity_insert Gy_TaxMIXSub on";
+ oCN.RunProc(sql);
+ //淇濆瓨涓昏〃
+ foreach (var oSub in subList)
+ {
+ oCN.RunProc($@"Insert into Gy_TaxMIXSub
+ (HItemID,HTAXMIXID,HTAXBENCHMARK,FTAXRATEID)
+ values({oSub.HItemID},{oSub.HTAXMIXID},'{oSub.HTAXBENCHMARK}'
+ ,{oSub.FTAXRATEID})");
+ }
+
+ sql = "set identity_insert Gy_TaxMIXSub off";
+ oCN.RunProc(sql);
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateBillController.cs"
index 56dce91..69465ca 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateBillController.cs"
@@ -17,7 +17,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
- #region 浠樻鏉′欢 鍒楄〃
+ #region 绋庣巼 鍒楄〃
[Route("Gy_TaxRateBill/Gy_TaxRateList")]
[HttpGet]
public object Gy_TaxRateList(string sWhere, string user, string Organization)
@@ -65,7 +65,7 @@
}
#endregion
- #region 浠樻鏉′欢 缂栬緫
+ #region 绋庣巼 缂栬緫
[Route("Gy_TaxRateBill/Gy_TaxRateEdit")]
[HttpPost]
public object Gy_TaxRateEdit([FromBody] JObject msg)
@@ -276,7 +276,7 @@
}
#endregion
- #region 浠樻鏉′欢 鍒犻櫎
+ #region 绋庣巼 鍒犻櫎
[Route("Gy_TaxRateBill/Delete")]
[HttpGet]
public object Delete(string HItemID, string user)
@@ -342,5 +342,55 @@
}
}
#endregion
+
+ #region 绋庣巼 閲戣澏鍚屾
+ [Route("Gy_TaxRate/SaveGy_TaxRateListApi")]
+ [HttpPost]
+ public object SaveGy_TaxRateListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_TaxRate_Model> lsmain = new List<Model.ClsGy_TaxRate_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_TaxRate(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_TaxRate where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_TaxRate on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_TaxRate(HItemID,HNumber,HName ,HTaxRate,HShortNumber ,HParentID ,HLevel
+ ,HEndFlag ,HStopflag ,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}',{lsmain[0].HTaxRate},'{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}','{lsmain[0].HUseFlag}'
+ ,'{lsmain[0].HMakeTime}','{lsmain[0].HMakeEmp}','{lsmain[0].HCheckEmp}','{lsmain[0].HCheckTime}','{lsmain[0].HModifyEmp}'
+ ,'{lsmain[0].HModifyTime}','{lsmain[0].HStopEmp}',null,{lsmain[0].HUSEORGID},{lsmain[0].HCREATEORGID})", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_TaxRate off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkController.cs"
new file mode 100644
index 0000000..9434442
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkController.cs"
@@ -0,0 +1,392 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_WorkController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 浣滀笟 鍒楄〃
+ [Route("Gy_Work/WorkList")]
+ [HttpGet]
+ public object WorkList(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ string sql1 = string.Format(@"select * from h_v_Gy_WorkList where 1 = 1 ");
+
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkList");
+
+ //娣诲姞鍒楀悕
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浣滀笟 缂栬緫
+ [Route("Gy_Work/WorkEdit")]
+ [HttpPost]
+ public object WorkEdit([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+ //string msg_HUSEORGID = sArray[2].ToString();
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Edit", 1, false, msg2))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ //DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxRate ", "Gy_TaxRate");
+ //if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ //{
+ // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // var maxid = Convert.ToInt32((Maxds.Tables[0].Rows[0]["HItemID"].ToString()==""?0: Maxds.Tables[0].Rows[0]["HItemID"]));
+ // maxid += 1;
+ // HItemID = maxid;
+ //}
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ DAL.ClsGy_Work_Ctl oBill = new DAL.ClsGy_Work_Ctl();
+ List<Model.ClsGy_Work_Model> lsmain = new List<Model.ClsGy_Work_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_Work(msg1);
+ foreach (Model.ClsGy_Work_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("select * from Gy_Work where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Work");
+ if (oItem.HItemID == 0)
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HItemID"].ToString() != oItem.HItemID.ToString())
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+
+ //鏂板鏃跺垽鏂�
+ #region 鐖剁骇鏍￠獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級
+ /*
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else//缂栬緫鏃跺垽鏂�
+ {
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ */
+ #endregion
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = 1; //绛夌骇 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
+ oBill.oModel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "1";
+ 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("Gy_Work/Delete")]
+ [HttpGet]
+ public object Delete(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ 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_Work where HItemID=" + HItemID, "Gy_Work");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ if (HStopflag)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from Gy_Work 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;
+ }
+ }
+ #endregion
+
+ #region 浣滀笟 閲戣澏鍚屾
+ [Route("Gy_Work/SaveGy_WorkListApi")]
+ [HttpPost]
+ public object SaveGy_WorkListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_Work_Model> lsmain = new List<Model.ClsGy_Work_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_Work(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_Work where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_Work on";
+ oCN.RunProc(sql);
+ oCN.RunProc($@"insert into Gy_Work(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID,
+ HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID,HWORKCENTERID)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HHelpCode}','{lsmain[0].HShortNumber}',
+ {lsmain[0].HParentID},{lsmain[0].HLevel},{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },
+ '{lsmain[0].HRemark}','{lsmain[0].HUseFlag}',{lsmain[0].HUSEORGID},{lsmain[0].HCREATEORGID},{lsmain[0].HWORKCENTERID})", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_Work off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\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 8246b14..c51bad8 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"
@@ -338,6 +338,66 @@
#endregion
+ #region 濮斿棰嗘枡 涓婁紶鐢熷崟
+
+ #region 濮斿棰嗘枡 鏍￠獙妯″紡
+
+ /// <summary>
+ /// 濮斿棰嗘枡鏍￠獙涓婁紶
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveEntrustOutBill_BillCheck_Json")]
+ [HttpPost]
+ public object set_SaveEntrustOutBill_BillCheck_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+
+ try
+ {
+ List<Model.ClsKf_EntrustOutBillMain> lsmain = new List<Model.ClsKf_EntrustOutBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getEntrustOutBillMainByJson(msg1);
+
+ WebAPI.WebS.ClsKf_EntrustOutBillMain websLsmain = new WebS.ClsKf_EntrustOutBillMain();
+
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = "1211";
+ websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+
+ if (oWebs.set_SaveEntrustOutBill_BillCheck(websLsmain, 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
+
+ #endregion
+
+
#region 鐢熶骇琛ユ枡 涓婁紶鐢熷崟
#region 鐢熶骇琛ユ枡 鏍￠獙妯″紡
@@ -396,6 +456,67 @@
#endregion
#endregion
+
+
+ #region 濮斿琛ユ枡 涓婁紶鐢熷崟
+
+ #region 濮斿琛ユ枡 鏍￠獙妯″紡
+
+ /// <summary>
+ /// 濮斿琛ユ枡鏍￠獙涓婁紶
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveEntrustReplenishOutBill_BillCheck_Json")]
+ [HttpPost]
+ public object set_SaveEntrustReplenishOutBill_BillCheck_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+
+ try
+ {
+ List<Model.ClsKf_EntrustReplenishOutBillMain> lsmain = new List<Model.ClsKf_EntrustReplenishOutBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getEntrustReplenishOutBillMainByJson(msg1);
+
+ WebAPI.WebS.ClsKf_EntrustReplenishOutBillMain websLsmain = new WebS.ClsKf_EntrustReplenishOutBillMain();
+
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = "1255";
+ websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+
+ if (oWebs.set_SaveEntrustReplenishOutBill_BillCheck(websLsmain, 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
+
+ #endregion
+
#endregion
@@ -603,37 +724,58 @@
[HttpGet]
public Object get_BarCode_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockOrgID, string HScanStyle, string HCustom1, string HCustom2)
{
- try
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ string sJXCode = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
- var sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo,HMaker);
- SourceFlag = true;
- WebSoBar = oWebs.get_BarCode(sJXCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HStockOrgID, HScanStyle, HCustom1, HCustom2, ref DBUtility.ClsPub.sErrInfo);
- if (WebSoBar == null)
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = null;
- return objJsonResult;
+ sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo, HMaker);
+ SourceFlag = true;
}
else
{
+ sJXCode = sBarCode;
+ }
+ try
+ {
+ WebSoBar = oWebs.get_BarCode(sJXCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HStockOrgID, HScanStyle, HCustom1, HCustom2, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = WebSoBar;
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
return objJsonResult;
}
}
- catch (Exception e)
+ else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
- }
+ }
#endregion
@@ -839,32 +981,53 @@
[HttpGet]
public Object get_CheckTypeByBarCode_BillCheck_Json(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, Int64 HStockOrgID)
{
- try
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ string sJXCode = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
- var sJXCode = POStockInBillController.JX_Json(sBarCode, HBillID, HBillType, HStockOrgID, HBillNo, HMaker);
- WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
- if (WebSoBar == null)
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = null;
- return objJsonResult;
+ sJXCode = POStockInBillController.JX_Json(sBarCode, HBillID, HBillType, HStockOrgID, HBillNo, HMaker);
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = WebSoBar;
- return objJsonResult;
+ sJXCode = sBarCode;
}
- }
- catch (Exception e)
+ try
+ {
+ WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏍￠獙妯″紡锛屾壂鎻忔潯鐮佸け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏍￠獙妯″紡锛屾壂鎻忔潯鐮佸け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 76faf2a..42b7352 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -98,6 +98,9 @@
double? HPlanQty = mainList[0].HPlanQty == null ? 0 : mainList[0].HPlanQty;//璁″垝鏁伴噺
string HMaker = user;//鍒跺崟浜�
+ long HISENTRUST = mainList[0].HISENTRUST == null ? 0 : mainList[0].HISENTRUST;//缁勭粐鍙楁墭鍔犲伐
+ long HISREWORK = mainList[0].HISREWORK == null ? 0 : mainList[0].HISREWORK;//鏄惁杩斿伐
+
ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_ICMOBillList");
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
@@ -107,11 +110,11 @@
(HBillType,HInterID,HBillNo,HDate,HPRDORGID
,HYear,HPeriod,HRemark,HMaker,HMakeDate
,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
- ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate)
+ ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HISENTRUST,HISREWORK)
values('3710'," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
- "," + HCenterID + "," + HPlanQty + ",0,0,0,0,'','') ");
+ "," + HCenterID + "," + HPlanQty + ",0,0,0,0,'',''" + "," + HISENTRUST + "," + HISREWORK + ") ");
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
@@ -154,6 +157,19 @@
public json AddBillSub(string msg3, long HInterID, int OperationType)
{
List<ClsSc_ICMOBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_ICMOBillSub>>(msg3);
+
+ string HINSTOCKTYPE = DetailColl[0].HINSTOCKTYPE == null ? "''" : DetailColl[0].HINSTOCKTYPE; //鍏ュ簱绫诲瀷,
+ long HCHECKPRODUCT = DetailColl[0].HCHECKPRODUCT == null ? 0 : DetailColl[0].HCHECKPRODUCT; //浜у搧妫�楠�,
+ string HQAIP = DetailColl[0].HQAIP == null ? "''" : DetailColl[0].HQAIP; //绱ф�ユ斁琛�,
+ long HISBACKFLUSH = DetailColl[0].HISBACKFLUSH == null ? 0 : DetailColl[0].HISBACKFLUSH; //鍊掑啿棰嗘枡,
+ string HREQSRC = DetailColl[0].HREQSRC == null ? "''" : DetailColl[0].HREQSRC; //闇�姹傛潵婧�,
+ double HSTOCKINQUASELAUXQTY = DetailColl[0].HSTOCKINQUASELAUXQTY == null ? 0 : DetailColl[0].HSTOCKINQUASELAUXQTY; //鍚堟牸鍝佸叆搴撻�夊崟鏁伴噺,
+ long HSeOrderEntrySEQ = DetailColl[0].HSeOrderEntrySEQ == null ? 0 : DetailColl[0].HSeOrderEntrySEQ; //閿�鍞鍗曡鍙�,
+ string HPROJECTNO = DetailColl[0].HPROJECTNO == null ? "''" : DetailColl[0].HPROJECTNO; //椤圭洰缂栧彿,
+ long HPRODUCTTYPE = DetailColl[0].HPRODUCTTYPE == null ? 0 : DetailColl[0].HPRODUCTTYPE; //浜у搧绫诲瀷,
+ long HCOSTRATE = DetailColl[0].HCOSTRATE == null ? 0 : DetailColl[0].HCOSTRATE; // 鏉冮噸,
+ long HBASEUNITID = DetailColl[0].HBASEUNITID == null ? 0 : DetailColl[0].HBASEUNITID; //鍩烘湰璁￠噺鍗曚綅,
+
int i = 0;
foreach (ClsSc_ICMOBillSub oSub in DetailColl)
{
@@ -208,12 +224,13 @@
,HPlanBeginDate,HPlanEndDate
,HBeginDate,HEndDate
,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
- ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
+ ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
+ ,HINSTOCKTYPE,HCHECKPRODUCT,HQAIP,HISBACKFLUSH,HREQSRC,HSTOCKINQUASELAUXQTY,HSeOrderEntrySEQ,HPROJECTNO,HPRODUCTTYPE,HCOSTRATE,HBASEUNITID)
values({HInterID},{i},{(oSub.HQty == null ? 0 : oSub.HQty)}
,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS}
- ,0,0,'','',0,0)");
+ ,0,0,'','',0,0,{HINSTOCKTYPE},{HCHECKPRODUCT},{HQAIP},{HISBACKFLUSH},{HREQSRC},{HSTOCKINQUASELAUXQTY},{HSeOrderEntrySEQ},{HPROJECTNO},{HPRODUCTTYPE},{HCOSTRATE},{HBASEUNITID})");
}
objJsonResult.code = "1";
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index 088733c..314e8e0 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -24,14 +24,16 @@
",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" +
",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" +
",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
- ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID,HERPItemID) " +
+ ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID,HERPItemID" +
+ ",HSALEUNITID,HSALEPRICEUNITID,HBASEUNITID,HSTOREUNITID,HCHECKINCOMING,HCHECKPRODUCT,HPERUNITSTANDHOUR" +
+ ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME) " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
- ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HSALEUNITID + "," + oModel.HSALEPRICEUNITID + "," + oModel.HBASEUNITID + "," + oModel.HSTOREUNITID + "," + oModel.HCHECKINCOMING + "," + oModel.HCHECKPRODUCT + "," + oModel.HPERUNITSTANDHOUR + "," + oModel.HSTDLABORPREPARETIME + "," + oModel.HSTDMACHINEPREPARETIME + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -47,6 +49,7 @@
{
try
{
+ LogService.Write("鐗╂枡鍚屾鎻掍欢,淇濆瓨鏂规硶鎵ц寮�濮嬶細" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
string sql = string.Empty;
oCn.BeginTran();
sql = $"delete Gy_Material where hitemid ={oModel.HItemID}";
@@ -60,19 +63,20 @@
",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" +
",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" +
",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
- ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HCREATEORGID,HUSEORGID,HERPItemID) " +
+ ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HCREATEORGID,HUSEORGID,HERPItemID,HBatchManager) " +
" Values('" + oModel.HItemID + "','" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
- ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HBatchManager + ")", ref DBUtility.ClsPub.sExeReturnInfo);
sql = "set identity_insert gy_material off";
oCn.RunProc(sql);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
+ LogService.Write("鐗╂枡鍚屾鎻掍欢,淇濆瓨鏂规硶鎵ц缁撴潫锛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
return true;
}
catch (Exception e)
@@ -126,7 +130,16 @@
",HSPGroupID=" + oModel.HSPGroupID.ToString() +
",HSPID=" + oModel.HSPID.ToString() +
",HMinPickQty=" + oModel.HMinPickQty.ToString() +
- ",HPropertyTypeID=" + oModel.HPropertyTypeID.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ ",HPropertyTypeID=" + oModel.HPropertyTypeID.ToString() +
+ ",HSALEUNITID=" + oModel.HSALEUNITID.ToString() +
+ ",HSALEPRICEUNITID=" + oModel.HSALEPRICEUNITID.ToString() +
+ ",HBASEUNITID=" + oModel.HBASEUNITID.ToString() +
+ ",HSTOREUNITID=" + oModel.HSTOREUNITID.ToString() +
+ ",HCHECKINCOMING=" + oModel.HCHECKINCOMING.ToString() +
+ ",HCHECKPRODUCT=" + oModel.HCHECKPRODUCT.ToString() +
+ ",HPERUNITSTANDHOUR=" + oModel.HPERUNITSTANDHOUR.ToString() +
+ ",HSTDLABORPREPARETIME=" + oModel.HSTDLABORPREPARETIME.ToString() +
+ ",HSTDMACHINEPREPARETIME=" + oModel.HSTDMACHINEPREPARETIME.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
diff --git a/WebAPI/DLL/ClsSc_ICMOReportBill.cs b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
index 937b973..476118b 100644
--- a/WebAPI/DLL/ClsSc_ICMOReportBill.cs
+++ b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
@@ -156,11 +156,15 @@
",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
",HGroupID,HDeptID,HDeptNumber" +
",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
+ ",HChecker,HCheckDate,HUpDater,HUpDateDate,HDeleteMan,HDeleteDate,HPrintQty,HCheckType" +
+ ",HERPInterID,HERPBillType,HPRDORGID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker+ "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HEmpID.ToString() + "','" + omodel.HEmpNumber +
"','" + omodel.HGroupID.ToString() + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber +
- "','" + omodel.HMainSourceBillNo.ToString() + "'," + omodel.HMainSourceInterID.ToString() + ",'" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillType + "'" +
+ "','" + omodel.HMainSourceBillNo.ToString() + "'," + omodel.HMainSourceInterID.ToString() + ",'" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillType + "','" + omodel.HChecker + "','" + omodel.HCheckDate + "','" + omodel.HUpDater +
+ "','" + omodel.HUpDateDate + "','" + omodel.HDeleteMan + "','" + omodel.HDeleteDate + "'," + omodel.HPrintQty +
+ ",'" + omodel.HCheckType + "'," + omodel.HERPInterID + ",'" + omodel.HERPBillType + "'," + omodel.HPRDORGID +
") ");
//鎻掑叆瀛愯〃
foreach (Models.ClsSc_ICMOReportBillSub oSub in DetailColl)
@@ -173,14 +177,23 @@
"HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
",HICMOInterID,HICMOBillNo,HBarCode" +
+ ",HOWNERTYPEID,HISENTRUST,HSTOCKINORGID,HOWNERID,HCHECKPRODUCT,HQAIP,HCOSTRATE,HISBACKFLUSH" +
+ ",HREQSRC,HREQBILLNO,HREQBILLID,HREQENTRYSEQ,HREQENTRYID,HMOMAINENTRYID,HSTOCKINQUASELQTY" +
+ ",HPRODUCTTYPE,HPROJECTNO,HICMOENTRYSEQ,HSEQ,HPRODUCEDATE,HEXPIRYDATE,HBASEUNITID,HDEPTID" +
+ ",HGroupID,HDESCRIPTION" +
+ ",HSourceNumber,HQPQty,HICMOEntryID" +
+ ",HWhID,HSPID,HBatChNo,HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'" +
"," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HTimes.ToString() + "," + oSub.HSourceID.ToString() +
"," + oSub.HQtyMust.ToString() + "," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HBadCount.ToString() + "," + oSub.HWasterQty.ToString() +
",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
- "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "'" +
+ "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "','" + oSub.HOWNERTYPEID + "'," +
+ oSub.HISENTRUST + "," + oSub.HSTOCKINORGID + "," + oSub.HOWNERID + "," + oSub.HCHECKPRODUCT + ",'" + oSub.HQAIP + "'," +
+ oSub.HCOSTRATE + "," + oSub.HISBACKFLUSH + ",'" + oSub.HREQSRC + "','" + oSub.HREQBILLNO + "'," + oSub.HREQBILLID + "," +
+ oSub.HREQENTRYSEQ + "," + oSub.HREQENTRYID + "," + oSub.HMOMAINENTRYID + "," + oSub.HSTOCKINQUASELQTY + "," + oSub.HPRODUCTTYPE + ",'" + oSub.HPROJECTNO + "'," + oSub.HICMOENTRYSEQ + "," + oSub.HSEQ + ",'" + oSub.HPRODUCEDATE + "','" + oSub.HEXPIRYDATE + "'," + oSub.HBASEUNITID + "," + oSub.HDEPTID + "," + oSub.HGroupID + ",'" + oSub.HDESCRIPTION + "','" + oSub.HSourceNumber + "'," + oSub.HQPQty + "," + oSub.HSourceEntryID + "," + oSub.HICMOEntryID + "," + oSub.HWhID + "," + oSub.HSPID + ",'" + oSub.HBatChNo + "'," + oSub.HAuxPropID + ",'" + oSub.HMTONo + "'," + oSub.HPlanMode + "," + oSub.HERPInterID + "," + oSub.HERPEntryID +
") ");
}
//
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 8f87506..cdd2748 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -120,6 +120,17 @@
return list;
}
/// <summary>
+ /// 濮斿琛ユ枡鍙嶅簭鍒楀寲
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsKf_EntrustReplenishOutBillMain> getEntrustReplenishOutBillMainByJson(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsKf_EntrustReplenishOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_EntrustReplenishOutBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
/// 濮斿鍑哄簱鍙嶅簭鍒楀寲
/// </summary>
/// <param name="jsonString"></param>
@@ -605,6 +616,18 @@
}
/// <summary>
+ /// 澶勭悊鏂板妯″叿淇濆吇璁″垝鍗曞瓙琛ㄤ繚鍏讳俊鎭殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MouldMaintainPlanBillSub_Item> getObjectByJson_Gy_MouldMaintainPlanBillSub_Item(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MouldMaintainPlanBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainPlanBillSub_Item>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板涓嶈壇鍘熷洜琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -885,6 +908,126 @@
}
/// <summary>
+ /// 澶勭悊姹囩巼琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_RateType_Model> getObjectByJson_Gy_RateType(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_RateType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_RateType_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊浜よ揣鍦扮偣琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_CustLocation_Model> getObjectByJson_Gy_CustLocation(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_CustLocation_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CustLocation_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊缁撶畻鏂瑰紡琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_SettleStyle_Model> getObjectByJson_Gy_SettleStyle(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_SettleStyle_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SettleStyle_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊杈呭姪灞炴�ц〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_Property_Model> getObjectByJson_Gy_Property(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_Property_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Property_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊涓氬姟鍛樿〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_Operator_Model> getObjectByJson_Gy_Operator(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_Operator_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Operator_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊浣滀笟琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_Work_Model> getObjectByJson_Gy_Work(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_Work_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Work_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鍛樺伐琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_Staff_Model> getObjectByJson_Gy_Staff(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_Staff_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Staff_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊绋庣巼缁勫悎琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_TaxMIXMain_Model> getObjectByJson_Gy_TaxMIXMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_TaxMIXMain_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_TaxMIXMain_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊閲囪喘浠锋牸琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_MatePriceSup_Model> getObjectByJson_Gy_MatePriceSup(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_MatePriceSup_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MatePriceSup_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鍗曟嵁绫诲瀷琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsXt_BillType_Model> getObjectByJson_Xt_BillType(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsXt_BillType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_BillType_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏀舵鏉′欢琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 0a5a831..75ab2b1 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -42,5 +42,16 @@
public int HUSEORGID;
public int HERPItemID;
public int HCREATEORGID;
+ public int HBatchManager;
+
+ public int HSALEUNITID; //閿�鍞閲忓崟浣�(gy_unit)
+ public int HSALEPRICEUNITID; //閿�鍞浠疯閲忓崟浣�(gy_unit)
+ public int HBASEUNITID; //鍩烘湰璁￠噺鍗曚綅(gy_unit)
+ public int HSTOREUNITID; //搴撳瓨璁￠噺鍗曚綅(gy_unit)
+ public int HCHECKINCOMING; //鏄惁鏉ユ枡妫�楠�
+ public int HCHECKPRODUCT; //鏄惁浜у搧妫�楠�
+ public double HPERUNITSTANDHOUR; //鏍囧噯宸ユ椂
+ public double HSTDLABORPREPARETIME; //鏍囧噯浜哄憳鍑嗗宸ユ椂
+ public double HSTDMACHINEPREPARETIME; //鏍囧噯鏈哄櫒鍑嗗宸ユ椂
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_ICMOReportBillMain.cs b/WebAPI/Models/ClsSc_ICMOReportBillMain.cs
index f1740fe..6270dcc 100644
--- a/WebAPI/Models/ClsSc_ICMOReportBillMain.cs
+++ b/WebAPI/Models/ClsSc_ICMOReportBillMain.cs
@@ -14,5 +14,9 @@
public string HCheckType;
public Int64 HPrintQty;
public string HWorkShift;
+
+ public Int64 HERPInterID;
+ public string HERPBillType;
+
}
}
diff --git a/WebAPI/Models/ClsSc_ICMOReportBillSub.cs b/WebAPI/Models/ClsSc_ICMOReportBillSub.cs
index c9c468c..b231e20 100644
--- a/WebAPI/Models/ClsSc_ICMOReportBillSub.cs
+++ b/WebAPI/Models/ClsSc_ICMOReportBillSub.cs
@@ -4,7 +4,7 @@
namespace WebAPI.Models
{
- public class ClsSc_ICMOReportBillSub:DBUtility.ClsXt_BaseBillSub
+ public class ClsSc_ICMOReportBillSub : DBUtility.ClsXt_BaseBillSub
{
public Int64 HMaterID;
public string HMaterNumber;
@@ -31,5 +31,49 @@
public string HSplitNO;
public string HBarCode;
public Int64 HBadQty;
+
+ public string HOWNERTYPEID; //货主类型,
+ public Int64 HISENTRUST; //组织委托加工,
+ public Int64 HSTOCKINORGID; //入库组织,
+ public Int64 HOWNERID; //货主,
+ public Int64 HCHECKPRODUCT; //产品检验,
+ public string HQAIP; //紧急放行,
+ public decimal HCOSTRATE; //成本权重
+ public Int64 HISBACKFLUSH; //倒冲领料
+ public string HREQSRC; //需求来源
+ public string HREQBILLNO; //需求单号
+ public Int64 HREQBILLID; //需求单内码
+ public Int64 HREQENTRYSEQ; //需求单据行号
+ public Int64 HREQENTRYID; //需求单据子内码
+ public Int64 HMOMAINENTRYID;//生产订单主产品分录
+ public double HSTOCKINQUASELQTY; //入库选单数量
+ public Int64 HPRODUCTTYPE;//产品类型,
+ public string HPROJECTNO; //项目编号
+ public Int64 HICMOENTRYSEQ; //生产订单行号
+ public Int64 HSEQ; //行号
+ public string HPRODUCEDATE;//生产日期
+ public string HEXPIRYDATE;//有效期至
+ public Int64 HBASEUNITID; //基本计量单位,
+ public Int64 HDEPTID;//车间部门,
+ public Int64 HGroupID;//班组,
+ public string HDESCRIPTION;//摘要备注
+
+ public string HSourceNumber;
+ public double HQPQty;
+ public Int64 HSourceInterID;
+ public Int64 HSourceEntryID;
+ public string HSourceBillNo;
+ public string HSourceBillType;
+ public Int64 HICMOEntryID;
+ public double HRelationQty;
+ public double HRelationMoney;
+ public Int64 HWhID;
+ public Int64 HSPID;
+ public string HBatChNo;
+ public Int64 HAuxPropID;
+ public string HMTONo;
+ public Int64 HPlanMode;
+ public Int64 HERPInterID;
+ public Int64 HERPEntryID;
}
}
diff --git a/WebAPI/Models/Cls_InventoryAnalysisList.cs b/WebAPI/Models/Cls_InventoryAnalysisList.cs
index 496302c..5cfc883 100644
--- a/WebAPI/Models/Cls_InventoryAnalysisList.cs
+++ b/WebAPI/Models/Cls_InventoryAnalysisList.cs
@@ -7,14 +7,14 @@
{
public class Cls_InventoryAnalysisList
{
- public long HItemID;
- public string HBarCode;
- public string HMouldNo;
- public string HStockCheck;
- public string HRealPotType;
- public string HRealPot;
- public string HBookPotType;
- public string HBookPot;
- public string HMakeDate;
+ public long HItemID { get; set; }
+ public string HBarCode{ get; set; }
+ public string HMouldNo{ get; set; }
+ public string HStockCheck{ get; set; }
+ public string HRealPotType{ get; set; }
+ public string HRealPot{ get; set; }
+ public string HBookPotType{ get; set; }
+ public string HBookPot{ get; set; }
+ public string HMakeDate{ get; set; }
}
}
\ No newline at end of file
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace.cs"
new file mode 100644
index 0000000..e6ec201
--- /dev/null
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace.cs"
@@ -0,0 +1,34 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_StockPlace
+ {
+ public bool HEndFlag { get; set; }
+ public string HHelpCode { get; set; }
+ public long HItemID { get; set; }
+ public long HLevel { get; set; }
+ public string HName { get; set; }
+ public string HNumber { get; set; }
+ public long HParentID { get; set; }
+ public string HRemark { get; set; }
+ public string HShortNumber { get; set; }
+ public bool HStopFlag { get; set; }
+ public string HUseFlag { get; set; }
+ public Int64 HEmpID { get; set; }
+ public string HAddress { get; set; }
+ public string HPhone { get; set; }
+ public Int64 HSPGroupID { get; set; }
+ public string HBarCode { get; set; }
+ public Int64 HUSEORGID { get; set; }
+ public Int64 HCREATEORGID { get; set; }
+ public string HMaker { get; set; }
+ public string HUpDater { get; set; }
+ public string HSPType { get; set; }
+ public string HSrcSPType { get; set; }
+ public string HDesSPType { get; set; }
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs"
index 813b237..c6e5b67 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs"
@@ -16,15 +16,19 @@
public long HParentID { get; set; }
public string HRemark { get; set; }
public string HShortNumber { get; set; }
- public bool HStopflag { get; set; }
+ public bool HStopFlag { get; set; }
public string HUseFlag { get; set; }
public Int64 HEmpID { get; set; }
public string HAddress { get; set; }
public string HPhone { get; set; }
- public bool HIsStockMgr { get; set; }
public Int64 HSPGroupID { get; set; }
+ public Int64 HSPFlag { get; set; }
+ public Int64 HSTOCKPROPERTY { get; set; }
+ public Int64 HUnderStock { get; set; }
+
public string HBarCode { get; set; }
public Int64 HUSEORGID { get; set; }
+ public Int64 HCREATEORGID { get; set; }
public string HMaker { get; set; }
public string HUpDater { get; set; }
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/WorkDay.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/WorkDay.cs"
index 36320f9..00eb1e4 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/WorkDay.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/WorkDay.cs"
@@ -15,5 +15,9 @@
public DateTime HNoonbreakEnd { get; set; }
public DateTime HNightbreakBegin { get; set; }
public DateTime HNightbreakEnd { get; set; }
+ public DateTime HNoonbreakBegin2 { get; set; }
+ public DateTime HNoonbreakEnd2 { get; set; }
+ public DateTime HNightbreakBegin2 { get; set; }
+ public DateTime HNightbreakEnd2 { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 1f96046..4528509 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2022-11-30T00:24:02.9999976Z;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|2022-12-23T09:06:52.0688439Z;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">
@@ -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/30/2022 08:21:49</publishTime>
+ <publishTime>12/23/2022 17:06:23</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/30/2022 08:21:49</publishTime>
+ <publishTime>12/23/2022 17:06:23</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/17/2020 21: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/30/2022 08:21:45</publishTime>
+ <publishTime>12/23/2022 17:06:19</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/30/2022 08:21:45</publishTime>
+ <publishTime>12/23/2022 17:06:19</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14: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/30/2022 08:21:33</publishTime>
+ <publishTime>12/23/2022 17:06:06</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/30/2022 08:21:33</publishTime>
+ <publishTime>12/23/2022 17:06:06</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 05:17:26</publishTime>
@@ -107,12 +107,12 @@
<File Include="bin/Model.dll">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/30/2022 08:21:34</publishTime>
+ <publishTime>12/23/2022 17:06:08</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/30/2022 08:21:34</publishTime>
+ <publishTime>12/23/2022 17:06:08</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/19/2021 09:44:01</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/30/2022 08:21:24</publishTime>
+ <publishTime>12/23/2022 17:05:56</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/30/2022 08:21:24</publishTime>
+ <publishTime>12/23/2022 17:05:56</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/30/2022 08:21:26</publishTime>
+ <publishTime>12/23/2022 17:06:05</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/30/2022 08:21:26</publishTime>
+ <publishTime>12/23/2022 17:06:05</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/30/2012 22:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/30/2022 08:21:27</publishTime>
+ <publishTime>12/23/2022 17:06:05</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/30/2022 08:21:27</publishTime>
+ <publishTime>12/23/2022 17:06:05</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</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/30/2022 08:22:01</publishTime>
+ <publishTime>12/23/2022 17:06:35</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/30/2022 08:22:01</publishTime>
+ <publishTime>12/23/2022 17:06:35</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -423,67 +423,67 @@
<publishTime>08/19/2021 09:44:01</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>11/22/2022 10:33:25</publishTime>
+ <publishTime>12/23/2022 09:54:45</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>11/22/2022 10:33:24</publishTime>
+ <publishTime>12/23/2022 09:54:44</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>11/22/2022 10:33:25</publishTime>
+ <publishTime>12/23/2022 09:54:45</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>11/22/2022 10:33:24</publishTime>
+ <publishTime>12/23/2022 09:54:44</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>11/22/2022 10:33:25</publishTime>
+ <publishTime>12/23/2022 09:54:45</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>11/22/2022 10:33:24</publishTime>
+ <publishTime>12/23/2022 09:54:44</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>11/22/2022 10:33:26</publishTime>
+ <publishTime>12/23/2022 09:54:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>11/22/2022 10:33:29</publishTime>
+ <publishTime>12/23/2022 09:54:49</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>11/22/2022 10:33:27</publishTime>
+ <publishTime>12/23/2022 09:54:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>11/22/2022 10:33:26</publishTime>
+ <publishTime>12/23/2022 09:54:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>11/22/2022 10:33:28</publishTime>
+ <publishTime>12/23/2022 09:54:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>11/22/2022 10:33:27</publishTime>
+ <publishTime>12/23/2022 09:54:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>11/22/2022 10:33:26</publishTime>
+ <publishTime>12/23/2022 09:54:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>11/22/2022 10:33:28</publishTime>
+ <publishTime>12/23/2022 09:54:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>11/22/2022 10:33:27</publishTime>
+ <publishTime>12/23/2022 09:54:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>11/22/2022 10:33:28</publishTime>
+ <publishTime>12/23/2022 09:54:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>11/22/2022 10:33:26</publishTime>
+ <publishTime>12/23/2022 09:54:46</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>11/22/2022 10:33:23</publishTime>
+ <publishTime>12/23/2022 09:54:44</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>11/22/2022 10:33:29</publishTime>
+ <publishTime>12/23/2022 09:54:49</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/28/2022 07:59:29</publishTime>
+ <publishTime>12/23/2022 09:54:38</publishTime>
</File>
<File Include="Web References/WebS/WebService1.disco">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -494,7 +494,7 @@
<File Include="Web.config">
<publishTime>11/14/2022 11:24:08</publishTime>
<publishTime>11/02/2022 22:03:20</publishTime>
- <publishTime>11/30/2022 08:23:59</publishTime>
+ <publishTime>12/23/2022 17:06:49</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/Settings.Designer.cs b/WebAPI/Properties/Settings.Designer.cs
index 69b9adb..c383284 100644
--- a/WebAPI/Properties/Settings.Designer.cs
+++ b/WebAPI/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -26,7 +26,7 @@
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
- [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/WEBS/WebService1.asmx")]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://192.168.63.7/WEBS-WMS/WebService1.asmx")]
public string WebAPI_WebS_WebService1 {
get {
return ((string)(this["WebAPI_WebS_WebService1"]));
diff --git a/WebAPI/Properties/Settings.settings b/WebAPI/Properties/Settings.settings
index 9ee11bf..8bc8bec 100644
--- a/WebAPI/Properties/Settings.settings
+++ b/WebAPI/Properties/Settings.settings
@@ -3,7 +3,7 @@
<Profiles />
<Settings>
<Setting Name="WebAPI_WebS_WebService1" Type="(Web Service URL)" Scope="Application">
- <Value Profile="(Default)">http://localhost/WEBS/WebService1.asmx</Value>
+ <Value Profile="(Default)">http://192.168.63.7/WEBS-WMS/WebService1.asmx</Value>
</Setting>
</Settings>
</SettingsFile>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index 2aabd55..5643ee2 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -35,6 +35,14 @@
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsGy_BarCodeBill_WMS_Model))]
public partial class WebService1 : System.Web.Services.Protocols.SoapHttpClientProtocol {
+ private System.Threading.SendOrPostCallback getCheckOpenOperationCompleted;
+
+ private System.Threading.SendOrPostCallback getGetDataBaseOperationCompleted;
+
+ private System.Threading.SendOrPostCallback getCheckCzymcOperationCompleted;
+
+ private System.Threading.SendOrPostCallback getSub_GetCurPeriodOperationCompleted;
+
private System.Threading.SendOrPostCallback getDataSetBySQLOperationCompleted;
private System.Threading.SendOrPostCallback getRunProcOperationCompleted;
@@ -54,6 +62,14 @@
private System.Threading.SendOrPostCallback DeleteMouldOperationCompleted;
private System.Threading.SendOrPostCallback set_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted;
+
+ private System.Threading.SendOrPostCallback GetICInventoryByBarCodeSP_ViewOperationCompleted;
+
+ private System.Threading.SendOrPostCallback GetMaterByBarCodeSP_ViewOperationCompleted;
+
+ private System.Threading.SendOrPostCallback SetFIFOPonderationBillMain_TempOperationCompleted;
+
+ private System.Threading.SendOrPostCallback set_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted;
private System.Threading.SendOrPostCallback get_CheckTypeByBarCodeOperationCompleted;
@@ -217,13 +233,9 @@
private System.Threading.SendOrPostCallback getDataSetByMasterSQLOperationCompleted;
- private System.Threading.SendOrPostCallback getCheckOpenOperationCompleted;
+ private System.Threading.SendOrPostCallback set_SaveProcReportMoveBill_MoveStockOperationCompleted;
- private System.Threading.SendOrPostCallback getGetDataBaseOperationCompleted;
-
- private System.Threading.SendOrPostCallback getCheckCzymcOperationCompleted;
-
- private System.Threading.SendOrPostCallback getSub_GetCurPeriodOperationCompleted;
+ private System.Threading.SendOrPostCallback set_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted;
private System.Threading.SendOrPostCallback set_CheckPOInStockBill_NewOperationCompleted;
@@ -381,13 +393,9 @@
private System.Threading.SendOrPostCallback GetMaterByBarCode_ViewOperationCompleted;
- private System.Threading.SendOrPostCallback GetICInventoryByBarCodeSP_ViewOperationCompleted;
+ private System.Threading.SendOrPostCallback set_SaveOtherOutBill_CLDOperationCompleted;
- private System.Threading.SendOrPostCallback GetMaterByBarCodeSP_ViewOperationCompleted;
-
- private System.Threading.SendOrPostCallback SetFIFOPonderationBillMain_TempOperationCompleted;
-
- private System.Threading.SendOrPostCallback set_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted;
+ private System.Threading.SendOrPostCallback set_SaveOtherOutBill_BillCheckOperationCompleted;
private System.Threading.SendOrPostCallback set_SavePOStockInBackBillOperationCompleted;
@@ -485,10 +493,6 @@
private System.Threading.SendOrPostCallback set_SaveProcReportMoveBill_CLD_NewOperationCompleted;
- private System.Threading.SendOrPostCallback set_SaveProcReportMoveBill_MoveStockOperationCompleted;
-
- private System.Threading.SendOrPostCallback set_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted;
-
private System.Threading.SendOrPostCallback set_SaveSellOutBackBill_CLD_NewOperationCompleted;
private System.Threading.SendOrPostCallback set_SaveSellOutBackBill_CLDOperationCompleted;
@@ -549,6 +553,8 @@
private System.Threading.SendOrPostCallback set_SaveMateReplenishOutBill_BillCheckOperationCompleted;
+ private System.Threading.SendOrPostCallback set_SaveEntrustReplenishOutBill_BillCheckOperationCompleted;
+
private System.Threading.SendOrPostCallback set_SaveEntrustInBackBill_CLDOperationCompleted;
private System.Threading.SendOrPostCallback set_SaveEntrustOutBackBillOperationCompleted;
@@ -575,6 +581,8 @@
private System.Threading.SendOrPostCallback set_SaveEntrustOutBill_CLDOperationCompleted;
+ private System.Threading.SendOrPostCallback set_SaveEntrustOutBill_BillCheckOperationCompleted;
+
private System.Threading.SendOrPostCallback set_SaveOtherOutBackBillOperationCompleted;
private System.Threading.SendOrPostCallback set_SaveOtherOutBackBill_NewOperationCompleted;
@@ -594,10 +602,6 @@
private System.Threading.SendOrPostCallback set_SaveOtherOutBill_NewOperationCompleted;
private System.Threading.SendOrPostCallback set_SaveOtherOutBill_CLD_NewOperationCompleted;
-
- private System.Threading.SendOrPostCallback set_SaveOtherOutBill_CLDOperationCompleted;
-
- private System.Threading.SendOrPostCallback set_SaveOtherOutBill_BillCheckOperationCompleted;
private System.Threading.SendOrPostCallback set_SavePonderationBillMain_Temp_ChangGuiOperationCompleted;
@@ -1114,6 +1118,18 @@
}
/// <remarks/>
+ public event getCheckOpenCompletedEventHandler getCheckOpenCompleted;
+
+ /// <remarks/>
+ public event getGetDataBaseCompletedEventHandler getGetDataBaseCompleted;
+
+ /// <remarks/>
+ public event getCheckCzymcCompletedEventHandler getCheckCzymcCompleted;
+
+ /// <remarks/>
+ public event getSub_GetCurPeriodCompletedEventHandler getSub_GetCurPeriodCompleted;
+
+ /// <remarks/>
public event getDataSetBySQLCompletedEventHandler getDataSetBySQLCompleted;
/// <remarks/>
@@ -1142,6 +1158,18 @@
/// <remarks/>
public event set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventHandler set_SavePonderationBillMain_Temp_BarCode_MouldCompleted;
+
+ /// <remarks/>
+ public event GetICInventoryByBarCodeSP_ViewCompletedEventHandler GetICInventoryByBarCodeSP_ViewCompleted;
+
+ /// <remarks/>
+ public event GetMaterByBarCodeSP_ViewCompletedEventHandler GetMaterByBarCodeSP_ViewCompleted;
+
+ /// <remarks/>
+ public event SetFIFOPonderationBillMain_TempCompletedEventHandler SetFIFOPonderationBillMain_TempCompleted;
+
+ /// <remarks/>
+ public event set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventHandler set_SavePonderationBillMain_Temp_BarCode_FastCompleted;
/// <remarks/>
public event get_CheckTypeByBarCodeCompletedEventHandler get_CheckTypeByBarCodeCompleted;
@@ -1387,16 +1415,10 @@
public event getDataSetByMasterSQLCompletedEventHandler getDataSetByMasterSQLCompleted;
/// <remarks/>
- public event getCheckOpenCompletedEventHandler getCheckOpenCompleted;
+ public event set_SaveProcReportMoveBill_MoveStockCompletedEventHandler set_SaveProcReportMoveBill_MoveStockCompleted;
/// <remarks/>
- public event getGetDataBaseCompletedEventHandler getGetDataBaseCompleted;
-
- /// <remarks/>
- public event getCheckCzymcCompletedEventHandler getCheckCzymcCompleted;
-
- /// <remarks/>
- public event getSub_GetCurPeriodCompletedEventHandler getSub_GetCurPeriodCompleted;
+ public event set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventHandler set_SaveProcReportMoveBill_MoveStock_CLD_NewCompleted;
/// <remarks/>
public event set_CheckPOInStockBill_NewCompletedEventHandler set_CheckPOInStockBill_NewCompleted;
@@ -1633,16 +1655,10 @@
public event GetMaterByBarCode_ViewCompletedEventHandler GetMaterByBarCode_ViewCompleted;
/// <remarks/>
- public event GetICInventoryByBarCodeSP_ViewCompletedEventHandler GetICInventoryByBarCodeSP_ViewCompleted;
+ public event set_SaveOtherOutBill_CLDCompletedEventHandler set_SaveOtherOutBill_CLDCompleted;
/// <remarks/>
- public event GetMaterByBarCodeSP_ViewCompletedEventHandler GetMaterByBarCodeSP_ViewCompleted;
-
- /// <remarks/>
- public event SetFIFOPonderationBillMain_TempCompletedEventHandler SetFIFOPonderationBillMain_TempCompleted;
-
- /// <remarks/>
- public event set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventHandler set_SavePonderationBillMain_Temp_BarCode_FastCompleted;
+ public event set_SaveOtherOutBill_BillCheckCompletedEventHandler set_SaveOtherOutBill_BillCheckCompleted;
/// <remarks/>
public event set_SavePOStockInBackBillCompletedEventHandler set_SavePOStockInBackBillCompleted;
@@ -1789,12 +1805,6 @@
public event set_SaveProcReportMoveBill_CLD_NewCompletedEventHandler set_SaveProcReportMoveBill_CLD_NewCompleted;
/// <remarks/>
- public event set_SaveProcReportMoveBill_MoveStockCompletedEventHandler set_SaveProcReportMoveBill_MoveStockCompleted;
-
- /// <remarks/>
- public event set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventHandler set_SaveProcReportMoveBill_MoveStock_CLD_NewCompleted;
-
- /// <remarks/>
public event set_SaveSellOutBackBill_CLD_NewCompletedEventHandler set_SaveSellOutBackBill_CLD_NewCompleted;
/// <remarks/>
@@ -1885,6 +1895,9 @@
public event set_SaveMateReplenishOutBill_BillCheckCompletedEventHandler set_SaveMateReplenishOutBill_BillCheckCompleted;
/// <remarks/>
+ public event set_SaveEntrustReplenishOutBill_BillCheckCompletedEventHandler set_SaveEntrustReplenishOutBill_BillCheckCompleted;
+
+ /// <remarks/>
public event set_SaveEntrustInBackBill_CLDCompletedEventHandler set_SaveEntrustInBackBill_CLDCompleted;
/// <remarks/>
@@ -1924,6 +1937,9 @@
public event set_SaveEntrustOutBill_CLDCompletedEventHandler set_SaveEntrustOutBill_CLDCompleted;
/// <remarks/>
+ public event set_SaveEntrustOutBill_BillCheckCompletedEventHandler set_SaveEntrustOutBill_BillCheckCompleted;
+
+ /// <remarks/>
public event set_SaveOtherOutBackBillCompletedEventHandler set_SaveOtherOutBackBillCompleted;
/// <remarks/>
@@ -1952,12 +1968,6 @@
/// <remarks/>
public event set_SaveOtherOutBill_CLD_NewCompletedEventHandler set_SaveOtherOutBill_CLD_NewCompleted;
-
- /// <remarks/>
- public event set_SaveOtherOutBill_CLDCompletedEventHandler set_SaveOtherOutBill_CLDCompleted;
-
- /// <remarks/>
- public event set_SaveOtherOutBill_BillCheckCompletedEventHandler set_SaveOtherOutBill_BillCheckCompleted;
/// <remarks/>
public event set_SavePonderationBillMain_Temp_ChangGuiCompletedEventHandler set_SavePonderationBillMain_Temp_ChangGuiCompleted;
@@ -2674,6 +2684,129 @@
public event GetSc_ICMOBillListCompletedEventHandler GetSc_ICMOBillListCompleted;
/// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getCheckOpen", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool getCheckOpen() {
+ object[] results = this.Invoke("getCheckOpen", new object[0]);
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void getCheckOpenAsync() {
+ this.getCheckOpenAsync(null);
+ }
+
+ /// <remarks/>
+ public void getCheckOpenAsync(object userState) {
+ if ((this.getCheckOpenOperationCompleted == null)) {
+ this.getCheckOpenOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetCheckOpenOperationCompleted);
+ }
+ this.InvokeAsync("getCheckOpen", new object[0], this.getCheckOpenOperationCompleted, userState);
+ }
+
+ private void OngetCheckOpenOperationCompleted(object arg) {
+ if ((this.getCheckOpenCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.getCheckOpenCompleted(this, new getCheckOpenCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getGetDataBase", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public string getGetDataBase(string sItem, ref string sK3) {
+ object[] results = this.Invoke("getGetDataBase", new object[] {
+ sItem,
+ sK3});
+ sK3 = ((string)(results[1]));
+ return ((string)(results[0]));
+ }
+
+ /// <remarks/>
+ public void getGetDataBaseAsync(string sItem, string sK3) {
+ this.getGetDataBaseAsync(sItem, sK3, null);
+ }
+
+ /// <remarks/>
+ public void getGetDataBaseAsync(string sItem, string sK3, object userState) {
+ if ((this.getGetDataBaseOperationCompleted == null)) {
+ this.getGetDataBaseOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetGetDataBaseOperationCompleted);
+ }
+ this.InvokeAsync("getGetDataBase", new object[] {
+ sItem,
+ sK3}, this.getGetDataBaseOperationCompleted, userState);
+ }
+
+ private void OngetGetDataBaseOperationCompleted(object arg) {
+ if ((this.getGetDataBaseCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.getGetDataBaseCompleted(this, new getGetDataBaseCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getCheckCzymc", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public System.Data.DataSet getCheckCzymc(string sUser, string sPsd) {
+ object[] results = this.Invoke("getCheckCzymc", new object[] {
+ sUser,
+ sPsd});
+ return ((System.Data.DataSet)(results[0]));
+ }
+
+ /// <remarks/>
+ public void getCheckCzymcAsync(string sUser, string sPsd) {
+ this.getCheckCzymcAsync(sUser, sPsd, null);
+ }
+
+ /// <remarks/>
+ public void getCheckCzymcAsync(string sUser, string sPsd, object userState) {
+ if ((this.getCheckCzymcOperationCompleted == null)) {
+ this.getCheckCzymcOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetCheckCzymcOperationCompleted);
+ }
+ this.InvokeAsync("getCheckCzymc", new object[] {
+ sUser,
+ sPsd}, this.getCheckCzymcOperationCompleted, userState);
+ }
+
+ private void OngetCheckCzymcOperationCompleted(object arg) {
+ if ((this.getCheckCzymcCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.getCheckCzymcCompleted(this, new getCheckCzymcCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getSub_GetCurPeriod", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool getSub_GetCurPeriod(ref int sYear, ref int sPeriod) {
+ object[] results = this.Invoke("getSub_GetCurPeriod", new object[] {
+ sYear,
+ sPeriod});
+ sYear = ((int)(results[1]));
+ sPeriod = ((int)(results[2]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void getSub_GetCurPeriodAsync(int sYear, int sPeriod) {
+ this.getSub_GetCurPeriodAsync(sYear, sPeriod, null);
+ }
+
+ /// <remarks/>
+ public void getSub_GetCurPeriodAsync(int sYear, int sPeriod, object userState) {
+ if ((this.getSub_GetCurPeriodOperationCompleted == null)) {
+ this.getSub_GetCurPeriodOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetSub_GetCurPeriodOperationCompleted);
+ }
+ this.InvokeAsync("getSub_GetCurPeriod", new object[] {
+ sYear,
+ sPeriod}, this.getSub_GetCurPeriodOperationCompleted, userState);
+ }
+
+ private void OngetSub_GetCurPeriodOperationCompleted(object arg) {
+ if ((this.getSub_GetCurPeriodCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.getSub_GetCurPeriodCompleted(this, new getSub_GetCurPeriodCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getDataSetBySQL", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public System.Data.DataSet getDataSetBySQL(string sSQL, string sTable, ref string sErrMsg) {
object[] results = this.Invoke("getDataSetBySQL", new object[] {
@@ -3200,6 +3333,241 @@
if ((this.set_SavePonderationBillMain_Temp_BarCode_MouldCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.set_SavePonderationBillMain_Temp_BarCode_MouldCompleted(this, new set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetICInventoryByBarCodeSP_View", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public System.Data.DataSet GetICInventoryByBarCodeSP_View(string sWhere, ref string sErr) {
+ object[] results = this.Invoke("GetICInventoryByBarCodeSP_View", new object[] {
+ sWhere,
+ sErr});
+ sErr = ((string)(results[1]));
+ return ((System.Data.DataSet)(results[0]));
+ }
+
+ /// <remarks/>
+ public void GetICInventoryByBarCodeSP_ViewAsync(string sWhere, string sErr) {
+ this.GetICInventoryByBarCodeSP_ViewAsync(sWhere, sErr, null);
+ }
+
+ /// <remarks/>
+ public void GetICInventoryByBarCodeSP_ViewAsync(string sWhere, string sErr, object userState) {
+ if ((this.GetICInventoryByBarCodeSP_ViewOperationCompleted == null)) {
+ this.GetICInventoryByBarCodeSP_ViewOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetICInventoryByBarCodeSP_ViewOperationCompleted);
+ }
+ this.InvokeAsync("GetICInventoryByBarCodeSP_View", new object[] {
+ sWhere,
+ sErr}, this.GetICInventoryByBarCodeSP_ViewOperationCompleted, userState);
+ }
+
+ private void OnGetICInventoryByBarCodeSP_ViewOperationCompleted(object arg) {
+ if ((this.GetICInventoryByBarCodeSP_ViewCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.GetICInventoryByBarCodeSP_ViewCompleted(this, new GetICInventoryByBarCodeSP_ViewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetMaterByBarCodeSP_View", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public System.Data.DataSet GetMaterByBarCodeSP_View(string sWhere, ref string sErr) {
+ object[] results = this.Invoke("GetMaterByBarCodeSP_View", new object[] {
+ sWhere,
+ sErr});
+ sErr = ((string)(results[1]));
+ return ((System.Data.DataSet)(results[0]));
+ }
+
+ /// <remarks/>
+ public void GetMaterByBarCodeSP_ViewAsync(string sWhere, string sErr) {
+ this.GetMaterByBarCodeSP_ViewAsync(sWhere, sErr, null);
+ }
+
+ /// <remarks/>
+ public void GetMaterByBarCodeSP_ViewAsync(string sWhere, string sErr, object userState) {
+ if ((this.GetMaterByBarCodeSP_ViewOperationCompleted == null)) {
+ this.GetMaterByBarCodeSP_ViewOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMaterByBarCodeSP_ViewOperationCompleted);
+ }
+ this.InvokeAsync("GetMaterByBarCodeSP_View", new object[] {
+ sWhere,
+ sErr}, this.GetMaterByBarCodeSP_ViewOperationCompleted, userState);
+ }
+
+ private void OnGetMaterByBarCodeSP_ViewOperationCompleted(object arg) {
+ if ((this.GetMaterByBarCodeSP_ViewCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.GetMaterByBarCodeSP_ViewCompleted(this, new GetMaterByBarCodeSP_ViewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetFIFOPonderationBillMain_Temp", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool SetFIFOPonderationBillMain_Temp(string HBillNo, long HInterID, long HUserOrgID, ref string sErr) {
+ object[] results = this.Invoke("SetFIFOPonderationBillMain_Temp", new object[] {
+ HBillNo,
+ HInterID,
+ HUserOrgID,
+ sErr});
+ sErr = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void SetFIFOPonderationBillMain_TempAsync(string HBillNo, long HInterID, long HUserOrgID, string sErr) {
+ this.SetFIFOPonderationBillMain_TempAsync(HBillNo, HInterID, HUserOrgID, sErr, null);
+ }
+
+ /// <remarks/>
+ public void SetFIFOPonderationBillMain_TempAsync(string HBillNo, long HInterID, long HUserOrgID, string sErr, object userState) {
+ if ((this.SetFIFOPonderationBillMain_TempOperationCompleted == null)) {
+ this.SetFIFOPonderationBillMain_TempOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetFIFOPonderationBillMain_TempOperationCompleted);
+ }
+ this.InvokeAsync("SetFIFOPonderationBillMain_Temp", new object[] {
+ HBillNo,
+ HInterID,
+ HUserOrgID,
+ sErr}, this.SetFIFOPonderationBillMain_TempOperationCompleted, userState);
+ }
+
+ private void OnSetFIFOPonderationBillMain_TempOperationCompleted(object arg) {
+ if ((this.SetFIFOPonderationBillMain_TempCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.SetFIFOPonderationBillMain_TempCompleted(this, new SetFIFOPonderationBillMain_TempCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Fast", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SavePonderationBillMain_Temp_BarCode_Fast(
+ string sBarCode,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ double HQty,
+ bool HRedBlueFlag,
+ bool SourceFlag,
+ string HSourceBillNo,
+ string HSourceBillType,
+ long HOWNERID,
+ ref string sHSourceBillNo,
+ ref string sHSourceBillType,
+ ref long sHSupID,
+ ref string sHSupName,
+ ref long sHDeptID,
+ ref string sHDeptName,
+ ref string sErrMsg) {
+ object[] results = this.Invoke("set_SavePonderationBillMain_Temp_BarCode_Fast", new object[] {
+ sBarCode,
+ HBillID,
+ HBillType,
+ HBillNo,
+ HMaker,
+ HWhID,
+ HSPID,
+ HQty,
+ HRedBlueFlag,
+ SourceFlag,
+ HSourceBillNo,
+ HSourceBillType,
+ HOWNERID,
+ sHSourceBillNo,
+ sHSourceBillType,
+ sHSupID,
+ sHSupName,
+ sHDeptID,
+ sHDeptName,
+ sErrMsg});
+ sHSourceBillNo = ((string)(results[1]));
+ sHSourceBillType = ((string)(results[2]));
+ sHSupID = ((long)(results[3]));
+ sHSupName = ((string)(results[4]));
+ sHDeptID = ((long)(results[5]));
+ sHDeptName = ((string)(results[6]));
+ sErrMsg = ((string)(results[7]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void set_SavePonderationBillMain_Temp_BarCode_FastAsync(
+ string sBarCode,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ double HQty,
+ bool HRedBlueFlag,
+ bool SourceFlag,
+ string HSourceBillNo,
+ string HSourceBillType,
+ long HOWNERID,
+ string sHSourceBillNo,
+ string sHSourceBillType,
+ long sHSupID,
+ string sHSupName,
+ long sHDeptID,
+ string sHDeptName,
+ string sErrMsg) {
+ this.set_SavePonderationBillMain_Temp_BarCode_FastAsync(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, sHSourceBillNo, sHSourceBillType, sHSupID, sHSupName, sHDeptID, sHDeptName, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void set_SavePonderationBillMain_Temp_BarCode_FastAsync(
+ string sBarCode,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ double HQty,
+ bool HRedBlueFlag,
+ bool SourceFlag,
+ string HSourceBillNo,
+ string HSourceBillType,
+ long HOWNERID,
+ string sHSourceBillNo,
+ string sHSourceBillType,
+ long sHSupID,
+ string sHSupName,
+ long sHDeptID,
+ string sHDeptName,
+ string sErrMsg,
+ object userState) {
+ if ((this.set_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted == null)) {
+ this.set_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted);
+ }
+ this.InvokeAsync("set_SavePonderationBillMain_Temp_BarCode_Fast", new object[] {
+ sBarCode,
+ HBillID,
+ HBillType,
+ HBillNo,
+ HMaker,
+ HWhID,
+ HSPID,
+ HQty,
+ HRedBlueFlag,
+ SourceFlag,
+ HSourceBillNo,
+ HSourceBillType,
+ HOWNERID,
+ sHSourceBillNo,
+ sHSourceBillType,
+ sHSupID,
+ sHSupName,
+ sHDeptID,
+ sHDeptName,
+ sErrMsg}, this.set_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted, userState);
+ }
+
+ private void Onset_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted(object arg) {
+ if ((this.set_SavePonderationBillMain_Temp_BarCode_FastCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.set_SavePonderationBillMain_Temp_BarCode_FastCompleted(this, new set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -7906,125 +8274,82 @@
}
/// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getCheckOpen", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool getCheckOpen() {
- object[] results = this.Invoke("getCheckOpen", new object[0]);
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveProcReportMoveBill_MoveStock", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SaveProcReportMoveBill_MoveStock(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, string HPPBomBillNo, long HSCWHID, long HSCSPID, ref string sErrMsg) {
+ object[] results = this.Invoke("set_SaveProcReportMoveBill_MoveStock", new object[] {
+ oMain,
+ HOutBillID,
+ HOutBillNo,
+ HPPBomBillNo,
+ HSCWHID,
+ HSCSPID,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
return ((bool)(results[0]));
}
/// <remarks/>
- public void getCheckOpenAsync() {
- this.getCheckOpenAsync(null);
+ public void set_SaveProcReportMoveBill_MoveStockAsync(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, string HPPBomBillNo, long HSCWHID, long HSCSPID, string sErrMsg) {
+ this.set_SaveProcReportMoveBill_MoveStockAsync(oMain, HOutBillID, HOutBillNo, HPPBomBillNo, HSCWHID, HSCSPID, sErrMsg, null);
}
/// <remarks/>
- public void getCheckOpenAsync(object userState) {
- if ((this.getCheckOpenOperationCompleted == null)) {
- this.getCheckOpenOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetCheckOpenOperationCompleted);
+ public void set_SaveProcReportMoveBill_MoveStockAsync(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, string HPPBomBillNo, long HSCWHID, long HSCSPID, string sErrMsg, object userState) {
+ if ((this.set_SaveProcReportMoveBill_MoveStockOperationCompleted == null)) {
+ this.set_SaveProcReportMoveBill_MoveStockOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveProcReportMoveBill_MoveStockOperationCompleted);
}
- this.InvokeAsync("getCheckOpen", new object[0], this.getCheckOpenOperationCompleted, userState);
+ this.InvokeAsync("set_SaveProcReportMoveBill_MoveStock", new object[] {
+ oMain,
+ HOutBillID,
+ HOutBillNo,
+ HPPBomBillNo,
+ HSCWHID,
+ HSCSPID,
+ sErrMsg}, this.set_SaveProcReportMoveBill_MoveStockOperationCompleted, userState);
}
- private void OngetCheckOpenOperationCompleted(object arg) {
- if ((this.getCheckOpenCompleted != null)) {
+ private void Onset_SaveProcReportMoveBill_MoveStockOperationCompleted(object arg) {
+ if ((this.set_SaveProcReportMoveBill_MoveStockCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.getCheckOpenCompleted(this, new getCheckOpenCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ this.set_SaveProcReportMoveBill_MoveStockCompleted(this, new set_SaveProcReportMoveBill_MoveStockCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
/// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getGetDataBase", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public string getGetDataBase(string sItem, ref string sK3) {
- object[] results = this.Invoke("getGetDataBase", new object[] {
- sItem,
- sK3});
- sK3 = ((string)(results[1]));
- return ((string)(results[0]));
- }
-
- /// <remarks/>
- public void getGetDataBaseAsync(string sItem, string sK3) {
- this.getGetDataBaseAsync(sItem, sK3, null);
- }
-
- /// <remarks/>
- public void getGetDataBaseAsync(string sItem, string sK3, object userState) {
- if ((this.getGetDataBaseOperationCompleted == null)) {
- this.getGetDataBaseOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetGetDataBaseOperationCompleted);
- }
- this.InvokeAsync("getGetDataBase", new object[] {
- sItem,
- sK3}, this.getGetDataBaseOperationCompleted, userState);
- }
-
- private void OngetGetDataBaseOperationCompleted(object arg) {
- if ((this.getGetDataBaseCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.getGetDataBaseCompleted(this, new getGetDataBaseCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getCheckCzymc", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public System.Data.DataSet getCheckCzymc(string sUser, string sPsd) {
- object[] results = this.Invoke("getCheckCzymc", new object[] {
- sUser,
- sPsd});
- return ((System.Data.DataSet)(results[0]));
- }
-
- /// <remarks/>
- public void getCheckCzymcAsync(string sUser, string sPsd) {
- this.getCheckCzymcAsync(sUser, sPsd, null);
- }
-
- /// <remarks/>
- public void getCheckCzymcAsync(string sUser, string sPsd, object userState) {
- if ((this.getCheckCzymcOperationCompleted == null)) {
- this.getCheckCzymcOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetCheckCzymcOperationCompleted);
- }
- this.InvokeAsync("getCheckCzymc", new object[] {
- sUser,
- sPsd}, this.getCheckCzymcOperationCompleted, userState);
- }
-
- private void OngetCheckCzymcOperationCompleted(object arg) {
- if ((this.getCheckCzymcCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.getCheckCzymcCompleted(this, new getCheckCzymcCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getSub_GetCurPeriod", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool getSub_GetCurPeriod(ref int sYear, ref int sPeriod) {
- object[] results = this.Invoke("getSub_GetCurPeriod", new object[] {
- sYear,
- sPeriod});
- sYear = ((int)(results[1]));
- sPeriod = ((int)(results[2]));
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveProcReportMoveBill_MoveStock_CLD_New", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SaveProcReportMoveBill_MoveStock_CLD_New(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
+ object[] results = this.Invoke("set_SaveProcReportMoveBill_MoveStock_CLD_New", new object[] {
+ oMain,
+ HOutBillID,
+ HOutBillNo,
+ oSystemParameterMain,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
return ((bool)(results[0]));
}
/// <remarks/>
- public void getSub_GetCurPeriodAsync(int sYear, int sPeriod) {
- this.getSub_GetCurPeriodAsync(sYear, sPeriod, null);
+ public void set_SaveProcReportMoveBill_MoveStock_CLD_NewAsync(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg) {
+ this.set_SaveProcReportMoveBill_MoveStock_CLD_NewAsync(oMain, HOutBillID, HOutBillNo, oSystemParameterMain, sErrMsg, null);
}
/// <remarks/>
- public void getSub_GetCurPeriodAsync(int sYear, int sPeriod, object userState) {
- if ((this.getSub_GetCurPeriodOperationCompleted == null)) {
- this.getSub_GetCurPeriodOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetSub_GetCurPeriodOperationCompleted);
+ public void set_SaveProcReportMoveBill_MoveStock_CLD_NewAsync(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg, object userState) {
+ if ((this.set_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted == null)) {
+ this.set_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted);
}
- this.InvokeAsync("getSub_GetCurPeriod", new object[] {
- sYear,
- sPeriod}, this.getSub_GetCurPeriodOperationCompleted, userState);
+ this.InvokeAsync("set_SaveProcReportMoveBill_MoveStock_CLD_New", new object[] {
+ oMain,
+ HOutBillID,
+ HOutBillNo,
+ oSystemParameterMain,
+ sErrMsg}, this.set_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted, userState);
}
- private void OngetSub_GetCurPeriodOperationCompleted(object arg) {
- if ((this.getSub_GetCurPeriodCompleted != null)) {
+ private void Onset_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted(object arg) {
+ if ((this.set_SaveProcReportMoveBill_MoveStock_CLD_NewCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.getSub_GetCurPeriodCompleted(this, new getSub_GetCurPeriodCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ this.set_SaveProcReportMoveBill_MoveStock_CLD_NewCompleted(this, new set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -10628,237 +10953,70 @@
}
/// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetICInventoryByBarCodeSP_View", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public System.Data.DataSet GetICInventoryByBarCodeSP_View(string sWhere, ref string sErr) {
- object[] results = this.Invoke("GetICInventoryByBarCodeSP_View", new object[] {
- sWhere,
- sErr});
- sErr = ((string)(results[1]));
- return ((System.Data.DataSet)(results[0]));
- }
-
- /// <remarks/>
- public void GetICInventoryByBarCodeSP_ViewAsync(string sWhere, string sErr) {
- this.GetICInventoryByBarCodeSP_ViewAsync(sWhere, sErr, null);
- }
-
- /// <remarks/>
- public void GetICInventoryByBarCodeSP_ViewAsync(string sWhere, string sErr, object userState) {
- if ((this.GetICInventoryByBarCodeSP_ViewOperationCompleted == null)) {
- this.GetICInventoryByBarCodeSP_ViewOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetICInventoryByBarCodeSP_ViewOperationCompleted);
- }
- this.InvokeAsync("GetICInventoryByBarCodeSP_View", new object[] {
- sWhere,
- sErr}, this.GetICInventoryByBarCodeSP_ViewOperationCompleted, userState);
- }
-
- private void OnGetICInventoryByBarCodeSP_ViewOperationCompleted(object arg) {
- if ((this.GetICInventoryByBarCodeSP_ViewCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.GetICInventoryByBarCodeSP_ViewCompleted(this, new GetICInventoryByBarCodeSP_ViewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetMaterByBarCodeSP_View", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public System.Data.DataSet GetMaterByBarCodeSP_View(string sWhere, ref string sErr) {
- object[] results = this.Invoke("GetMaterByBarCodeSP_View", new object[] {
- sWhere,
- sErr});
- sErr = ((string)(results[1]));
- return ((System.Data.DataSet)(results[0]));
- }
-
- /// <remarks/>
- public void GetMaterByBarCodeSP_ViewAsync(string sWhere, string sErr) {
- this.GetMaterByBarCodeSP_ViewAsync(sWhere, sErr, null);
- }
-
- /// <remarks/>
- public void GetMaterByBarCodeSP_ViewAsync(string sWhere, string sErr, object userState) {
- if ((this.GetMaterByBarCodeSP_ViewOperationCompleted == null)) {
- this.GetMaterByBarCodeSP_ViewOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMaterByBarCodeSP_ViewOperationCompleted);
- }
- this.InvokeAsync("GetMaterByBarCodeSP_View", new object[] {
- sWhere,
- sErr}, this.GetMaterByBarCodeSP_ViewOperationCompleted, userState);
- }
-
- private void OnGetMaterByBarCodeSP_ViewOperationCompleted(object arg) {
- if ((this.GetMaterByBarCodeSP_ViewCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.GetMaterByBarCodeSP_ViewCompleted(this, new GetMaterByBarCodeSP_ViewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetFIFOPonderationBillMain_Temp", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool SetFIFOPonderationBillMain_Temp(string HBillNo, long HInterID, long HUserOrgID, ref string sErr) {
- object[] results = this.Invoke("SetFIFOPonderationBillMain_Temp", new object[] {
- HBillNo,
- HInterID,
- HUserOrgID,
- sErr});
- sErr = ((string)(results[1]));
- return ((bool)(results[0]));
- }
-
- /// <remarks/>
- public void SetFIFOPonderationBillMain_TempAsync(string HBillNo, long HInterID, long HUserOrgID, string sErr) {
- this.SetFIFOPonderationBillMain_TempAsync(HBillNo, HInterID, HUserOrgID, sErr, null);
- }
-
- /// <remarks/>
- public void SetFIFOPonderationBillMain_TempAsync(string HBillNo, long HInterID, long HUserOrgID, string sErr, object userState) {
- if ((this.SetFIFOPonderationBillMain_TempOperationCompleted == null)) {
- this.SetFIFOPonderationBillMain_TempOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetFIFOPonderationBillMain_TempOperationCompleted);
- }
- this.InvokeAsync("SetFIFOPonderationBillMain_Temp", new object[] {
- HBillNo,
- HInterID,
- HUserOrgID,
- sErr}, this.SetFIFOPonderationBillMain_TempOperationCompleted, userState);
- }
-
- private void OnSetFIFOPonderationBillMain_TempOperationCompleted(object arg) {
- if ((this.SetFIFOPonderationBillMain_TempCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.SetFIFOPonderationBillMain_TempCompleted(this, new SetFIFOPonderationBillMain_TempCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Fast", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_SavePonderationBillMain_Temp_BarCode_Fast(
- string sBarCode,
- long HBillID,
- string HBillType,
- string HBillNo,
- string HMaker,
- long HWhID,
- long HSPID,
- double HQty,
- bool HRedBlueFlag,
- bool SourceFlag,
- string HSourceBillNo,
- string HSourceBillType,
- long HOWNERID,
- ref string sHSourceBillNo,
- ref string sHSourceBillType,
- ref long sHSupID,
- ref string sHSupName,
- ref long sHDeptID,
- ref string sHDeptName,
- ref string sErrMsg) {
- object[] results = this.Invoke("set_SavePonderationBillMain_Temp_BarCode_Fast", new object[] {
- sBarCode,
- HBillID,
- HBillType,
- HBillNo,
- HMaker,
- HWhID,
- HSPID,
- HQty,
- HRedBlueFlag,
- SourceFlag,
- HSourceBillNo,
- HSourceBillType,
- HOWNERID,
- sHSourceBillNo,
- sHSourceBillType,
- sHSupID,
- sHSupName,
- sHDeptID,
- sHDeptName,
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveOtherOutBill_CLD", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SaveOtherOutBill_CLD(ClsKf_OtherOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
+ object[] results = this.Invoke("set_SaveOtherOutBill_CLD", new object[] {
+ oMain,
+ sHSourceType,
+ oSystemParameterMain,
sErrMsg});
- sHSourceBillNo = ((string)(results[1]));
- sHSourceBillType = ((string)(results[2]));
- sHSupID = ((long)(results[3]));
- sHSupName = ((string)(results[4]));
- sHDeptID = ((long)(results[5]));
- sHDeptName = ((string)(results[6]));
- sErrMsg = ((string)(results[7]));
+ sErrMsg = ((string)(results[1]));
return ((bool)(results[0]));
}
/// <remarks/>
- public void set_SavePonderationBillMain_Temp_BarCode_FastAsync(
- string sBarCode,
- long HBillID,
- string HBillType,
- string HBillNo,
- string HMaker,
- long HWhID,
- long HSPID,
- double HQty,
- bool HRedBlueFlag,
- bool SourceFlag,
- string HSourceBillNo,
- string HSourceBillType,
- long HOWNERID,
- string sHSourceBillNo,
- string sHSourceBillType,
- long sHSupID,
- string sHSupName,
- long sHDeptID,
- string sHDeptName,
- string sErrMsg) {
- this.set_SavePonderationBillMain_Temp_BarCode_FastAsync(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, sHSourceBillNo, sHSourceBillType, sHSupID, sHSupName, sHDeptID, sHDeptName, sErrMsg, null);
+ public void set_SaveOtherOutBill_CLDAsync(ClsKf_OtherOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg) {
+ this.set_SaveOtherOutBill_CLDAsync(oMain, sHSourceType, oSystemParameterMain, sErrMsg, null);
}
/// <remarks/>
- public void set_SavePonderationBillMain_Temp_BarCode_FastAsync(
- string sBarCode,
- long HBillID,
- string HBillType,
- string HBillNo,
- string HMaker,
- long HWhID,
- long HSPID,
- double HQty,
- bool HRedBlueFlag,
- bool SourceFlag,
- string HSourceBillNo,
- string HSourceBillType,
- long HOWNERID,
- string sHSourceBillNo,
- string sHSourceBillType,
- long sHSupID,
- string sHSupName,
- long sHDeptID,
- string sHDeptName,
- string sErrMsg,
- object userState) {
- if ((this.set_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted == null)) {
- this.set_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted);
+ public void set_SaveOtherOutBill_CLDAsync(ClsKf_OtherOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg, object userState) {
+ if ((this.set_SaveOtherOutBill_CLDOperationCompleted == null)) {
+ this.set_SaveOtherOutBill_CLDOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveOtherOutBill_CLDOperationCompleted);
}
- this.InvokeAsync("set_SavePonderationBillMain_Temp_BarCode_Fast", new object[] {
- sBarCode,
- HBillID,
- HBillType,
- HBillNo,
- HMaker,
- HWhID,
- HSPID,
- HQty,
- HRedBlueFlag,
- SourceFlag,
- HSourceBillNo,
- HSourceBillType,
- HOWNERID,
- sHSourceBillNo,
- sHSourceBillType,
- sHSupID,
- sHSupName,
- sHDeptID,
- sHDeptName,
- sErrMsg}, this.set_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted, userState);
+ this.InvokeAsync("set_SaveOtherOutBill_CLD", new object[] {
+ oMain,
+ sHSourceType,
+ oSystemParameterMain,
+ sErrMsg}, this.set_SaveOtherOutBill_CLDOperationCompleted, userState);
}
- private void Onset_SavePonderationBillMain_Temp_BarCode_FastOperationCompleted(object arg) {
- if ((this.set_SavePonderationBillMain_Temp_BarCode_FastCompleted != null)) {
+ private void Onset_SaveOtherOutBill_CLDOperationCompleted(object arg) {
+ if ((this.set_SaveOtherOutBill_CLDCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.set_SavePonderationBillMain_Temp_BarCode_FastCompleted(this, new set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ this.set_SaveOtherOutBill_CLDCompleted(this, new set_SaveOtherOutBill_CLDCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveOtherOutBill_BillCheck", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SaveOtherOutBill_BillCheck(ClsKf_OtherOutBillMain oMain, ref string sErrMsg) {
+ object[] results = this.Invoke("set_SaveOtherOutBill_BillCheck", new object[] {
+ oMain,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void set_SaveOtherOutBill_BillCheckAsync(ClsKf_OtherOutBillMain oMain, string sErrMsg) {
+ this.set_SaveOtherOutBill_BillCheckAsync(oMain, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void set_SaveOtherOutBill_BillCheckAsync(ClsKf_OtherOutBillMain oMain, string sErrMsg, object userState) {
+ if ((this.set_SaveOtherOutBill_BillCheckOperationCompleted == null)) {
+ this.set_SaveOtherOutBill_BillCheckOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveOtherOutBill_BillCheckOperationCompleted);
+ }
+ this.InvokeAsync("set_SaveOtherOutBill_BillCheck", new object[] {
+ oMain,
+ sErrMsg}, this.set_SaveOtherOutBill_BillCheckOperationCompleted, userState);
+ }
+
+ private void Onset_SaveOtherOutBill_BillCheckOperationCompleted(object arg) {
+ if ((this.set_SaveOtherOutBill_BillCheckCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.set_SaveOtherOutBill_BillCheckCompleted(this, new set_SaveOtherOutBill_BillCheckCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -12498,86 +12656,6 @@
}
/// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveProcReportMoveBill_MoveStock", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_SaveProcReportMoveBill_MoveStock(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, string HPPBomBillNo, long HSCWHID, long HSCSPID, ref string sErrMsg) {
- object[] results = this.Invoke("set_SaveProcReportMoveBill_MoveStock", new object[] {
- oMain,
- HOutBillID,
- HOutBillNo,
- HPPBomBillNo,
- HSCWHID,
- HSCSPID,
- sErrMsg});
- sErrMsg = ((string)(results[1]));
- return ((bool)(results[0]));
- }
-
- /// <remarks/>
- public void set_SaveProcReportMoveBill_MoveStockAsync(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, string HPPBomBillNo, long HSCWHID, long HSCSPID, string sErrMsg) {
- this.set_SaveProcReportMoveBill_MoveStockAsync(oMain, HOutBillID, HOutBillNo, HPPBomBillNo, HSCWHID, HSCSPID, sErrMsg, null);
- }
-
- /// <remarks/>
- public void set_SaveProcReportMoveBill_MoveStockAsync(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, string HPPBomBillNo, long HSCWHID, long HSCSPID, string sErrMsg, object userState) {
- if ((this.set_SaveProcReportMoveBill_MoveStockOperationCompleted == null)) {
- this.set_SaveProcReportMoveBill_MoveStockOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveProcReportMoveBill_MoveStockOperationCompleted);
- }
- this.InvokeAsync("set_SaveProcReportMoveBill_MoveStock", new object[] {
- oMain,
- HOutBillID,
- HOutBillNo,
- HPPBomBillNo,
- HSCWHID,
- HSCSPID,
- sErrMsg}, this.set_SaveProcReportMoveBill_MoveStockOperationCompleted, userState);
- }
-
- private void Onset_SaveProcReportMoveBill_MoveStockOperationCompleted(object arg) {
- if ((this.set_SaveProcReportMoveBill_MoveStockCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.set_SaveProcReportMoveBill_MoveStockCompleted(this, new set_SaveProcReportMoveBill_MoveStockCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveProcReportMoveBill_MoveStock_CLD_New", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_SaveProcReportMoveBill_MoveStock_CLD_New(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
- object[] results = this.Invoke("set_SaveProcReportMoveBill_MoveStock_CLD_New", new object[] {
- oMain,
- HOutBillID,
- HOutBillNo,
- oSystemParameterMain,
- sErrMsg});
- sErrMsg = ((string)(results[1]));
- return ((bool)(results[0]));
- }
-
- /// <remarks/>
- public void set_SaveProcReportMoveBill_MoveStock_CLD_NewAsync(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg) {
- this.set_SaveProcReportMoveBill_MoveStock_CLD_NewAsync(oMain, HOutBillID, HOutBillNo, oSystemParameterMain, sErrMsg, null);
- }
-
- /// <remarks/>
- public void set_SaveProcReportMoveBill_MoveStock_CLD_NewAsync(ClsKf_ProductInBillMain oMain, long HOutBillID, string HOutBillNo, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg, object userState) {
- if ((this.set_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted == null)) {
- this.set_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted);
- }
- this.InvokeAsync("set_SaveProcReportMoveBill_MoveStock_CLD_New", new object[] {
- oMain,
- HOutBillID,
- HOutBillNo,
- oSystemParameterMain,
- sErrMsg}, this.set_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted, userState);
- }
-
- private void Onset_SaveProcReportMoveBill_MoveStock_CLD_NewOperationCompleted(object arg) {
- if ((this.set_SaveProcReportMoveBill_MoveStock_CLD_NewCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.set_SaveProcReportMoveBill_MoveStock_CLD_NewCompleted(this, new set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveSellOutBackBill_CLD_New", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public bool set_SaveSellOutBackBill_CLD_New(ClsKf_ICStockBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
object[] results = this.Invoke("set_SaveSellOutBackBill_CLD_New", new object[] {
@@ -13587,6 +13665,38 @@
}
/// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveEntrustReplenishOutBill_BillCheck", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SaveEntrustReplenishOutBill_BillCheck(ClsKf_EntrustReplenishOutBillMain oMain, ref string sErrMsg) {
+ object[] results = this.Invoke("set_SaveEntrustReplenishOutBill_BillCheck", new object[] {
+ oMain,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void set_SaveEntrustReplenishOutBill_BillCheckAsync(ClsKf_EntrustReplenishOutBillMain oMain, string sErrMsg) {
+ this.set_SaveEntrustReplenishOutBill_BillCheckAsync(oMain, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void set_SaveEntrustReplenishOutBill_BillCheckAsync(ClsKf_EntrustReplenishOutBillMain oMain, string sErrMsg, object userState) {
+ if ((this.set_SaveEntrustReplenishOutBill_BillCheckOperationCompleted == null)) {
+ this.set_SaveEntrustReplenishOutBill_BillCheckOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveEntrustReplenishOutBill_BillCheckOperationCompleted);
+ }
+ this.InvokeAsync("set_SaveEntrustReplenishOutBill_BillCheck", new object[] {
+ oMain,
+ sErrMsg}, this.set_SaveEntrustReplenishOutBill_BillCheckOperationCompleted, userState);
+ }
+
+ private void Onset_SaveEntrustReplenishOutBill_BillCheckOperationCompleted(object arg) {
+ if ((this.set_SaveEntrustReplenishOutBill_BillCheckCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.set_SaveEntrustReplenishOutBill_BillCheckCompleted(this, new set_SaveEntrustReplenishOutBill_BillCheckCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveEntrustInBackBill_CLD", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public bool set_SaveEntrustInBackBill_CLD(ClsKf_EntrustInBackBillMain_CLD oMain, string sHSourceType, ref string sErrMsg) {
object[] results = this.Invoke("set_SaveEntrustInBackBill_CLD", new object[] {
@@ -14030,6 +14140,38 @@
}
/// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveEntrustOutBill_BillCheck", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SaveEntrustOutBill_BillCheck(ClsKf_EntrustOutBillMain oMain, ref string sErrMsg) {
+ object[] results = this.Invoke("set_SaveEntrustOutBill_BillCheck", new object[] {
+ oMain,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void set_SaveEntrustOutBill_BillCheckAsync(ClsKf_EntrustOutBillMain oMain, string sErrMsg) {
+ this.set_SaveEntrustOutBill_BillCheckAsync(oMain, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void set_SaveEntrustOutBill_BillCheckAsync(ClsKf_EntrustOutBillMain oMain, string sErrMsg, object userState) {
+ if ((this.set_SaveEntrustOutBill_BillCheckOperationCompleted == null)) {
+ this.set_SaveEntrustOutBill_BillCheckOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveEntrustOutBill_BillCheckOperationCompleted);
+ }
+ this.InvokeAsync("set_SaveEntrustOutBill_BillCheck", new object[] {
+ oMain,
+ sErrMsg}, this.set_SaveEntrustOutBill_BillCheckOperationCompleted, userState);
+ }
+
+ private void Onset_SaveEntrustOutBill_BillCheckOperationCompleted(object arg) {
+ if ((this.set_SaveEntrustOutBill_BillCheckCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.set_SaveEntrustOutBill_BillCheckCompleted(this, new set_SaveEntrustOutBill_BillCheckCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveOtherOutBackBill", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public bool set_SaveOtherOutBackBill(ClsKf_ICStockBillMain oMain, string sHSourceType, ref string sErrMsg) {
object[] results = this.Invoke("set_SaveOtherOutBackBill", new object[] {
@@ -14355,74 +14497,6 @@
if ((this.set_SaveOtherOutBill_CLD_NewCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.set_SaveOtherOutBill_CLD_NewCompleted(this, new set_SaveOtherOutBill_CLD_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveOtherOutBill_CLD", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_SaveOtherOutBill_CLD(ClsKf_OtherOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
- object[] results = this.Invoke("set_SaveOtherOutBill_CLD", new object[] {
- oMain,
- sHSourceType,
- oSystemParameterMain,
- sErrMsg});
- sErrMsg = ((string)(results[1]));
- return ((bool)(results[0]));
- }
-
- /// <remarks/>
- public void set_SaveOtherOutBill_CLDAsync(ClsKf_OtherOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg) {
- this.set_SaveOtherOutBill_CLDAsync(oMain, sHSourceType, oSystemParameterMain, sErrMsg, null);
- }
-
- /// <remarks/>
- public void set_SaveOtherOutBill_CLDAsync(ClsKf_OtherOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg, object userState) {
- if ((this.set_SaveOtherOutBill_CLDOperationCompleted == null)) {
- this.set_SaveOtherOutBill_CLDOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveOtherOutBill_CLDOperationCompleted);
- }
- this.InvokeAsync("set_SaveOtherOutBill_CLD", new object[] {
- oMain,
- sHSourceType,
- oSystemParameterMain,
- sErrMsg}, this.set_SaveOtherOutBill_CLDOperationCompleted, userState);
- }
-
- private void Onset_SaveOtherOutBill_CLDOperationCompleted(object arg) {
- if ((this.set_SaveOtherOutBill_CLDCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.set_SaveOtherOutBill_CLDCompleted(this, new set_SaveOtherOutBill_CLDCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveOtherOutBill_BillCheck", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_SaveOtherOutBill_BillCheck(ClsKf_OtherOutBillMain oMain, ref string sErrMsg) {
- object[] results = this.Invoke("set_SaveOtherOutBill_BillCheck", new object[] {
- oMain,
- sErrMsg});
- sErrMsg = ((string)(results[1]));
- return ((bool)(results[0]));
- }
-
- /// <remarks/>
- public void set_SaveOtherOutBill_BillCheckAsync(ClsKf_OtherOutBillMain oMain, string sErrMsg) {
- this.set_SaveOtherOutBill_BillCheckAsync(oMain, sErrMsg, null);
- }
-
- /// <remarks/>
- public void set_SaveOtherOutBill_BillCheckAsync(ClsKf_OtherOutBillMain oMain, string sErrMsg, object userState) {
- if ((this.set_SaveOtherOutBill_BillCheckOperationCompleted == null)) {
- this.set_SaveOtherOutBill_BillCheckOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveOtherOutBill_BillCheckOperationCompleted);
- }
- this.InvokeAsync("set_SaveOtherOutBill_BillCheck", new object[] {
- oMain,
- sErrMsg}, this.set_SaveOtherOutBill_BillCheckOperationCompleted, userState);
- }
-
- private void Onset_SaveOtherOutBill_BillCheckOperationCompleted(object arg) {
- if ((this.set_SaveOtherOutBill_BillCheckCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.set_SaveOtherOutBill_BillCheckCompleted(this, new set_SaveOtherOutBill_BillCheckCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -33355,9 +33429,9 @@
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_QualityReportBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_ICMOReportBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_DoorOutCheckBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_OtherOutBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_EntrustOutBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_EntrustInBackBillMain_CLD))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_EntrustReplenishOutBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MateReplenishOutBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MateOutBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_StdWorkQtyBillMain))]
@@ -33371,13 +33445,14 @@
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ProductInBillMain_K3))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_AGVRequestBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ProductInBillMain_CLD))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ProductInBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_POStockInBillMain_K3))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_POStockInBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ICStockBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_OtherOutBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsQC_NoPassProdCheckBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsCg_POInStockBillMain_K3))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsCg_POInStockBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ProductInBillMain))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_MouldStockBillMain))]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
[System.SerializableAttribute()]
@@ -35307,183 +35382,6 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
- public partial class ClsKf_OtherOutBillMain : ClsXt_BaseBillMain {
-
- private long hSupIDField;
-
- private long hWHIDField;
-
- private long hSCWHIDField;
-
- private long hEmpIDField;
-
- private long hManagerIDField;
-
- private long hSecManagerIDField;
-
- private long hKeeperIDField;
-
- private long hDeptIDField;
-
- private string hExplanationField;
-
- private string hInnerBillNoField;
-
- private bool hRedBlueFlagField;
-
- private string hStockStyleField;
-
- private long hSTOCKORGIDField;
-
- private long hOWNERIDField;
-
- /// <remarks/>
- public long HSupID {
- get {
- return this.hSupIDField;
- }
- set {
- this.hSupIDField = value;
- }
- }
-
- /// <remarks/>
- public long HWHID {
- get {
- return this.hWHIDField;
- }
- set {
- this.hWHIDField = value;
- }
- }
-
- /// <remarks/>
- public long HSCWHID {
- get {
- return this.hSCWHIDField;
- }
- set {
- this.hSCWHIDField = value;
- }
- }
-
- /// <remarks/>
- public long HEmpID {
- get {
- return this.hEmpIDField;
- }
- set {
- this.hEmpIDField = value;
- }
- }
-
- /// <remarks/>
- public long HManagerID {
- get {
- return this.hManagerIDField;
- }
- set {
- this.hManagerIDField = value;
- }
- }
-
- /// <remarks/>
- public long HSecManagerID {
- get {
- return this.hSecManagerIDField;
- }
- set {
- this.hSecManagerIDField = value;
- }
- }
-
- /// <remarks/>
- public long HKeeperID {
- get {
- return this.hKeeperIDField;
- }
- set {
- this.hKeeperIDField = value;
- }
- }
-
- /// <remarks/>
- public long HDeptID {
- get {
- return this.hDeptIDField;
- }
- set {
- this.hDeptIDField = value;
- }
- }
-
- /// <remarks/>
- public string HExplanation {
- get {
- return this.hExplanationField;
- }
- set {
- this.hExplanationField = value;
- }
- }
-
- /// <remarks/>
- public string HInnerBillNo {
- get {
- return this.hInnerBillNoField;
- }
- set {
- this.hInnerBillNoField = value;
- }
- }
-
- /// <remarks/>
- public bool HRedBlueFlag {
- get {
- return this.hRedBlueFlagField;
- }
- set {
- this.hRedBlueFlagField = value;
- }
- }
-
- /// <remarks/>
- public string HStockStyle {
- get {
- return this.hStockStyleField;
- }
- set {
- this.hStockStyleField = value;
- }
- }
-
- /// <remarks/>
- public long HSTOCKORGID {
- get {
- return this.hSTOCKORGIDField;
- }
- set {
- this.hSTOCKORGIDField = value;
- }
- }
-
- /// <remarks/>
- public long HOWNERID {
- get {
- return this.hOWNERIDField;
- }
- set {
- this.hOWNERIDField = value;
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
public partial class ClsKf_EntrustOutBillMain : ClsXt_BaseBillMain {
private long hSupIDField;
@@ -35864,6 +35762,171 @@
}
set {
this.hORGANIZATIONSNOField = value;
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
+ [System.SerializableAttribute()]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
+ public partial class ClsKf_EntrustReplenishOutBillMain : ClsXt_BaseBillMain {
+
+ private long hSupIDField;
+
+ private long hWHIDField;
+
+ private long hSCWHIDField;
+
+ private long hEmpIDField;
+
+ private long hManagerIDField;
+
+ private long hSecManagerIDField;
+
+ private long hKeeperIDField;
+
+ private long hDeptIDField;
+
+ private string hExplanationField;
+
+ private string hInnerBillNoField;
+
+ private bool hRedBlueFlagField;
+
+ private long hSTOCKORGIDField;
+
+ private long hOWNERIDField;
+
+ /// <remarks/>
+ public long HSupID {
+ get {
+ return this.hSupIDField;
+ }
+ set {
+ this.hSupIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HWHID {
+ get {
+ return this.hWHIDField;
+ }
+ set {
+ this.hWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSCWHID {
+ get {
+ return this.hSCWHIDField;
+ }
+ set {
+ this.hSCWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HEmpID {
+ get {
+ return this.hEmpIDField;
+ }
+ set {
+ this.hEmpIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HManagerID {
+ get {
+ return this.hManagerIDField;
+ }
+ set {
+ this.hManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSecManagerID {
+ get {
+ return this.hSecManagerIDField;
+ }
+ set {
+ this.hSecManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HKeeperID {
+ get {
+ return this.hKeeperIDField;
+ }
+ set {
+ this.hKeeperIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HDeptID {
+ get {
+ return this.hDeptIDField;
+ }
+ set {
+ this.hDeptIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HExplanation {
+ get {
+ return this.hExplanationField;
+ }
+ set {
+ this.hExplanationField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HInnerBillNo {
+ get {
+ return this.hInnerBillNoField;
+ }
+ set {
+ this.hInnerBillNoField = value;
+ }
+ }
+
+ /// <remarks/>
+ public bool HRedBlueFlag {
+ get {
+ return this.hRedBlueFlagField;
+ }
+ set {
+ this.hRedBlueFlagField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSTOCKORGID {
+ get {
+ return this.hSTOCKORGIDField;
+ }
+ set {
+ this.hSTOCKORGIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HOWNERID {
+ get {
+ return this.hOWNERIDField;
+ }
+ set {
+ this.hOWNERIDField = value;
}
}
}
@@ -38307,183 +38370,6 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
- public partial class ClsKf_ProductInBillMain : ClsXt_BaseBillMain {
-
- private string hDateForWebField;
-
- private long hSupIDField;
-
- private long hWHIDField;
-
- private long hSCWHIDField;
-
- private long hEmpIDField;
-
- private long hManagerIDField;
-
- private long hSecManagerIDField;
-
- private long hKeeperIDField;
-
- private long hDeptIDField;
-
- private string hExplanationField;
-
- private string hInnerBillNoField;
-
- private bool hRedBlueFlagField;
-
- private long hSTOCKORGIDField;
-
- private long hOWNERIDField;
-
- /// <remarks/>
- public string HDateForWeb {
- get {
- return this.hDateForWebField;
- }
- set {
- this.hDateForWebField = value;
- }
- }
-
- /// <remarks/>
- public long HSupID {
- get {
- return this.hSupIDField;
- }
- set {
- this.hSupIDField = value;
- }
- }
-
- /// <remarks/>
- public long HWHID {
- get {
- return this.hWHIDField;
- }
- set {
- this.hWHIDField = value;
- }
- }
-
- /// <remarks/>
- public long HSCWHID {
- get {
- return this.hSCWHIDField;
- }
- set {
- this.hSCWHIDField = value;
- }
- }
-
- /// <remarks/>
- public long HEmpID {
- get {
- return this.hEmpIDField;
- }
- set {
- this.hEmpIDField = value;
- }
- }
-
- /// <remarks/>
- public long HManagerID {
- get {
- return this.hManagerIDField;
- }
- set {
- this.hManagerIDField = value;
- }
- }
-
- /// <remarks/>
- public long HSecManagerID {
- get {
- return this.hSecManagerIDField;
- }
- set {
- this.hSecManagerIDField = value;
- }
- }
-
- /// <remarks/>
- public long HKeeperID {
- get {
- return this.hKeeperIDField;
- }
- set {
- this.hKeeperIDField = value;
- }
- }
-
- /// <remarks/>
- public long HDeptID {
- get {
- return this.hDeptIDField;
- }
- set {
- this.hDeptIDField = value;
- }
- }
-
- /// <remarks/>
- public string HExplanation {
- get {
- return this.hExplanationField;
- }
- set {
- this.hExplanationField = value;
- }
- }
-
- /// <remarks/>
- public string HInnerBillNo {
- get {
- return this.hInnerBillNoField;
- }
- set {
- this.hInnerBillNoField = value;
- }
- }
-
- /// <remarks/>
- public bool HRedBlueFlag {
- get {
- return this.hRedBlueFlagField;
- }
- set {
- this.hRedBlueFlagField = value;
- }
- }
-
- /// <remarks/>
- public long HSTOCKORGID {
- get {
- return this.hSTOCKORGIDField;
- }
- set {
- this.hSTOCKORGIDField = value;
- }
- }
-
- /// <remarks/>
- public long HOWNERID {
- get {
- return this.hOWNERIDField;
- }
- set {
- this.hOWNERIDField = value;
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
public partial class ClsKf_POStockInBillMain_K3 : ClsXt_BaseBillMain {
private long hCussentAcctIDField;
@@ -39399,6 +39285,183 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
+ public partial class ClsKf_OtherOutBillMain : ClsXt_BaseBillMain {
+
+ private long hSupIDField;
+
+ private long hWHIDField;
+
+ private long hSCWHIDField;
+
+ private long hEmpIDField;
+
+ private long hManagerIDField;
+
+ private long hSecManagerIDField;
+
+ private long hKeeperIDField;
+
+ private long hDeptIDField;
+
+ private string hExplanationField;
+
+ private string hInnerBillNoField;
+
+ private bool hRedBlueFlagField;
+
+ private string hStockStyleField;
+
+ private long hSTOCKORGIDField;
+
+ private long hOWNERIDField;
+
+ /// <remarks/>
+ public long HSupID {
+ get {
+ return this.hSupIDField;
+ }
+ set {
+ this.hSupIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HWHID {
+ get {
+ return this.hWHIDField;
+ }
+ set {
+ this.hWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSCWHID {
+ get {
+ return this.hSCWHIDField;
+ }
+ set {
+ this.hSCWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HEmpID {
+ get {
+ return this.hEmpIDField;
+ }
+ set {
+ this.hEmpIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HManagerID {
+ get {
+ return this.hManagerIDField;
+ }
+ set {
+ this.hManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSecManagerID {
+ get {
+ return this.hSecManagerIDField;
+ }
+ set {
+ this.hSecManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HKeeperID {
+ get {
+ return this.hKeeperIDField;
+ }
+ set {
+ this.hKeeperIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HDeptID {
+ get {
+ return this.hDeptIDField;
+ }
+ set {
+ this.hDeptIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HExplanation {
+ get {
+ return this.hExplanationField;
+ }
+ set {
+ this.hExplanationField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HInnerBillNo {
+ get {
+ return this.hInnerBillNoField;
+ }
+ set {
+ this.hInnerBillNoField = value;
+ }
+ }
+
+ /// <remarks/>
+ public bool HRedBlueFlag {
+ get {
+ return this.hRedBlueFlagField;
+ }
+ set {
+ this.hRedBlueFlagField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HStockStyle {
+ get {
+ return this.hStockStyleField;
+ }
+ set {
+ this.hStockStyleField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSTOCKORGID {
+ get {
+ return this.hSTOCKORGIDField;
+ }
+ set {
+ this.hSTOCKORGIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HOWNERID {
+ get {
+ return this.hOWNERIDField;
+ }
+ set {
+ this.hOWNERIDField = value;
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
+ [System.SerializableAttribute()]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
public partial class ClsQC_NoPassProdCheckBillMain : ClsXt_BaseBillMain {
private long hPrintQtyField;
@@ -39968,6 +40031,183 @@
}
set {
this.hInnerBillNoField = value;
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
+ [System.SerializableAttribute()]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
+ public partial class ClsKf_ProductInBillMain : ClsXt_BaseBillMain {
+
+ private string hDateForWebField;
+
+ private long hSupIDField;
+
+ private long hWHIDField;
+
+ private long hSCWHIDField;
+
+ private long hEmpIDField;
+
+ private long hManagerIDField;
+
+ private long hSecManagerIDField;
+
+ private long hKeeperIDField;
+
+ private long hDeptIDField;
+
+ private string hExplanationField;
+
+ private string hInnerBillNoField;
+
+ private bool hRedBlueFlagField;
+
+ private long hSTOCKORGIDField;
+
+ private long hOWNERIDField;
+
+ /// <remarks/>
+ public string HDateForWeb {
+ get {
+ return this.hDateForWebField;
+ }
+ set {
+ this.hDateForWebField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSupID {
+ get {
+ return this.hSupIDField;
+ }
+ set {
+ this.hSupIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HWHID {
+ get {
+ return this.hWHIDField;
+ }
+ set {
+ this.hWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSCWHID {
+ get {
+ return this.hSCWHIDField;
+ }
+ set {
+ this.hSCWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HEmpID {
+ get {
+ return this.hEmpIDField;
+ }
+ set {
+ this.hEmpIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HManagerID {
+ get {
+ return this.hManagerIDField;
+ }
+ set {
+ this.hManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSecManagerID {
+ get {
+ return this.hSecManagerIDField;
+ }
+ set {
+ this.hSecManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HKeeperID {
+ get {
+ return this.hKeeperIDField;
+ }
+ set {
+ this.hKeeperIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HDeptID {
+ get {
+ return this.hDeptIDField;
+ }
+ set {
+ this.hDeptIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HExplanation {
+ get {
+ return this.hExplanationField;
+ }
+ set {
+ this.hExplanationField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HInnerBillNo {
+ get {
+ return this.hInnerBillNoField;
+ }
+ set {
+ this.hInnerBillNoField = value;
+ }
+ }
+
+ /// <remarks/>
+ public bool HRedBlueFlag {
+ get {
+ return this.hRedBlueFlagField;
+ }
+ set {
+ this.hRedBlueFlagField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSTOCKORGID {
+ get {
+ return this.hSTOCKORGIDField;
+ }
+ set {
+ this.hSTOCKORGIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HOWNERID {
+ get {
+ return this.hOWNERIDField;
+ }
+ set {
+ this.hOWNERIDField = value;
}
}
}
@@ -41599,6 +41839,12 @@
private string kf_EntrustOutBill_SimpleModeField;
+ private string kf_EntrustOutBillCheck_MustQtyCtlField;
+
+ private string kf_EntrustOutBillCheck_WHSPCtlField;
+
+ private string kf_EntrustOutBillCheck_MultilineCtlField;
+
private string kf_MateReplenishOutBill_AutoCheckField;
private string kf_MateReplenishOutBill_ERPModeField;
@@ -41622,6 +41868,30 @@
private string kf_MateReplenishOutBillCheck_WHSPCtlField;
private string kf_MateReplenishOutBillCheck_MultilineCtlField;
+
+ private string kf_EntrustReplenishOutBill_AutoCheckField;
+
+ private string kf_EntrustReplenishOutBill_ERPModeField;
+
+ private string kf_EntrustReplenishOutBill_MustQtyCtlField;
+
+ private string kf_EntrustReplenishOutBill_MulSourceBillField;
+
+ private string kf_EntrustReplenishOutBill_BillTypeOneScanField;
+
+ private string kf_EntrustReplenishOutBill_BatchNoCtlField;
+
+ private string kf_EntrustReplenishOutBill_MultilineCtlField;
+
+ private string kf_EntrustReplenishOutBill_MaterWHSPCtlField;
+
+ private string kf_EntrustReplenishOutBill_SourceWHSPCtlField;
+
+ private string kf_EntrustReplenishOutBillCheck_MustQtyCtlField;
+
+ private string kf_EntrustReplenishOutBillCheck_WHSPCtlField;
+
+ private string kf_EntrustReplenishOutBillCheck_MultilineCtlField;
private string kf_MoveStockBill_AutoCheckField;
@@ -41874,6 +42144,8 @@
private string wMS_UserByOrgRelationField;
private string wMS_MouldManagerCtlField;
+
+ private string wMS_CloudModeField;
private string barCode_SourceQtyCtlField;
@@ -43160,6 +43432,36 @@
}
/// <remarks/>
+ public string Kf_EntrustOutBillCheck_MustQtyCtl {
+ get {
+ return this.kf_EntrustOutBillCheck_MustQtyCtlField;
+ }
+ set {
+ this.kf_EntrustOutBillCheck_MustQtyCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustOutBillCheck_WHSPCtl {
+ get {
+ return this.kf_EntrustOutBillCheck_WHSPCtlField;
+ }
+ set {
+ this.kf_EntrustOutBillCheck_WHSPCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustOutBillCheck_MultilineCtl {
+ get {
+ return this.kf_EntrustOutBillCheck_MultilineCtlField;
+ }
+ set {
+ this.kf_EntrustOutBillCheck_MultilineCtlField = value;
+ }
+ }
+
+ /// <remarks/>
public string Kf_MateReplenishOutBill_AutoCheck {
get {
return this.kf_MateReplenishOutBill_AutoCheckField;
@@ -43276,6 +43578,126 @@
}
set {
this.kf_MateReplenishOutBillCheck_MultilineCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBill_AutoCheck {
+ get {
+ return this.kf_EntrustReplenishOutBill_AutoCheckField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBill_ERPMode {
+ get {
+ return this.kf_EntrustReplenishOutBill_ERPModeField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBill_ERPModeField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBill_MustQtyCtl {
+ get {
+ return this.kf_EntrustReplenishOutBill_MustQtyCtlField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBill_MustQtyCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBill_MulSourceBill {
+ get {
+ return this.kf_EntrustReplenishOutBill_MulSourceBillField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBill_MulSourceBillField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBill_BillTypeOneScan {
+ get {
+ return this.kf_EntrustReplenishOutBill_BillTypeOneScanField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBill_BillTypeOneScanField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBill_BatchNoCtl {
+ get {
+ return this.kf_EntrustReplenishOutBill_BatchNoCtlField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBill_BatchNoCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBill_MultilineCtl {
+ get {
+ return this.kf_EntrustReplenishOutBill_MultilineCtlField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBill_MultilineCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBill_MaterWHSPCtl {
+ get {
+ return this.kf_EntrustReplenishOutBill_MaterWHSPCtlField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBill_MaterWHSPCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBill_SourceWHSPCtl {
+ get {
+ return this.kf_EntrustReplenishOutBill_SourceWHSPCtlField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBill_SourceWHSPCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBillCheck_MustQtyCtl {
+ get {
+ return this.kf_EntrustReplenishOutBillCheck_MustQtyCtlField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBillCheck_MustQtyCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBillCheck_WHSPCtl {
+ get {
+ return this.kf_EntrustReplenishOutBillCheck_WHSPCtlField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBillCheck_WHSPCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_EntrustReplenishOutBillCheck_MultilineCtl {
+ get {
+ return this.kf_EntrustReplenishOutBillCheck_MultilineCtlField;
+ }
+ set {
+ this.kf_EntrustReplenishOutBillCheck_MultilineCtlField = value;
}
}
@@ -44540,6 +44962,16 @@
}
/// <remarks/>
+ public string WMS_CloudMode {
+ get {
+ return this.wMS_CloudModeField;
+ }
+ set {
+ this.wMS_CloudModeField = value;
+ }
+ }
+
+ /// <remarks/>
public string BarCode_SourceQtyCtl {
get {
return this.barCode_SourceQtyCtlField;
@@ -45441,6 +45873,134 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void getCheckOpenCompletedEventHandler(object sender, getCheckOpenCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class getCheckOpenCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal getCheckOpenCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public bool Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[0]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void getGetDataBaseCompletedEventHandler(object sender, getGetDataBaseCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class getGetDataBaseCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal getGetDataBaseCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public string Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sK3 {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void getCheckCzymcCompletedEventHandler(object sender, getCheckCzymcCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class getCheckCzymcCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal getCheckCzymcCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public System.Data.DataSet Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((System.Data.DataSet)(this.results[0]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void getSub_GetCurPeriodCompletedEventHandler(object sender, getSub_GetCurPeriodCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class getSub_GetCurPeriodCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal getSub_GetCurPeriodCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public bool Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public int sYear {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((int)(this.results[1]));
+ }
+ }
+
+ /// <remarks/>
+ public int sPeriod {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((int)(this.results[2]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
public delegate void getDataSetBySQLCompletedEventHandler(object sender, getDataSetBySQLCompletedEventArgs e);
/// <remarks/>
@@ -45726,6 +46286,190 @@
private object[] results;
internal set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public bool Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sHSourceBillNo {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+
+ /// <remarks/>
+ public string sHSourceBillType {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[2]));
+ }
+ }
+
+ /// <remarks/>
+ public long sHSupID {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((long)(this.results[3]));
+ }
+ }
+
+ /// <remarks/>
+ public string sHSupName {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[4]));
+ }
+ }
+
+ /// <remarks/>
+ public long sHDeptID {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((long)(this.results[5]));
+ }
+ }
+
+ /// <remarks/>
+ public string sHDeptName {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[6]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[7]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void GetICInventoryByBarCodeSP_ViewCompletedEventHandler(object sender, GetICInventoryByBarCodeSP_ViewCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class GetICInventoryByBarCodeSP_ViewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal GetICInventoryByBarCodeSP_ViewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public System.Data.DataSet Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((System.Data.DataSet)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErr {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void GetMaterByBarCodeSP_ViewCompletedEventHandler(object sender, GetMaterByBarCodeSP_ViewCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class GetMaterByBarCodeSP_ViewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal GetMaterByBarCodeSP_ViewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public System.Data.DataSet Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((System.Data.DataSet)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErr {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void SetFIFOPonderationBillMain_TempCompletedEventHandler(object sender, SetFIFOPonderationBillMain_TempCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class SetFIFOPonderationBillMain_TempCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal SetFIFOPonderationBillMain_TempCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public bool Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErr {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventHandler(object sender, set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
@@ -48911,17 +49655,17 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void getCheckOpenCompletedEventHandler(object sender, getCheckOpenCompletedEventArgs e);
+ public delegate void set_SaveProcReportMoveBill_MoveStockCompletedEventHandler(object sender, set_SaveProcReportMoveBill_MoveStockCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class getCheckOpenCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class set_SaveProcReportMoveBill_MoveStockCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- internal getCheckOpenCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ internal set_SaveProcReportMoveBill_MoveStockCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
@@ -48933,35 +49677,9 @@
return ((bool)(this.results[0]));
}
}
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void getGetDataBaseCompletedEventHandler(object sender, getGetDataBaseCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class getGetDataBaseCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal getGetDataBaseCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
/// <remarks/>
- public string Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sK3 {
+ public string sErrMsg {
get {
this.RaiseExceptionIfNecessary();
return ((string)(this.results[1]));
@@ -48971,43 +49689,17 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void getCheckCzymcCompletedEventHandler(object sender, getCheckCzymcCompletedEventArgs e);
+ public delegate void set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventHandler(object sender, set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class getCheckCzymcCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- internal getCheckCzymcCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public System.Data.DataSet Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((System.Data.DataSet)(this.results[0]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void getSub_GetCurPeriodCompletedEventHandler(object sender, getSub_GetCurPeriodCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class getSub_GetCurPeriodCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal getSub_GetCurPeriodCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ internal set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
@@ -49021,18 +49713,10 @@
}
/// <remarks/>
- public int sYear {
+ public string sErrMsg {
get {
this.RaiseExceptionIfNecessary();
- return ((int)(this.results[1]));
- }
- }
-
- /// <remarks/>
- public int sPeriod {
- get {
- this.RaiseExceptionIfNecessary();
- return ((int)(this.results[2]));
+ return ((string)(this.results[1]));
}
}
}
@@ -51619,85 +52303,17 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void GetICInventoryByBarCodeSP_ViewCompletedEventHandler(object sender, GetICInventoryByBarCodeSP_ViewCompletedEventArgs e);
+ public delegate void set_SaveOtherOutBill_CLDCompletedEventHandler(object sender, set_SaveOtherOutBill_CLDCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class GetICInventoryByBarCodeSP_ViewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class set_SaveOtherOutBill_CLDCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- internal GetICInventoryByBarCodeSP_ViewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public System.Data.DataSet Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((System.Data.DataSet)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sErr {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void GetMaterByBarCodeSP_ViewCompletedEventHandler(object sender, GetMaterByBarCodeSP_ViewCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class GetMaterByBarCodeSP_ViewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal GetMaterByBarCodeSP_ViewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public System.Data.DataSet Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((System.Data.DataSet)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sErr {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void SetFIFOPonderationBillMain_TempCompletedEventHandler(object sender, SetFIFOPonderationBillMain_TempCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class SetFIFOPonderationBillMain_TempCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal SetFIFOPonderationBillMain_TempCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ internal set_SaveOtherOutBill_CLDCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
@@ -51707,88 +52323,6 @@
get {
this.RaiseExceptionIfNecessary();
return ((bool)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sErr {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventHandler(object sender, set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal set_SavePonderationBillMain_Temp_BarCode_FastCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public bool Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((bool)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sHSourceBillNo {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
-
- /// <remarks/>
- public string sHSourceBillType {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[2]));
- }
- }
-
- /// <remarks/>
- public long sHSupID {
- get {
- this.RaiseExceptionIfNecessary();
- return ((long)(this.results[3]));
- }
- }
-
- /// <remarks/>
- public string sHSupName {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[4]));
- }
- }
-
- /// <remarks/>
- public long sHDeptID {
- get {
- this.RaiseExceptionIfNecessary();
- return ((long)(this.results[5]));
- }
- }
-
- /// <remarks/>
- public string sHDeptName {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[6]));
}
}
@@ -51796,7 +52330,41 @@
public string sErrMsg {
get {
this.RaiseExceptionIfNecessary();
- return ((string)(this.results[7]));
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void set_SaveOtherOutBill_BillCheckCompletedEventHandler(object sender, set_SaveOtherOutBill_BillCheckCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class set_SaveOtherOutBill_BillCheckCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal set_SaveOtherOutBill_BillCheckCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public bool Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
}
}
}
@@ -53475,74 +54043,6 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void set_SaveProcReportMoveBill_MoveStockCompletedEventHandler(object sender, set_SaveProcReportMoveBill_MoveStockCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class set_SaveProcReportMoveBill_MoveStockCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal set_SaveProcReportMoveBill_MoveStockCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public bool Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((bool)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sErrMsg {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventHandler(object sender, set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal set_SaveProcReportMoveBill_MoveStock_CLD_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public bool Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((bool)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sErrMsg {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
public delegate void set_SaveSellOutBackBill_CLD_NewCompletedEventHandler(object sender, set_SaveSellOutBackBill_CLD_NewCompletedEventArgs e);
/// <remarks/>
@@ -54539,6 +55039,40 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void set_SaveEntrustReplenishOutBill_BillCheckCompletedEventHandler(object sender, set_SaveEntrustReplenishOutBill_BillCheckCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class set_SaveEntrustReplenishOutBill_BillCheckCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal set_SaveEntrustReplenishOutBill_BillCheckCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public bool Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
public delegate void set_SaveEntrustInBackBill_CLDCompletedEventHandler(object sender, set_SaveEntrustInBackBill_CLDCompletedEventArgs e);
/// <remarks/>
@@ -54973,6 +55507,40 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void set_SaveEntrustOutBill_BillCheckCompletedEventHandler(object sender, set_SaveEntrustOutBill_BillCheckCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class set_SaveEntrustOutBill_BillCheckCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal set_SaveEntrustOutBill_BillCheckCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public bool Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
public delegate void set_SaveOtherOutBackBillCompletedEventHandler(object sender, set_SaveOtherOutBackBillCompletedEventArgs e);
/// <remarks/>
@@ -55282,74 +55850,6 @@
private object[] results;
internal set_SaveOtherOutBill_CLD_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public bool Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((bool)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sErrMsg {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void set_SaveOtherOutBill_CLDCompletedEventHandler(object sender, set_SaveOtherOutBill_CLDCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class set_SaveOtherOutBill_CLDCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal set_SaveOtherOutBill_CLDCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public bool Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((bool)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sErrMsg {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- public delegate void set_SaveOtherOutBill_BillCheckCompletedEventHandler(object sender, set_SaveOtherOutBill_BillCheckCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class set_SaveOtherOutBill_BillCheckCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal set_SaveOtherOutBill_BillCheckCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
diff --git a/WebAPI/Web References/WebS/Reference.map b/WebAPI/Web References/WebS/Reference.map
index 9cbccab..698aaf4 100644
--- a/WebAPI/Web References/WebS/Reference.map
+++ b/WebAPI/Web References/WebS/Reference.map
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Results>
- <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WEBS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
- <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WEBS/WebService1.asmx?disco" filename="WebService1.disco" />
+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://192.168.63.7/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />
+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://192.168.63.7/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
</Results>
</DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/WebService1.disco b/WebAPI/Web References/WebS/WebService1.disco
index 34b53d6..e7984d8 100644
--- a/WebAPI/Web References/WebS/WebService1.disco
+++ b/WebAPI/Web References/WebS/WebService1.disco
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
- <contractRef ref="http://localhost/WEBS/WebService1.asmx?wsdl" docRef="http://localhost/WEBS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
- <soap address="http://localhost/WEBS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
- <soap address="http://localhost/WEBS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+ <contractRef ref="http://192.168.63.7/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://192.168.63.7/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+ <soap address="http://192.168.63.7/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+ <soap address="http://192.168.63.7/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
</discovery>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/WebService1.wsdl b/WebAPI/Web References/WebS/WebService1.wsdl
index 8d6f402..cb9b846 100644
--- a/WebAPI/Web References/WebS/WebService1.wsdl
+++ b/WebAPI/Web References/WebS/WebService1.wsdl
@@ -2,6 +2,71 @@
<wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://tempuri.org/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/">
+ <s:element name="getCheckOpen">
+ <s:complexType />
+ </s:element>
+ <s:element name="getCheckOpenResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="getCheckOpenResult" type="s:boolean" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="getGetDataBase">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="sItem" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sK3" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="getGetDataBaseResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="getGetDataBaseResult" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sK3" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="getCheckCzymc">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="sUser" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sPsd" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="getCheckCzymcResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="getCheckCzymcResult">
+ <s:complexType>
+ <s:sequence>
+ <s:element ref="s:schema" />
+ <s:any />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="getSub_GetCurPeriod">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="sYear" type="s:int" />
+ <s:element minOccurs="1" maxOccurs="1" name="sPeriod" type="s:int" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="getSub_GetCurPeriodResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="getSub_GetCurPeriodResult" type="s:boolean" />
+ <s:element minOccurs="1" maxOccurs="1" name="sYear" type="s:int" />
+ <s:element minOccurs="1" maxOccurs="1" name="sPeriod" type="s:int" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="getDataSetBySQL">
<s:complexType>
<s:sequence>
@@ -236,6 +301,110 @@
<s:complexType>
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="set_SavePonderationBillMain_Temp_BarCode_MouldResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillType" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="sHSupID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSupName" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="sHDeptID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHDeptName" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="GetICInventoryByBarCodeSP_View">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="sWhere" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="GetICInventoryByBarCodeSP_ViewResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="GetICInventoryByBarCodeSP_ViewResult">
+ <s:complexType>
+ <s:sequence>
+ <s:element ref="s:schema" />
+ <s:any />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="GetMaterByBarCodeSP_View">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="sWhere" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="GetMaterByBarCodeSP_ViewResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="GetMaterByBarCodeSP_ViewResult">
+ <s:complexType>
+ <s:sequence>
+ <s:element ref="s:schema" />
+ <s:any />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="SetFIFOPonderationBillMain_Temp">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HUserOrgID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="SetFIFOPonderationBillMain_TempResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="SetFIFOPonderationBillMain_TempResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SavePonderationBillMain_Temp_BarCode_Fast">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="sBarCode" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HBillID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HWhID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSPID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HQty" type="s:double" />
+ <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
+ <s:element minOccurs="1" maxOccurs="1" name="SourceFlag" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillType" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="sHSupID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSupName" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="sHDeptID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHDeptName" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SavePonderationBillMain_Temp_BarCode_FastResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="set_SavePonderationBillMain_Temp_BarCode_FastResult" type="s:boolean" />
<s:element minOccurs="0" maxOccurs="1" name="sHSourceBillNo" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="sHSourceBillType" type="s:string" />
<s:element minOccurs="1" maxOccurs="1" name="sHSupID" type="s:long" />
@@ -602,6 +771,9 @@
<s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustOutBill_FIFOList" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustOutBill_FIFOCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustOutBill_SimpleMode" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustOutBillCheck_MustQtyCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustOutBillCheck_WHSPCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustOutBillCheck_MultilineCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_MateReplenishOutBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_MateReplenishOutBill_ERPMode" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_MateReplenishOutBill_MustQtyCtl" type="s:string" />
@@ -614,6 +786,18 @@
<s:element minOccurs="0" maxOccurs="1" name="Kf_MateReplenishOutBillCheck_MustQtyCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_MateReplenishOutBillCheck_WHSPCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_MateReplenishOutBillCheck_MultilineCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBill_ERPMode" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBill_MustQtyCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBill_MulSourceBill" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBill_BillTypeOneScan" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBill_BatchNoCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBill_MultilineCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBill_MaterWHSPCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBill_SourceWHSPCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBillCheck_MustQtyCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBillCheck_WHSPCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_EntrustReplenishOutBillCheck_MultilineCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_MoveStockBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_MoveStockBill_ERPMode" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_MoveStockBill_MustQtyCtl" type="s:string" />
@@ -740,6 +924,7 @@
<s:element minOccurs="0" maxOccurs="1" name="WMS_OneScanMode" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="WMS_UserByOrgRelation" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="WMS_MouldManagerCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="WMS_CloudMode" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="BarCode_SourceQtyCtl" type="s:string" />
<s:element minOccurs="1" maxOccurs="1" name="BarCode_PrintQty" type="s:long" />
<s:element minOccurs="0" maxOccurs="1" name="BarCode_PrintQtyCtl" type="s:string" />
@@ -2824,68 +3009,65 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="getCheckOpen">
- <s:complexType />
- </s:element>
- <s:element name="getCheckOpenResponse">
+ <s:element name="set_SaveProcReportMoveBill_MoveStock">
<s:complexType>
<s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="getCheckOpenResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_ProductInBillMain" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOutBillID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HOutBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HPPBomBillNo" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSCSPID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="getGetDataBase">
+ <s:complexType name="ClsKf_ProductInBillMain">
+ <s:complexContent mixed="false">
+ <s:extension base="tns:ClsXt_BaseBillMain">
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="HDateForWeb" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSecManagerID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSTOCKORGID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ </s:sequence>
+ </s:extension>
+ </s:complexContent>
+ </s:complexType>
+ <s:element name="set_SaveProcReportMoveBill_MoveStockResponse">
<s:complexType>
<s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="sItem" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sK3" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="set_SaveProcReportMoveBill_MoveStockResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="getGetDataBaseResponse">
+ <s:element name="set_SaveProcReportMoveBill_MoveStock_CLD_New">
<s:complexType>
<s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="getGetDataBaseResult" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sK3" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_ProductInBillMain" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOutBillID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HOutBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="getCheckCzymc">
+ <s:element name="set_SaveProcReportMoveBill_MoveStock_CLD_NewResponse">
<s:complexType>
<s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="sUser" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sPsd" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="getCheckCzymcResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="getCheckCzymcResult">
- <s:complexType>
- <s:sequence>
- <s:element ref="s:schema" />
- <s:any />
- </s:sequence>
- </s:complexType>
- </s:element>
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="getSub_GetCurPeriod">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="sYear" type="s:int" />
- <s:element minOccurs="1" maxOccurs="1" name="sPeriod" type="s:int" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="getSub_GetCurPeriodResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="getSub_GetCurPeriodResult" type="s:boolean" />
- <s:element minOccurs="1" maxOccurs="1" name="sYear" type="s:int" />
- <s:element minOccurs="1" maxOccurs="1" name="sPeriod" type="s:int" />
+ <s:element minOccurs="1" maxOccurs="1" name="set_SaveProcReportMoveBill_MoveStock_CLD_NewResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
</s:element>
@@ -4491,106 +4673,58 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="GetICInventoryByBarCodeSP_View">
+ <s:element name="set_SaveOtherOutBill_CLD">
<s:complexType>
<s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="sWhere" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="GetICInventoryByBarCodeSP_ViewResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="GetICInventoryByBarCodeSP_ViewResult">
- <s:complexType>
- <s:sequence>
- <s:element ref="s:schema" />
- <s:any />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="GetMaterByBarCodeSP_View">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="sWhere" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="GetMaterByBarCodeSP_ViewResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="GetMaterByBarCodeSP_ViewResult">
- <s:complexType>
- <s:sequence>
- <s:element ref="s:schema" />
- <s:any />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="SetFIFOPonderationBillMain_Temp">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HUserOrgID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="SetFIFOPonderationBillMain_TempResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="SetFIFOPonderationBillMain_TempResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sErr" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SavePonderationBillMain_Temp_BarCode_Fast">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="sBarCode" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HBillID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HWhID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HSPID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HQty" type="s:double" />
- <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
- <s:element minOccurs="1" maxOccurs="1" name="SourceFlag" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillType" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="sHSupID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSupName" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="sHDeptID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sHDeptName" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_OtherOutBillMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="set_SavePonderationBillMain_Temp_BarCode_FastResponse">
+ <s:complexType name="ClsKf_OtherOutBillMain">
+ <s:complexContent mixed="false">
+ <s:extension base="tns:ClsXt_BaseBillMain">
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSecManagerID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="HStockStyle" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSTOCKORGID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ </s:sequence>
+ </s:extension>
+ </s:complexContent>
+ </s:complexType>
+ <s:element name="set_SaveOtherOutBill_CLDResponse">
<s:complexType>
<s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="set_SavePonderationBillMain_Temp_BarCode_FastResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillType" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="sHSupID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSupName" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="sHDeptID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sHDeptName" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="set_SaveOtherOutBill_CLDResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SaveOtherOutBill_BillCheck">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_OtherOutBillMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SaveOtherOutBill_BillCheckResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="set_SaveOtherOutBill_BillCheckResult" type="s:boolean" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -4890,28 +5024,6 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:complexType name="ClsKf_ProductInBillMain">
- <s:complexContent mixed="false">
- <s:extension base="tns:ClsXt_BaseBillMain">
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="HDateForWeb" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HSecManagerID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
- <s:element minOccurs="1" maxOccurs="1" name="HSTOCKORGID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
- </s:sequence>
- </s:extension>
- </s:complexContent>
- </s:complexType>
<s:element name="set_SaveProductInBill_MulSource_CLDResponse">
<s:complexType>
<s:sequence>
@@ -5719,46 +5831,6 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="set_SaveProcReportMoveBill_MoveStock">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_ProductInBillMain" />
- <s:element minOccurs="1" maxOccurs="1" name="HOutBillID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HOutBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HPPBomBillNo" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HSCSPID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveProcReportMoveBill_MoveStockResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="set_SaveProcReportMoveBill_MoveStockResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveProcReportMoveBill_MoveStock_CLD_New">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_ProductInBillMain" />
- <s:element minOccurs="1" maxOccurs="1" name="HOutBillID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HOutBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveProcReportMoveBill_MoveStock_CLD_NewResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="set_SaveProcReportMoveBill_MoveStock_CLD_NewResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
<s:element name="set_SaveSellOutBackBill_CLD_New">
<s:complexType>
<s:sequence>
@@ -6554,6 +6626,43 @@
</s:sequence>
</s:complexType>
</s:element>
+ <s:element name="set_SaveEntrustReplenishOutBill_BillCheck">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_EntrustReplenishOutBillMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:complexType name="ClsKf_EntrustReplenishOutBillMain">
+ <s:complexContent mixed="false">
+ <s:extension base="tns:ClsXt_BaseBillMain">
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSecManagerID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSTOCKORGID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ </s:sequence>
+ </s:extension>
+ </s:complexContent>
+ </s:complexType>
+ <s:element name="set_SaveEntrustReplenishOutBill_BillCheckResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="set_SaveEntrustReplenishOutBill_BillCheckResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="set_SaveEntrustInBackBill_CLD">
<s:complexType>
<s:sequence>
@@ -6867,6 +6976,22 @@
</s:sequence>
</s:complexType>
</s:element>
+ <s:element name="set_SaveEntrustOutBill_BillCheck">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_EntrustOutBillMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SaveEntrustOutBill_BillCheckResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="set_SaveEntrustOutBill_BillCheckResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="set_SaveOtherOutBackBill">
<s:complexType>
<s:sequence>
@@ -6910,28 +7035,6 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:complexType name="ClsKf_OtherOutBillMain">
- <s:complexContent mixed="false">
- <s:extension base="tns:ClsXt_BaseBillMain">
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HSecManagerID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="HStockStyle" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HSTOCKORGID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
- </s:sequence>
- </s:extension>
- </s:complexContent>
- </s:complexType>
<s:element name="set_SaveOtherOutBillResponse">
<s:complexType>
<s:sequence>
@@ -7084,40 +7187,6 @@
<s:complexType>
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="set_SaveOtherOutBill_CLD_NewResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveOtherOutBill_CLD">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_OtherOutBillMain" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveOtherOutBill_CLDResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="set_SaveOtherOutBill_CLDResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveOtherOutBill_BillCheck">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_OtherOutBillMain" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SaveOtherOutBill_BillCheckResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="set_SaveOtherOutBill_BillCheckResult" type="s:boolean" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -12849,6 +12918,30 @@
</s:element>
</s:schema>
</wsdl:types>
+ <wsdl:message name="getCheckOpenSoapIn">
+ <wsdl:part name="parameters" element="tns:getCheckOpen" />
+ </wsdl:message>
+ <wsdl:message name="getCheckOpenSoapOut">
+ <wsdl:part name="parameters" element="tns:getCheckOpenResponse" />
+ </wsdl:message>
+ <wsdl:message name="getGetDataBaseSoapIn">
+ <wsdl:part name="parameters" element="tns:getGetDataBase" />
+ </wsdl:message>
+ <wsdl:message name="getGetDataBaseSoapOut">
+ <wsdl:part name="parameters" element="tns:getGetDataBaseResponse" />
+ </wsdl:message>
+ <wsdl:message name="getCheckCzymcSoapIn">
+ <wsdl:part name="parameters" element="tns:getCheckCzymc" />
+ </wsdl:message>
+ <wsdl:message name="getCheckCzymcSoapOut">
+ <wsdl:part name="parameters" element="tns:getCheckCzymcResponse" />
+ </wsdl:message>
+ <wsdl:message name="getSub_GetCurPeriodSoapIn">
+ <wsdl:part name="parameters" element="tns:getSub_GetCurPeriod" />
+ </wsdl:message>
+ <wsdl:message name="getSub_GetCurPeriodSoapOut">
+ <wsdl:part name="parameters" element="tns:getSub_GetCurPeriodResponse" />
+ </wsdl:message>
<wsdl:message name="getDataSetBySQLSoapIn">
<wsdl:part name="parameters" element="tns:getDataSetBySQL" />
</wsdl:message>
@@ -12908,6 +13001,30 @@
</wsdl:message>
<wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_MouldSoapOut">
<wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_MouldResponse" />
+ </wsdl:message>
+ <wsdl:message name="GetICInventoryByBarCodeSP_ViewSoapIn">
+ <wsdl:part name="parameters" element="tns:GetICInventoryByBarCodeSP_View" />
+ </wsdl:message>
+ <wsdl:message name="GetICInventoryByBarCodeSP_ViewSoapOut">
+ <wsdl:part name="parameters" element="tns:GetICInventoryByBarCodeSP_ViewResponse" />
+ </wsdl:message>
+ <wsdl:message name="GetMaterByBarCodeSP_ViewSoapIn">
+ <wsdl:part name="parameters" element="tns:GetMaterByBarCodeSP_View" />
+ </wsdl:message>
+ <wsdl:message name="GetMaterByBarCodeSP_ViewSoapOut">
+ <wsdl:part name="parameters" element="tns:GetMaterByBarCodeSP_ViewResponse" />
+ </wsdl:message>
+ <wsdl:message name="SetFIFOPonderationBillMain_TempSoapIn">
+ <wsdl:part name="parameters" element="tns:SetFIFOPonderationBillMain_Temp" />
+ </wsdl:message>
+ <wsdl:message name="SetFIFOPonderationBillMain_TempSoapOut">
+ <wsdl:part name="parameters" element="tns:SetFIFOPonderationBillMain_TempResponse" />
+ </wsdl:message>
+ <wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_FastSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_Fast" />
+ </wsdl:message>
+ <wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_FastSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_FastResponse" />
</wsdl:message>
<wsdl:message name="get_CheckTypeByBarCodeSoapIn">
<wsdl:part name="parameters" element="tns:get_CheckTypeByBarCode" />
@@ -13395,29 +13512,17 @@
<wsdl:message name="getDataSetByMasterSQLSoapOut">
<wsdl:part name="parameters" element="tns:getDataSetByMasterSQLResponse" />
</wsdl:message>
- <wsdl:message name="getCheckOpenSoapIn">
- <wsdl:part name="parameters" element="tns:getCheckOpen" />
+ <wsdl:message name="set_SaveProcReportMoveBill_MoveStockSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SaveProcReportMoveBill_MoveStock" />
</wsdl:message>
- <wsdl:message name="getCheckOpenSoapOut">
- <wsdl:part name="parameters" element="tns:getCheckOpenResponse" />
+ <wsdl:message name="set_SaveProcReportMoveBill_MoveStockSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SaveProcReportMoveBill_MoveStockResponse" />
</wsdl:message>
- <wsdl:message name="getGetDataBaseSoapIn">
- <wsdl:part name="parameters" element="tns:getGetDataBase" />
+ <wsdl:message name="set_SaveProcReportMoveBill_MoveStock_CLD_NewSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SaveProcReportMoveBill_MoveStock_CLD_New" />
</wsdl:message>
- <wsdl:message name="getGetDataBaseSoapOut">
- <wsdl:part name="parameters" element="tns:getGetDataBaseResponse" />
- </wsdl:message>
- <wsdl:message name="getCheckCzymcSoapIn">
- <wsdl:part name="parameters" element="tns:getCheckCzymc" />
- </wsdl:message>
- <wsdl:message name="getCheckCzymcSoapOut">
- <wsdl:part name="parameters" element="tns:getCheckCzymcResponse" />
- </wsdl:message>
- <wsdl:message name="getSub_GetCurPeriodSoapIn">
- <wsdl:part name="parameters" element="tns:getSub_GetCurPeriod" />
- </wsdl:message>
- <wsdl:message name="getSub_GetCurPeriodSoapOut">
- <wsdl:part name="parameters" element="tns:getSub_GetCurPeriodResponse" />
+ <wsdl:message name="set_SaveProcReportMoveBill_MoveStock_CLD_NewSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SaveProcReportMoveBill_MoveStock_CLD_NewResponse" />
</wsdl:message>
<wsdl:message name="set_CheckPOInStockBill_NewSoapIn">
<wsdl:part name="parameters" element="tns:set_CheckPOInStockBill_New" />
@@ -13887,29 +13992,17 @@
<wsdl:message name="GetMaterByBarCode_ViewSoapOut">
<wsdl:part name="parameters" element="tns:GetMaterByBarCode_ViewResponse" />
</wsdl:message>
- <wsdl:message name="GetICInventoryByBarCodeSP_ViewSoapIn">
- <wsdl:part name="parameters" element="tns:GetICInventoryByBarCodeSP_View" />
+ <wsdl:message name="set_SaveOtherOutBill_CLDSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SaveOtherOutBill_CLD" />
</wsdl:message>
- <wsdl:message name="GetICInventoryByBarCodeSP_ViewSoapOut">
- <wsdl:part name="parameters" element="tns:GetICInventoryByBarCodeSP_ViewResponse" />
+ <wsdl:message name="set_SaveOtherOutBill_CLDSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SaveOtherOutBill_CLDResponse" />
</wsdl:message>
- <wsdl:message name="GetMaterByBarCodeSP_ViewSoapIn">
- <wsdl:part name="parameters" element="tns:GetMaterByBarCodeSP_View" />
+ <wsdl:message name="set_SaveOtherOutBill_BillCheckSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SaveOtherOutBill_BillCheck" />
</wsdl:message>
- <wsdl:message name="GetMaterByBarCodeSP_ViewSoapOut">
- <wsdl:part name="parameters" element="tns:GetMaterByBarCodeSP_ViewResponse" />
- </wsdl:message>
- <wsdl:message name="SetFIFOPonderationBillMain_TempSoapIn">
- <wsdl:part name="parameters" element="tns:SetFIFOPonderationBillMain_Temp" />
- </wsdl:message>
- <wsdl:message name="SetFIFOPonderationBillMain_TempSoapOut">
- <wsdl:part name="parameters" element="tns:SetFIFOPonderationBillMain_TempResponse" />
- </wsdl:message>
- <wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_FastSoapIn">
- <wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_Fast" />
- </wsdl:message>
- <wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_FastSoapOut">
- <wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_FastResponse" />
+ <wsdl:message name="set_SaveOtherOutBill_BillCheckSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SaveOtherOutBill_BillCheckResponse" />
</wsdl:message>
<wsdl:message name="set_SavePOStockInBackBillSoapIn">
<wsdl:part name="parameters" element="tns:set_SavePOStockInBackBill" />
@@ -14199,18 +14292,6 @@
<wsdl:message name="set_SaveProcReportMoveBill_CLD_NewSoapOut">
<wsdl:part name="parameters" element="tns:set_SaveProcReportMoveBill_CLD_NewResponse" />
</wsdl:message>
- <wsdl:message name="set_SaveProcReportMoveBill_MoveStockSoapIn">
- <wsdl:part name="parameters" element="tns:set_SaveProcReportMoveBill_MoveStock" />
- </wsdl:message>
- <wsdl:message name="set_SaveProcReportMoveBill_MoveStockSoapOut">
- <wsdl:part name="parameters" element="tns:set_SaveProcReportMoveBill_MoveStockResponse" />
- </wsdl:message>
- <wsdl:message name="set_SaveProcReportMoveBill_MoveStock_CLD_NewSoapIn">
- <wsdl:part name="parameters" element="tns:set_SaveProcReportMoveBill_MoveStock_CLD_New" />
- </wsdl:message>
- <wsdl:message name="set_SaveProcReportMoveBill_MoveStock_CLD_NewSoapOut">
- <wsdl:part name="parameters" element="tns:set_SaveProcReportMoveBill_MoveStock_CLD_NewResponse" />
- </wsdl:message>
<wsdl:message name="set_SaveSellOutBackBill_CLD_NewSoapIn">
<wsdl:part name="parameters" element="tns:set_SaveSellOutBackBill_CLD_New" />
</wsdl:message>
@@ -14391,6 +14472,12 @@
<wsdl:message name="set_SaveMateReplenishOutBill_BillCheckSoapOut">
<wsdl:part name="parameters" element="tns:set_SaveMateReplenishOutBill_BillCheckResponse" />
</wsdl:message>
+ <wsdl:message name="set_SaveEntrustReplenishOutBill_BillCheckSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SaveEntrustReplenishOutBill_BillCheck" />
+ </wsdl:message>
+ <wsdl:message name="set_SaveEntrustReplenishOutBill_BillCheckSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SaveEntrustReplenishOutBill_BillCheckResponse" />
+ </wsdl:message>
<wsdl:message name="set_SaveEntrustInBackBill_CLDSoapIn">
<wsdl:part name="parameters" element="tns:set_SaveEntrustInBackBill_CLD" />
</wsdl:message>
@@ -14469,6 +14556,12 @@
<wsdl:message name="set_SaveEntrustOutBill_CLDSoapOut">
<wsdl:part name="parameters" element="tns:set_SaveEntrustOutBill_CLDResponse" />
</wsdl:message>
+ <wsdl:message name="set_SaveEntrustOutBill_BillCheckSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SaveEntrustOutBill_BillCheck" />
+ </wsdl:message>
+ <wsdl:message name="set_SaveEntrustOutBill_BillCheckSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SaveEntrustOutBill_BillCheckResponse" />
+ </wsdl:message>
<wsdl:message name="set_SaveOtherOutBackBillSoapIn">
<wsdl:part name="parameters" element="tns:set_SaveOtherOutBackBill" />
</wsdl:message>
@@ -14528,18 +14621,6 @@
</wsdl:message>
<wsdl:message name="set_SaveOtherOutBill_CLD_NewSoapOut">
<wsdl:part name="parameters" element="tns:set_SaveOtherOutBill_CLD_NewResponse" />
- </wsdl:message>
- <wsdl:message name="set_SaveOtherOutBill_CLDSoapIn">
- <wsdl:part name="parameters" element="tns:set_SaveOtherOutBill_CLD" />
- </wsdl:message>
- <wsdl:message name="set_SaveOtherOutBill_CLDSoapOut">
- <wsdl:part name="parameters" element="tns:set_SaveOtherOutBill_CLDResponse" />
- </wsdl:message>
- <wsdl:message name="set_SaveOtherOutBill_BillCheckSoapIn">
- <wsdl:part name="parameters" element="tns:set_SaveOtherOutBill_BillCheck" />
- </wsdl:message>
- <wsdl:message name="set_SaveOtherOutBill_BillCheckSoapOut">
- <wsdl:part name="parameters" element="tns:set_SaveOtherOutBill_BillCheckResponse" />
</wsdl:message>
<wsdl:message name="set_SavePonderationBillMain_Temp_ChangGuiSoapIn">
<wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_ChangGui" />
@@ -15970,6 +16051,22 @@
<wsdl:part name="parameters" element="tns:GetSc_ICMOBillListResponse" />
</wsdl:message>
<wsdl:portType name="WebService1Soap">
+ <wsdl:operation name="getCheckOpen">
+ <wsdl:input message="tns:getCheckOpenSoapIn" />
+ <wsdl:output message="tns:getCheckOpenSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="getGetDataBase">
+ <wsdl:input message="tns:getGetDataBaseSoapIn" />
+ <wsdl:output message="tns:getGetDataBaseSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="getCheckCzymc">
+ <wsdl:input message="tns:getCheckCzymcSoapIn" />
+ <wsdl:output message="tns:getCheckCzymcSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="getSub_GetCurPeriod">
+ <wsdl:input message="tns:getSub_GetCurPeriodSoapIn" />
+ <wsdl:output message="tns:getSub_GetCurPeriodSoapOut" />
+ </wsdl:operation>
<wsdl:operation name="getDataSetBySQL">
<wsdl:input message="tns:getDataSetBySQLSoapIn" />
<wsdl:output message="tns:getDataSetBySQLSoapOut" />
@@ -16009,6 +16106,22 @@
<wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
<wsdl:input message="tns:set_SavePonderationBillMain_Temp_BarCode_MouldSoapIn" />
<wsdl:output message="tns:set_SavePonderationBillMain_Temp_BarCode_MouldSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="GetICInventoryByBarCodeSP_View">
+ <wsdl:input message="tns:GetICInventoryByBarCodeSP_ViewSoapIn" />
+ <wsdl:output message="tns:GetICInventoryByBarCodeSP_ViewSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="GetMaterByBarCodeSP_View">
+ <wsdl:input message="tns:GetMaterByBarCodeSP_ViewSoapIn" />
+ <wsdl:output message="tns:GetMaterByBarCodeSP_ViewSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="SetFIFOPonderationBillMain_Temp">
+ <wsdl:input message="tns:SetFIFOPonderationBillMain_TempSoapIn" />
+ <wsdl:output message="tns:SetFIFOPonderationBillMain_TempSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Fast">
+ <wsdl:input message="tns:set_SavePonderationBillMain_Temp_BarCode_FastSoapIn" />
+ <wsdl:output message="tns:set_SavePonderationBillMain_Temp_BarCode_FastSoapOut" />
</wsdl:operation>
<wsdl:operation name="get_CheckTypeByBarCode">
<wsdl:input message="tns:get_CheckTypeByBarCodeSoapIn" />
@@ -16334,21 +16447,13 @@
<wsdl:input message="tns:getDataSetByMasterSQLSoapIn" />
<wsdl:output message="tns:getDataSetByMasterSQLSoapOut" />
</wsdl:operation>
- <wsdl:operation name="getCheckOpen">
- <wsdl:input message="tns:getCheckOpenSoapIn" />
- <wsdl:output message="tns:getCheckOpenSoapOut" />
+ <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock">
+ <wsdl:input message="tns:set_SaveProcReportMoveBill_MoveStockSoapIn" />
+ <wsdl:output message="tns:set_SaveProcReportMoveBill_MoveStockSoapOut" />
</wsdl:operation>
- <wsdl:operation name="getGetDataBase">
- <wsdl:input message="tns:getGetDataBaseSoapIn" />
- <wsdl:output message="tns:getGetDataBaseSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="getCheckCzymc">
- <wsdl:input message="tns:getCheckCzymcSoapIn" />
- <wsdl:output message="tns:getCheckCzymcSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="getSub_GetCurPeriod">
- <wsdl:input message="tns:getSub_GetCurPeriodSoapIn" />
- <wsdl:output message="tns:getSub_GetCurPeriodSoapOut" />
+ <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock_CLD_New">
+ <wsdl:input message="tns:set_SaveProcReportMoveBill_MoveStock_CLD_NewSoapIn" />
+ <wsdl:output message="tns:set_SaveProcReportMoveBill_MoveStock_CLD_NewSoapOut" />
</wsdl:operation>
<wsdl:operation name="set_CheckPOInStockBill_New">
<wsdl:input message="tns:set_CheckPOInStockBill_NewSoapIn" />
@@ -16662,21 +16767,13 @@
<wsdl:input message="tns:GetMaterByBarCode_ViewSoapIn" />
<wsdl:output message="tns:GetMaterByBarCode_ViewSoapOut" />
</wsdl:operation>
- <wsdl:operation name="GetICInventoryByBarCodeSP_View">
- <wsdl:input message="tns:GetICInventoryByBarCodeSP_ViewSoapIn" />
- <wsdl:output message="tns:GetICInventoryByBarCodeSP_ViewSoapOut" />
+ <wsdl:operation name="set_SaveOtherOutBill_CLD">
+ <wsdl:input message="tns:set_SaveOtherOutBill_CLDSoapIn" />
+ <wsdl:output message="tns:set_SaveOtherOutBill_CLDSoapOut" />
</wsdl:operation>
- <wsdl:operation name="GetMaterByBarCodeSP_View">
- <wsdl:input message="tns:GetMaterByBarCodeSP_ViewSoapIn" />
- <wsdl:output message="tns:GetMaterByBarCodeSP_ViewSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="SetFIFOPonderationBillMain_Temp">
- <wsdl:input message="tns:SetFIFOPonderationBillMain_TempSoapIn" />
- <wsdl:output message="tns:SetFIFOPonderationBillMain_TempSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Fast">
- <wsdl:input message="tns:set_SavePonderationBillMain_Temp_BarCode_FastSoapIn" />
- <wsdl:output message="tns:set_SavePonderationBillMain_Temp_BarCode_FastSoapOut" />
+ <wsdl:operation name="set_SaveOtherOutBill_BillCheck">
+ <wsdl:input message="tns:set_SaveOtherOutBill_BillCheckSoapIn" />
+ <wsdl:output message="tns:set_SaveOtherOutBill_BillCheckSoapOut" />
</wsdl:operation>
<wsdl:operation name="set_SavePOStockInBackBill">
<wsdl:input message="tns:set_SavePOStockInBackBillSoapIn" />
@@ -16870,14 +16967,6 @@
<wsdl:input message="tns:set_SaveProcReportMoveBill_CLD_NewSoapIn" />
<wsdl:output message="tns:set_SaveProcReportMoveBill_CLD_NewSoapOut" />
</wsdl:operation>
- <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock">
- <wsdl:input message="tns:set_SaveProcReportMoveBill_MoveStockSoapIn" />
- <wsdl:output message="tns:set_SaveProcReportMoveBill_MoveStockSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock_CLD_New">
- <wsdl:input message="tns:set_SaveProcReportMoveBill_MoveStock_CLD_NewSoapIn" />
- <wsdl:output message="tns:set_SaveProcReportMoveBill_MoveStock_CLD_NewSoapOut" />
- </wsdl:operation>
<wsdl:operation name="set_SaveSellOutBackBill_CLD_New">
<wsdl:input message="tns:set_SaveSellOutBackBill_CLD_NewSoapIn" />
<wsdl:output message="tns:set_SaveSellOutBackBill_CLD_NewSoapOut" />
@@ -16998,6 +17087,10 @@
<wsdl:input message="tns:set_SaveMateReplenishOutBill_BillCheckSoapIn" />
<wsdl:output message="tns:set_SaveMateReplenishOutBill_BillCheckSoapOut" />
</wsdl:operation>
+ <wsdl:operation name="set_SaveEntrustReplenishOutBill_BillCheck">
+ <wsdl:input message="tns:set_SaveEntrustReplenishOutBill_BillCheckSoapIn" />
+ <wsdl:output message="tns:set_SaveEntrustReplenishOutBill_BillCheckSoapOut" />
+ </wsdl:operation>
<wsdl:operation name="set_SaveEntrustInBackBill_CLD">
<wsdl:input message="tns:set_SaveEntrustInBackBill_CLDSoapIn" />
<wsdl:output message="tns:set_SaveEntrustInBackBill_CLDSoapOut" />
@@ -17050,6 +17143,10 @@
<wsdl:input message="tns:set_SaveEntrustOutBill_CLDSoapIn" />
<wsdl:output message="tns:set_SaveEntrustOutBill_CLDSoapOut" />
</wsdl:operation>
+ <wsdl:operation name="set_SaveEntrustOutBill_BillCheck">
+ <wsdl:input message="tns:set_SaveEntrustOutBill_BillCheckSoapIn" />
+ <wsdl:output message="tns:set_SaveEntrustOutBill_BillCheckSoapOut" />
+ </wsdl:operation>
<wsdl:operation name="set_SaveOtherOutBackBill">
<wsdl:input message="tns:set_SaveOtherOutBackBillSoapIn" />
<wsdl:output message="tns:set_SaveOtherOutBackBillSoapOut" />
@@ -17089,14 +17186,6 @@
<wsdl:operation name="set_SaveOtherOutBill_CLD_New">
<wsdl:input message="tns:set_SaveOtherOutBill_CLD_NewSoapIn" />
<wsdl:output message="tns:set_SaveOtherOutBill_CLD_NewSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="set_SaveOtherOutBill_CLD">
- <wsdl:input message="tns:set_SaveOtherOutBill_CLDSoapIn" />
- <wsdl:output message="tns:set_SaveOtherOutBill_CLDSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="set_SaveOtherOutBill_BillCheck">
- <wsdl:input message="tns:set_SaveOtherOutBill_BillCheckSoapIn" />
- <wsdl:output message="tns:set_SaveOtherOutBill_BillCheckSoapOut" />
</wsdl:operation>
<wsdl:operation name="set_SavePonderationBillMain_Temp_ChangGui">
<wsdl:input message="tns:set_SavePonderationBillMain_Temp_ChangGuiSoapIn" />
@@ -18053,6 +18142,42 @@
</wsdl:portType>
<wsdl:binding name="WebService1Soap" type="tns:WebService1Soap">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="getCheckOpen">
+ <soap:operation soapAction="http://tempuri.org/getCheckOpen" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="getGetDataBase">
+ <soap:operation soapAction="http://tempuri.org/getGetDataBase" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="getCheckCzymc">
+ <soap:operation soapAction="http://tempuri.org/getCheckCzymc" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="getSub_GetCurPeriod">
+ <soap:operation soapAction="http://tempuri.org/getSub_GetCurPeriod" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="getDataSetBySQL">
<soap:operation soapAction="http://tempuri.org/getDataSetBySQL" style="document" />
<wsdl:input>
@@ -18136,6 +18261,42 @@
</wsdl:operation>
<wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
<soap:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Mould" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="GetICInventoryByBarCodeSP_View">
+ <soap:operation soapAction="http://tempuri.org/GetICInventoryByBarCodeSP_View" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="GetMaterByBarCodeSP_View">
+ <soap:operation soapAction="http://tempuri.org/GetMaterByBarCodeSP_View" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="SetFIFOPonderationBillMain_Temp">
+ <soap:operation soapAction="http://tempuri.org/SetFIFOPonderationBillMain_Temp" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Fast">
+ <soap:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Fast" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -18872,8 +19033,8 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="getCheckOpen">
- <soap:operation soapAction="http://tempuri.org/getCheckOpen" style="document" />
+ <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock">
+ <soap:operation soapAction="http://tempuri.org/set_SaveProcReportMoveBill_MoveStock" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -18881,26 +19042,8 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="getGetDataBase">
- <soap:operation soapAction="http://tempuri.org/getGetDataBase" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getCheckCzymc">
- <soap:operation soapAction="http://tempuri.org/getCheckCzymc" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getSub_GetCurPeriod">
- <soap:operation soapAction="http://tempuri.org/getSub_GetCurPeriod" style="document" />
+ <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock_CLD_New">
+ <soap:operation soapAction="http://tempuri.org/set_SaveProcReportMoveBill_MoveStock_CLD_New" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -19610,8 +19753,8 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="GetICInventoryByBarCodeSP_View">
- <soap:operation soapAction="http://tempuri.org/GetICInventoryByBarCodeSP_View" style="document" />
+ <wsdl:operation name="set_SaveOtherOutBill_CLD">
+ <soap:operation soapAction="http://tempuri.org/set_SaveOtherOutBill_CLD" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -19619,26 +19762,8 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="GetMaterByBarCodeSP_View">
- <soap:operation soapAction="http://tempuri.org/GetMaterByBarCodeSP_View" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="SetFIFOPonderationBillMain_Temp">
- <soap:operation soapAction="http://tempuri.org/SetFIFOPonderationBillMain_Temp" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Fast">
- <soap:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Fast" style="document" />
+ <wsdl:operation name="set_SaveOtherOutBill_BillCheck">
+ <soap:operation soapAction="http://tempuri.org/set_SaveOtherOutBill_BillCheck" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -20078,24 +20203,6 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock">
- <soap:operation soapAction="http://tempuri.org/set_SaveProcReportMoveBill_MoveStock" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock_CLD_New">
- <soap:operation soapAction="http://tempuri.org/set_SaveProcReportMoveBill_MoveStock_CLD_New" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
<wsdl:operation name="set_SaveSellOutBackBill_CLD_New">
<soap:operation soapAction="http://tempuri.org/set_SaveSellOutBackBill_CLD_New" style="document" />
<wsdl:input>
@@ -20366,6 +20473,15 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="set_SaveEntrustReplenishOutBill_BillCheck">
+ <soap:operation soapAction="http://tempuri.org/set_SaveEntrustReplenishOutBill_BillCheck" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="set_SaveEntrustInBackBill_CLD">
<soap:operation soapAction="http://tempuri.org/set_SaveEntrustInBackBill_CLD" style="document" />
<wsdl:input>
@@ -20483,6 +20599,15 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="set_SaveEntrustOutBill_BillCheck">
+ <soap:operation soapAction="http://tempuri.org/set_SaveEntrustOutBill_BillCheck" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="set_SaveOtherOutBackBill">
<soap:operation soapAction="http://tempuri.org/set_SaveOtherOutBackBill" style="document" />
<wsdl:input>
@@ -20566,24 +20691,6 @@
</wsdl:operation>
<wsdl:operation name="set_SaveOtherOutBill_CLD_New">
<soap:operation soapAction="http://tempuri.org/set_SaveOtherOutBill_CLD_New" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SaveOtherOutBill_CLD">
- <soap:operation soapAction="http://tempuri.org/set_SaveOtherOutBill_CLD" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SaveOtherOutBill_BillCheck">
- <soap:operation soapAction="http://tempuri.org/set_SaveOtherOutBill_BillCheck" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -22736,6 +22843,42 @@
</wsdl:binding>
<wsdl:binding name="WebService1Soap12" type="tns:WebService1Soap">
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="getCheckOpen">
+ <soap12:operation soapAction="http://tempuri.org/getCheckOpen" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="getGetDataBase">
+ <soap12:operation soapAction="http://tempuri.org/getGetDataBase" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="getCheckCzymc">
+ <soap12:operation soapAction="http://tempuri.org/getCheckCzymc" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="getSub_GetCurPeriod">
+ <soap12:operation soapAction="http://tempuri.org/getSub_GetCurPeriod" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="getDataSetBySQL">
<soap12:operation soapAction="http://tempuri.org/getDataSetBySQL" style="document" />
<wsdl:input>
@@ -22819,6 +22962,42 @@
</wsdl:operation>
<wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
<soap12:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Mould" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="GetICInventoryByBarCodeSP_View">
+ <soap12:operation soapAction="http://tempuri.org/GetICInventoryByBarCodeSP_View" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="GetMaterByBarCodeSP_View">
+ <soap12:operation soapAction="http://tempuri.org/GetMaterByBarCodeSP_View" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="SetFIFOPonderationBillMain_Temp">
+ <soap12:operation soapAction="http://tempuri.org/SetFIFOPonderationBillMain_Temp" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Fast">
+ <soap12:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Fast" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -23555,8 +23734,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="getCheckOpen">
- <soap12:operation soapAction="http://tempuri.org/getCheckOpen" style="document" />
+ <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock">
+ <soap12:operation soapAction="http://tempuri.org/set_SaveProcReportMoveBill_MoveStock" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -23564,26 +23743,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="getGetDataBase">
- <soap12:operation soapAction="http://tempuri.org/getGetDataBase" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getCheckCzymc">
- <soap12:operation soapAction="http://tempuri.org/getCheckCzymc" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getSub_GetCurPeriod">
- <soap12:operation soapAction="http://tempuri.org/getSub_GetCurPeriod" style="document" />
+ <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock_CLD_New">
+ <soap12:operation soapAction="http://tempuri.org/set_SaveProcReportMoveBill_MoveStock_CLD_New" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -24293,8 +24454,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="GetICInventoryByBarCodeSP_View">
- <soap12:operation soapAction="http://tempuri.org/GetICInventoryByBarCodeSP_View" style="document" />
+ <wsdl:operation name="set_SaveOtherOutBill_CLD">
+ <soap12:operation soapAction="http://tempuri.org/set_SaveOtherOutBill_CLD" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -24302,26 +24463,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="GetMaterByBarCodeSP_View">
- <soap12:operation soapAction="http://tempuri.org/GetMaterByBarCodeSP_View" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="SetFIFOPonderationBillMain_Temp">
- <soap12:operation soapAction="http://tempuri.org/SetFIFOPonderationBillMain_Temp" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Fast">
- <soap12:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Fast" style="document" />
+ <wsdl:operation name="set_SaveOtherOutBill_BillCheck">
+ <soap12:operation soapAction="http://tempuri.org/set_SaveOtherOutBill_BillCheck" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -24761,24 +24904,6 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock">
- <soap12:operation soapAction="http://tempuri.org/set_SaveProcReportMoveBill_MoveStock" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SaveProcReportMoveBill_MoveStock_CLD_New">
- <soap12:operation soapAction="http://tempuri.org/set_SaveProcReportMoveBill_MoveStock_CLD_New" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
<wsdl:operation name="set_SaveSellOutBackBill_CLD_New">
<soap12:operation soapAction="http://tempuri.org/set_SaveSellOutBackBill_CLD_New" style="document" />
<wsdl:input>
@@ -25049,6 +25174,15 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="set_SaveEntrustReplenishOutBill_BillCheck">
+ <soap12:operation soapAction="http://tempuri.org/set_SaveEntrustReplenishOutBill_BillCheck" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="set_SaveEntrustInBackBill_CLD">
<soap12:operation soapAction="http://tempuri.org/set_SaveEntrustInBackBill_CLD" style="document" />
<wsdl:input>
@@ -25166,6 +25300,15 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="set_SaveEntrustOutBill_BillCheck">
+ <soap12:operation soapAction="http://tempuri.org/set_SaveEntrustOutBill_BillCheck" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="set_SaveOtherOutBackBill">
<soap12:operation soapAction="http://tempuri.org/set_SaveOtherOutBackBill" style="document" />
<wsdl:input>
@@ -25249,24 +25392,6 @@
</wsdl:operation>
<wsdl:operation name="set_SaveOtherOutBill_CLD_New">
<soap12:operation soapAction="http://tempuri.org/set_SaveOtherOutBill_CLD_New" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SaveOtherOutBill_CLD">
- <soap12:operation soapAction="http://tempuri.org/set_SaveOtherOutBill_CLD" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SaveOtherOutBill_BillCheck">
- <soap12:operation soapAction="http://tempuri.org/set_SaveOtherOutBill_BillCheck" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -27419,10 +27544,10 @@
</wsdl:binding>
<wsdl:service name="WebService1">
<wsdl:port name="WebService1Soap" binding="tns:WebService1Soap">
- <soap:address location="http://localhost/WEBS/WebService1.asmx" />
+ <soap:address location="http://192.168.63.7/WEBS-WMS/WebService1.asmx" />
</wsdl:port>
<wsdl:port name="WebService1Soap12" binding="tns:WebService1Soap12">
- <soap12:address location="http://localhost/WEBS/WebService1.asmx" />
+ <soap12:address location="http://192.168.63.7/WEBS-WMS/WebService1.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 1ecd39b..fb33827 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -8,9 +8,9 @@
- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
- <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
- </sectionGroup>
+ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+ <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+ </sectionGroup>
</configSections>
<connectionStrings>
<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />
@@ -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.195/WEBS-WMS/WebService1.asmx"/> <!--棰滃彴寮忔満-->
+ <add key="sUrl" value="http://192.168.63.7/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"/> 鍗氭棩绉戞妧-->
@@ -96,7 +96,7 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.63.195/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
+ <endpoint address="http://192.168.63.7/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
name="WebService1Soap" />
</client>
@@ -105,7 +105,7 @@
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://192.168.63.195/WEBS-WMS/WebService1.asmx</value>
+ <value>http://192.168.63.7/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 6f7c654..9e9911b 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -325,6 +325,7 @@
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_ICBomBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" />
<Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
@@ -392,6 +393,8 @@
<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
<Compile Include="Controllers\Gy_MateMouldController.cs" />
<Compile Include="Controllers\Pay_ReportController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
@@ -437,23 +440,34 @@
<Compile Include="Controllers\浠撳瓨绠＄悊\鎵爜寮傚父璁板綍\KF_PonderationBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryList_WMSBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Gy_BarCodeBill_OutController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\KF_BarCodeStatusChangeBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Sc_BarCodeController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\璋冩嫧鐩樼偣\Kf_MoveStockRequestBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\棰嗘枡鍙戣揣\apiController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\棰嗘枡鍙戣揣\Kf_StepFoldOutBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\棰嗘枡鍙戣揣\Kf_StockOutRequestBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" />
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSupController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RecConditionBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SettleStyleController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillEditController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillListController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StaffController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockStatusBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SupplierContactBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxMIXController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxRateBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
@@ -626,6 +640,7 @@
<Compile Include="Models\鍩虹璧勬枡\ConkType.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_StockPlace.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" />
<Compile Include="Models\鍩虹璧勬枡\PackType.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkStation.cs" />
@@ -882,24 +897,34 @@
<Folder Include="Views\Cj_CallGoodsBillMain\" />
<Folder Include="Views\Cj_ComplementGoodsBill\" />
<Folder Include="Views\Cj_SendGoodsBill\" />
+ <Folder Include="Views\Gy_BarCodeBill_Out\" />
<Folder Include="Views\Gy_COMMONCONTACTBill\" />
<Folder Include="Views\Gy_ConkType\" />
+ <Folder Include="Views\Gy_CustLocation\" />
<Folder Include="Views\Gy_DutyBill\" />
<Folder Include="Views\Gy_EquipType\" />
<Folder Include="Views\Gy_ICBomBill\" />
<Folder Include="Views\Gy_MateMould\" />
+ <Folder Include="Views\Gy_MatePriceSup\" />
+ <Folder Include="Views\Gy_Operator\" />
<Folder Include="Views\Gy_PackType\" />
<Folder Include="Views\Gy_PaymentConditionListBill\" />
+ <Folder Include="Views\Gy_RateType\" />
<Folder Include="Views\Gy_RecConditionBill\" />
<Folder Include="Views\Gy_RoutingGroup\" />
+ <Folder Include="Views\Gy_SettleStyle\" />
<Folder Include="Views\Gy_SOPBill\" />
+ <Folder Include="Views\Gy_Staff\" />
<Folder Include="Views\Gy_StockStatusBill\" />
<Folder Include="Views\Gy_SupplierContactBill\" />
+ <Folder Include="Views\Gy_TaxMIXMain\" />
<Folder Include="Views\Gy_TaxRateBill\" />
<Folder Include="Views\Gy_WorkStation\" />
+ <Folder Include="Views\Gy_Work\" />
<Folder Include="Views\JIT_DayPlanPlatFormBill\" />
<Folder Include="Views\JIT_DayPlanPlatFormImport\" />
<Folder Include="Views\JIT_ICMOSortBillList\" />
+ <Folder Include="Views\KF_BarCodeStatusChangeBill\" />
<Folder Include="Views\KF_ICInventoryList_WMSBill\" />
<Folder Include="Views\Kf_ICStockBillMain\" />
<Folder Include="Views\Kf_ICStockInOutBill\" />
@@ -907,6 +932,7 @@
<Folder Include="Views\KF_PonderationBill\" />
<Folder Include="Views\kf_StepFoldinBill\" />
<Folder Include="Views\Kf_StepFoldOutBill\" />
+ <Folder Include="Views\Kf_StockOutRequestBill\" />
<Folder Include="Views\Mes_OrderProcFlowAllReport\" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\Pay_Report\" />
@@ -914,6 +940,8 @@
<Folder Include="Views\ProductionReturnBill\" />
<Folder Include="Views\QC_Management\" />
<Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
+ <Folder Include="Views\Sb_EquipSparepartsBill\" />
+ <Folder Include="Views\Sb_EquipSparepartsChangeBill\" />
<Folder Include="Views\Sc_CallGoodsBackRequestBill\" />
<Folder Include="Views\Sc_ComplementGoodBill\" />
<Folder Include="Views\Sc_ComplementGoodBill_ZXBZ\" />
@@ -971,10 +999,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://localhost/WEBS/WebService1.asmx">
+ <WebReferenceUrl Include="http://192.168.63.7/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://localhost/WEBS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://192.168.63.7/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index b5bf336..d152f2c 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -18,7 +18,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopReport.cs"
index 2ddd55c..8d13608 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopReport.cs"
@@ -166,8 +166,8 @@
{
sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
}
- //
- DSet = SubCn.RunProcReturn("exec h_p_CJKB" + sDlgWhere, "Gy_Czygl");
+
+ DSet = SubCn.RunProcReturn("exec h_p_CJKB " + sDlgWhere, "h_p_CJKB");
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -176,33 +176,21 @@
}
//
grdMain.DataSource = DSet.Tables[0].DefaultView;
- //鑾峰彇鍔ㄦ�佸垪 锛堢墿鏂欎俊鎭級
- //DsHead = SubCn.RunProcReturn("exec h_p_Sc_GetProcExchReportHead " + sDlgWhere, "Gy_Czygl");
-
- //for (int a = 0; a < DsHead.Tables[0].Rows.Count; a++)
- //{
- // if (ClsPub.isLong(DsHead.Tables[0].Rows[a]["HMaterID"]) != 0)
- // {
- // grdMain.Columns.Add(ClsPub.isStrNull(DsHead.Tables[0].Rows[a]["HMaterID"]), ClsPub.isStrNull(DsHead.Tables[0].Rows[a]["HName"]));
- // grdMain.Columns[BCol].Tag = ClsPub.isLong(DsHead.Tables[0].Rows[a]["HMaterID"]);
- // BCol = BCol + 1;
- // }
- //}
BCol = 7;
//鑾峰彇鍔ㄦ�佸唴瀹� 锛堟暟閲忎俊鎭級
- for (int row = 0; row <= grdMain.RowCount - 1; row++)
- {
- for (int col = BCol; col <= grdMain.ColumnCount - 1; col++)
- {
- HDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HDeptID")].Value);
- DsQty = SubCn.RunProcReturn("exec h_p_CJKB '" + HDeptID.ToString(), "Gy_Czygl");
- if (DsQty != null && DsQty.Tables[0].Rows.Count > 0)
- {
- grdMain.Rows[row].Cells[col].Value = DBUtility.ClsPub.isDoule(DsQty.Tables[0].Rows[0]["HQty"], 2);
- }
- }
- }
+ //for (int row = 0; row <= grdMain.RowCount - 1; row++)
+ //{
+ // for (int col = BCol; col <= grdMain.ColumnCount - 1; col++)
+ // {
+ // //HDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HDeptID")].Value);
+ // DsQty = SubCn.RunProcReturn("exec h_p_CJKB " + 0, "h_p_CJKB");
+ // if (DsQty != null && DsQty.Tables[0].Rows.Count > 0)
+ // {
+ // grdMain.Rows[row].Cells[col].Value = DBUtility.ClsPub.isDoule(DsQty.Tables[0].Rows[0]["HQty"], 2);
+ // }
+ // }
+ //}
//璁剧疆鍚堣鍒�
string sTotalCol = "";
--
Gitblit v1.9.1