From 340d08dd77e729ccc7ca7602a72721740e374379 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 02 十二月 2024 15:21:30 +0800
Subject: [PATCH] 1
---
NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll | 0
WebAPI/WebAPI.csproj.user | 23
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 26
NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs | 2
NETERPNoWin/bin/x86/Debug/Pub_Control.dll | 0
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs | 13
WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs | 737 ++++
NETERPNoWin/bin/x86/Debug/SQLHelper.dll | 0
WebAPI/Properties/Settings.Designer.cs | 2
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs | 248 +
NETERPNoWin/bin/x86/Debug/Model.pdb | 0
NETERPNoWin/bin/x86/Debug/KanbanInfo.ini | 27
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache | 0
NETERPNoWin/bin/x86/Debug/Pub_Control.pdb | 0
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 242 +
NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb | 0
WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs | 2
WebAPI/ListModels.cs | 73
NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/WarM.pdb | 0
WebAPI/Controllers/人事管理/人员履历/HR_PersonnelResumeController.cs | 4
NETERPNoWin/bin/x86/Debug/OAM.dll | 0
NETERPNoWin/bin/x86/Debug/WarM.dll | 0
NETERPNoWin/bin/x86/Debug/WorkM.pdb | 0
Model/质检管理/ClsGy_EnvironmentTestSchemeBillSub.cs | 16
NETERPNoWin/bin/x86/Debug/Model.dll | 0
WebAPI/WebAPI.csproj | 11
WebAPI/Web References/WebS/WebService1.wsdl | 498 ++-
NETERPNoWin/bin/x86/Debug/Kanban.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 18
WebAPI/Controllers/条码管理/WEBSController.cs | 312 +
Model/Model.csproj | 5
NETERPNoWin/bin/x86/Debug/OAM.pdb | 0
NETERPNoWin/bin/x86/Debug/Kanban.pdb | 0
NETERPNoWin/bin/x86/Debug/WarM.dll.config | 2
NETERPNoWin/bin/x86/Debug/BLL.dll | 0
WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs | 2
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt | 56
WebAPI/Web References/WebS/Reference.cs | 2825 ++++++++++++------
Model/质检管理/ClsGy_EnvironmentTestSchemeBillMain.cs | 15
WebAPI/Web.config | 24
NETERPNoWin/bin/x86/Debug/BLL.pdb | 0
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs | 62
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache | 0
DAL/质检管理/ClsQC_EnvironmentTestDotCheckBillMain.cs | 267 +
WebAPI/Controllers/工资管理/Pay_ErrWorkTimesRequestBillController.cs | 3
NETERPNoWin/bin/x86/Debug/SQLHelper.pdb | 0
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 144
LMES/DingDing_autoGetData.cs | 10
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 73
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs | 60
NETERPNoWin/bin/x86/Debug/PlanM.dll | 0
NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 72
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs | 2
DAL/质检管理/ClsGy_EnvironmentTestSchemeBillMain.cs | 256 +
NETERPNoWin/bin/x86/Debug/Pub_Class.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 9
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 42
WebAPI/Controllers/品质管理/基础资料/Gy_BaseInformationController.cs | 764 ++++
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs | 2
NETERPNoWin/bin/x86/Debug/Pub_Class.dll | 0
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 444 ++
WebAPI/Models/ClsSc_MESBeginWorkBillSub.cs | 6
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 60
WebAPI/Controllers/CGGL/Cg_PayableBillController.cs | 59
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 2
Model/基础资料/基础资料/ClsGy_EnvironmentTestItem_Model.cs | 15
WebAPI/Controllers/WebAPIController.cs | 278 +
WebAPI/Controllers/品质管理/环境检测单/QC_EnvironmentTestDotCheckBillController.cs | 763 ++++
WebAPI/Web References/WebS/WebService1.disco | 6
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 4
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 82
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 9
DAL/DAL.csproj | 2
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 4
NETERPNoWin/bin/x86/Debug/grdWidth.wyini | 4
WebAPI/Properties/Settings.settings | 2
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 42
NETERPNoWin/bin/x86/Debug/WorkM.dll | 0
NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0
WebAPI/Service/LuBaoSevice.cs | 20
NETERPNoWin/bin/x86/Debug/BaseSet.pdb | 0
NETERPNoWin/bin/x86/Debug/DBUtility.dll | 0
WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs | 62
WebAPI/DLL/ClsGy_EnvironmentTestItem_Ctl.cs | 101
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config | 3
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache | 2
NETERPNoWin/bin/x86/Debug/DBUtility.pdb | 0
NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll | 0
WebAPI/Controllers/Pay_ReportController.cs | 68
NETERPNoWin/bin/x86/Debug/DAL.pdb | 0
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LangChao.cs | 4
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 133
Model/质检管理/ClsQC_EnvironmentTestDotCheckBillSub.cs | 16
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0
Model/质检管理/ClsQC_EnvironmentTestDotCheckBillMain.cs | 20
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 19
WebAPI/Web References/WebS/Reference.map | 4
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 2
/dev/null | 6
NETERPNoWin/bin/x86/Debug/DAL.dll | 0
105 files changed, 7,817 insertions(+), 1,374 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index fb3b1e8..8c96bf8 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -93,6 +93,7 @@
<Compile Include="ClsPM_WorkPlanMonthBillMain.cs" />
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList_CusBarCodeBill.cs" />
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOReportBillList_CusBarCodeBill.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_EnvironmentTestDotCheckBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_MonthTarGetBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSignBill.cs" />
<Compile Include="WMS\ClsWMS_CusBarCodeCheckBill.cs" />
@@ -688,6 +689,7 @@
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProdReportCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBill.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsGy_EnvironmentTestSchemeBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_MaterPreventErrMouldBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillMain.cs" />
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsGy_EnvironmentTestSchemeBillMain.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsGy_EnvironmentTestSchemeBillMain.cs"
new file mode 100644
index 0000000..9c3b6df
--- /dev/null
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsGy_EnvironmentTestSchemeBillMain.cs"
@@ -0,0 +1,256 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_EnvironmentTestSchemeBillMain : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsGy_EnvironmentTestSchemeBillMain omodel = new Model.ClsGy_EnvironmentTestSchemeBillMain();
+ public List<Model.ClsGy_EnvironmentTestSchemeBillSub> DetailColl = new List<Model.ClsGy_EnvironmentTestSchemeBillSub>();
+
+ public ClsGy_EnvironmentTestSchemeBillMain()
+ {
+ base.MvarItemKeySub = "Gy_EnvironmentTestSchemeBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "Gy_EnvironmentTestSchemeBillMain";
+ base.MvarReportTitle="鐜妫�娴嬫柟妗�";
+ base.BillType = "3340";
+ base.HBillSubType = "3340";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsGy_EnvironmentTestSchemeBillMain()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Gy_EnvironmentTestSchemeBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+
+ ",HDeptID =" + omodel.HDeptID.ToString() +
+ ",HCenterWorkID =" + omodel.HCenterWorkID.ToString() +
+ ",HProcID =" + omodel.HProcID.ToString() +
+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsGy_EnvironmentTestSchemeBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Gy_EnvironmentTestSchemeBillSub " +
+ "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
+ ",HPrjNo,HEnvironmentItemID,HTargetVal,HUpLimit,HDownLimit) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "','" + oSub.HRemark +
+ "','" + oSub.HPrjNo +
+ "','" + oSub.HEnvironmentItemID +
+ "','" + oSub.HTargetVal +
+ "','" + oSub.HUpLimit +
+ "','" + oSub.HDownLimit +
+ "')";
+ oCn.RunProc(subSql);
+ }
+
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+
+ DataSet ds;
+
+ oCn.BeginTran();
+
+ //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅
+ while (true)
+ {
+ ds = oCn.RunProcReturn("select * from Gy_EnvironmentTestSchemeBillMain where HInterID = " + omodel.HInterID, "Gy_EnvironmentTestSchemeBillMain");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ //涓昏〃
+ string mainSql = "insert into Gy_EnvironmentTestSchemeBillMain" +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
+ ",HDeptID,HCenterWorkID,HProcID) " +
+ "values(" +
+ "" + (omodel.HYear.ToString() != "0" ? omodel.HYear.ToString() : DateTime.Now.Year.ToString()) +
+ "," + omodel.HPeriod.ToString() +
+ ",'" + this.BillType +
+ "','" + this.HBillSubType +
+ "'," + omodel.HInterID +
+ ",'" + omodel.HDate +
+ "','" + omodel.HBillNo +
+ "','" + omodel.HRemark +
+ "','getdate()" +
+ "','" + omodel.HMakeDate +
+ "','" + omodel.HDeptID +
+ "','" + omodel.HCenterWorkID +
+ "','" + omodel.HProcID +
+ "')";
+
+ oCn.RunProc(mainSql);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsGy_EnvironmentTestSchemeBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Gy_EnvironmentTestSchemeBillSub " +
+ "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
+ ",HPrjNo,HEnvironmentItemID,HTargetVal,HUpLimit,HDownLimit) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "','" + oSub.HRemark +
+ "','" + oSub.HPrjNo +
+ "','" + oSub.HEnvironmentItemID +
+ "','" + oSub.HTargetVal +
+ "','" + oSub.HUpLimit +
+ "','" + oSub.HDownLimit +
+ "')";
+ oCn.RunProc(subSql);
+ }
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("Select * from Gy_EnvironmentTestSchemeBillMain Where HInterID=" + lngBillKey.ToString(), "Gy_EnvironmentTestSchemeBillMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HInterID =DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HDate =DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from Gy_EnvironmentTestSchemeBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_WorkBeginDotCheckBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsGy_EnvironmentTestSchemeBillSub oSub = new Model.ClsGy_EnvironmentTestSchemeBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_EnvironmentTestDotCheckBillMain.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_EnvironmentTestDotCheckBillMain.cs"
new file mode 100644
index 0000000..b4097d8
--- /dev/null
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_EnvironmentTestDotCheckBillMain.cs"
@@ -0,0 +1,267 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsQC_EnvironmentTestDotCheckBillMain : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsQC_EnvironmentTestDotCheckBillMain omodel = new Model.ClsQC_EnvironmentTestDotCheckBillMain();
+ public List<Model.ClsQC_EnvironmentTestDotCheckBillSub> DetailColl = new List<Model.ClsQC_EnvironmentTestDotCheckBillSub>();
+
+ public ClsQC_EnvironmentTestDotCheckBillMain()
+ {
+ base.MvarItemKeySub = "QC_EnvironmentTestDotCheckBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "QC_EnvironmentTestDotCheckBillMain";
+ base.MvarReportTitle="鐜妫�娴嬪崟";
+ base.BillType = "3340";
+ base.HBillSubType = "3340";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsQC_EnvironmentTestDotCheckBillMain()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate QC_EnvironmentTestDotCheckBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+
+ ",HDeptID =" + omodel.HDeptID.ToString() +
+ ",HCenterWorkID =" + omodel.HCenterWorkID.ToString() +
+ ",HProcID =" + omodel.HProcID.ToString() +
+ ",HCleanType ='" + omodel.HCleanType.ToString() +
+ "',HErrMsgBack ='" + omodel.HErrMsgBack.ToString() +
+ "',HNote ='" + omodel.HNote.ToString() +
+ "',HEmpID =" + omodel.HEmpID.ToString() +
+ ",HEnvironmentTestSchemeID =" + omodel.HEnvironmentTestSchemeID.ToString() +
+ ",HOrgID =" + omodel.HOrgID.ToString() +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsQC_EnvironmentTestDotCheckBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into QC_EnvironmentTestDotCheckBillSub " +
+ "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
+ ",HEnvironmentItemID,HMeasure,HTargetVal,HUpLimit,HDownLimit) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "','" + oSub.HRemark +
+ "','" + oSub.HEnvironmentItemID +
+ "','" + oSub.HMeasure +
+ "','" + oSub.HTargetVal +
+ "','" + oSub.HUpLimit +
+ "','" + oSub.HDownLimit +
+ "')";
+ oCn.RunProc(subSql);
+ }
+
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+
+ DataSet ds;
+
+ oCn.BeginTran();
+
+ //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅
+ while (true)
+ {
+ ds = oCn.RunProcReturn("select * from QC_EnvironmentTestDotCheckBillMain where HInterID = " + omodel.HInterID, "QC_EnvironmentTestDotCheckBillMain");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ //涓昏〃
+ string mainSql = "insert into QC_EnvironmentTestDotCheckBillMain" +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
+ ",HDeptID,HCenterWorkID,HProcID,HCleanType,HErrMsgBack,HNote,HEmpID,HEnvironmentTestSchemeID,HOrgID ) " +
+ "values(" +
+ "" + (omodel.HYear.ToString() != "0" ? omodel.HYear.ToString() : DateTime.Now.Year.ToString()) +
+ "," + omodel.HPeriod.ToString() +
+ ",'" + this.BillType +
+ "','" + this.HBillSubType +
+ "'," + omodel.HInterID +
+ ",'" + omodel.HDate +
+ "','" + omodel.HBillNo +
+ "','" + omodel.HRemark +
+ "','" + omodel.HMaker +
+ "',getdate()" +
+ ",'" + omodel.HDeptID +
+ "','" + omodel.HCenterWorkID +
+ "','" + omodel.HProcID +
+ "','" + omodel.HCleanType +
+ "','" + omodel.HErrMsgBack +
+ "','" + omodel.HNote +
+ "','" + omodel.HEmpID +
+ "','" + omodel.HEnvironmentTestSchemeID +
+ "','" + omodel.HOrgID +
+ "')";
+
+ oCn.RunProc(mainSql);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsQC_EnvironmentTestDotCheckBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into QC_EnvironmentTestDotCheckBillSub " +
+ "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRemark" +
+ ",HEnvironmentItemID,HMeasure,HTargetVal,HUpLimit,HDownLimit) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "','" + oSub.HRemark +
+ "','" + oSub.HEnvironmentItemID +
+ "','" + oSub.HMeasure +
+ "','" + oSub.HTargetVal +
+ "','" + oSub.HUpLimit +
+ "','" + oSub.HDownLimit +
+ "')";
+ oCn.RunProc(subSql);
+ }
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("Select * from QC_EnvironmentTestDotCheckBillMain Where HInterID=" + lngBillKey.ToString(), "QC_EnvironmentTestDotCheckBillMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HInterID =DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HDate =DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from QC_EnvironmentTestDotCheckBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_WorkBeginDotCheckBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsQC_EnvironmentTestDotCheckBillSub oSub = new Model.ClsQC_EnvironmentTestDotCheckBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git a/LMES/DingDing_autoGetData.cs b/LMES/DingDing_autoGetData.cs
index 8e9b291..c965687 100644
--- a/LMES/DingDing_autoGetData.cs
+++ b/LMES/DingDing_autoGetData.cs
@@ -58,11 +58,6 @@
return false;
}
- if (obj.getData_HuaMingCe(ref msg) == false)
- {
- return false;
- }
-
//璁惧缁翠慨璁板綍鍗�
if (obj.getData_EquipRepairWeiXiu(ref msg) == false)
{
@@ -74,6 +69,11 @@
return false;
}
+ if (obj.getData_HuaMingCe(ref msg) == false)
+ {
+ return false;
+ }
+
return true;
}
catch (Exception e)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 3f2aabf..4bcdef2 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -147,9 +147,12 @@
<Compile Include="WMS\ClsWMS_CusBarCodeCheckBillMain.cs" />
<Compile Include="鍣ㄥ叿绠＄悊\ClsSc_MouldBatchWorkCheckBillMain.cs" />
<Compile Include="鍣ㄥ叿绠＄悊\ClsSc_MouldBatchWorkCheckBillSub.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_EnvironmentTestItem_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TechnologyParameterType_Model .cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RestDay_Model.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub_Plan.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_EnvironmentTestDotCheckBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_EnvironmentTestDotCheckBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_MonthTarGetBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_MonthTarGetBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSignBillMain.cs" />
@@ -701,7 +704,9 @@
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsGy_EnvironmentTestSchemeBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_MaterPreventErrMouldBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsGy_EnvironmentTestSchemeBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsCJ_WIPBeginStockBillMain.cs" />
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_EnvironmentTestItem_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_EnvironmentTestItem_Model.cs"
new file mode 100644
index 0000000..21902d4
--- /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_EnvironmentTestItem_Model.cs"
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_EnvironmentTestItem_Model : DBUtility.ClsGy_Base_Model
+ {
+
+ public DateTime HMakeTime;
+ public int HUSEORGID;
+ public string HMakeEmp;
+ public DateTime HModifyTime;
+ }
+}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsGy_EnvironmentTestSchemeBillMain.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsGy_EnvironmentTestSchemeBillMain.cs"
new file mode 100644
index 0000000..255787b
--- /dev/null
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsGy_EnvironmentTestSchemeBillMain.cs"
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_EnvironmentTestSchemeBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+
+ public Int64 HDeptID; //int ---生产部门（Gy_Department）
+ public Int64 HCenterWorkID; //int --工作中心（Gy_WorkCenter）
+ public Int64 HProcID; //int --工序（gy_Process）
+
+ }
+}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsGy_EnvironmentTestSchemeBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsGy_EnvironmentTestSchemeBillSub.cs"
new file mode 100644
index 0000000..65398d9
--- /dev/null
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsGy_EnvironmentTestSchemeBillSub.cs"
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_EnvironmentTestSchemeBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HPrjNo; // int --次序号
+ public Int64 HEnvironmentItemID; // int --检测项目(Gy_EnvironmentTestItem)
+ public string HTargetVal; // varchar(200) --目标值
+ public string HUpLimit; //varchar(200) --上限值
+ public string HDownLimit; // varchar(200) --下限值
+
+ }
+}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_EnvironmentTestDotCheckBillMain.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_EnvironmentTestDotCheckBillMain.cs"
new file mode 100644
index 0000000..cea1dc2
--- /dev/null
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_EnvironmentTestDotCheckBillMain.cs"
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsQC_EnvironmentTestDotCheckBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+
+ public Int64 HDeptID; //int ---生产部门（Gy_Department）
+ public Int64 HCenterWorkID; //int --工作中心（Gy_WorkCenter）
+ public Int64 HProcID; //int --工序（gy_Process）
+ public string HCleanType; //varchar(20) --洁净度（A，B，C）
+ public string HErrMsgBack; //varchar(500)--异常原因
+ public string HNote; //varchar(500) --改善对策
+ public Int64 HEmpID; //int --记录人（Gy_Employee）
+ public string HEnvironmentTestSchemeID; //int --环境检测方案(Gy_EnvironmentTestSchemeBillMain)
+ public Int64 HOrgID; // int --组织
+ }
+}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_EnvironmentTestDotCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_EnvironmentTestDotCheckBillSub.cs"
new file mode 100644
index 0000000..6839eb9
--- /dev/null
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_EnvironmentTestDotCheckBillSub.cs"
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsQC_EnvironmentTestDotCheckBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HEnvironmentItemID; // int --检测项目(Gy_EnvironmentTestItem)
+ public string HMeasure; // varchar(200) --实际值
+ public string HTargetVal; // varchar(200) --目标值
+ public string HUpLimit; //varchar(200) --上限值
+ public string HDownLimit; // varchar(200) --下限值
+
+ }
+}
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll
index df02f0e..dd375aa 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.dll
+++ b/NETERPNoWin/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.pdb b/NETERPNoWin/bin/x86/Debug/BLL.pdb
index bbad742..cd49197 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.dll b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
index e3b57bc..fdf19f3 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.dll
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
index 8dd2b44..b89aa66 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.dll b/NETERPNoWin/bin/x86/Debug/DAL.dll
index 7430215..097d356 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.dll
+++ b/NETERPNoWin/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.pdb b/NETERPNoWin/bin/x86/Debug/DAL.pdb
index fb936cb..fec6f92 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.dll b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
index bb37f30..7aea836 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.dll
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
index 5e730de..93c9d87 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
index 7ceb9e9..8a24037 100644
--- a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll b/NETERPNoWin/bin/x86/Debug/Kanban.dll
index 8518dbe..e889e8a 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.dll
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.pdb b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
index 729cf94..8350757 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini b/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini
index 58ded1c..b79b725 100644
--- a/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini
+++ b/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini
@@ -214,3 +214,30 @@
Cell-AlternatingBackColor=
Cell-DefaultBackColor=
Header-ColWidth=77
+[Sc_QLKB]
+Title-Caption=1111
+Title-ForeColor=
+Title-FontFamily=
+Title-FontSize=
+Title-FontStyle=
+Title-BackColor=
+Title-PageRows=
+Title-PageDownTimer=
+Title-DisplayTimer=
+Header-ForeColor=
+Header-FontFamily=
+Header-FontSize=
+Header-FontStyle=
+Header-BackColor=
+Header-Alignment=
+Header-RowHeight=
+Header-ColWidth=
+Cell-ForeColor=
+Cell-FontFamily=
+Cell-FontSize=
+Cell-FontStyle=
+Cell-BackColor=
+Cell-Alignment=
+Cell-RowHeight=
+Cell-AlternatingBackColor=
+Cell-DefaultBackColor=
diff --git a/NETERPNoWin/bin/x86/Debug/Model.dll b/NETERPNoWin/bin/x86/Debug/Model.dll
index b088253..b58b9e6 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.dll
+++ b/NETERPNoWin/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.pdb b/NETERPNoWin/bin/x86/Debug/Model.pdb
index 55a9737..f02f8f0 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
index 77d655f..dbd619e 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
new file mode 100644
index 0000000..51278a4
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
index d5efdaa..bf6bb99 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.dll b/NETERPNoWin/bin/x86/Debug/OAM.dll
index b178844..7294a93 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.dll
+++ b/NETERPNoWin/bin/x86/Debug/OAM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.pdb b/NETERPNoWin/bin/x86/Debug/OAM.pdb
index 345defb..1e0db81 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/OAM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.dll b/NETERPNoWin/bin/x86/Debug/PlanM.dll
index 4162bf7..ddcbed9 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.dll
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.pdb b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
index 4a40c24..e628789 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
index 8478cd3..58b3584 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
index ac1a060..a174929 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
index bfd1895..2cac7ce 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
index 2a912b8..1a2f26b 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
index ea08612..1c1cb05 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
index 4cda84e..b85dece 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll b/NETERPNoWin/bin/x86/Debug/WarM.dll
index 36105f3..f7954e6 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll.config b/NETERPNoWin/bin/x86/Debug/WarM.dll.config
index d767ae0..d9658be 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.dll.config
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll.config
@@ -2,4 +2,4 @@
<configuration>
<configSections>
</configSections>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.pdb b/NETERPNoWin/bin/x86/Debug/WarM.pdb
index 5bd2d1b..638ff0e 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WarM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.dll b/NETERPNoWin/bin/x86/Debug/WorkM.dll
index f6032fc..dda65c3 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.pdb b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
index 0caf41d..4999ead 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
index 707ec82..8258182 100644
--- a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
+++ b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
@@ -56,5 +56,5 @@
frmDownMenu任务单设置=100,135,100
Sc_CJKB=
Sc_CGKB=100,100,100,100,100,100,100,100,100,100,100
-Sc_QLKB=
-Sc_WGJCKKB=5,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100
+Sc_QLKB=100,100,100,100,100,100,100,100,100,100,100
+Sc_WGJCKKB=
diff --git a/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
index efc8916..8a24037 100644
--- a/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
index d5f6ada..4b582c6 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache
index 68a9329..fbbdd71 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-a745b9346fad4036762fb74aefe814be70fc1e71
+417e6dc671e47ed52c7b59de94e63aca66435af8
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
index 577e027..1dcbcf0 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
@@ -217,3 +217,59 @@
D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete
D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe
D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.exe.config
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.exe
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\BLL.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\DAL.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\DBUtility.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kanban.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\Model.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\OAM.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\PlanM.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Class.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Control.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\SQLHelper.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\AxInterop.gregn6Lib.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OOXML.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kingdee.BOS.WebApi.Client.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\AxInterop.grdes6Lib.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\Interop.gregn6Lib.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXmlFormats.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXml4Net.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\Newtonsoft.Json.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\stdole.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\BLL.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\DAL.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\DBUtility.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kanban.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\Model.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\OAM.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\PlanM.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Class.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Control.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\SQLHelper.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.dll.config
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.AssemblyReference.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\Interop.gregn6Lib.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.ResolveComReference.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Form1.resources
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Frm_MESSetIni.resources
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.OA_MessageBox.resources
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Frm_Show.resources
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.MDIMain.resources
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Properties.Resources.resources
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Xt_Wait.resources
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.MESMain.resources
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.GenerateResource.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CoreCompileInputs.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
index 07cd5f0..bea1829 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache
index 1dffd52..1ea538c 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
index 77d655f..dbd619e 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
index d5efdaa..bf6bb99 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index b0a9f09..07635be 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -211,6 +211,23 @@
{
omodel.Kf_POStockInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //============采购入库单 校验
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_POStockInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_WHSPCtl")
+ {
+ omodel.Kf_POStockInBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_MultilineCtl")
+ {
+ omodel.Kf_POStockInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_POStockInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//=======================================产品入库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck")
@@ -262,6 +279,24 @@
{
omodel.Kf_ProductInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //============产品入库单 校验
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_ProductInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_WHSPCtl")
+ {
+ omodel.Kf_ProductInBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_MultilineCtl")
+ {
+ omodel.Kf_ProductInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_ProductInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//=======================================================其他入库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoCheck")
{
@@ -321,6 +356,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MultilineCtl")
{
omodel.Kf_OtherInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_OtherInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//==============================================委外入库单
@@ -440,6 +479,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MultilineCtl")
{
omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_MateOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//=======================================销售出库单
@@ -588,6 +631,10 @@
{
omodel.Kf_OtherOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//========================================委外出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck")
@@ -658,6 +705,10 @@
{
omodel.Kf_EntrustOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//=============================生产补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
@@ -722,6 +773,10 @@
{
omodel.Kf_MateReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//================================委外补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoCheck")
@@ -785,6 +840,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MultilineCtl")
{
omodel.Kf_EntrustReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//==================直接调拨单
@@ -853,6 +912,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MultilineCtl")
{
omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//==============================================分步式调出单
@@ -1739,6 +1802,10 @@
}
//=======JIT
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "JIT_DayPlan_TimeFrame")
+ {
+ omodel.JIT_DayPlan_TimeFrame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//==========开班单
//自动审核
@@ -2181,6 +2248,23 @@
{
omodel.Kf_POStockInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //============采购入库单 校验
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_POStockInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_WHSPCtl")
+ {
+ omodel.Kf_POStockInBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_MultilineCtl")
+ {
+ omodel.Kf_POStockInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_POStockInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========产品入库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck")
@@ -2231,6 +2315,23 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_DeleterAndMakerMustSame")
{
omodel.Kf_ProductInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //============产品入库单 校验
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_ProductInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_WHSPCtl")
+ {
+ omodel.Kf_ProductInBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_MultilineCtl")
+ {
+ omodel.Kf_ProductInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_ProductInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//=========其他入库单
@@ -2291,6 +2392,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MultilineCtl")
{
omodel.Kf_OtherInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_OtherInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//=========委外入库单
@@ -2405,6 +2510,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MultilineCtl")
{
omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_MateOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//============销售出库单
@@ -2550,6 +2659,10 @@
{
omodel.Kf_OtherOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//==========委外出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck")
@@ -2618,6 +2731,10 @@
{
omodel.Kf_EntrustOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========生产补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
@@ -2682,6 +2799,10 @@
{
omodel.Kf_MateReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========委外补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoCheck")
@@ -2745,6 +2866,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MultilineCtl")
{
omodel.Kf_EntrustReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//=========直接调拨单
@@ -2813,6 +2938,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MultilineCtl")
{
omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_SourceBarCodeCtl")
+ {
+ omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//============分步式调出单
@@ -3775,6 +3904,10 @@
//=======JIT系统参数
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "JIT_DayPlan_TimeFrame")
+ {
+ omodel.JIT_DayPlan_TimeFrame = 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 e460fcc..225add6 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -47,6 +47,11 @@
public string Kf_POStockInBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_POStockInBill_AutoBarCode; //免扫码模式，条码类型为非唯一条码，上传时自动生成条码扫码记录
public string Kf_POStockInBill_DeleterAndMakerMustSame; //采购入库单暂存删除人必须是制单人
+ //采购入库 校验
+ public string Kf_POStockInBillCheck_MustQtyCtl; //校验数量控制
+ public string Kf_POStockInBillCheck_WHSPCtl; //校验-是否校对仓库仓位
+ public string Kf_POStockInBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
+ public string Kf_POStockInBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//产品入库
public string Kf_ProductInBill_AutoCheck; //保存后是否自动审核
@@ -62,6 +67,11 @@
public string Kf_ProductInBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_ProductInBill_Display; //扫描物料条码后是否自动刷新子表界面（'Y'为是）
public string Kf_ProductInBill_DeleterAndMakerMustSame; //产品入库单暂存删除人必须是制单人
+ //产品入库 校验
+ public string Kf_ProductInBillCheck_MustQtyCtl; //校验数量控制
+ public string Kf_ProductInBillCheck_WHSPCtl; //校验-是否校对仓库仓位
+ public string Kf_ProductInBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
+ public string Kf_ProductInBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//其他入库
public string Kf_OtherInBill_AutoCheck; //保存后是否自动审核
@@ -80,6 +90,7 @@
public string Kf_OtherInBillCheck_MustQtyCtl; //校验数量控制
public string Kf_OtherInBillCheck_WHSPCtl; //校验-是否校对仓库仓位
public string Kf_OtherInBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
+ public string Kf_OtherInBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//委外入库
public string Kf_EntrustInBill_AutoCheck; //保存后是否自动审核
@@ -115,6 +126,7 @@
public string Kf_MateOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_MateOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
public string Kf_MateOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
+ public string Kf_MateOutBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//销售出库
public string Kf_SellOutBill_AutoCheck; //保存后是否自动审核
@@ -157,6 +169,7 @@
public string Kf_OtherOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_OtherOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
public string Kf_OtherOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
+ public string Kf_OtherOutBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//委外出库
public string Kf_EntrustOutBill_AutoCheck; //保存后是否自动审核
@@ -177,6 +190,7 @@
public string Kf_EntrustOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_EntrustOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
public string Kf_EntrustOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
+ public string Kf_EntrustOutBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//生产补料
public string Kf_MateReplenishOutBill_AutoCheck; //保存后是否自动审核
@@ -196,6 +210,7 @@
public string Kf_MateReplenishOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_MateReplenishOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
public string Kf_MateReplenishOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
+ public string Kf_MateReplenishOutBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//委外补料
public string Kf_EntrustReplenishOutBill_AutoCheck; //保存后是否自动审核
@@ -215,6 +230,7 @@
public string Kf_EntrustReplenishOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_EntrustReplenishOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
public string Kf_EntrustReplenishOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
+ public string Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//直接调拨
public string Kf_MoveStockBill_AutoCheck; //保存后是否自动审核
@@ -235,6 +251,7 @@
public string Kf_MoveStockBillCheck_MustQtyCtl; //校验数量控制
public string Kf_MoveStockBillCheck_WHSPCtl; //校验-是否校对仓库仓位
public string Kf_MoveStockBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
+ public string Kf_MoveStockBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//分步式调出单
public string Kf_MoveStockStepOutBill_AutoCheck; //保存后是否自动审核
@@ -554,7 +571,7 @@
//JIT
-
+ public string JIT_DayPlan_TimeFrame; //设置导入计划日期范围
//开班单
public string Sc_MESBeginWorkBill_AutoCheck; //保存后是否自动审核
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 7143ce1..c292047 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,6 +1,15 @@
+<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+=======
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+>>>>>>> b75c484393ae95535edada81e805d05c56652931
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
index 3c4deaf..42705a0 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
@@ -83,6 +83,7 @@
public string sYear = ""; //骞达紙2浣嶏級
public string sYear4 = ""; //骞达紙4浣嶏級
public string sPeriod = ""; //鏈�
+ public string sPeriod2 = ""; //鏈堬紙姝ｅ父锛�
public string sDay = ""; //鏃�
@@ -456,6 +457,7 @@
sYear4 = ClsPub.isDate(sDate).Year.ToString();
sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sPeriod2 = sPeriod.Substring(sPeriod.Length - 2, 2);
sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
sDay = sDay.Substring(sDay.Length - 2, 2);
//==================================
@@ -852,7 +854,7 @@
HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value);
//鑾峰彇鏈�澶ф祦姘村彿
//鏉＄爜鍓嶇紑 = 渚涘簲鍟嗕唬鐮� + 骞� + 鏈� + 鏃�
- sTMNumber = HCusModel + sYear4 + sPeriod + sDay;
+ sTMNumber = HCusModel + sYear4 + sPeriod2 + sDay;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
LWSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index ad1d60a..ffd6a2f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -4356,7 +4356,6 @@
}
#endregion
-
#region 宸ヨ壓鍙傛暟鍒嗙被 鏌ヨ,瀹℃牳锛屽弽瀹℃牳锛岀鐢紝鍙嶇鐢�
/// <summary>
/// 渚涘簲鍟嗗垎绫� 鏌ヨ
@@ -7404,5 +7403,448 @@
}
}
#endregion
+
+ #region 鐜妫�娴嬪崟 鏌ヨ,瀹℃牳锛屽弽瀹℃牳锛岀鐢紝鍙嶇鐢�
+ /// <summary>
+ /// 鐜妫�娴嬪崟 鏌ヨ
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Gy_BadReason/Gy_EnvironmentTestItemList")]
+ [HttpGet]
+ public object Gy_EnvironmentTestItemList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestItem_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql1 = "select * from h_v_Gy_EnvironmentTestItem where 1 = 1";
+ string sql = sql1 + sWhere + " order by 妫�娴嬩唬鐮� ";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_EnvironmentTestItem");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鐜妫�娴嬪崟瀹℃牳銆佸弽瀹℃牳
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_BadReason/AuditGy_EnvironmentTestItem")]
+ [HttpGet]
+ public object AuditGy_EnvironmentTestItem(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_EnvironmentTestItem_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_EnvironmentTestItem where HItemID=" + HInterID, "Gy_EnvironmentTestItem");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_EnvironmentTestItem set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update Gy_EnvironmentTestItem set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+ /// <summary>
+ /// 鐜妫�娴嬪崟绂佺敤銆佸弽绂佺敤
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_BadReason/StopGy_EnvironmentTestItem")]
+ [HttpGet]
+ public object StopGy_EnvironmentTestItem(int HInterID, int IsStop, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_EnvironmentTestItem_Close", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_EnvironmentTestItem where HItemID=" + HInterID, "Gy_EnvironmentTestItem");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_EnvironmentTestItem set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ oCN.RunProc("update Gy_EnvironmentTestItem set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region 鏍￠獙椤圭洰鍒楄〃 鏂囦欢涓婁紶
+ [Route("Gy_EnvironmentTestItem/Gy_EnvironmentTestItem_Excel")]
+ [HttpPost]
+ public json Gy_EnvironmentTestItem_Excel()
+ {
+ json res = new json();
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable provisional = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = provisional.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ provisional.Rows.Add(row);
+ }
+
+ //鍒ゆ柇鍒�
+ string error = JudgmentGy_EnvironmentTestItemColumns(provisional);
+ if (error.Length > 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ res.data = null;
+ return res;
+ }
+
+ for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ {
+ string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�娴嬩唬鐮�"].ToString());
+ string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�娴嬪悕绉�"].ToString());
+ string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+ //鑾峰彇鐪熷疄琛屾暟
+ int line = i + 1;
+ }
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = error;
+ res.data = provisional;
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鐜妫�娴嬪崟鍒�
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentGy_EnvironmentTestItemColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("妫�娴嬩唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愭娴嬩唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("妫�娴嬪悕绉�"))
+ error += "娌℃湁鎵惧埌銆愭娴嬪悕绉般�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 鐜妫�娴嬪崟鍒楄〃 瀵煎叆(淇濆瓨)
+ [Route("Gy_EnvironmentTestItem/Gy_EnvironmentTestItem_btnSave")]
+ [HttpPost]
+ public object Gy_EnvironmentTestItem_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ string organ = sArray[2].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestItem_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["妫�娴嬩唬鐮�"].ToString();
+ string HName = item["妫�娴嬪悕绉�"].ToString();
+ string HHelpCode = item["鍔╄鐮�"];
+ string HRemark = item["澶囨敞"].ToString();
+
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_EnvironmentTestItem where HNumber='" + HNumber + "' and HName='" + HName + "'", "Gy_EnvironmentTestItem");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_EnvironmentTestItem (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HMakeTime,HMakeEmp)" +
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_EnvironmentTestItem set HName='" + HName + "', HHelpCode= '" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "' where HNumber= '" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index 789edda..484d2a0 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -38,7 +38,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList where hmainid=" + HInterID, "h_v_IF_POInStockBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillEdit where hmainid=" + HInterID, "h_v_IF_POInStockBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -65,6 +65,62 @@
return objJsonResult;
}
}
+
+ #region 鏀舵枡閫氱煡鍗曞垎椤靛垪琛�
+ [Route("Cg_POInStockBill/page")]
+ [HttpGet]
+ public object Cg_POInStockBillPage(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_POInStockBillList " + page + "," + size + ",''", "h_p_IF_POInStockBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_POInStockBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_POInStockBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
/// <summary>
/// 杩斿洖鏀舵枡閫氱煡鍗曞垪琛�
@@ -2633,7 +2689,7 @@
}
string sql = "select * from h_v_Cg_POInStockBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Cg_POInStockBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Cg_POInStockBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index ba14fd5..7654825 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -25,7 +25,70 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
- /// <summary>
+ #region 閲囪喘璁㈠崟鍒嗛〉鍒楄〃
+ [Route("Cg_POOrderBill/page")]
+ [HttpGet]
+ public object Cg_POOrderBillPage(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillList", 3, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛�
+ bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
+ if (!isCgjl)
+ {
+ sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' and HEmpID >0 )";
+ }
+
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_POOrderBillList " + page + "," + size + ",''", "h_p_IF_POOrderBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_POOrderBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_POOrderBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
+ /// <summary>
/// 杩斿洖閲囪喘璁㈠崟鍒楄〃
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
@@ -1275,7 +1338,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillEdit where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -3054,7 +3117,7 @@
}
string sql = "select * from h_v_Cg_POOrderBillQuerySub where hmainid = "+ hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Cg_POOrderBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Cg_POOrderBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -3139,6 +3202,81 @@
}
}
#endregion
+
+ #region 鍑哄簱姹囨�� 鏌ヨ
+ [Route("Xs_SeOrderOutStockSumReport/Xs_SeOrderOutStockSumReportList")]
+ [HttpGet]
+ public object Xs_SeOrderOutStockSumReportList(string sWhere)
+ {
+ try
+ {
+ //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+
+ ds = oCN.RunProcReturn($"exec h_p_Xs_SeOrderOutStockSumReport " + sWhere + "", "h_p_Xs_SeOrderOutStockSumReport");
+
+ List<object> listCol = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ listCol.Add(JsonConvert.DeserializeObject(str));
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = listCol;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍏ュ簱姹囨�� 鏌ヨ
+ [Route("Cg_PoOrderInStockSumReport/Cg_PoOrderInStockSumReportList")]
+ [HttpGet]
+ public object Cg_PoOrderInStockSumReportList(string sWhere)
+ {
+ try
+ {
+ //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+
+ ds = oCN.RunProcReturn($"exec h_p_Cg_PoOrderInStockSumReport " + sWhere + "", "h_p_Cg_PoOrderInStockSumReport");
+
+ List<object> listCol = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ listCol.Add(JsonConvert.DeserializeObject(str));
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = listCol;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
index 319c480..b853ee9 100644
--- a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -25,6 +25,63 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ #region 搴斾粯鍗曞垎椤靛垪琛�
+ [Route("Cg_PayableBill/page")]
+ [HttpGet]
+ public object Cg_PayableBillPage(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Kf_POStockInBillList", 1, false, user))
+ //{
+ // objJsonResult.code = CodeConstant.FAIL;
+ // objJsonResult.count = CountConstant.FAIL;
+ // objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Cg_PayableBillList " + page + "," + size + ",''", "h_p_Cg_PayableBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Cg_PayableBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Cg_PayableBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
+
#region 搴斾粯鍗曞垪琛� 鏌ヨ
/// <summary>
/// 杩斿洖搴旀敹鍗曞垪琛�
@@ -1627,7 +1684,7 @@
//}
string sql = "select * from h_v_Cg_PayableBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Cg_PayableBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Cg_PayableBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
index ae5a923..deff087 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -90,6 +90,64 @@
}
}
+
+ #region 閲囪喘鍏ュ簱鍗曞垎椤靛垪琛�
+ [Route("Kf_POStockInBill/page")]
+ [HttpGet]
+ public object Kf_POStockInBillPage(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Kf_POStockInBillList", 1, false, user))
+ //{
+ // objJsonResult.code = CodeConstant.FAIL;
+ // objJsonResult.count = CountConstant.FAIL;
+ // objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Kf_POStockInBillList_New " + page + "," + size + ",''", "h_p_Kf_POStockInBillList_New");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Kf_POStockInBillList_New " + page + "," + size + ",'" + sWhere + "'", "h_p_Kf_POStockInBillList_New");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
+
#region 閲囪喘鍏ュ簱鍗� 淇濆瓨/缂栬緫鍔熻兘
[Route("Kf_POStockInBill/POStockInBillEdit")]
[HttpPost]
@@ -573,7 +631,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_Kf_POStockInBillList where hmainid =" + HInterID, "h_v_Kf_POStockInBillList");
+ ds = oCN.RunProcReturn("select * from h_v_Kf_POStockInBillEdit where hmainid =" + HInterID, "h_v_Kf_POStockInBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1972,7 +2030,7 @@
}
string sql = "select * from h_v_Kf_POStockInBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Kf_POStockInBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Kf_POStockInBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
index bbc13bd..c62ac51 100644
--- a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
+++ b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
@@ -25,6 +25,62 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ #region 浠樻鍗曞垎椤靛垪琛�
+ [Route("YF_PayMentBill/page")]
+ [HttpGet]
+ public object YF_PayMentBillPage(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Kf_POStockInBillList", 1, false, user))
+ //{
+ // objJsonResult.code = CodeConstant.FAIL;
+ // objJsonResult.count = CountConstant.FAIL;
+ // objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_YF_PayMentBillList_New " + page + "," + size + ",''", "h_p_YF_PayMentBillList_New");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_YF_PayMentBillList_New " + page + "," + size + ",'" + sWhere + "'", "h_p_YF_PayMentBillList_New");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
#region 浠樻鍗曞垪琛� 鏌ヨ
/// <summary>
/// 杩斿洖椤圭洰闃舵鍒楄〃
@@ -346,7 +402,7 @@
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_YF_PayMentBillList where hmainid=" + HInterID, "h_v_YF_PayMentBillList");
+ ds = oCN.RunProcReturn("select * from h_v_YF_PayMentBillEdit where hmainid=" + HInterID, "h_v_YF_PayMentBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1108,7 +1164,7 @@
string sql = "select * from h_v_YF_PayMentBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_YF_PayMentBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_YF_PayMentBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
index 544ec93..b399ad4 100644
--- a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
@@ -166,11 +166,20 @@
List<object> columnNameList = new List<object>();
if (num=="1")
{
- ds = oCN.RunProcReturn("select b.HEquipFileNumber 璁惧缂栫爜,b.HName 璁惧鍚嶇О from Sc_ICMOBillStatus_Tmp a left join Gy_EquipFileBillMain b on a.HSourceID=b.HSourceID where HSourceInterID='" + linterid + "' and HProcID='85'", "Gy_EquipFileBillMain");
+ ds = oCN.RunProcReturn("select b.HEquipFileNumber 璁惧缂栫爜,b.HName 璁惧鍚嶇О,c.HProjectNum 椤圭洰缂栧彿,d.HRelBeginDate 寮�濮嬫椂闂�,d.HRelEndDate 缁撴潫鏃堕棿 from Sc_ICMOBillStatus_Tmp a " +
+ "left join Gy_EquipFileBillMain b on a.HSourceID=b.HSourceID " +
+ "left join Sc_ProcessExchangeBillMain c on a.HSourceInterID=c.HInterID " +
+ "left join Sc_ProcessExchangeBillSub d on c.HInterID=d.HInterID and a.HSourceEntryID=d.HEntryID " +
+ "where a.HSourceInterID='" + linterid + "' and a.HProcID='85'", "Gy_EquipFileBillMain");
}
else if (num=="2")
{
- ds = oCN.RunProcReturn("SELECT ef.HEquipFileNumber AS 璁惧缂栫爜,ef.HName AS 璁惧鍚嶇О FROM Gy_EquipFileBillMain ef JOIN Sc_ICMOBillStatus_Tmp tmp ON ef.HSourceID = tmp.HSourceID where HSourceInterID='" + linterid + "' and HProcID='186')", "Gy_EquipFileBillMain");
+ ds = oCN.RunProcReturn("SELECT ef1.HEquipFileNumber AS 璁惧缂栫爜,ef1.HName AS 璁惧鍚嶇О,d.HRelBeginDate 寮�濮嬫椂闂�,d.HRelEndDate 缁撴潫鏃堕棿 FROM Gy_EquipFileBillMain ef " +
+ "JOIN Sc_ICMOBillStatus_Tmp tmp ON ef.HSourceID = tmp.HSourceID " +
+ "left join Gy_EquipFileBillMain ef1 on ef1.HMainSourceID=ef.HInterID " +
+ "left join Sc_ProcessExchangeBillMain c on tmp.HSourceInterID=c.HInterID " +
+ "left join Sc_ProcessExchangeBillSub d on c.HInterID=d.HInterID and tmp.HSourceEntryID=d.HEntryID " +
+ "where tmp.HSourceInterID='" + linterid + "' and tmp.HProcID='186'", "Gy_EquipFileBillMain");
}
//娣诲姞鍒楀悕
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 076d216..eddce9c 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -322,9 +322,23 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ string HProcID = "0";
ds = oCN.RunProcReturn("select * from gy_czygl WITH(NOLOCK) where czymc='" + user + "'", "gy_czygl");
- string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
+ }
+
+ //鍒ゆ柇褰撳墠娴佽浆鍗℃槸鍚︽槸寮�宸�
+ ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus='1'", "Sc_ICMOBillStatus_Tmp");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗″彿:" + HBarCode + ",娴佽浆鍗℃湭寮�宸�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = oCN.RunProcReturn(@"exec h_p_Gy_BarCodeBillBomList '" + HBarCode + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
if (ds.Tables[0].Rows.Count == 0)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index bda557a..ab05368 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -159,7 +159,7 @@
string sReturn = "";
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
- if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴") //绯荤粺鍙傛暟 鍒ゆ柇瀹㈡埛
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴" || oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�") //绯荤粺鍙傛暟 鍒ゆ柇瀹㈡埛
{
//鍒ゆ柇鐢熶骇璧勬簮
if (HSourceID <= 0)
diff --git a/WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs b/WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs
index 694171f..c02545a 100644
--- a/WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs
+++ b/WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs
@@ -268,7 +268,6 @@
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
- oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
@@ -816,5 +815,741 @@
}
#endregion
+ #region 鐜妫�娴嬮」鐩� 鏌ヨ
+ [Route("Gy_MaterPreventErrMouldBill/get锘縂y_EnvironmentTestSchemeBillMainList")]
+ [HttpGet]
+ public object get锘縂y_EnvironmentTestSchemeBillMainList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_EnvironmentTestSchemeBillMain_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EnvironmentTestSchemeBillMainList order by 鍗曟嵁鍙� desc", "锘縣_v_Gy_EnvironmentTestSchemeBillMainList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_EnvironmentTestSchemeBillMainList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_Gy_EnvironmentTestSchemeBillMainList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 鑾峰彇缂栬緫鍒楄〃鏁版嵁
+ [Route("Gy_MaterPreventErrMouldBill/锘縂y_EnvironmentTestSchemeBillMainEditList")]
+ [HttpGet]
+ public object Gy_EnvironmentTestSchemeBillMainEditList(string HInterID, string User)
+ {
+ try
+ {
+ List<DataTable> tableList = new List<DataTable>();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Edit", 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EnvironmentTestSchemeBillMainList where HInterID = " + HInterID, " h_v_Gy_EnvironmentTestSchemeBillMainList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 淇濆瓨/缂栬緫
+ [Route("Gy_MaterPreventErrMouldBill/Save锘縂y_EnvironmentTestSchemeBillMain")]
+ [HttpPost]
+ public object Save锘縂y_EnvironmentTestSchemeBillMain([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string user = sArray[3].ToString();//鐢ㄦ埛鍚�
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_EnvironmentTestSchemeBillMain_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsGy_EnvironmentTestSchemeBillMain oBill = new DAL.ClsGy_EnvironmentTestSchemeBillMain();
+ List<Model.Cls锘縂y_EnvironmentTestSchemeBillMain> lsmain = new List<Model.Cls锘縂y_EnvironmentTestSchemeBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_锘縂y_EnvironmentTestSchemeBillMain(msg2);
+ foreach (Model.Cls锘縂y_EnvironmentTestSchemeBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (OBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, OBill.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (OBill.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (OBill.omodel.HChecker != "" && OBill.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (OBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "7516";
+ oItem.HBillSubType = "7516";
+
+
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ // 琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<Model.ClsGy_EnvironmentTestSchemeBillSub> ls = new List<Model.ClsGy_EnvironmentTestSchemeBillSub>();
+ ls = oListModels.getObjectByJson_Gy_EnvironmentTestSchemeBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsGy_EnvironmentTestSchemeBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 鍒犻櫎
+ [Route("Gy_MaterPreventErrMouldBill/Delete锘縂y_EnvironmentTestSchemeBill")]
+ [HttpGet]
+ public object Delete锘縂y_EnvironmentTestSchemeBill(string HInterID, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Gy_EnvironmentTestSchemeBillMain where HInterID = " + HInterID);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 瀹℃牳/鍙嶅鏍�
+ [Route("Gy_MaterPreventErrMouldBill/AuditGy_EnvironmentTestSchemeBill")]
+ [HttpGet]
+ public object AuditGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊鏍告潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鍗曟嵁
+ if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘杩涜鍙嶅鏍革紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍙嶅鏍革紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍稿崟鎹�
+ if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 鍏抽棴/鍙嶅叧闂姛鑳�
+ [Route("Gy_MaterPreventErrMouldBill/CloseGy_EnvironmentTestSchemeBill")]
+ [HttpGet]
+ public object CloseGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍗曟嵁
+ if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅叧闂�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸啀鍙嶅叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 浣滃簾/鍙嶄綔搴熷姛鑳�
+ [Route("Gy_MaterPreventErrMouldBill/DropGy_EnvironmentTestSchemeBill")]
+ [HttpGet]
+ public object DropGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈変綔搴熸潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶄綔搴�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸啀鍙嶄綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs b/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs
index e1d9db7..67195a9 100644
--- a/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs
@@ -554,5 +554,67 @@
}
#endregion
+ [Route("Sc_KeyElementBinding/UpdatePartsCode")]
+ [HttpGet]
+ /// <summary>
+ /// 鏇挎崲閰嶄欢鐮佺粦瀹�
+ /// </summary>
+ /// <param name=""></param>
+ /// <returns></returns>
+ public object UpdatePartsCode(string HInterID, string HEntryID, string HPartsCode,string HPartsOld,string HOrgID,string user)
+ {
+ try
+ {
+ if (HInterID == null || HInterID == "" || HInterID == "undefined" || HEntryID == null || HEntryID == "" || HEntryID == "undefined")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触锛佷富鍐呯爜鎴栧瓙鍐呯爜涓虹┖";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ string sql = "exec h_p_Sc_KeyElementBinding_Change '" + HInterID + "','" + HEntryID + "','" + HPartsCode + "','" + HPartsOld + "','" + HOrgID + "','" + user + "'";
+
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_KeyElementBinding_Replace");
+
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "";
+ objJsonResult.data = "娌℃湁杩斿洖鏁版嵁锛�" + sql;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
}
}
diff --git a/WebAPI/Controllers/Pay_ReportController.cs b/WebAPI/Controllers/Pay_ReportController.cs
index ac86a0f..a817a58 100644
--- a/WebAPI/Controllers/Pay_ReportController.cs
+++ b/WebAPI/Controllers/Pay_ReportController.cs
@@ -639,5 +639,73 @@
return objJsonResult;
}
#endregion
+
+ #region [宸ヨ祫鎶ヨ〃--閲戣澏鍙栧�糫
+ [Route("Pay_PayrollReportByKD/list")]
+ [HttpGet]
+ public object Pay_PayrollReportByKD(string sWhere, string user)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Pay_PayrollReportByKD", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潯浠讹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+ int HDeptID = int.Parse(dic["HDeptID"].ToString());
+ string HGroupName = dic["HGroupName"].ToString();
+ string HMaterNumber = dic["HMaterNumber"].ToString();
+ string HMaterName = dic["HMaterName"].ToString();
+ string HMaterModel = dic["HMaterModel"].ToString();
+
+ ds = oCN.RunProcReturn("exec h_p_KD_PayrollReport '" + HBeginDate + "','" + HEndDate + "'," + HDeptID + ",'" + HGroupName + "','" + HMaterNumber + "','" + HMaterName + "','" + HMaterModel + "'", "h_p_KD_PayrollReport");
+
+ //ds = oCN.RunProcReturn("select * from h_v_KD_PayrollReport where 1 = 1 " + sWhere, "h_v_KD_PayrollReport");
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion+
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 9fe6dab..4af70c3 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -1253,23 +1253,25 @@
objJsonResult.data = null;
return objJsonResult;
}
+ //鏇存敼涓哄瓨鍌ㄨ繃绋嬫墽琛�
+ //ds = oCN.RunProcReturn($@"select a.HInterID,a.HDate '鏃ユ湡',a.HBillType,x.HName 鍗曟嵁绫诲瀷,a.HBillNo as '鍗曟嵁鍙�',
+ // CASE WHEN a.HBillStatus <= 1 THEN '鍒涘缓' WHEN a.HBillStatus = 2 THEN '宸插鏍�' WHEN a.HBillStatus = 3 AND
+ // a.HCloseType = 0 THEN '鑷姩鍏抽棴' WHEN a.HBillStatus = 3 AND
+ // a.HCloseType = 1 THEN '鎵嬪姩鍏抽棴' WHEN a.HBillStatus = 4 THEN '宸蹭綔搴�' ELSE '鍏跺畠鐘舵��' END AS 鍗曟嵁鐘舵��,
+ // a.HMaker AS 鍒跺崟浜�, a.HMakeDate AS 鍒跺崟鏃ユ湡,a.HChecker AS 瀹℃牳浜�, a.HCheckDate AS 瀹℃牳鏃ユ湡, a.HUpDater AS 淇敼浜�, a.HUpDateDate AS 淇敼鏃ユ湡,
+ // a.HCloseMan AS 鍏抽棴浜�, a.HCloseDate AS 鍏抽棴鏃ユ湡, a.HDeleteMan AS 浣滃簾浜�, a.HDeleteDate AS 浣滃簾鏃ユ湡
+ // from (
+ // select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Gy_EquipFileBillMain where HInterID = {HInterID} UNION ALL
+ // select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipStockInCheckBillMain where HEquipID = {HInterID} UNION ALL
+ // select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipDotCheckBillMain where HEquipID = {HInterID} UNION ALL
+ // select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipMaintainBillMain where HEquipID = {HInterID} UNION ALL
+ // select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipRepairWorkBillMain where HEquipID = {HInterID} UNION ALL
+ // select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipConkBookBillMain where HEquipID = {HInterID}
+ // )as a,Xt_BillType as x
+ // where a.HBillType = x.HNumber
+ // ORDER BY '鏃ユ湡' ASC;", "h_v_Gy_EquipFileMainList");
- ds = oCN.RunProcReturn($@"select a.HInterID,a.HDate '鏃ユ湡',a.HBillType,x.HName 鍗曟嵁绫诲瀷,a.HBillNo as '鍗曟嵁鍙�',
- CASE WHEN a.HBillStatus <= 1 THEN '鍒涘缓' WHEN a.HBillStatus = 2 THEN '宸插鏍�' WHEN a.HBillStatus = 3 AND
- a.HCloseType = 0 THEN '鑷姩鍏抽棴' WHEN a.HBillStatus = 3 AND
- a.HCloseType = 1 THEN '鎵嬪姩鍏抽棴' WHEN a.HBillStatus = 4 THEN '宸蹭綔搴�' ELSE '鍏跺畠鐘舵��' END AS 鍗曟嵁鐘舵��,
- a.HMaker AS 鍒跺崟浜�, a.HMakeDate AS 鍒跺崟鏃ユ湡,a.HChecker AS 瀹℃牳浜�, a.HCheckDate AS 瀹℃牳鏃ユ湡, a.HUpDater AS 淇敼浜�, a.HUpDateDate AS 淇敼鏃ユ湡,
- a.HCloseMan AS 鍏抽棴浜�, a.HCloseDate AS 鍏抽棴鏃ユ湡, a.HDeleteMan AS 浣滃簾浜�, a.HDeleteDate AS 浣滃簾鏃ユ湡
- from (
- select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Gy_EquipFileBillMain where HInterID = {HInterID} UNION ALL
- select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipStockInCheckBillMain where HEquipID = {HInterID} UNION ALL
- select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipDotCheckBillMain where HEquipID = {HInterID} UNION ALL
- select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipMaintainBillMain where HEquipID = {HInterID} UNION ALL
- select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipRepairWorkBillMain where HEquipID = {HInterID} UNION ALL
- select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sb_EquipConkBookBillMain where HEquipID = {HInterID}
- )as a,Xt_BillType as x
- where a.HBillType = x.HNumber
- ORDER BY '鏃ユ湡' ASC;", "h_v_Gy_EquipFileMainList");
+ ds = oCN.RunProcReturn("exec h_p_Gy_EquipFileReport '" + HInterID + "'", "h_p_Gy_EquipFileReport");
//娣诲姞鍔ㄦ�佸垪淇℃伅
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1315,25 +1317,27 @@
objJsonResult.data = null;
return objJsonResult;
}
+ //鏇存敼涓哄瓨鍌ㄨ繃绋嬫墽琛�
+ //ds = oCN.RunProcReturn($@"select a.HInterID,a.HDate '鏃ユ湡',a.HBillType,x.HName 鍗曟嵁绫诲瀷,a.HBillNo as '鍗曟嵁鍙�',
+ //CASE WHEN a.HBillStatus <= 1 THEN '鍒涘缓' WHEN a.HBillStatus = 2 THEN '宸插鏍�' WHEN a.HBillStatus = 3 AND
+ //a.HCloseType = 0 THEN '鑷姩鍏抽棴' WHEN a.HBillStatus = 3 AND
+ //a.HCloseType = 1 THEN '鎵嬪姩鍏抽棴' WHEN a.HBillStatus = 4 THEN '宸蹭綔搴�' ELSE '鍏跺畠鐘舵��' END AS 鍗曟嵁鐘舵��,
+ //a.HMaker AS 鍒跺崟浜�, a.HMakeDate AS 鍒跺崟鏃ユ湡,a.HChecker AS 瀹℃牳浜�, a.HCheckDate AS 瀹℃牳鏃ユ湡, a.HUpDater AS 淇敼浜�, a.HUpDateDate AS 淇敼鏃ユ湡,
+ //a.HCloseMan AS 鍏抽棴浜�, a.HCloseDate AS 鍏抽棴鏃ユ湡, a.HDeleteMan AS 浣滃簾浜�, a.HDeleteDate AS 浣滃簾鏃ユ湡
+ //from (
+ //select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Gy_MouldFileMain where HInterID = {HInterID} UNION ALL
+ //select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldDotCheckBillMain where HMouldID = {HInterID} UNION ALL
+ //select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldMaintainBillMain where HMouldID = {HInterID} UNION ALL
+ //select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldRepairWorkBillMain where HMouldID = {HInterID} UNION ALL
+ //select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldConkBookBillMain where HMouldID = {HInterID} UNION ALL
+ //select a.HInterID,a.HDate,a.HBillType,a.HBillNo,a.HBillStatus,a.HMaker,a.HMakeDate,a.HChecker,a.HCheckDate,a.HUpDater,a.HUpDateDate,a.HCloseMan,a.HCloseDate,a.HDeleteMan,a.HDeleteDate,a.HCloseType
+ //from Sc_MouldStockBillMain as a,Sc_MouldStockBillSub as b
+ //where a.HInterID = b.HInterID and b.HMaterID = {HInterID} and HBillType in ('3801','3829','3826','3831','3827')
+ //)as a,Xt_BillType as x
+ //where a.HBillType = x.HNumber
+ //ORDER BY '鏃ユ湡' ASC;", "Gy_MouldFileResume");
- ds = oCN.RunProcReturn($@"select a.HInterID,a.HDate '鏃ユ湡',a.HBillType,x.HName 鍗曟嵁绫诲瀷,a.HBillNo as '鍗曟嵁鍙�',
- CASE WHEN a.HBillStatus <= 1 THEN '鍒涘缓' WHEN a.HBillStatus = 2 THEN '宸插鏍�' WHEN a.HBillStatus = 3 AND
- a.HCloseType = 0 THEN '鑷姩鍏抽棴' WHEN a.HBillStatus = 3 AND
- a.HCloseType = 1 THEN '鎵嬪姩鍏抽棴' WHEN a.HBillStatus = 4 THEN '宸蹭綔搴�' ELSE '鍏跺畠鐘舵��' END AS 鍗曟嵁鐘舵��,
- a.HMaker AS 鍒跺崟浜�, a.HMakeDate AS 鍒跺崟鏃ユ湡,a.HChecker AS 瀹℃牳浜�, a.HCheckDate AS 瀹℃牳鏃ユ湡, a.HUpDater AS 淇敼浜�, a.HUpDateDate AS 淇敼鏃ユ湡,
- a.HCloseMan AS 鍏抽棴浜�, a.HCloseDate AS 鍏抽棴鏃ユ湡, a.HDeleteMan AS 浣滃簾浜�, a.HDeleteDate AS 浣滃簾鏃ユ湡
- from (
- select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Gy_MouldFileMain where HInterID = {HInterID} UNION ALL
- select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldDotCheckBillMain where HMouldID = {HInterID} UNION ALL
- select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldMaintainBillMain where HMouldID = {HInterID} UNION ALL
- select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldRepairWorkBillMain where HMouldID = {HInterID} UNION ALL
- select HInterID,HDate,HBillType,HBillNo,HBillStatus,HMaker,HMakeDate,HChecker,HCheckDate,HUpDater,HUpDateDate,HCloseMan,HCloseDate,HDeleteMan,HDeleteDate,HCloseType from Sc_MouldConkBookBillMain where HMouldID = {HInterID} UNION ALL
- select a.HInterID,a.HDate,a.HBillType,a.HBillNo,a.HBillStatus,a.HMaker,a.HMakeDate,a.HChecker,a.HCheckDate,a.HUpDater,a.HUpDateDate,a.HCloseMan,a.HCloseDate,a.HDeleteMan,a.HDeleteDate,a.HCloseType
- from Sc_MouldStockBillMain as a,Sc_MouldStockBillSub as b
- where a.HInterID = b.HInterID and b.HMaterID = {HInterID} and HBillType in ('3801','3829','3826','3831','3827')
- )as a,Xt_BillType as x
- where a.HBillType = x.HNumber
- ORDER BY '鏃ユ湡' ASC;", "Gy_MouldFileResume");
+ ds = oCN.RunProcReturn("exec h_p_Gy_MouldFileReport '" + HInterID + "'", "h_p_Gy_MouldFileReport");
//娣诲姞鍔ㄦ�佸垪淇℃伅
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index a46948a..a438827 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -938,6 +938,79 @@
}
#endregion
+ #region 鎶ュ伐骞冲彴寮�宸ュ崟 鍒峰崱淇濆瓨鍒峰崱浜�
+ /// <summary>
+ /// 寮�宸ュ崟
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sc_MESBeginWorkBill/AddHCardswiper")]
+ [HttpPost]
+ public object AddHCardswiper([FromBody] JObject msg)
+ {
+
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ oCN.BeginTran();
+ DLL.ClsSc_MESBeginWorkBill oBill = new DLL.ClsSc_MESBeginWorkBill();
+ List<Models.ClsSc_MESBeginWorkBillSub> lsmain = new List<Models.ClsSc_MESBeginWorkBillSub>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sc_MESBeginWorkBillSub(msg2);
+
+ foreach (Models.ClsSc_MESBeginWorkBillSub oItemSub in lsmain)
+ {
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ oBill.DetailColl.Add(oItemSub);
+ }
+ ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillSub where HInterID<0 order by HInterID", "Sc_MESBeginWorkBillSub");
+ string HInterID = "-1";
+ if (ds.Tables[0].Rows.Count>0) {
+ HInterID = (int.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString()) - 1).ToString();
+ }
+ //msg3 = msg3.Substring(1, msg3.Length - 2);
+ //msg3 = msg3.Replace("\\", "");
+ //msg3 = msg3.Replace("\n", ""); //\n
+
+ //淇濆瓨
+ foreach (Models.ClsSc_MESBeginWorkBillSub oSub in oBill.DetailColl)
+ {
+ ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillSub where HBillNo_bak='" + oSub.HBillNo_bak + "'", "Sc_MESBeginWorkBillSub");
+ string subSql = "insert into Sc_MESBeginWorkBillSub " +
+ "(HInterID, HEntryID,HBillNo_bak,HCloseMan,HEntryCloseDate,HCloseType, HSourceInterID, HSourceEntryID" +
+ ",HRelationQty,HRelationMoney, HSourceBillNo, HSourceBillType, HRemark,HCardswiperMan,HCardswiperDate,HEmpID) " +
+ "values(" +
+ "'" + HInterID + "','" + (ds.Tables[0].Rows.Count + 1) + "','" + oSub.HBillNo_bak + "','','" + oSub.HEntryCloseDate + "','" + oSub.HCloseType + "','',''," +
+ "0,0,'','','','" + oSub.HCardswiperMan + "',getdate(),'" + oSub.HEmpID + "')";
+ oCN.RunProc(subSql);
+ }
+ oCN.Commit();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
public DataTable getInfodatanow(string hsoucreID)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
diff --git a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
index 0e0a441..83fa34d 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
@@ -509,7 +509,7 @@
//oItem.HMaker = "";
DBUtility.ClsPub.CurUserName = oItem.HMaker;
- UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HMaker = UserName; //鍒跺崟浜�
oItem.HBillType = "3789";
oItem.HBillSubType = "3789";
oItem.HReportType = "3";//锛�1鏉＄爜鎵弿锛�2鏈哄櫒姹囨姤锛�3鎵嬪伐褰曞叆锛�
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
index 394d0cd..8df30d4 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
@@ -20,6 +20,8 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
public static string BillType = "4610";
Sc_WorkBillSortBillMain omdelMian = new Sc_WorkBillSortBillMain();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
#region 鐢熶骇鏃ヨ鍒� 鏂囦欢涓婁紶
[Route("JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_DR")]
@@ -61,11 +63,16 @@
tb2.Columns.Add("ICMOBillHInterID", typeof(Int32));//鐢熶骇璁㈠崟涓籭d
tb2.Columns.Add("ICMOBillHEntryID", typeof(Int32));//鐢熶骇璁㈠崟瀛恑d
tb2.Columns.Add("HProdORGID", typeof(Int32));//缁勭粐id
- tb2.Columns.Add("HSeOrderBillNo", typeof(string));//閿�鍞鍗曞彿
+ tb2.Columns.Add("HSeOrderBillNo", typeof(string));//閿�鍞鍗曞彿
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ oSystemParameter.ShowBill(ref Ret);
+
+ LogService.Write("excel鍊硷細" + ExcelDs.Tables[0].Rows[1][15].ToString());//2024-11-26
//娣诲姞鏁版嵁
for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
- {
+ {
DataRow row = tb2.NewRow();
for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
{
@@ -75,6 +82,21 @@
if (ExcelDs.Tables[0].Rows[i][0].ToString() == "" && ExcelDs.Tables[0].Rows[i][1].ToString() == "")
{
continue;
+ }
+ else if (oSystemParameter.omodel.JIT_DayPlan_TimeFrame != "0" && oSystemParameter.omodel.JIT_DayPlan_TimeFrame != "")
+ {
+ Int32 HDays = Convert.ToInt32(oSystemParameter.omodel.JIT_DayPlan_TimeFrame) * 7;
+
+
+
+
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ if (Convert.ToInt32(ExcelDs.Tables[0].Rows[i][j].ToString()) > 0 )
+ {
+ continue;
+ }
+ }
}
else
{
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index ece6a5d..9828e5d 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -12999,6 +12999,284 @@
}
#endregion
+
+ #region 鐜妫�娴嬪崟 璁剧疆鍒楄〃/淇濆瓨/缂栬緫/鍒犻櫎鏂规硶
+ /// <summary>
+ /// 淇濆瓨鐜妫�娴嬪崟
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveGy_EnvironmentTestItem")]
+ [HttpPost]
+ public object SaveGy_EnvironmentTestItem([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();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestItem_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_EnvironmentTestItem ", "Gy_EnvironmentTestItem");
+ 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"]);
+ maxid += 1;
+ HItemID = maxid;
+ }
+ ListModels oListModels = new ListModels();
+ try
+ {
+ WebAPI.DLL.ClsGy_EnvironmentTestItem_Ctl oBill = new WebAPI.DLL.ClsGy_EnvironmentTestItem_Ctl();
+ List<Model.ClsGy_EnvironmentTestItem_Model> lsmain = new List<Model.ClsGy_EnvironmentTestItem_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_EnvironmentTestItem(msg1);
+ foreach (Model.ClsGy_EnvironmentTestItem_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;
+ }
+ if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+
+ ds = oCN.RunProcReturn("select * from Gy_EnvironmentTestItem where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_EnvironmentTestItem");
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鏂板鏃跺垽鏂�
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+
+ }
+ else
+ {
+ 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;
+ }
+ }
+ }
+ //寰楀埌鐭唬鐮�
+ 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.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+ oItem.HMakeEmp = msg2; //鍒涘缓浜�
+
+ oBill.oModel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鐜妫�娴嬪崟鍙栦俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("GetGy_EnvironmentTestItem_Edit")]
+ [HttpGet]
+ public ApiResult<DataSet> GetGy_EnvironmentTestItem_Edit(string HID)
+ {
+ var model = LuBaoSevice.GetGy_EnvironmentTestItemEdit(HID);
+ return model;
+ }
+
+ /// <summary>
+ /// 鐜妫�娴嬪崟鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("DeltetGy_EnvironmentTestItem")]
+ [HttpGet]
+ public object DeltetGy_EnvironmentTestItem(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestItem_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from Gy_EnvironmentTestItem where HItemID=" + HItemID, "Gy_EnvironmentTestItem");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+
+ oCN.RunProc("delete Gy_EnvironmentTestItem 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
+
+
/// <summary>
/// 鐢ㄥ叧鑱斿伐搴忚幏鍙栦俊鎭�
/// </summary>
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
index 5c0eccf..affcc46 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -1971,7 +1971,7 @@
}
string sql = "select * from h_v_Kf_SellOutBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Kf_SellOutBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Kf_SellOutBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
index d850d4f..d20866a 100644
--- a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
@@ -1700,7 +1700,7 @@
}
string sql = "select * from h_v_Xs_ReceivableBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_ReceivableBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Xs_ReceivableBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 144f767..af3a3a0 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1451,7 +1451,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillEdit where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -3547,7 +3547,7 @@
}
string sql = "select * from h_v_Xs_SeOrderBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_SeOrderBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Xs_SeOrderBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
index 9158cba..53b6023 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -37,7 +37,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid=" + HInterID, "h_v_IF_SeOutStockBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillEdit where hmainid=" + HInterID, "h_v_IF_SeOutStockBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -2232,7 +2232,7 @@
}
string sql = "select * from h_v_Xs_SeOutStockBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_SeOutStockBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Xs_SeOutStockBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
index b634a84..ac7e7cc 100644
--- a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
@@ -1793,7 +1793,7 @@
}
string sql = "select * from h_v_YS_ReceiveBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_YS_ReceiveBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_YS_ReceiveBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git "a/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeController.cs" "b/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeController.cs"
index 11c73d3..d8973ce 100644
--- "a/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeController.cs"
+++ "b/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeController.cs"
@@ -40,8 +40,8 @@
string HNumber = dic["HNumber"].ToString();//鑱屽憳浠ｇ爜
string HName = dic["HName"].ToString();//鑱屽憳
-
- ds = oCN.RunProcReturn("exec h_p_HR_PersonnelResumeReport '" + HNumber.ToString() + "','" + HName + "'", "h_p_HR_PersonnelResumeReport");
+ string HProcID = dic["HProcID"].ToString();//宸ュ簭id
+ ds = oCN.RunProcReturn("exec h_p_HR_PersonnelResumeReport '" + HNumber.ToString() + "','" + HName + "','" + HProcID + "'", "h_p_HR_PersonnelResumeReport");
List<object> columnNameList = new List<object>();
// 閬嶅巻鎵�鏈夎〃
foreach (DataTable table in ds.Tables)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BaseInformationController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BaseInformationController.cs"
new file mode 100644
index 0000000..f9d6b9d
--- /dev/null
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BaseInformationController.cs"
@@ -0,0 +1,764 @@
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using System.Windows.Forms;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.鍝佽川绠＄悊
+{
+ public class Gy_BaseInformationController : ApiController
+ {
+ //璐ㄩ噺绠＄悊鐨勫叏閮ㄥ熀纭�璧勬枡鏂规硶
+
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DAL.ClsGy_EnvironmentTestSchemeBillMain OBill = new DAL.ClsGy_EnvironmentTestSchemeBillMain();
+ public DAL.ClsGy_EnvironmentTestSchemeBillMain BillOld = new DAL.ClsGy_EnvironmentTestSchemeBillMain();
+
+ #region 鐜妫�娴嬮」鐩� 鏌ヨ
+ [Route("Gy_BaseInformation/get锘縂y_EnvironmentTestSchemeBillMainList")]
+ [HttpGet]
+ public object get锘縂y_EnvironmentTestSchemeBillMainList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_EnvironmentTestSchemeBillMain_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EnvironmentTestSchemeBillList order by 鍗曟嵁鍙� desc", "锘縣_v_Gy_EnvironmentTestSchemeBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_EnvironmentTestSchemeBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_Gy_EnvironmentTestSchemeBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 鑾峰彇缂栬緫鍒楄〃鏁版嵁
+ [Route("Gy_BaseInformation/Gy_EnvironmentTestSchemeBillMainEditList")]
+ [HttpGet]
+ public object Gy_EnvironmentTestSchemeBillMainEditList(string linterid, string user)
+ {
+ try
+ {
+ List<DataTable> tableList = new List<DataTable>();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (linterid == null || linterid.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EnvironmentTestSchemeBillEdit where HInterID = " + linterid, " h_v_Gy_EnvironmentTestSchemeBillEdit");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 淇濆瓨/缂栬緫
+ [Route("Gy_BaseInformation/Save锘縂y_EnvironmentTestSchemeBillMain")]
+ [HttpPost]
+ public object Save锘縂y_EnvironmentTestSchemeBillMain([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string user = sArray[3].ToString();//鐢ㄦ埛鍚�
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_EnvironmentTestSchemeBillMain_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsGy_EnvironmentTestSchemeBillMain oBill = new DAL.ClsGy_EnvironmentTestSchemeBillMain();
+ List<Model.Cls锘縂y_EnvironmentTestSchemeBillMain> lsmain = new List<Model.Cls锘縂y_EnvironmentTestSchemeBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_锘縂y_EnvironmentTestSchemeBillMain(msg2);
+ foreach (Model.Cls锘縂y_EnvironmentTestSchemeBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (OBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, OBill.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (OBill.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (OBill.omodel.HChecker != "" && OBill.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (OBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "7516";
+ oItem.HBillSubType = "7516";
+
+
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ // 琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<Model.ClsGy_EnvironmentTestSchemeBillSub> ls = new List<Model.ClsGy_EnvironmentTestSchemeBillSub>();
+ ls = oListModels.getObjectByJson_Gy_EnvironmentTestSchemeBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsGy_EnvironmentTestSchemeBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 鍒犻櫎
+ [Route("Gy_BaseInformation/Delete锘縂y_EnvironmentTestSchemeBill")]
+ [HttpGet]
+ public object Delete锘縂y_EnvironmentTestSchemeBill(string HInterID, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Gy_EnvironmentTestSchemeBillMain where HInterID = " + HInterID);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ 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_BaseInformation/AuditGy_EnvironmentTestSchemeBill")]
+ [HttpGet]
+ public object AuditGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊鏍告潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鍗曟嵁
+ if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘杩涜鍙嶅鏍革紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍙嶅鏍革紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍稿崟鎹�
+ if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 鍏抽棴/鍙嶅叧闂姛鑳�
+ [Route("Gy_BaseInformation/CloseGy_EnvironmentTestSchemeBill")]
+ [HttpGet]
+ public object CloseGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍗曟嵁
+ if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅叧闂�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸啀鍙嶅叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 浣滃簾/鍙嶄綔搴熷姛鑳�
+ [Route("Gy_BaseInformation/DropGy_EnvironmentTestSchemeBill")]
+ [HttpGet]
+ public object DropGy_EnvironmentTestSchemeBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈変綔搴熸潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_EnvironmentTestSchemeBillMain_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶄綔搴�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸啀鍙嶄綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
index 762eb30..211072e 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
@@ -251,7 +251,7 @@
List<object> columnNameList = new List<object>();
string sql1 = "select * from h_v_QC_ProcessCheckBill_Edit where 1 = 1 ";
- string sql = sql1 + sWhere + " order by hmainid desc";
+ string sql = sql1 + sWhere + " order by hmainid desc,hsubid asc";
ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBill_Edit");
//娣诲姞鍒楀悕
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillController.cs"
new file mode 100644
index 0000000..f65b335
--- /dev/null
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillController.cs"
@@ -0,0 +1,763 @@
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using System.Windows.Forms;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.鍝佽川绠＄悊
+{
+ public class QC_EnvironmentTestDotCheckBillController : ApiController
+ {
+ //鐜妫�娴嬪崟
+
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DAL.ClsQC_EnvironmentTestDotCheckBillMain OBill = new DAL.ClsQC_EnvironmentTestDotCheckBillMain();
+ public DAL.ClsQC_EnvironmentTestDotCheckBillMain BillOld = new DAL.ClsQC_EnvironmentTestDotCheckBillMain();
+
+ #region 鐜妫�娴嬮」鐩� 鏌ヨ
+ [Route("QC_EnvironmentTestDotCheckBill/get锘縌C_EnvironmentTestDotCheckBillMainList")]
+ [HttpGet]
+ public object get锘縌C_EnvironmentTestDotCheckBillMainList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("QC_EnvironmentTestDotCheckBillMain_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_QC_EnvironmentTestDotCheckBillList order by 鍗曟嵁鍙� desc", "锘縣_v_QC_EnvironmentTestDotCheckBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_QC_EnvironmentTestDotCheckBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_QC_EnvironmentTestDotCheckBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 鑾峰彇缂栬緫鍒楄〃鏁版嵁
+ [Route("QC_EnvironmentTestDotCheckBill/QC_EnvironmentTestDotCheckBillMainEditList")]
+ [HttpGet]
+ public object QC_EnvironmentTestDotCheckBillMainEditList(string linterid, string user)
+ {
+ try
+ {
+ List<DataTable> tableList = new List<DataTable>();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("QC_EnvironmentTestDotCheckBillMain_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (linterid == null || linterid.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_QC_EnvironmentTestDotCheckBillEdit where HInterID = " + linterid, " h_v_QC_EnvironmentTestDotCheckBillEdit");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 淇濆瓨/缂栬緫
+ [Route("QC_EnvironmentTestDotCheckBill/Save锘縌C_EnvironmentTestDotCheckBillMain")]
+ [HttpPost]
+ public object Save锘縌C_EnvironmentTestDotCheckBillMain([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string user = sArray[3].ToString();//鐢ㄦ埛鍚�
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("QC_EnvironmentTestDotCheckBillMain_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsQC_EnvironmentTestDotCheckBillMain oBill = new DAL.ClsQC_EnvironmentTestDotCheckBillMain();
+ List<Model.Cls锘縌C_EnvironmentTestDotCheckBillMain> lsmain = new List<Model.Cls锘縌C_EnvironmentTestDotCheckBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_锘縌C_EnvironmentTestDotCheckBillMain(msg2);
+ foreach (Model.Cls锘縌C_EnvironmentTestDotCheckBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (OBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, OBill.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (OBill.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (OBill.omodel.HChecker != "" && OBill.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (OBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "7524";
+ oItem.HBillSubType = "7524";
+
+
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ // 琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<Model.ClsQC_EnvironmentTestDotCheckBillSub> ls = new List<Model.ClsQC_EnvironmentTestDotCheckBillSub>();
+ ls = oListModels.getObjectByJson_QC_EnvironmentTestDotCheckBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsQC_EnvironmentTestDotCheckBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 鍒犻櫎
+ [Route("QC_EnvironmentTestDotCheckBill/Delete锘縌C_EnvironmentTestDotCheckBill")]
+ [HttpGet]
+ public object Delete锘縌C_EnvironmentTestDotCheckBill(string HInterID, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("QC_EnvironmentTestDotCheckBillMain_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from QC_EnvironmentTestDotCheckBillMain where HInterID = " + HInterID);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ 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("QC_EnvironmentTestDotCheckBill/AuditQC_EnvironmentTestDotCheckBill")]
+ [HttpGet]
+ public object AuditQC_EnvironmentTestDotCheckBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊鏍告潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_EnvironmentTestDotCheckBillMain_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "QC_EnvironmentTestDotCheckBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鍗曟嵁
+ if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘杩涜鍙嶅鏍革紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍙嶅鏍革紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍稿崟鎹�
+ if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 鍏抽棴/鍙嶅叧闂姛鑳�
+ [Route("QC_EnvironmentTestDotCheckBill/CloseQC_EnvironmentTestDotCheckBill")]
+ [HttpGet]
+ public object CloseQC_EnvironmentTestDotCheckBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_EnvironmentTestDotCheckBillMain_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "QC_EnvironmentTestDotCheckBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍗曟嵁
+ if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅叧闂�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸啀鍙嶅叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐜妫�娴嬮」鐩� 浣滃簾/鍙嶄綔搴熷姛鑳�
+ [Route("QC_EnvironmentTestDotCheckBill/DropQC_EnvironmentTestDotCheckBill")]
+ [HttpGet]
+ public object DropQC_EnvironmentTestDotCheckBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈変綔搴熸潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_EnvironmentTestDotCheckBillMain_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "QC_EnvironmentTestDotCheckBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶄綔搴�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸啀鍙嶄綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index 4593319..35b30b8 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -690,20 +690,20 @@
}
#endregion
- #region 璐ㄩ噺妯″潡 璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥� 鏍规嵁娴佽浆鍗¤幏鍙栬澶�+妯″叿
+ #region 璐ㄩ噺妯″潡 璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥� 鏍规嵁娴佽浆鍗�+宸ュ簭 鑾峰彇璁惧
[Route("QC_CustomerAppealReport/Get_EquipList")]
[HttpGet]
- public object Get_EquipList(string HProcExchBillNo, string user)
+ public object Get_EquipList(string HProcExchBillNo,string HProcID, string user)
{
try
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("select distinct b.HInterID HItemID,b.HEquipFileNumber HEquipFileNumber,b.HName HName,d.HMouldNo HMouldNumber,d.HName HMouldName " +
- " from SB_EquipICMOTechParamBillMain a left join Gy_EquipFileBillMain b on a.HEquipID=b.HInterID" +
- " left join Sc_ICMOBillStatus_Tmp c on a.HProcExchInterID = c.HSourceInterID and a.HProcExchEntryID = c.HSourceEntryID and a.HProcID = c.HProcID" +
- " left join Gy_MouldFileMain d on c.HMouldID = d.HInterID where HProcExchBillNo='" + HProcExchBillNo + "'", "SB_EquipICMOTechParamBillMain");
+ ds = oCN.RunProcReturn("select isnull(c.HInterID,0)璁惧id,isnull(c.HEquipFileNumber,'') 璁惧浠ｇ爜,isnull(c.HName,'') 璁惧鍚嶇О,b.HRelBeginDate 寮�濮嬫椂闂�,b.HRelEndDate 缁撴潫鏃堕棿 from Sc_ProcessExchangeBillMain a " +
+ " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID" +
+ " left join Gy_EquipFileBillMain c on b.HSourceID=c.HSourceID" +
+ " where a.HBillNo='" + HProcExchBillNo + "'and b.HProcID='"+ HProcID + "' and b.HSourceID !=0 ", "Sc_ProcessExchangeBillMain");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -744,11 +744,13 @@
Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
string HProcExchBillNo = dic["HProcExchBillNo"].ToString();
- string HProcName = dic["HProcName"].ToString();
+ string HProcID = dic["HProcID"].ToString();
string HTechParamName = dic["HTechParamName"].ToString();
- string HEquipName = dic["HEquipName"].ToString();
+ string HEquipID = dic["HEquipID"].ToString();
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
- if ((HProcExchBillNo == null || HProcExchBillNo == "")&&(HProcName == null || HProcName == "") && (HTechParamName == null || HTechParamName == "") && (HEquipName == null || HEquipName == ""))
+ if ((HProcExchBillNo == null || HProcExchBillNo == "")&&(HProcID == null || HProcID == "") && (HTechParamName == null || HTechParamName == "") && (HEquipID == null || HEquipID == ""))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -757,7 +759,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "','"+HEquipName+"','"+Type+"'", "h_p_SB_EquipICMOTechParamBillList");
+ ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcID + "','" + HTechParamName + "','"+ HEquipID + "','" + HBeginDate + "','" + HEndDate + "','" + Type+"'", "h_p_SB_EquipICMOTechParamBillList");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1604,13 +1606,13 @@
//鐐瑰嚮涓昏〃鏍肩殑娴佽浆鍗�,鏌ヨ瀛愯〃鏍兼暟鎹�
[Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right")]
[HttpGet]
- public object Get_QC_FiveMenOneRingList_Right(string linterid, string user)
+ public object Get_QC_FiveMenOneRingList_Right(string linterid,string HProcID,string SNs, string user)
{
try
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "'", "h_p_QC_FiveMenOneRingList_Query");
+ ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "','"+ HProcID + "','" + SNs + "'", "h_p_QC_FiveMenOneRingList_Query");
// 閬嶅巻鎵�鏈夎〃
foreach (DataTable table in ds.Tables)
@@ -1800,14 +1802,64 @@
[Route("QC_CustomerAppealReport/Get_EquipICMOTechParamList")]
[HttpGet]
- public object Get_EquipICMOTechParamList(string linterid, string user)
+ public object Get_EquipICMOTechParamList(string linterid, string HProcID, string user)
{
try
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn(@"select a.HProcExchBillNo,g.HEquipFileNumber,g.HName 璁惧鍚嶇О,b.HName 鐗╂枡鍚嶇О,h.HName 宸ュ簭鍚嶇О from SB_EquipICMOTechParamBillMain a left join Gy_Material b on a.HMaterID = b.HItemID
- left join Gy_Source e on a.HSourceID = e.HItemID left join Gy_EquipFileBillMain g on a.HEquipID = g.HInterID left join Gy_Process h on a.HProcID = h.HItemID", "SB_EquipICMOTechParamBillMain");
+ ds = oCN.RunProcReturn("select a.HBillNo 宸ュ簭娴佽浆鍗″彿,e.HInterID 璁惧id,e.HEquipFileNumber 璁惧浠ｇ爜,e.HName 璁惧鍚嶇О,d.HName 鐢熶骇璧勬簮,a.HMaterID 鐗╂枡id,c.HName 鐗╂枡鍚嶇О,b.HProcID 宸ュ簭id,f.HName 宸ュ簭鍚嶇О,b.HRelBeginDate 寮�濮嬫椂闂�,b.HRelEndDate 缁撴潫鏃堕棿 " +
+ "from Sc_ProcessExchangeBillMain a inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
+ "left join Gy_Material c on a.HMaterID = c.HItemID left join Gy_Source d on b.HSourceID = d.HItemID " +
+ "left join Gy_EquipFileBillMain e on b.HSourceID = e.HSourceID and b.HSourceID<>0 left join Gy_Process f on b.HProcID = f.HItemID where a.HInterID='" + linterid+ "' and b.HProcID='"+HProcID+"'", "SB_EquipICMOTechParamBillMain");
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璐ㄩ噺妯″潡 璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥� 鏍规嵁鐗╂枡+璁惧+宸ュ簭 鑾峰彇 浜у搧宸ヨ壓鍙傛暟娓呭崟 宸ヨ壓鍙傛暟
+
+ [Route("QC_CustomerAppealReport/Get_TechParamList")]
+ [HttpGet]
+ public object Get_TechParamList(string HMaterID, string HProID, string HEquId, string HTeachName, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (HTeachName=="")
+ {
+ ds = oCN.RunProcReturn("select c.HName 宸ヨ壓鍙傛暟,b.HDataForm 閲囬泦鏉ユ簮 from Gy_MaterialTechParamBillMain a " +
+ "inner join Gy_MaterialTechParamBillSub b on a.HInterID = b.HInterID " +
+ "left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='" + HProID + "' and a.HEquipID='" + HEquId + "'", "SB_EquipICMOTechParamBillMain");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select c.HName 宸ヨ壓鍙傛暟,b.HDataForm 閲囬泦鏉ユ簮 from Gy_MaterialTechParamBillMain a " +
+ "inner join Gy_MaterialTechParamBillSub b on a.HInterID = b.HInterID " +
+ "left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='" + HProID + "' and a.HEquipID='" + HEquId + "' and c.HName ='" + HTeachName + "'", "SB_EquipICMOTechParamBillMain");
+ }
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs"
index 5fe2aa0..a219136 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs"
@@ -856,7 +856,7 @@
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
{
string sql = "insert into Pay_ErrWorkTimesRequestBillMain" +
- "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark, HMaker,HMakeDate) " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark, HMaker,HMakeDate,HIsImport) " +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -881,6 +881,7 @@
"','" + HRemark +
"','" + HMaker +
"','" + HMakerDate +
+ "','" + 0 + //鍒ゆ柇鏄惁鏄鍏�
"')";
//涓昏〃
diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
index 7dbfc38..d7adea1 100644
--- "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
@@ -536,25 +536,29 @@
#region 鑾峰彇 閽夐拤-鏅鸿兘浜轰簨 鑾峰彇鍦ㄨ亴鍛樺伐ID鍒楄〃
public bool getEmployeeIDList_DingDing(long offset, long size, ref List<string> IDList, ref string msg)
{
+ LogService.Write("鏌ョ湅5-1-1");
OapiSmartworkHrmEmployeeQueryonjobResponse response = new OapiSmartworkHrmEmployeeQueryonjobResponse();
do
{
if (getEmployeeIDList_Page_DingDing(offset, size, ref response, ref msg) == false)
{
+ LogService.Write("鏌ョ湅5-1-2");
return false;
}
-
+ LogService.Write("鏌ョ湅5-1-3");
for (int i = 0; i < response.Result.DataList.Count; i++)
{
IDList.Add(response.Result.DataList[i]);
}
-
+ LogService.Write("鏌ョ湅5-1-4");
if (response.Result.NextCursor != 0)
{
+ LogService.Write("鏌ョ湅5-1-4-1");
offset = response.Result.NextCursor;
}
else
{
+ LogService.Write("鏌ョ湅5-1-5");
break;
}
} while (true);
@@ -1098,6 +1102,7 @@
lsmain.Add(oItem);
}catch(Exception e)
{
+ LogService.Write("鏌ョ湅1" + e.Message);
continue;
}
}
@@ -1134,7 +1139,7 @@
string formUuid = "FORM-A01FFB0B63A34F18B7753F695F49190DJEY7"; //绛惧埌琛�
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅1");
//鑾峰彇鍒嗗眰瀹℃牳琛ㄧ殑瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -1341,6 +1346,7 @@
lsmain.Add(oItem);
}catch(Exception e)
{
+ LogService.Write("鏌ョ湅2"+e.Message);
continue;
}
}
@@ -1372,7 +1378,7 @@
string formUuid = "FORM-E3DFC12364514330A836DD3056C15668UGG7";
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅2");
//鑾峰彇瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -1610,6 +1616,7 @@
}
catch (Exception e)
{
+ LogService.Write("鏌ョ湅3"+e.Message);
continue;
}
}
@@ -1641,7 +1648,7 @@
string formUuid = "FORM-K5766HA1CKZB4E1L64Y1KBWCJTQF2HWJ3NDJL4";
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅3");
//鑾峰彇瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -1913,6 +1920,7 @@
}
catch (Exception e)
{
+ LogService.Write("鏌ョ湅4"+e.Message);
continue;
}
}
@@ -1944,7 +1952,7 @@
string formUuid = "FORM-65AD77453E7F44EA847166C3AB5A1F04IPSS";
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅4");
//鑾峰彇瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -2158,6 +2166,7 @@
}
catch (Exception e)
{
+ LogService.Write("鏌ョ湅5"+e.Message);
continue;
}
}
@@ -2189,14 +2198,16 @@
{
long offset = 0;
long size = 50;
-
+ LogService.Write("鏌ョ湅5");
+ LogService.Write("鏌ョ湅5.1");
//鑾峰彇鑺卞悕鍐岃亴鍛業D鍒楄〃
List<string> IDList = new List<string>();
if (getEmployeeIDList_DingDing(offset, size, ref IDList, ref msg) == false)
{
+ LogService.Write("鏌ョ湅5-1"+ msg);
return false;
}
-
+ LogService.Write("鏌ョ湅5-2");
//鑾峰彇璇︾粏淇℃伅骞堕檮鍔犲埌鍒楄〃lsmain涓�
List<DD_HuaMingCe> lsmain = new List<DD_HuaMingCe>();
if (getEmployeeDetailList_HuaMingCe__DingDing(IDList, ref lsmain, ref msg) == false)
@@ -2205,6 +2216,7 @@
}
try
{
+ LogService.Write("鏌ョ湅5-3");
oCN.BeginTran();
foreach (DD_HuaMingCe oItem in lsmain)
{
@@ -2229,12 +2241,14 @@
oCN.RunProc(sql_main);
}
+ LogService.Write("鏌ョ湅5-4");
oCN.Commit();
return true;
}
catch (Exception e)
{
msg = e.Message;
+ LogService.Write("鏌ョ湅5鎶ラ敊:" + e.Message);
oCN.RollBack();
return false;
}
@@ -2294,11 +2308,88 @@
{
continue;
}
+ string HStaus = "";
+
+ switch (getInstanceByIdResponse.Body.InstanceStatus)
+ {
+ case "COMPLETED":
+ HStaus = "缁翠慨缁撴潫";
+ break;
+ case "RUNNING":
+ HStaus = "缁翠慨杩涜涓�";
+ break;
+ case "TERMINATED":
+ HStaus = "缁翠慨缁堟";
+ break;
+ }
+
+ LogService.Write("鐘舵��:" + HStaus);
if (getInstanceByIdResponse.Body.InstanceStatus != "COMPLETED")
{
+ //妯″叿缂栫爜
+ if (keys.Contains("selectField_lq3idkvg"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["selectField_lq3idkvg"].ToString();
+ LogService.Write("妯″叿:" + HDate_Temp);
+ DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HMouldNo='" + HDate_Temp + "'", "Gy_MouldFileMain");
+ string HMouldID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ LogService.Write("娴嬭瘯1:" + ds.Tables[0].Rows[0]["HCloseDate"].ToString());
+ string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString() == "" ? "1900-01-01 00:00:00" : ds.Tables[0].Rows[0]["HCloseDate"].ToString();
+ string HMouldStaus = ds.Tables[0].Rows[0]["HMouldStatus"].ToString();
+ LogService.Write("妯″叿:" + HDate_Temp + ",鐘舵��:" + HMouldStaus + ",鏃堕棿:" + HUpdateDate);
+ HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate)) {
+ //淇敼妯″叿鐨勭姸鎬佸拰鏃堕棿
+ oCN.RunProc("update Gy_MouldFileMain set HMouldStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
+ }
+ }
+ }
+
continue;
}
+
+ //妯″叿缂栫爜
+ if (keys.Contains("selectField_lq3idkvg"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["selectField_lq3idkvg"].ToString();
+ LogService.Write("妯″叿:" + HDate_Temp);
+ DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HMouldNo='" + HDate_Temp + "'", "Gy_MouldFileMain");
+ string HMouldID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ LogService.Write("娴嬭瘯2:" + ds.Tables[0].Rows[0]["HCloseDate"].ToString());
+ HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString() == "" ? "1900-01-01 00:00:00" : ds.Tables[0].Rows[0]["HCloseDate"].ToString();
+
+ string HMouldStaus = ds.Tables[0].Rows[0]["HMouldStatus"].ToString();
+
+ LogService.Write("妯″叿:" + HDate_Temp+ ",鐘舵��:" + HMouldStaus + ",鏃堕棿:" + HUpdateDate);
+ if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate))
+ {
+ //淇敼妯″叿鐨勭姸鎬佸拰鏃堕棿
+ oCN.RunProc("update Gy_MouldFileMain set HMouldStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
+ }
+ }
+ oItem.HMouldID = long.Parse(HMouldID);
+ oItem.HRemark = HDate_Temp;
+ //LogService.Write("娴嬭瘯3:" + HMouldID);
+
+ //鏌ヨ淇濆吇璁″垝
+ ds = oCN.RunProcReturn(@"select a.HInterID,a.HBillNo from Sc_MouldMaintainPlanBillMain a
+ inner join Sc_MouldMaintainPlanBillSub b on a.HInterID = b.HInterID
+ where a.HMouldID =" + oItem.HMouldID+ " order by a.HMakeDate desc", "Sc_MouldMaintainPlanBillMain");
+ //LogService.Write("娴嬭瘯4:");
+ oItem.HPlanInterID = "";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ oItem.HPlanInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ oItem.HPlanNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
+ }
+ }
+ LogService.Write("妯″叿缂栫爜:" + oItem.HMouldID);
//寮�鍗曟棩鏈�
if (keys.Contains("dateField_lq0v65sv"))
@@ -2306,6 +2397,7 @@
double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq0v65sv"].ToString());
oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm");
}
+ LogService.Write("寮�鍗曟棩鏈�:" + oItem.HDate);
//妯″叿淇濆吇绾у埆
if (keys.Contains("selectField_m1ip9j31"))
@@ -2330,6 +2422,7 @@
oItem.HMaintainLevID = HDate_Temp;
}
+ LogService.Write("妯″叿淇濆吇绾у埆:" + oItem.HMaintainLevID);
//淇ā寮�濮嬫椂闂�
if (keys.Contains("dateField_lq4gf2ih"))
@@ -2337,6 +2430,7 @@
double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ih"].ToString());
oItem.HRepairBeginDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm"));
}
+ LogService.Write("淇ā寮�濮嬫椂闂�:" + oItem.HRepairBeginDate);
//淇ā缁撴潫鏃堕棿
if (keys.Contains("dateField_lq4gf2ii"))
@@ -2344,6 +2438,7 @@
double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ii"].ToString());
oItem.HRepairEndDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm"));
}
+ LogService.Write("淇ā缁撴潫鏃堕棿:" + oItem.HRepairEndDate);
//妯″叿鍗曟嵁鍙�
if (keys.Contains("serialNumberField_lqaak4ts"))
@@ -2351,6 +2446,7 @@
string HDate_Temp = response.Body.Result[i].FormData["serialNumberField_lqaak4ts"].ToString();
oItem.HBillNo = HDate_Temp;
}
+ LogService.Write("妯″叿鍗曟嵁鍙�:" + oItem.HBillNo);
//瑕佹眰瀹屾垚鏃ユ湡
if (keys.Contains("dateField_lq3idkvd"))
@@ -2358,6 +2454,7 @@
double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq3idkvd"].ToString());
oItem.HRequestComDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm:ss"));
}
+ LogService.Write("瑕佹眰瀹屾垚鏃ユ湡:" + oItem.HRequestComDate);
//缁翠慨鍙楃悊鏃ユ湡
if (keys.Contains("dateField_lq4gf2ih"))
@@ -2365,6 +2462,7 @@
double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ih"].ToString());
oItem.HRepairAccepDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm:ss"));
}
+ LogService.Write("缁翠慨鍙楃悊鏃ユ湡:" + oItem.HRepairAccepDate);
//鏈�杩戜繚鍏绘ā鏁�
if (keys.Contains("numberField_lq3idkvi"))
@@ -2372,6 +2470,7 @@
string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvi"].ToString();
oItem.HRecentMainModule = double.Parse(HDate_Temp);
}
+ LogService.Write("鏈�杩戜繚鍏绘ā鏁�:" + oItem.HRecentMainModule);
//绱妯℃暟
if (keys.Contains("numberField_lq3idkvj"))
@@ -2379,6 +2478,7 @@
string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvj"].ToString();
oItem.HCumulativeModule = double.Parse(HDate_Temp);
}
+ LogService.Write("绱妯℃暟:" + oItem.HCumulativeModule);
//鏈鐢熶骇妯℃暟
if (keys.Contains("textField_lq4vdvgh"))
@@ -2386,32 +2486,7 @@
string HDate_Temp = response.Body.Result[i].FormData["textField_lq4vdvgh"].ToString();
oItem.HProductionModule = double.Parse(HDate_Temp);
}
-
- //妯″叿缂栫爜
- if (keys.Contains("selectField_lq3idkvg"))
- {
- string HDate_Temp = response.Body.Result[i].FormData["selectField_lq3idkvg"].ToString();
- DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HMouldNo='" + HDate_Temp + "'", "Gy_MouldFileMain");
- string HMouldID = "0";
- if (ds.Tables[0].Rows.Count > 0)
- {
- HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
- }
- oItem.HMouldID = long.Parse(HMouldID);
- oItem.HRemark = HDate_Temp;
-
-
- //鏌ヨ淇濆吇璁″垝
- ds = oCN.RunProcReturn(@"select a.HInterID,a.HBillNo from Sc_MouldMaintainPlanBillMain a
- inner join Sc_MouldMaintainPlanBillSub b on a.HInterID = b.HInterID
- where a.HMouldID =" + oItem.HMouldID + " and a.HMaintainLevID = " + oItem.HMaintainLevID, "Sc_MouldMaintainPlanBillMain");
- oItem.HPlanInterID = "";
- if (ds.Tables[0].Rows.Count > 0) {
- oItem.HPlanInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
- oItem.HPlanNo = ds.Tables[0].Rows[0]["HInterID"].ToString();
- }
- }
-
+ LogService.Write("绱妯℃暟:" + oItem.HProductionModule);
//缁翠慨閮ㄩ棬
if (keys.Contains("selectField_lq3idkva"))
@@ -2425,6 +2500,7 @@
}
oItem.HDeptID = long.Parse(HDeptID);
}
+ LogService.Write("缁翠慨閮ㄩ棬:" + oItem.HDeptID);
//鏂拌璁″鍛�
oItem.HNewDesignLife = 30000;
@@ -2441,6 +2517,7 @@
}
oItem.HEmpID = long.Parse(HEmpID);
}
+ LogService.Write("缁翠慨浜�:" + oItem.HEmpID);
//缁翠慨鏃堕棿
if (keys.Contains("numberField_lq3ixr9j"))
@@ -2450,6 +2527,7 @@
oItem.HTimes = long.Parse(HDate_Temp);
oItem.HPlanTimes = long.Parse(HDate_Temp);
}
+ LogService.Write("缁翠慨鏃堕棿:" + oItem.HTimes);
//瀛愯〃 缁翠慨瑕佹眰 缁翠慨澶囨敞(闂鎻忚堪)
if (keys.Contains("tableField_lq3ixr9b"))
@@ -2466,15 +2544,19 @@
{
oItemSub.HRepairExplanation = dic[ij]["textareaField_lq3ixr9e"].ToString();
}
+ LogService.Write("缁翠慨瑕佹眰:" + oItemSub.HRepairExplanation);
//澶囨敞
if (keys_Sub.Contains("textField_lq3ixr9d"))
{
oItemSub.HRemark = dic[ij]["textField_lq3ixr9d"].ToString();
}
+ LogService.Write("澶囨敞:" + oItemSub.HRemark);
+
oItem.DetailColMouldRepair.Add(oItemSub);
}
}
+
string HRemark = "";
//瀛愯〃 淇濆吇澶囨敞(闂鎻忚堪)
@@ -2496,9 +2578,10 @@
oItemSub.HClaim = HDate_Temp[ij];
oItemSub.HMaintainResult = HRemark;
oItem.DetailColMouldMaintain.Add(oItemSub);
+ LogService.Write("鍏蜂綋瑕佹眰:" + oItemSub.HClaim);
}
-
}
+
int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
oItem.HTitle = startIndex + response.Body.Result[i].Title.Substring(startindex).Replace("\"}", "").Replace("'", "");
@@ -2533,6 +2616,7 @@
}
catch (Exception e)
{
+ LogService.Write("鎶ラ敊:" + e.Message);
continue;
}
}
@@ -2568,7 +2652,7 @@
string formUuid = "FORM-30C78F46E77E46A9AA8778214CEFE6B5J0AN";
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅7");
//鑾峰彇妯″叿缁翠慨淇濆吇琛ㄧ殑瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -2780,8 +2864,45 @@
continue;
}
+ string HStaus = "";
+
+ switch (getInstanceByIdResponse.Body.InstanceStatus)
+ {
+ case "COMPLETED":
+ HStaus = "缁翠慨缁撴潫";
+ break;
+ case "RUNNING":
+ HStaus = "缁翠慨杩涜涓�";
+ break;
+ case "TERMINATED":
+ HStaus = "缁翠慨缁堟";
+ break;
+ }
+ LogService.Write("鐘舵��:" + HStaus);
if (getInstanceByIdResponse.Body.InstanceStatus != "COMPLETED")
{
+ //璁惧缂栫爜
+ if (keys.Contains("textField_lfg9hgys"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
+ DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain with(nolock) where HEquipFileNo='" + HDate_Temp + "'", "Gy_EquipFileBillMain");
+ string HEquipID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HEquipID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ oItem.HEquipID = long.Parse(HEquipID);
+ oItem.HRemark2 = HDate_Temp;
+
+ string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString()==""?"1900-01-01 00:00:00": ds.Tables[0].Rows[0]["HCloseDate"].ToString();
+ string HMouldStaus = ds.Tables[0].Rows[0]["HStatus"].ToString();
+ LogService.Write("璁惧:" + HDate_Temp + ",鐘舵��:" + HMouldStaus + ",鏃堕棿:" + HUpdateDate);
+ if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate))
+ {
+ //淇敼璁惧鐨勭姸鎬佸拰鏃堕棿
+ oCN.RunProc("update Gy_EquipFileBillMain set HStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HEquipID);
+ }
+ }
+ }
continue;
}
@@ -2794,18 +2915,28 @@
{
string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain with(nolock) where HEquipFileNo='" + HDate_Temp + "'", "Gy_EquipFileBillMain");
+ LogService.Write("璁惧鏃�:" + HDate_Temp);
string HEquipID = "0";
if (ds.Tables[0].Rows.Count > 0)
{
HEquipID = ds.Tables[0].Rows[0]["HInterID"].ToString();
oItem.HEquipID = long.Parse(HEquipID);
oItem.HRemark2 = HDate_Temp;
+ string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString() == "" ? "1900-01-01 00:00:00" : ds.Tables[0].Rows[0]["HCloseDate"].ToString();
+ string HMouldStaus = ds.Tables[0].Rows[0]["HStatus"].ToString();
+ LogService.Write("璁惧:" + HDate_Temp + ",鐘舵��:" + HMouldStaus + ",鏃堕棿:" + HUpdateDate);
+ if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate))
+ {
+ //淇敼璁惧鐨勭姸鎬佸拰鏃堕棿
+ oCN.RunProc("update Gy_EquipFileBillMain set HStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HEquipID);
+ }
}
else
{
continue;
}
}
+ LogService.Write("璁惧:" + oItem.HEquipID);
//缁翠慨閮ㄩ棬
if (keys.Contains("selectField_kzgkw10a"))
@@ -2824,6 +2955,7 @@
}
}
+ LogService.Write("缁翠慨閮ㄩ棬:" + oItem.HDeptID);
//缁翠慨浜�
if (keys.Contains("employeeField_lthwkdh2"))
@@ -2842,6 +2974,7 @@
}
}
+ LogService.Write("缁翠慨浜�:" + oItem.HEmpID);
//缁翠慨鍐呭
if (keys.Contains("textField_l2r9bvwk"))
@@ -2850,6 +2983,7 @@
oItem.HRepairContent = HDate_Temp;
}
+ LogService.Write("缁翠慨鍐呭:" + oItem.HRepairContent);
//鎶ヤ慨绫诲埆
if (keys.Contains("multiSelectField_lfg9hgyv"))
@@ -2858,7 +2992,7 @@
oItem.HRepairCategory = HDate_Temp[0];
}
-
+ LogService.Write("鎶ヤ慨绫诲埆:" + oItem.HRepairCategory);
//绱ф�ョ▼搴�
if (keys.Contains("radioField_kzgkw10c"))
{
@@ -2866,6 +3000,7 @@
oItem.HUrgenLevel = HDate_Temp;
}
+ LogService.Write("绱ф�ョ▼搴�:" + oItem.HUrgenLevel);
//鎶ヤ慨浜�
if (keys.Contains("employeeField_lkasesrk"))
@@ -2874,6 +3009,7 @@
oItem.HRepairer = HDate_Temp[0];
}
+ LogService.Write("鎶ヤ慨浜�:" + oItem.HRepairer);
//鏄惁鏈変骇鑳藉奖鍝�
if (keys.Contains("textField_lyjddw0r"))
@@ -2882,7 +3018,8 @@
oItem.HIsCapacityImpact = HDate_Temp;
}
-
+ LogService.Write("鏄惁鏈変骇鑳藉奖鍝�:" + oItem.HIsCapacityImpact);
+
//缁翠慨鏃堕棿
if (keys.Contains("textField_l2r95oo2"))
{
@@ -2898,6 +3035,8 @@
oItem.HTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
oItem.HPlanTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
}
+ LogService.Write("缁翠慨鏃堕棿:" + oItem.HTimes);
+
//瀛愯〃 缁翠慨瑕佹眰 缁翠慨澶囨敞(闂鎻忚堪)
@@ -2910,6 +3049,7 @@
oItem.HExplanation = HDate_Temp;
sub.HRepairExplanation = HDate_Temp;
}
+ LogService.Write("缁翠慨瑕佹眰:" + oItem.HExplanation);
//澶囨敞
if (keys.Contains("textField_l2r95oo0"))
@@ -2918,6 +3058,8 @@
sub.HRemark = HDate_Temp;
}
+ LogService.Write("澶囨敞:" + oItem.HRemark);
+
oItem.DetailColMouldRepair.Add(sub);
int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
@@ -2953,7 +3095,7 @@
}
catch (Exception e)
{
- LogService.Write(e.Message);
+ LogService.Write("鎶ラ敊:" + e.Message);
a = "";
continue;
}
@@ -2989,7 +3131,7 @@
string formUuid = "FORM-OM566O7177LW0ARJ5IMFF63NTFKA34G9RL2YKN1";
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅6");
//鑾峰彇璁惧缁翠慨淇濆吇琛ㄧ殑瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -3136,6 +3278,11 @@
{
continue;
}
+ string result = getProcessInstanceResponse.Body.Result.Result.ToString();
+ if (result != "agree")
+ {
+ continue;
+ }
string[] deptNameAndGroupName = getProcessInstanceResponse.Body.Result.OriginatorDeptName.Split('-');//鑾峰彇閮ㄩ棬鎷兼帴瀛楃涓叉暟缁�
oItem.HDeptName = deptNameAndGroupName[1];
oItem.HGroupName = deptNameAndGroupName[deptNameAndGroupName.Length-1];
@@ -3160,11 +3307,11 @@
}
oItem.HMangerID = int.Parse(HMangerID);
//澶勭悊閮ㄩ棬鍜岀彮缁勫悕绉癷d
- ds = oCN.RunProcReturn("select * from Gy_Department with(nolock) where HName='" + oItem.HDeptName + "'", "Gy_Department");
+ ds = oCN.RunProcReturn("select * from h_v_GroupList with(nolock) where 鐝粍鍚嶇О='" + oItem.HGroupName + "'", "h_v_GroupList");
string HDeptID = "0";
if (ds.Tables[0].Rows.Count > 0)
{
- HDeptID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ HDeptID = ds.Tables[0].Rows[0]["HDeptID"].ToString();
}
oItem.HDeptID = int.Parse(HDeptID);
ds = oCN.RunProcReturn("select * from Gy_Group with(nolock) where HName='" + oItem.HGroupName + "'", "Gy_Group");
@@ -3188,10 +3335,18 @@
//寰幆閬嶅巻鑾峰彇鑱屽憳鍚嶇Оid锛屽伐鏃�
for (int i = 0; i < rows.Count; i++)
{
+ if (rows[i].RowValue.Count<10)
+ {
+ continue;
+ }
string[] nameArray = rows[i].RowValue[4].Value.ToString().Split(',');//鑾峰彇姣忎釜浜虹殑浜哄悕
oItem.HPlanQty += double.Parse(rows[i].RowValue[2].Value.ToString());//璁″垝鏁伴噺
for (int j = 0; j < int.Parse(rows[i].RowValue[5].Value.ToString()); j++)
{
+ if (nameArray.Length < j + 1)//闃叉鍑虹幇浜虹鑱屼簡璁℃椂鍗曠敵璇峰畬浜嗗鑷存妧鏈汉鍛樹笌璁℃椂浜烘暟涓嶄竴鑷寸殑闂
+ {
+ continue;
+ }
Pay_ErrWorkTimesRequestBillSub pay_ErrWorkTimesRequestBillSub = new Pay_ErrWorkTimesRequestBillSub();
ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HName='" + nameArray[j] + "'", "Gy_Employee");
string HEmpID = "0";
@@ -3249,7 +3404,7 @@
{
oCN.BeginTran();
//鍒犻櫎鏃堕棿鑼冨洿鍐呯殑瀵煎叆鍗曟嵁
- DataSet dataSet = oCN.RunProcReturn(@"select HInterID from Pay_ErrWorkTimesRequestBillMain a with(nolock) where a.HRemark like '%閽夐拤瀵煎叆%' and HDate >= '" + startTime + "' and HDate<='" + endTime + "'", "Pay_ErrWorkTimesRequestBillMain");
+ DataSet dataSet = oCN.RunProcReturn(@"select HInterID from Pay_ErrWorkTimesRequestBillMain a with(nolock) where a.HRemark like '%閽夐拤瀵煎叆%' and a.HIsImport = 1 and HDate >= '" + startTime + "' and HDate<='" + endTime + "'", "Pay_ErrWorkTimesRequestBillMain");
if(dataSet != null && dataSet.Tables[0].Rows.Count > 0)
{
foreach (DataRow row in dataSet.Tables[0].Rows)
@@ -3271,13 +3426,13 @@
int HPeriod = int.Parse(oItem.HDate.Split('-')[1]);
//涓昏〃
string sql = "insert into Pay_ErrWorkTimesRequestBillMain" +
- "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark,HMaker,HMakeDate) " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark,HMaker,HMakeDate,HChecker,HCheckDate,HIsImport) " +
"values(" +
"" + HYear +
"," + HPeriod +
",'" + HBillType +
"','" + " " +
- "'," + 1 +
+ "'," + 2 +
"," + HInterID +
",'" + HBillNo +
"','" + oItem.HDate +
@@ -3296,6 +3451,9 @@
"','" + oItem.HRemark +
"','" + "System" +
"'," + "GETDATE()" +
+ ",'" + "System" +
+ "'," + "GETDATE()" +
+ "," + "1" +
")";
//涓昏〃
LogService.Write(sql);
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 2d8bc14..65accf5 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"
@@ -35,9 +35,6 @@
string ComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
- WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
-
-
#region 鍏敤鏂规硶
#region 璐﹀彿鐧诲叆
@@ -2272,6 +2269,88 @@
#endregion
+ #region 鍏朵粬鍏ュ簱 鏍￠獙妯″紡
+
+ /// <summary>
+ /// 鍏朵粬鍏ュ簱鏍￠獙涓婁紶
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveOtherInBill_BillCheck_Json")]
+ [HttpPost]
+ public object set_SaveOtherInBill_BillCheck_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string sMainStr = sArray[0].ToString(); //鍗曟嵁鏁版嵁
+ string HSourceBarCodeCtl = sArray[1].ToString(); //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+
+ try
+ {
+ List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getOtherInBillMainByJson(sMainStr);
+
+ WebAPI.WebS.ClsKf_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();
+
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = "1203";
+ websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+
+ //鍘熷崟鎹负鎵爜鐢熸垚锛屽鍘熸壂鎻忕殑鏉＄爜杩涜鏍稿
+ if (HSourceBarCodeCtl == "Y")
+ {
+ if (oWebs.set_SaveOtherInBill_CLD_BillCheck_Verify(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;
+ }
+ }
+ //鍘熷崟鎹潪鎵爜鐢熸垚
+ else
+ {
+ if (oWebs.set_SaveOtherInBill_CLD_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 棰嗘枡鍑哄簱 涓婁紶鐢熷崟
@@ -4395,14 +4474,14 @@
FentityModel.Add("FQty", item["鍑�閲�"].ToString()); //鍑�閲�
FentityModel.Add("FBASEUNITID", new JObject() { ["FNumber"] = item["鍩烘湰璁￠噺鍗曚綅浠ｇ爜"].ToString() }); // 鍩烘湰鍗曚綅浠ｇ爜
FentityModel.Add("FBASEQTY", item["瀹炴敹鏁伴噺"].ToString()); //瀹炴敹鏁伴噺
- FentityModel.Add("FSecUNITID", new JObject() { ["FNumber"] = item["搴撳瓨杈呰閲忓崟浣嶄唬鐮�"].ToString() }); // 搴撳瓨杈呰閲忓崟浣嶄唬鐮�
+ FentityModel.Add("FSecUNITID", new JObject() { ["FNumber"] = item["搴撳瓨杈呰閲忓崟浣嶄唬鐮�"].ToString() }); // 搴撳瓨杈呭崟浣�
FentityModel.Add("FSecQTY", item["搴撳瓨杈呭崟浣嶅疄鏀舵暟閲�"].ToString()); //瀹炴敹鏁伴噺锛堝簱瀛樿緟鍗曚綅锛�
FentityModel.Add("FOWNERTYPEID", item["璐т富绫诲瀷"].ToString()); //璐т富绫诲瀷 ???鏁板��
FentityModel.Add("FOWNERID", new JObject() { ["FNumber"] = item["璐т富浠ｇ爜"].ToString() }); // 璐т富浠ｇ爜
FentityModel.Add("FKEEPERTYPEID", item["淇濈鑰呯被鍨�"].ToString()); //淇濈鑰呯被鍨� ???鏁板��
FentityModel.Add("FKEEPERID", new JObject() { ["FNumber"] = item["淇濈鑰呬唬鐮�"].ToString() }); // 淇濈鑰呬唬鐮�
FentityModel.Add("FAuxPropId", new JObject() { ["FAUXPROPID__FF100003"] = new JObject() { ["FNumber"] = item["杈呭姪灞炴�т唬鐮�"].ToString() } }); // 杈呭姪灞炴��
- FentityModel.Add("FExtAuxUnitId", new JObject() { ["FNumber"] = item["杈呰閲忓崟浣嶄唬鐮�"].ToString() }); // 杈呰閲忓崟浣嶄唬鐮�
+ FentityModel.Add("FExtAuxUnitId", new JObject() { ["FNumber"] = item["杈呰閲忓崟浣嶄唬鐮�"].ToString() }); // 杈呭崟浣�
FentityModel.Add("FExtAuxUnitQty", item["绠辨暟"].ToString()); //绠辨暟
FentityModel.Add("F_TFKO_Assistant", new JObject() { ["FNumber"] = item["缃戝埆浠ｇ爜"].ToString() }); // 缃戝埆 ???蹇呭～
FentityModel.Add("F_TFKO_Assistant1", new JObject() { ["FNumber"] = item["瀛斿瀷浠ｇ爜"].ToString() }); // 瀛斿瀷
@@ -4417,6 +4496,7 @@
FentityModel.Add("F_paez_BaseQty", item["瀹炲彂鏁伴噺"].ToString()); //瀹炲彂鏁伴噺
FentityModel.Add("F_paez_Qty1", item["瀹炴敹鏁伴噺"].ToString()); //瀹炴敹鏁伴噺
FentityModel.Add("F_paez_Text2", item["绠卞彿"].ToString()); //绠卞彿 ???涓嶈兘涓烘暟瀛�
+ FentityModel.Add("FLOT", new JObject() { ["FNumber"] = item["鎵瑰彿"].ToString() }); // 杈呰閲忓崟浣嶄唬鐮�
//JArray Fentity2 = new JArray();
@@ -4457,7 +4537,7 @@
//浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
{
- oCn.RollBack();
+ //oCn.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍏ュ簱鐢宠鍗曞悓姝ヨ幏鍙栫櫥褰曡处鍙峰瘑鐮佸け璐ワ紒";
@@ -4473,7 +4553,7 @@
if (isSuccess == 0)
{
LogService.Write("鍏朵粬鍏ュ簱,鐧诲綍閲戣澏澶辫触锛�");
- oCn.RollBack();
+ //oCn.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鐧诲綍閲戣澏澶辫触锛�";
@@ -4487,14 +4567,14 @@
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
LogService.Write("鍏ュ簱鐢宠鍗曞悓姝ラ噾铦朵簯澶辫触锛�" + JsonConvert.SerializeObject(jsonRoot));
- oCn.RollBack();
+ //oCn.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍏ュ簱鐢宠鍗曞悓姝ラ噾铦朵簯澶辫触锛佸崟鍙�:" + HSourceBillNo_TB + result + jsonRoot;
objJsonResult.data = null;
return objJsonResult;
}
-
+ LogService.Write("鍏ュ簱鐢宠鍗曞悓姝ラ噾铦朵簯鎴愬姛锛�" + JsonConvert.SerializeObject(jsonRoot));
//鎻愪氦瀹℃牳
string result1 = string.Empty;
string result2 = string.Empty;
@@ -4511,7 +4591,7 @@
if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
- oCn.RollBack();
+ //oCn.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍏ュ簱鐢宠鍗曞崟鍙�:" + ",鎻愪氦澶辫触" + result1;
@@ -4521,7 +4601,7 @@
if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
- oCn.RollBack();
+ //oCn.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍏ュ簱鐢宠鍗曞崟鍙�:" + ",瀹℃牳澶辫触" + result2;
@@ -4533,6 +4613,13 @@
}
}
}
+
+ sJXCode = sBarCode;
+
+ //鏇存柊鏉＄爜婧愬崟id淇℃伅
+ sql = string.Format($@"update a set HSourceInterID = b.FID,HSourceEntryID = c.FEntryID from Gy_BarCodeBill a left join AIS20220609121235..TFKO_t_Cust100009 b on a.HSourceBillNo = b.FBillNo left join AIS20220609121235..TFKO_t_Cust_Entry100065 c on b.FID = C.FID and a.HBarcodeNo = c.FSEQ where HSourceBillNo = '{HSourceBillNo_TB}'");
+ //鎵ц鏇存柊璇彞
+ oCn.RunProc(sql);
}
else
{
@@ -5073,11 +5160,99 @@
if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
string sSourceBarCodeCtl = "N"; //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
- if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
+
+ #region 绯荤粺鍙傛暟鑾峰彇
+ //閲囪喘鍏ュ簱鍗�
+ if (HBillType == "1201")
{
- //閿�鍞嚭搴撳崟
- sSourceBarCodeCtl = "Y";
+ //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+ if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sSourceBarCodeCtl = "Y";
+ }
}
+ //鐢熶骇鍏ュ簱鍗�
+ if (HBillType == "1202")
+ {
+ //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+ if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sSourceBarCodeCtl = "Y";
+ }
+ }
+ //鍏朵粬鍏ュ簱鍗�
+ if (HBillType == "1203")
+ {
+ //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+ if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sSourceBarCodeCtl = "Y";
+ }
+ }
+ //棰嗘枡鍑哄簱鍗�
+ else if (HBillType == "1204")
+ {
+ //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+ if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sSourceBarCodeCtl = "Y";
+ }
+ }
+ //閿�鍞嚭搴撳崟
+ else if (HBillType == "1205")
+ {
+ //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+ if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sSourceBarCodeCtl = "Y";
+ }
+ }
+ //鍏朵粬鍑哄簱鍗�
+ else if (HBillType == "1206")
+ {
+ //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+ if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sSourceBarCodeCtl = "Y";
+ }
+ }
+ //濮斿棰嗘枡鍗�
+ else if (HBillType == "1211")
+ {
+ //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+ if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sSourceBarCodeCtl = "Y";
+ }
+ }
+ //鐢熶骇琛ユ枡鍗�
+ else if (HBillType == "1254")
+ {
+ //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+ if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sSourceBarCodeCtl = "Y";
+ }
+ }
+ //濮斿琛ユ枡鍗�
+ else if (HBillType == "1255")
+ {
+ //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+ if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sSourceBarCodeCtl = "Y";
+ }
+ }
+ //鐩存帴璋冩嫧鍗�
+ else if (HBillType == "1207")
+ {
+ //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+ if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sSourceBarCodeCtl = "Y";
+ }
+ }
+ #endregion
if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
@@ -5153,6 +5328,71 @@
#endregion
+ #region 杩斿洖鍗曟嵁鍒楄〃淇℃伅 20241114
+
+ /// <summary>
+ /// 杩斿洖鍗曟嵁鍒楄〃淇℃伅 鏍￠獙妯″紡
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_New_Json")]
+ [HttpGet]
+ public object GetKf_PonderationBillMain_Temp_BillCheck_New_Json(long HInterID, string HBillType, string sWhere, string HSourceBarCodeCtl)
+ {
+ try
+ {
+ //鍘熷崟鎹负鎵爜鐢熸垚锛屽鍘熸壂鎻忕殑鏉＄爜杩涜鏍稿
+ if (HSourceBarCodeCtl == "Y")
+ {
+ ds = oCn.RunProcReturn("exec h_p_KF_PonderationBillMain_TempList_Verify " + HInterID.ToString() + ",'" + HBillType + "','" + sWhere + "'", "h_p_KF_PonderationBillMain_TempList_Verify");
+ }
+ //鍘熷崟鎹潪鎵爜鐢熸垚
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_KF_PonderationBillMain_TempList_BillCheck " + HInterID.ToString() + ",'" + HBillType + "','" + sWhere + "'", "h_p_KF_PonderationBillMain_TempList_BillCheck");
+ }
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = new
+ {
+ Materlist = ds.Tables[0], //杩斿洖鐗╂枡鏄庣粏鍒楄〃淇℃伅锛�0锛�
+ BarCodeDetailslist = ds.Tables[1], //杩斿洖褰撳墠鎵�鎵弿鏉＄爜鏄庣粏淇℃伅锛�5锛�
+ };
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region 杩斿洖鍗曟嵁鍒楄〃淇℃伅
/// <summary>
@@ -5204,6 +5444,50 @@
#endregion
+ #region 鏍￠獙鎵爜妯″潡锛屽垹闄ら�変腑琛屾潯鐮佸嚭鍏ュ簱涓存椂琛ㄨ褰� 20241114
+
+ /// <summary>
+ /// 鎵爜妯″潡锛屽垹闄ら�変腑琛屾潯鐮佸嚭鍏ュ簱涓存椂琛ㄨ褰�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json")]
+ [HttpGet]
+ public object set_DeleteBarCodeByEntryID_BillCheck_New_Json(long HInterID, string HBillType, long HSourceInterID, long HSourceEntryID, string HSourceBarCodeCtl)
+ {
+ //鍘熷崟鎹负鎵爜鐢熸垚锛屽鍘熸壂鎻忕殑鏉＄爜杩涜鏍稿
+ if (HSourceBarCodeCtl == "Y")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏍￠獙鏉＄爜锛屾棤闇�鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍘熷崟鎹潪鎵爜鐢熸垚
+ else
+ {
+ try
+ {
+ oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "' and HSourceInterID=" + HSourceInterID.ToString() + " and HSourceEntryID=" + HSourceEntryID.ToString() + " and HQty<>0 ", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鎵�閫夎鏉＄爜鍑哄叆搴撲复鏃惰〃璁板綍澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ #endregion
+
#region 鎵爜妯″潡锛屽垹闄ら�変腑琛屾潯鐮佸嚭鍏ュ簱涓存椂琛ㄨ褰�
/// <summary>
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index 73764e2..6cfe6fd 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -1926,5 +1926,247 @@
}
}
#endregion
+
+ #region PDA寮�宸ュ崟 鎵弿娴佽浆鍗� 鏌ュ嚭瀵瑰簲淇℃伅
+ [Route("Sc_MESBeginStepWorkBill/GetHProcExchInterID")]
+ [HttpGet]
+ public object GetHProcExchInterID(string HBarCode, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜淇℃伅涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string sql = "select a.*,b.HName HMaterName,b.HNumber HMaterNumbers,b.HModel HModel,c.HName HDeptName from Sc_ICMOBillStatus_Tmp a " +
+ "left join Gy_Material b on a.HMaterID=b.HItemID left join Gy_Department c on a.HDeptID=c.HItemID where HSourceBillNo = '" + HBarCode + "'";
+ ds = oCN.RunProcReturn(sql, "锘縎c_ICMOBillStatus_Tmp");
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ュ簭娴佽浆鍗★細" + HBarCode + " ,娌℃湁杩涜娲惧伐鎿嶄綔";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region PDA寮�宸ュ崟淇濆瓨/缂栬緫
+ /// <summary>
+ /// 寮�宸ュ崟
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sc_MESBeginStepWorkBill/SaveSc_MESBeginWorkBill")]
+ [HttpPost]
+ public object SaveSc_MESBeginWorkBill([FromBody] JObject msg)
+ {
+
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string UserName = sArray[1].ToString();
+ string refSav = sArray[2].ToString();
+
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, false, UserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ LogService.Write("寮�宸�:1" + msg1);
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSc_MESBeginWorkBill oBill = new DLL.ClsSc_MESBeginWorkBill();
+ List<Models.ClsSc_MESBeginWorkBillMain> lsmain = new List<Models.ClsSc_MESBeginWorkBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_MESBeginWorkFrom(msg2);
+ foreach (Models.ClsSc_MESBeginWorkBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ oItem.HMaker = UserName;
+ oItem.HBillType = "3787";
+ oItem.HBillSubType = "3787";
+ oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HBarCodeMakeDate = Convert.ToDateTime(DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"))); //鎵弿鏃ユ湡锛堝勾-鏈�-鏃�-鏃�-鍒�-绉掞級
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+
+ LogService.Write("寮�宸�:2" + msg1);
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ LogService.Write("寮�宸�:2.1" + msg1);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ if (bResult)
+ {
+ objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ LogService.Write("寮�宸�:2.8");
+ objJsonResult.Verify = "Y";
+ }
+ }
+
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = "N";
+ }
+
+ LogService.Write("寮�宸�:3" + msg1);
+
+ if (bResult)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git a/WebAPI/DLL/ClsGy_EnvironmentTestItem_Ctl.cs b/WebAPI/DLL/ClsGy_EnvironmentTestItem_Ctl.cs
new file mode 100644
index 0000000..6b2c4d5
--- /dev/null
+++ b/WebAPI/DLL/ClsGy_EnvironmentTestItem_Ctl.cs
@@ -0,0 +1,101 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsGy_EnvironmentTestItem_Ctl : DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_EnvironmentTestItem_Model oModel = new Model.ClsGy_EnvironmentTestItem_Model();
+ //鏂板
+ public override bool AddNew()
+ {
+ //
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Insert into " + MvarItemKey + " " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,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 + "','" +DateTime.Now+ "','" + oModel.HUSEORGID + "','" + oModel.HUseFlag + "','" + oModel.HMakeEmp+ "','" + oModel.HUSEORGID + "')", 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 + "'" +
+ ",HModifyTime='" + DateTime.Now + "'" +
+ ",HUSEORGID='" + oModel.HUSEORGID + "'" +
+ ",HModifyEmp ='" + oModel.HMakeEmp + "'" +
+ ",HUseFlag='" + oModel.HUseFlag + "'" +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "' 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_EnvironmentTestItem_Ctl()
+ {
+ MvarItemKey = "Gy_EnvironmentTestItem";
+ MvarReportTitle = "鐜妫�娴嬮」鐩缃�";
+ oModel = new Model.ClsGy_EnvironmentTestItem_Model();
+ }
+
+
+
+ }
+}
diff --git a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
index a7197c3..fd3f142 100644
--- a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
@@ -269,7 +269,7 @@
{
return false;
}
- LogService.Write("寮�宸�:2.3");
+ LogService.Write("寮�宸�:2.3");
//涓昏〃
oCn.RunProc("Insert Into Sc_MESBeginWorkBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 2b33e21..476fb14 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1196,6 +1196,17 @@
return list;
}
+ /// <summary>
+ /// 澶勭悊鏂板鐜妫�娴嬮」鐩〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_EnvironmentTestItem_Model> getObjectByJson_Gy_EnvironmentTestItem(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_EnvironmentTestItem_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_EnvironmentTestItem_Model>>(jsonString);
+ return list;
+ }
/// <summary>
/// 澶勭悊鏂板淇濆吇绾у埆琛ㄧ殑json
@@ -2995,6 +3006,56 @@
}
/// <summary>
+ /// 澶勭悊鏂板鐜妫�娴嬫柟妗堜富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.Cls锘縂y_EnvironmentTestSchemeBillMain> getObjectByJson_锘縂y_EnvironmentTestSchemeBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.Cls锘縂y_EnvironmentTestSchemeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Cls锘縂y_EnvironmentTestSchemeBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板鐜妫�娴嬫柟妗堝瓙琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_EnvironmentTestSchemeBillSub> getObjectByJson_Gy_EnvironmentTestSchemeBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_EnvironmentTestSchemeBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_EnvironmentTestSchemeBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板鐜妫�娴嬪崟涓昏〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.Cls锘縌C_EnvironmentTestDotCheckBillMain> getObjectByJson_锘縌C_EnvironmentTestDotCheckBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.Cls锘縌C_EnvironmentTestDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Cls锘縌C_EnvironmentTestDotCheckBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板鐜妫�娴嬪崟瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsQC_EnvironmentTestDotCheckBillSub> getObjectByJson_QC_EnvironmentTestDotCheckBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_EnvironmentTestDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_EnvironmentTestDotCheckBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板闃查敊楠岃瘉妫�鏌ヤ富琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -3411,6 +3472,18 @@
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
+ public List<Models.ClsSc_MESBeginWorkBillSub> getObjectByJson_Sc_MESBeginWorkBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_MESBeginWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 鎶ュ伐骞冲彴寮�宸ュ崟瀛愯〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
public List<Models.ClsSc_MESBeginWorkBillSub_RelationBill> getObjectByJson_Sc_MESBeginWorkBillSub_RelationBill(string jsonString)
{
jsonString = "[" + jsonString.ToString() + "]";
diff --git a/WebAPI/Models/ClsSc_MESBeginWorkBillSub.cs b/WebAPI/Models/ClsSc_MESBeginWorkBillSub.cs
index bb6d829..adc810a 100644
--- a/WebAPI/Models/ClsSc_MESBeginWorkBillSub.cs
+++ b/WebAPI/Models/ClsSc_MESBeginWorkBillSub.cs
@@ -5,7 +5,9 @@
namespace WebAPI.Models
{
public class ClsSc_MESBeginWorkBillSub : DBUtility.ClsXt_BaseBillSub
- {
-
+ {
+ public string HCardswiperMan { get; set; }
+ public DateTime HCardswiperDate { get; set; }
+ public long HEmpID { get; set; }
}
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index 29b3519..b81ab9b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-11-20T01:08:48.6293480Z;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+ <History>True|2024-11-28T02:42:45.3823067Z;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
<_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>11/20/2024 09:08:11</publishTime>
+ <publishTime>11/28/2024 16:06:48</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/20/2024 09:08:11</publishTime>
+ <publishTime>11/28/2024 16:06:48</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/20/2024 09:08:08</publishTime>
+ <publishTime>11/28/2024 16:06:46</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/20/2024 09:08:08</publishTime>
+ <publishTime>11/28/2024 16:06:46</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/20/2024 09:08:02</publishTime>
+ <publishTime>11/28/2024 16:06:40</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/20/2024 09:08:02</publishTime>
+ <publishTime>11/28/2024 16:06:40</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>11/20/2024 09:08:03</publishTime>
+ <publishTime>11/28/2024 16:06:42</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/20/2024 09:08:03</publishTime>
+ <publishTime>11/28/2024 16:06:42</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>11/20/2024 09:07:59</publishTime>
+ <publishTime>11/28/2024 16:06:38</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/20/2024 09:07:59</publishTime>
+ <publishTime>11/28/2024 16:06:38</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/20/2024 09:08:00</publishTime>
+ <publishTime>11/28/2024 16:06:39</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/20/2024 09:08:00</publishTime>
+ <publishTime>11/28/2024 16:06:39</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/20/2024 09:08:00</publishTime>
+ <publishTime>11/28/2024 16:06:39</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/20/2024 09:08:00</publishTime>
+ <publishTime>11/28/2024 16:06:39</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>11/20/2024 08:52:55</publishTime>
+ <publishTime>11/28/2024 16:04:36</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>11/20/2024 08:52:55</publishTime>
+ <publishTime>11/28/2024 16:04:36</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>11/20/2024 08:53:01</publishTime>
+ <publishTime>11/28/2024 16:04:42</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>11/20/2024 08:53:01</publishTime>
+ <publishTime>11/28/2024 16:04:42</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>11/20/2024 09:08:45</publishTime>
+ <publishTime>11/28/2024 16:07:25</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/20/2024 09:08:45</publishTime>
+ <publishTime>11/28/2024 16:07:25</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
index a3aed13..9a26d5f 100644
--- a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.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|2024-11-18T05:05:41.0455534Z;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
+ <History>True|2024-11-29T04:08:55.4868083Z;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>11/18/2024 13:05:19</publishTime>
+ <publishTime>11/27/2024 15:21:43</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/18/2024 13:05:19</publishTime>
+ <publishTime>11/27/2024 15:21:43</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/18/2024 13:05:18</publishTime>
+ <publishTime>11/27/2024 15:21:41</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/18/2024 13:05:18</publishTime>
+ <publishTime>11/27/2024 15:21:41</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/18/2024 13:05:15</publishTime>
+ <publishTime>11/19/2024 14:12:48</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/18/2024 13:05:15</publishTime>
+ <publishTime>11/19/2024 14:12:48</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>11/18/2024 13:05:16</publishTime>
+ <publishTime>11/27/2024 14:34:16</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/18/2024 13:05:16</publishTime>
+ <publishTime>11/27/2024 14:34:16</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>11/18/2024 13:05:13</publishTime>
+ <publishTime>11/19/2024 14:12:46</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/18/2024 13:05:13</publishTime>
+ <publishTime>11/19/2024 14:12:46</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/18/2024 13:05:14</publishTime>
+ <publishTime>11/19/2024 14:12:47</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/18/2024 13:05:14</publishTime>
+ <publishTime>11/19/2024 14:12:47</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/18/2024 13:05:14</publishTime>
+ <publishTime>11/19/2024 14:12:47</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/18/2024 13:05:14</publishTime>
+ <publishTime>11/19/2024 14:12:47</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>11/18/2024 11:31:14</publishTime>
+ <publishTime>11/19/2024 10:11:11</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>11/18/2024 11:31:14</publishTime>
+ <publishTime>11/19/2024 10:11:11</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>11/12/2024 17:43:04</publishTime>
+ <publishTime>11/25/2024 16:15:57</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>11/12/2024 17:43:04</publishTime>
+ <publishTime>11/25/2024 16:15:57</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>11/18/2024 11:31:38</publishTime>
+ <publishTime>11/29/2024 12:08:30</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/18/2024 11:31:38</publishTime>
+ <publishTime>11/29/2024 12:08:30</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
diff --git a/WebAPI/Properties/Settings.Designer.cs b/WebAPI/Properties/Settings.Designer.cs
index 4e42dc4..69fef59 100644
--- a/WebAPI/Properties/Settings.Designer.cs
+++ b/WebAPI/Properties/Settings.Designer.cs
@@ -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://192.168.0.81/WEBS-WMS/WebService1.asmx")]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://192.168.0.11/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 b5c0318..80ebbb1 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://192.168.0.81/WEBS-WMS/WebService1.asmx</Value>
+ <Value Profile="(Default)">http://192.168.0.11/WEBS-WMS/WebService1.asmx</Value>
</Setting>
</Settings>
</SettingsFile>
\ No newline at end of file
diff --git a/WebAPI/Service/LuBaoSevice.cs b/WebAPI/Service/LuBaoSevice.cs
index 5960303..0694899 100644
--- a/WebAPI/Service/LuBaoSevice.cs
+++ b/WebAPI/Service/LuBaoSevice.cs
@@ -681,6 +681,26 @@
}
/// <summary>
+ /// 鐜妫�娴嬪崟鏍规嵁id鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_EnvironmentTestItemEdit(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ var dataSet = GetGy_EnvironmentTestItemDb(HID);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄦ楠屼华鍣ㄦ暟鎹�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetGy_EnvironmentTestItemDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_EnvironmentTestItem where HItemID= " + HID + " ", "h_v_Gy_EnvironmentTestItem");
+ return dataSet;
+ }
+
+
+ /// <summary>
/// 浼戞伅鏃ユ牴鎹櫥褰曚汉鑾峰彇淇℃伅
/// </summary>
public static ApiResult<DataSet> GetGy_RestDayDetail(string HName)
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index f6c0460..8471c76 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -34,6 +34,10 @@
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsXt_BaseBillMain))]
public partial class WebService1 : System.Web.Services.Protocols.SoapHttpClientProtocol {
+ private System.Threading.SendOrPostCallback get_CheckTypeByMouldSourceOperationCompleted;
+
+ private System.Threading.SendOrPostCallback getMouldSourceBillListOperationCompleted;
+
private System.Threading.SendOrPostCallback Get_CheckTypeByMouldBarCode_ProdCheckStockOperationCompleted;
private System.Threading.SendOrPostCallback GetMouldBillEntry_TmpListOperationCompleted;
@@ -165,6 +169,8 @@
private System.Threading.SendOrPostCallback DeleteMouldOperationCompleted;
private System.Threading.SendOrPostCallback set_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted;
+
+ private System.Threading.SendOrPostCallback get_InfoByBarCode_SourceOperationCompleted;
private System.Threading.SendOrPostCallback get_InfoByBarCodeForReportOperationCompleted;
@@ -330,9 +336,7 @@
private System.Threading.SendOrPostCallback set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiOperationCompleted;
- private System.Threading.SendOrPostCallback get_CheckTypeByMouldSourceOperationCompleted;
-
- private System.Threading.SendOrPostCallback getMouldSourceBillListOperationCompleted;
+ private System.Threading.SendOrPostCallback GetJXBarCode_SiMoErOperationCompleted;
private System.Threading.SendOrPostCallback set_CheckOtherInBillOperationCompleted;
@@ -347,6 +351,10 @@
private System.Threading.SendOrPostCallback set_SaveOtherInBill_MESOperationCompleted;
private System.Threading.SendOrPostCallback set_SaveOtherInBill_BillCheckOperationCompleted;
+
+ private System.Threading.SendOrPostCallback set_SaveOtherInBill_CLD_BillCheckOperationCompleted;
+
+ private System.Threading.SendOrPostCallback set_SaveOtherInBill_CLD_BillCheck_VerifyOperationCompleted;
private System.Threading.SendOrPostCallback set_SaveMouldProdInBill_NewOperationCompleted;
@@ -475,8 +483,6 @@
private System.Threading.SendOrPostCallback Get_CheckWhAndSPOperationCompleted;
private System.Threading.SendOrPostCallback Get_CheckWhAndSP_BeUpdateOperationCompleted;
-
- private System.Threading.SendOrPostCallback get_InfoByBarCode_SourceOperationCompleted;
private System.Threading.SendOrPostCallback set_SaveEntrustOutBill_BillCheckOperationCompleted;
@@ -1201,6 +1207,12 @@
}
/// <remarks/>
+ public event get_CheckTypeByMouldSourceCompletedEventHandler get_CheckTypeByMouldSourceCompleted;
+
+ /// <remarks/>
+ public event getMouldSourceBillListCompletedEventHandler getMouldSourceBillListCompleted;
+
+ /// <remarks/>
public event Get_CheckTypeByMouldBarCode_ProdCheckStockCompletedEventHandler Get_CheckTypeByMouldBarCode_ProdCheckStockCompleted;
/// <remarks/>
@@ -1397,6 +1409,9 @@
/// <remarks/>
public event set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventHandler set_SavePonderationBillMain_Temp_BarCode_MouldCompleted;
+
+ /// <remarks/>
+ public event get_InfoByBarCode_SourceCompletedEventHandler get_InfoByBarCode_SourceCompleted;
/// <remarks/>
public event get_InfoByBarCodeForReportCompletedEventHandler get_InfoByBarCodeForReportCompleted;
@@ -1645,10 +1660,7 @@
public event set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiCompletedEventHandler set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiCompleted;
/// <remarks/>
- public event get_CheckTypeByMouldSourceCompletedEventHandler get_CheckTypeByMouldSourceCompleted;
-
- /// <remarks/>
- public event getMouldSourceBillListCompletedEventHandler getMouldSourceBillListCompleted;
+ public event GetJXBarCode_SiMoErCompletedEventHandler GetJXBarCode_SiMoErCompleted;
/// <remarks/>
public event set_CheckOtherInBillCompletedEventHandler set_CheckOtherInBillCompleted;
@@ -1670,6 +1682,12 @@
/// <remarks/>
public event set_SaveOtherInBill_BillCheckCompletedEventHandler set_SaveOtherInBill_BillCheckCompleted;
+
+ /// <remarks/>
+ public event set_SaveOtherInBill_CLD_BillCheckCompletedEventHandler set_SaveOtherInBill_CLD_BillCheckCompleted;
+
+ /// <remarks/>
+ public event set_SaveOtherInBill_CLD_BillCheck_VerifyCompletedEventHandler set_SaveOtherInBill_CLD_BillCheck_VerifyCompleted;
/// <remarks/>
public event set_SaveMouldProdInBill_NewCompletedEventHandler set_SaveMouldProdInBill_NewCompleted;
@@ -1862,9 +1880,6 @@
/// <remarks/>
public event Get_CheckWhAndSP_BeUpdateCompletedEventHandler Get_CheckWhAndSP_BeUpdateCompleted;
-
- /// <remarks/>
- public event get_InfoByBarCode_SourceCompletedEventHandler get_InfoByBarCode_SourceCompleted;
/// <remarks/>
public event set_SaveEntrustOutBill_BillCheckCompletedEventHandler set_SaveEntrustOutBill_BillCheckCompleted;
@@ -2891,6 +2906,94 @@
/// <remarks/>
public event GetSc_ICMOBackBillListCompletedEventHandler GetSc_ICMOBackBillListCompleted;
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_CheckTypeByMouldSource", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public ClsKf_ICStockBill_Mould get_CheckTypeByMouldSource(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, ref string sErrMsg) {
+ object[] results = this.Invoke("get_CheckTypeByMouldSource", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HHMaker,
+ HOWNERID,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((ClsKf_ICStockBill_Mould)(results[0]));
+ }
+
+ /// <remarks/>
+ public void get_CheckTypeByMouldSourceAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, string sErrMsg) {
+ this.get_CheckTypeByMouldSourceAsync(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HHMaker, HOWNERID, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void get_CheckTypeByMouldSourceAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, string sErrMsg, object userState) {
+ if ((this.get_CheckTypeByMouldSourceOperationCompleted == null)) {
+ this.get_CheckTypeByMouldSourceOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_CheckTypeByMouldSourceOperationCompleted);
+ }
+ this.InvokeAsync("get_CheckTypeByMouldSource", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HHMaker,
+ HOWNERID,
+ sErrMsg}, this.get_CheckTypeByMouldSourceOperationCompleted, userState);
+ }
+
+ private void Onget_CheckTypeByMouldSourceOperationCompleted(object arg) {
+ if ((this.get_CheckTypeByMouldSourceCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.get_CheckTypeByMouldSourceCompleted(this, new get_CheckTypeByMouldSourceCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getMouldSourceBillList", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public ClsKf_ICStockBill_Mould getMouldSourceBillList(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, ref string sErrMsg) {
+ object[] results = this.Invoke("getMouldSourceBillList", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HHMaker,
+ HOWNERID,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((ClsKf_ICStockBill_Mould)(results[0]));
+ }
+
+ /// <remarks/>
+ public void getMouldSourceBillListAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, string sErrMsg) {
+ this.getMouldSourceBillListAsync(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HHMaker, HOWNERID, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void getMouldSourceBillListAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, string sErrMsg, object userState) {
+ if ((this.getMouldSourceBillListOperationCompleted == null)) {
+ this.getMouldSourceBillListOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetMouldSourceBillListOperationCompleted);
+ }
+ this.InvokeAsync("getMouldSourceBillList", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HHMaker,
+ HOWNERID,
+ sErrMsg}, this.getMouldSourceBillListOperationCompleted, userState);
+ }
+
+ private void OngetMouldSourceBillListOperationCompleted(object arg) {
+ if ((this.getMouldSourceBillListCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.getMouldSourceBillListCompleted(this, new getMouldSourceBillListCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
/// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/Get_CheckTypeByMouldBarCode_ProdCheckStock", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
@@ -5606,6 +5709,43 @@
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/get_InfoByBarCode_Source", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public ClsGy_BarCodeBill_WMS_Model_View get_InfoByBarCode_Source(string sBarCode, long sInterID, ref bool sBool, ref string sErrMsg) {
+ object[] results = this.Invoke("get_InfoByBarCode_Source", new object[] {
+ sBarCode,
+ sInterID,
+ sBool,
+ sErrMsg});
+ sBool = ((bool)(results[1]));
+ sErrMsg = ((string)(results[2]));
+ return ((ClsGy_BarCodeBill_WMS_Model_View)(results[0]));
+ }
+
+ /// <remarks/>
+ public void get_InfoByBarCode_SourceAsync(string sBarCode, long sInterID, bool sBool, string sErrMsg) {
+ this.get_InfoByBarCode_SourceAsync(sBarCode, sInterID, sBool, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void get_InfoByBarCode_SourceAsync(string sBarCode, long sInterID, bool sBool, string sErrMsg, object userState) {
+ if ((this.get_InfoByBarCode_SourceOperationCompleted == null)) {
+ this.get_InfoByBarCode_SourceOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_InfoByBarCode_SourceOperationCompleted);
+ }
+ this.InvokeAsync("get_InfoByBarCode_Source", new object[] {
+ sBarCode,
+ sInterID,
+ sBool,
+ sErrMsg}, this.get_InfoByBarCode_SourceOperationCompleted, userState);
+ }
+
+ private void Onget_InfoByBarCode_SourceOperationCompleted(object arg) {
+ if ((this.get_InfoByBarCode_SourceCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.get_InfoByBarCode_SourceCompleted(this, new get_InfoByBarCode_SourceCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -10414,90 +10554,36 @@
}
/// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_CheckTypeByMouldSource", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public ClsKf_ICStockBill_Mould get_CheckTypeByMouldSource(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, ref string sErrMsg) {
- object[] results = this.Invoke("get_CheckTypeByMouldSource", new object[] {
- HInterID,
- HBillNo,
- HBillType,
- HSourceBillNo,
- HSourceBillType,
- HHMaker,
- HOWNERID,
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetJXBarCode_SiMoEr", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool GetJXBarCode_SiMoEr(string sBarCode, double HQty, ref string sErrMsg) {
+ object[] results = this.Invoke("GetJXBarCode_SiMoEr", new object[] {
+ sBarCode,
+ HQty,
sErrMsg});
sErrMsg = ((string)(results[1]));
- return ((ClsKf_ICStockBill_Mould)(results[0]));
+ return ((bool)(results[0]));
}
/// <remarks/>
- public void get_CheckTypeByMouldSourceAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, string sErrMsg) {
- this.get_CheckTypeByMouldSourceAsync(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HHMaker, HOWNERID, sErrMsg, null);
+ public void GetJXBarCode_SiMoErAsync(string sBarCode, double HQty, string sErrMsg) {
+ this.GetJXBarCode_SiMoErAsync(sBarCode, HQty, sErrMsg, null);
}
/// <remarks/>
- public void get_CheckTypeByMouldSourceAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, string sErrMsg, object userState) {
- if ((this.get_CheckTypeByMouldSourceOperationCompleted == null)) {
- this.get_CheckTypeByMouldSourceOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_CheckTypeByMouldSourceOperationCompleted);
+ public void GetJXBarCode_SiMoErAsync(string sBarCode, double HQty, string sErrMsg, object userState) {
+ if ((this.GetJXBarCode_SiMoErOperationCompleted == null)) {
+ this.GetJXBarCode_SiMoErOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetJXBarCode_SiMoErOperationCompleted);
}
- this.InvokeAsync("get_CheckTypeByMouldSource", new object[] {
- HInterID,
- HBillNo,
- HBillType,
- HSourceBillNo,
- HSourceBillType,
- HHMaker,
- HOWNERID,
- sErrMsg}, this.get_CheckTypeByMouldSourceOperationCompleted, userState);
+ this.InvokeAsync("GetJXBarCode_SiMoEr", new object[] {
+ sBarCode,
+ HQty,
+ sErrMsg}, this.GetJXBarCode_SiMoErOperationCompleted, userState);
}
- private void Onget_CheckTypeByMouldSourceOperationCompleted(object arg) {
- if ((this.get_CheckTypeByMouldSourceCompleted != null)) {
+ private void OnGetJXBarCode_SiMoErOperationCompleted(object arg) {
+ if ((this.GetJXBarCode_SiMoErCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.get_CheckTypeByMouldSourceCompleted(this, new get_CheckTypeByMouldSourceCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/getMouldSourceBillList", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public ClsKf_ICStockBill_Mould getMouldSourceBillList(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, ref string sErrMsg) {
- object[] results = this.Invoke("getMouldSourceBillList", new object[] {
- HInterID,
- HBillNo,
- HBillType,
- HSourceBillNo,
- HSourceBillType,
- HHMaker,
- HOWNERID,
- sErrMsg});
- sErrMsg = ((string)(results[1]));
- return ((ClsKf_ICStockBill_Mould)(results[0]));
- }
-
- /// <remarks/>
- public void getMouldSourceBillListAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, string sErrMsg) {
- this.getMouldSourceBillListAsync(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HHMaker, HOWNERID, sErrMsg, null);
- }
-
- /// <remarks/>
- public void getMouldSourceBillListAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HHMaker, long HOWNERID, string sErrMsg, object userState) {
- if ((this.getMouldSourceBillListOperationCompleted == null)) {
- this.getMouldSourceBillListOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetMouldSourceBillListOperationCompleted);
- }
- this.InvokeAsync("getMouldSourceBillList", new object[] {
- HInterID,
- HBillNo,
- HBillType,
- HSourceBillNo,
- HSourceBillType,
- HHMaker,
- HOWNERID,
- sErrMsg}, this.getMouldSourceBillListOperationCompleted, userState);
- }
-
- private void OngetMouldSourceBillListOperationCompleted(object arg) {
- if ((this.getMouldSourceBillListCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.getMouldSourceBillListCompleted(this, new getMouldSourceBillListCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ this.GetJXBarCode_SiMoErCompleted(this, new GetJXBarCode_SiMoErCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -10727,6 +10813,70 @@
if ((this.set_SaveOtherInBill_BillCheckCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.set_SaveOtherInBill_BillCheckCompleted(this, new set_SaveOtherInBill_BillCheckCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveOtherInBill_CLD_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_SaveOtherInBill_CLD_BillCheck(ClsKf_OtherInBillMain oMain, ref string sErrMsg) {
+ object[] results = this.Invoke("set_SaveOtherInBill_CLD_BillCheck", new object[] {
+ oMain,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void set_SaveOtherInBill_CLD_BillCheckAsync(ClsKf_OtherInBillMain oMain, string sErrMsg) {
+ this.set_SaveOtherInBill_CLD_BillCheckAsync(oMain, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void set_SaveOtherInBill_CLD_BillCheckAsync(ClsKf_OtherInBillMain oMain, string sErrMsg, object userState) {
+ if ((this.set_SaveOtherInBill_CLD_BillCheckOperationCompleted == null)) {
+ this.set_SaveOtherInBill_CLD_BillCheckOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveOtherInBill_CLD_BillCheckOperationCompleted);
+ }
+ this.InvokeAsync("set_SaveOtherInBill_CLD_BillCheck", new object[] {
+ oMain,
+ sErrMsg}, this.set_SaveOtherInBill_CLD_BillCheckOperationCompleted, userState);
+ }
+
+ private void Onset_SaveOtherInBill_CLD_BillCheckOperationCompleted(object arg) {
+ if ((this.set_SaveOtherInBill_CLD_BillCheckCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.set_SaveOtherInBill_CLD_BillCheckCompleted(this, new set_SaveOtherInBill_CLD_BillCheckCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveOtherInBill_CLD_BillCheck_Verify", 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_SaveOtherInBill_CLD_BillCheck_Verify(ClsKf_OtherInBillMain oMain, ref string sErrMsg) {
+ object[] results = this.Invoke("set_SaveOtherInBill_CLD_BillCheck_Verify", new object[] {
+ oMain,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void set_SaveOtherInBill_CLD_BillCheck_VerifyAsync(ClsKf_OtherInBillMain oMain, string sErrMsg) {
+ this.set_SaveOtherInBill_CLD_BillCheck_VerifyAsync(oMain, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void set_SaveOtherInBill_CLD_BillCheck_VerifyAsync(ClsKf_OtherInBillMain oMain, string sErrMsg, object userState) {
+ if ((this.set_SaveOtherInBill_CLD_BillCheck_VerifyOperationCompleted == null)) {
+ this.set_SaveOtherInBill_CLD_BillCheck_VerifyOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveOtherInBill_CLD_BillCheck_VerifyOperationCompleted);
+ }
+ this.InvokeAsync("set_SaveOtherInBill_CLD_BillCheck_Verify", new object[] {
+ oMain,
+ sErrMsg}, this.set_SaveOtherInBill_CLD_BillCheck_VerifyOperationCompleted, userState);
+ }
+
+ private void Onset_SaveOtherInBill_CLD_BillCheck_VerifyOperationCompleted(object arg) {
+ if ((this.set_SaveOtherInBill_CLD_BillCheck_VerifyCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.set_SaveOtherInBill_CLD_BillCheck_VerifyCompleted(this, new set_SaveOtherInBill_CLD_BillCheck_VerifyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -12892,43 +13042,6 @@
if ((this.Get_CheckWhAndSP_BeUpdateCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.Get_CheckWhAndSP_BeUpdateCompleted(this, new Get_CheckWhAndSP_BeUpdateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_InfoByBarCode_Source", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public ClsGy_BarCodeBill_WMS_Model_View get_InfoByBarCode_Source(string sBarCode, long sInterID, ref bool sBool, ref string sErrMsg) {
- object[] results = this.Invoke("get_InfoByBarCode_Source", new object[] {
- sBarCode,
- sInterID,
- sBool,
- sErrMsg});
- sBool = ((bool)(results[1]));
- sErrMsg = ((string)(results[2]));
- return ((ClsGy_BarCodeBill_WMS_Model_View)(results[0]));
- }
-
- /// <remarks/>
- public void get_InfoByBarCode_SourceAsync(string sBarCode, long sInterID, bool sBool, string sErrMsg) {
- this.get_InfoByBarCode_SourceAsync(sBarCode, sInterID, sBool, sErrMsg, null);
- }
-
- /// <remarks/>
- public void get_InfoByBarCode_SourceAsync(string sBarCode, long sInterID, bool sBool, string sErrMsg, object userState) {
- if ((this.get_InfoByBarCode_SourceOperationCompleted == null)) {
- this.get_InfoByBarCode_SourceOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_InfoByBarCode_SourceOperationCompleted);
- }
- this.InvokeAsync("get_InfoByBarCode_Source", new object[] {
- sBarCode,
- sInterID,
- sBool,
- sErrMsg}, this.get_InfoByBarCode_SourceOperationCompleted, userState);
- }
-
- private void Onget_InfoByBarCode_SourceOperationCompleted(object arg) {
- if ((this.get_InfoByBarCode_SourceCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.get_InfoByBarCode_SourceCompleted(this, new get_InfoByBarCode_SourceCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -24640,101 +24753,147 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
- public partial class ClsSc_MouldStockBillMain : ClsXt_BaseBillMain {
+ public partial class ClsKf_ICStockBill_Mould {
- private long hSCWHIDField;
+ private long hItemIDField;
- private long hSupIDField;
+ private string hBarTypeField;
- private long hEmpIDField;
+ private long hWhIDField;
- private long hManagerIDField;
+ private string hWhNumberField;
- private long hWHIDField;
+ private string hWhNameField;
- private long hSecManagerIDField;
+ private bool hSPFlagField;
- private long hKeeperIDField;
+ private long hSPIDField;
+
+ private string hSPNumberField;
+
+ private string hSPNameField;
private long hDeptIDField;
- private string hExplanationField;
+ private string hDeptNumberField;
- private string hInnerBillNoField;
+ private string hDeptNameField;
- private bool hRedBlueFlagField;
+ private long hSupIDField;
- private string hRepairTypeField;
+ private string hSupNumberField;
- private long hCorrespondentTypeIDField;
+ private string hSupNameField;
+
+ private string hSourceBillNoField;
+
+ private string hSourceBillTypeField;
+
+ private long hOWNERIDField;
+
+ private string hOWNERNAMEField;
+
+ private string hCustomField;
+
+ private long hMulSourceFlagField;
+
+ private string hStockStyleField;
+
+ private long hStockInOrgIDField;
+
+ private string hStockInOrgNameField;
+
+ private long hStockOutOrgIDField;
+
+ private string hStockOutOrgNameField;
/// <remarks/>
- public long HSCWHID {
+ public long HItemID {
get {
- return this.hSCWHIDField;
+ return this.hItemIDField;
}
set {
- this.hSCWHIDField = value;
+ this.hItemIDField = value;
}
}
/// <remarks/>
- public long HSupID {
+ public string HBarType {
get {
- return this.hSupIDField;
+ return this.hBarTypeField;
}
set {
- this.hSupIDField = value;
+ this.hBarTypeField = value;
}
}
/// <remarks/>
- public long HEmpID {
+ public long HWhID {
get {
- return this.hEmpIDField;
+ return this.hWhIDField;
}
set {
- this.hEmpIDField = value;
+ this.hWhIDField = value;
}
}
/// <remarks/>
- public long HManagerID {
+ public string HWhNumber {
get {
- return this.hManagerIDField;
+ return this.hWhNumberField;
}
set {
- this.hManagerIDField = value;
+ this.hWhNumberField = value;
}
}
/// <remarks/>
- public long HWHID {
+ public string HWhName {
get {
- return this.hWHIDField;
+ return this.hWhNameField;
}
set {
- this.hWHIDField = value;
+ this.hWhNameField = value;
}
}
/// <remarks/>
- public long HSecManagerID {
+ public bool HSPFlag {
get {
- return this.hSecManagerIDField;
+ return this.hSPFlagField;
}
set {
- this.hSecManagerIDField = value;
+ this.hSPFlagField = value;
}
}
/// <remarks/>
- public long HKeeperID {
+ public long HSPID {
get {
- return this.hKeeperIDField;
+ return this.hSPIDField;
}
set {
- this.hKeeperIDField = value;
+ this.hSPIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HSPNumber {
+ get {
+ return this.hSPNumberField;
+ }
+ set {
+ this.hSPNumberField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HSPName {
+ get {
+ return this.hSPNameField;
+ }
+ set {
+ this.hSPNameField = value;
}
}
@@ -24749,480 +24908,162 @@
}
/// <remarks/>
- public string HExplanation {
+ public string HDeptNumber {
get {
- return this.hExplanationField;
+ return this.hDeptNumberField;
}
set {
- this.hExplanationField = value;
+ this.hDeptNumberField = value;
}
}
/// <remarks/>
- public string HInnerBillNo {
+ public string HDeptName {
get {
- return this.hInnerBillNoField;
+ return this.hDeptNameField;
}
set {
- this.hInnerBillNoField = value;
+ this.hDeptNameField = value;
}
}
/// <remarks/>
- public bool HRedBlueFlag {
+ public long HSupID {
get {
- return this.hRedBlueFlagField;
+ return this.hSupIDField;
}
set {
- this.hRedBlueFlagField = value;
+ this.hSupIDField = value;
}
}
/// <remarks/>
- public string HRepairType {
+ public string HSupNumber {
get {
- return this.hRepairTypeField;
+ return this.hSupNumberField;
}
set {
- this.hRepairTypeField = value;
+ this.hSupNumberField = value;
}
}
/// <remarks/>
- public long HCorrespondentTypeID {
+ public string HSupName {
get {
- return this.hCorrespondentTypeIDField;
+ return this.hSupNameField;
}
set {
- this.hCorrespondentTypeIDField = value;
- }
- }
- }
-
- /// <remarks/>
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_ProcExchReportMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackUnionBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackDoubleBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackSplitBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockStepOutBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockBillMain))]
- [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_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))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_MESBeginWorkBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_StationInBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_SellOutBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockStepInBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_EntrustInBillMain_K3))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_EntrustInBillMain))]
- [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_POStockInBillMain_K3))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_POStockInBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_OtherOutBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ICStockBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_EntrustOutBillMain))]
- [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_MouldProdInBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_OtherInBillMain))]
- [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_MouldStockBillMain))]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
- public partial class ClsXt_BaseBillMain {
-
- private long hYearField;
-
- private long hPeriodField;
-
- private string hBillTypeField;
-
- private string hBillSubTypeField;
-
- private long hInterIDField;
-
- private System.DateTime hDateField;
-
- private string hBillNoField;
-
- private int hBillStatusField;
-
- private long hCheckItemNowIDField;
-
- private long hCheckItemNextIDField;
-
- private long hCheckFlowIDField;
-
- private string hRemarkField;
-
- private string hEmpCodeField;
-
- private string hMakerField;
-
- private string hMakeDateField;
-
- private string hUpDaterField;
-
- private string hUpDateDateField;
-
- private string hCheckerField;
-
- private string hCheckDateField;
-
- private string hBackerField;
-
- private string hBackDateField;
-
- private string hBackRemarkField;
-
- private string hCloseManField;
-
- private string hCloseDateField;
-
- private bool hCloseTypeField;
-
- private string hDeleteManField;
-
- private string hDeleteDateField;
-
- private long hBillerIDField;
-
- private string hMainSourceBillNoField;
-
- private string hMainSourceBillTypeField;
-
- private long hMainSourceInterIDField;
-
- private long hMainSourceEntryIDField;
-
- /// <remarks/>
- public long HYear {
- get {
- return this.hYearField;
- }
- set {
- this.hYearField = value;
+ this.hSupNameField = value;
}
}
/// <remarks/>
- public long HPeriod {
+ public string HSourceBillNo {
get {
- return this.hPeriodField;
+ return this.hSourceBillNoField;
}
set {
- this.hPeriodField = value;
+ this.hSourceBillNoField = value;
}
}
/// <remarks/>
- public string HBillType {
+ public string HSourceBillType {
get {
- return this.hBillTypeField;
+ return this.hSourceBillTypeField;
}
set {
- this.hBillTypeField = value;
+ this.hSourceBillTypeField = value;
}
}
/// <remarks/>
- public string HBillSubType {
+ public long HOWNERID {
get {
- return this.hBillSubTypeField;
+ return this.hOWNERIDField;
}
set {
- this.hBillSubTypeField = value;
+ this.hOWNERIDField = value;
}
}
/// <remarks/>
- public long HInterID {
+ public string HOWNERNAME {
get {
- return this.hInterIDField;
+ return this.hOWNERNAMEField;
}
set {
- this.hInterIDField = value;
+ this.hOWNERNAMEField = value;
}
}
/// <remarks/>
- public System.DateTime HDate {
+ public string HCustom {
get {
- return this.hDateField;
+ return this.hCustomField;
}
set {
- this.hDateField = value;
+ this.hCustomField = value;
}
}
/// <remarks/>
- public string HBillNo {
+ public long HMulSourceFlag {
get {
- return this.hBillNoField;
+ return this.hMulSourceFlagField;
}
set {
- this.hBillNoField = value;
+ this.hMulSourceFlagField = value;
}
}
/// <remarks/>
- public int HBillStatus {
+ public string HStockStyle {
get {
- return this.hBillStatusField;
+ return this.hStockStyleField;
}
set {
- this.hBillStatusField = value;
+ this.hStockStyleField = value;
}
}
/// <remarks/>
- public long HCheckItemNowID {
+ public long HStockInOrgID {
get {
- return this.hCheckItemNowIDField;
+ return this.hStockInOrgIDField;
}
set {
- this.hCheckItemNowIDField = value;
+ this.hStockInOrgIDField = value;
}
}
/// <remarks/>
- public long HCheckItemNextID {
+ public string HStockInOrgName {
get {
- return this.hCheckItemNextIDField;
+ return this.hStockInOrgNameField;
}
set {
- this.hCheckItemNextIDField = value;
+ this.hStockInOrgNameField = value;
}
}
/// <remarks/>
- public long HCheckFlowID {
+ public long HStockOutOrgID {
get {
- return this.hCheckFlowIDField;
+ return this.hStockOutOrgIDField;
}
set {
- this.hCheckFlowIDField = value;
+ this.hStockOutOrgIDField = value;
}
}
/// <remarks/>
- public string HRemark {
+ public string HStockOutOrgName {
get {
- return this.hRemarkField;
+ return this.hStockOutOrgNameField;
}
set {
- this.hRemarkField = value;
- }
- }
-
- /// <remarks/>
- public string HEmpCode {
- get {
- return this.hEmpCodeField;
- }
- set {
- this.hEmpCodeField = value;
- }
- }
-
- /// <remarks/>
- public string HMaker {
- get {
- return this.hMakerField;
- }
- set {
- this.hMakerField = value;
- }
- }
-
- /// <remarks/>
- public string HMakeDate {
- get {
- return this.hMakeDateField;
- }
- set {
- this.hMakeDateField = value;
- }
- }
-
- /// <remarks/>
- public string HUpDater {
- get {
- return this.hUpDaterField;
- }
- set {
- this.hUpDaterField = value;
- }
- }
-
- /// <remarks/>
- public string HUpDateDate {
- get {
- return this.hUpDateDateField;
- }
- set {
- this.hUpDateDateField = value;
- }
- }
-
- /// <remarks/>
- public string HChecker {
- get {
- return this.hCheckerField;
- }
- set {
- this.hCheckerField = value;
- }
- }
-
- /// <remarks/>
- public string HCheckDate {
- get {
- return this.hCheckDateField;
- }
- set {
- this.hCheckDateField = value;
- }
- }
-
- /// <remarks/>
- public string HBacker {
- get {
- return this.hBackerField;
- }
- set {
- this.hBackerField = value;
- }
- }
-
- /// <remarks/>
- public string HBackDate {
- get {
- return this.hBackDateField;
- }
- set {
- this.hBackDateField = value;
- }
- }
-
- /// <remarks/>
- public string HBackRemark {
- get {
- return this.hBackRemarkField;
- }
- set {
- this.hBackRemarkField = value;
- }
- }
-
- /// <remarks/>
- public string HCloseMan {
- get {
- return this.hCloseManField;
- }
- set {
- this.hCloseManField = value;
- }
- }
-
- /// <remarks/>
- public string HCloseDate {
- get {
- return this.hCloseDateField;
- }
- set {
- this.hCloseDateField = value;
- }
- }
-
- /// <remarks/>
- public bool HCloseType {
- get {
- return this.hCloseTypeField;
- }
- set {
- this.hCloseTypeField = value;
- }
- }
-
- /// <remarks/>
- public string HDeleteMan {
- get {
- return this.hDeleteManField;
- }
- set {
- this.hDeleteManField = value;
- }
- }
-
- /// <remarks/>
- public string HDeleteDate {
- get {
- return this.hDeleteDateField;
- }
- set {
- this.hDeleteDateField = value;
- }
- }
-
- /// <remarks/>
- public long HBillerID {
- get {
- return this.hBillerIDField;
- }
- set {
- this.hBillerIDField = value;
- }
- }
-
- /// <remarks/>
- public string HMainSourceBillNo {
- get {
- return this.hMainSourceBillNoField;
- }
- set {
- this.hMainSourceBillNoField = value;
- }
- }
-
- /// <remarks/>
- public string HMainSourceBillType {
- get {
- return this.hMainSourceBillTypeField;
- }
- set {
- this.hMainSourceBillTypeField = value;
- }
- }
-
- /// <remarks/>
- public long HMainSourceInterID {
- get {
- return this.hMainSourceInterIDField;
- }
- set {
- this.hMainSourceInterIDField = value;
- }
- }
-
- /// <remarks/>
- public long HMainSourceEntryID {
- get {
- return this.hMainSourceEntryIDField;
- }
- set {
- this.hMainSourceEntryIDField = value;
+ this.hStockOutOrgNameField = value;
}
}
}
@@ -36509,327 +36350,6 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
- public partial class ClsKf_ICStockBill_Mould {
-
- private long hItemIDField;
-
- private string hBarTypeField;
-
- private long hWhIDField;
-
- private string hWhNumberField;
-
- private string hWhNameField;
-
- private bool hSPFlagField;
-
- private long hSPIDField;
-
- private string hSPNumberField;
-
- private string hSPNameField;
-
- private long hDeptIDField;
-
- private string hDeptNumberField;
-
- private string hDeptNameField;
-
- private long hSupIDField;
-
- private string hSupNumberField;
-
- private string hSupNameField;
-
- private string hSourceBillNoField;
-
- private string hSourceBillTypeField;
-
- private long hOWNERIDField;
-
- private string hOWNERNAMEField;
-
- private string hCustomField;
-
- private long hMulSourceFlagField;
-
- private string hStockStyleField;
-
- private long hStockInOrgIDField;
-
- private string hStockInOrgNameField;
-
- private long hStockOutOrgIDField;
-
- private string hStockOutOrgNameField;
-
- /// <remarks/>
- public long HItemID {
- get {
- return this.hItemIDField;
- }
- set {
- this.hItemIDField = value;
- }
- }
-
- /// <remarks/>
- public string HBarType {
- get {
- return this.hBarTypeField;
- }
- set {
- this.hBarTypeField = value;
- }
- }
-
- /// <remarks/>
- public long HWhID {
- get {
- return this.hWhIDField;
- }
- set {
- this.hWhIDField = value;
- }
- }
-
- /// <remarks/>
- public string HWhNumber {
- get {
- return this.hWhNumberField;
- }
- set {
- this.hWhNumberField = value;
- }
- }
-
- /// <remarks/>
- public string HWhName {
- get {
- return this.hWhNameField;
- }
- set {
- this.hWhNameField = value;
- }
- }
-
- /// <remarks/>
- public bool HSPFlag {
- get {
- return this.hSPFlagField;
- }
- set {
- this.hSPFlagField = value;
- }
- }
-
- /// <remarks/>
- public long HSPID {
- get {
- return this.hSPIDField;
- }
- set {
- this.hSPIDField = value;
- }
- }
-
- /// <remarks/>
- public string HSPNumber {
- get {
- return this.hSPNumberField;
- }
- set {
- this.hSPNumberField = value;
- }
- }
-
- /// <remarks/>
- public string HSPName {
- get {
- return this.hSPNameField;
- }
- set {
- this.hSPNameField = value;
- }
- }
-
- /// <remarks/>
- public long HDeptID {
- get {
- return this.hDeptIDField;
- }
- set {
- this.hDeptIDField = value;
- }
- }
-
- /// <remarks/>
- public string HDeptNumber {
- get {
- return this.hDeptNumberField;
- }
- set {
- this.hDeptNumberField = value;
- }
- }
-
- /// <remarks/>
- public string HDeptName {
- get {
- return this.hDeptNameField;
- }
- set {
- this.hDeptNameField = value;
- }
- }
-
- /// <remarks/>
- public long HSupID {
- get {
- return this.hSupIDField;
- }
- set {
- this.hSupIDField = value;
- }
- }
-
- /// <remarks/>
- public string HSupNumber {
- get {
- return this.hSupNumberField;
- }
- set {
- this.hSupNumberField = value;
- }
- }
-
- /// <remarks/>
- public string HSupName {
- get {
- return this.hSupNameField;
- }
- set {
- this.hSupNameField = value;
- }
- }
-
- /// <remarks/>
- public string HSourceBillNo {
- get {
- return this.hSourceBillNoField;
- }
- set {
- this.hSourceBillNoField = value;
- }
- }
-
- /// <remarks/>
- public string HSourceBillType {
- get {
- return this.hSourceBillTypeField;
- }
- set {
- this.hSourceBillTypeField = value;
- }
- }
-
- /// <remarks/>
- public long HOWNERID {
- get {
- return this.hOWNERIDField;
- }
- set {
- this.hOWNERIDField = value;
- }
- }
-
- /// <remarks/>
- public string HOWNERNAME {
- get {
- return this.hOWNERNAMEField;
- }
- set {
- this.hOWNERNAMEField = value;
- }
- }
-
- /// <remarks/>
- public string HCustom {
- get {
- return this.hCustomField;
- }
- set {
- this.hCustomField = value;
- }
- }
-
- /// <remarks/>
- public long HMulSourceFlag {
- get {
- return this.hMulSourceFlagField;
- }
- set {
- this.hMulSourceFlagField = value;
- }
- }
-
- /// <remarks/>
- public string HStockStyle {
- get {
- return this.hStockStyleField;
- }
- set {
- this.hStockStyleField = value;
- }
- }
-
- /// <remarks/>
- public long HStockInOrgID {
- get {
- return this.hStockInOrgIDField;
- }
- set {
- this.hStockInOrgIDField = value;
- }
- }
-
- /// <remarks/>
- public string HStockInOrgName {
- get {
- return this.hStockInOrgNameField;
- }
- set {
- this.hStockInOrgNameField = value;
- }
- }
-
- /// <remarks/>
- public long HStockOutOrgID {
- get {
- return this.hStockOutOrgIDField;
- }
- set {
- this.hStockOutOrgIDField = value;
- }
- }
-
- /// <remarks/>
- public string HStockOutOrgName {
- get {
- return this.hStockOutOrgNameField;
- }
- set {
- this.hStockOutOrgNameField = value;
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
public partial class ClsXt_SystemParameterMain {
private string sc_ICMOReportBill_AutoCheckField;
@@ -36900,6 +36420,12 @@
private string kf_POStockInBill_DeleterAndMakerMustSameField;
+ private string kf_POStockInBillCheck_MustQtyCtlField;
+
+ private string kf_POStockInBillCheck_WHSPCtlField;
+
+ private string kf_POStockInBillCheck_MultilineCtlField;
+
private string kf_ProductInBill_AutoCheckField;
private string kf_ProductInBill_SaveAutoAddnewField;
@@ -36925,6 +36451,12 @@
private string kf_ProductInBill_DisplayField;
private string kf_ProductInBill_DeleterAndMakerMustSameField;
+
+ private string kf_ProductInBillCheck_MustQtyCtlField;
+
+ private string kf_ProductInBillCheck_WHSPCtlField;
+
+ private string kf_ProductInBillCheck_MultilineCtlField;
private string kf_OtherInBill_AutoCheckField;
@@ -37514,6 +37046,72 @@
private string barCode_DeleterAndMakerMustSameField;
+ private string sc_MouldProdInBill_AutoCheckField;
+
+ private string sc_MouldProdInBill_BarCodeQtyField;
+
+ private string sc_MouldProdOutBill_AutoCheckField;
+
+ private string sc_MouldProdOutBill_BarCodeQtyField;
+
+ private string sc_MouldProdOutBill_SaveAutoAddnewField;
+
+ private string sc_MouldProdOutBill_DeleterAndMakerMustSameField;
+
+ private string sc_MouldProdOutBill_MouldLifeCtrlField;
+
+ private string sc_MouldProdOutBill_MouldLifeCtrlTypeField;
+
+ private string sc_MouldProdBackBill_AutoCheckField;
+
+ private string sc_MouldProdBackBill_BarCodeQtyField;
+
+ private string sc_MouldRepairOutBill_AutoCheckField;
+
+ private string sc_MouldRepairOutBill_BarCodeQtyField;
+
+ private string sc_MouldRepairInBill_AutoCheckField;
+
+ private string sc_MouldRepairInBill_BarCodeQtyField;
+
+ private string sc_MouldOtherInBill_AutoCheckField;
+
+ private string sc_MouldOtherInBill_BarCodeQtyField;
+
+ private string sc_MouldOtherOutBill_AutoCheckField;
+
+ private string sc_MouldOtherOutBill_BarCodeQtyField;
+
+ private string sc_MouldBorrowInBill_AutoCheckField;
+
+ private string sc_MouldBorrowInBill_BarCodeQtyField;
+
+ private string sc_MouldBorrowOutBill_AutoCheckField;
+
+ private string sc_MouldBorrowOutBill_BarCodeQtyField;
+
+ private string sc_MouldScrapInBill_AutoCheckField;
+
+ private string sc_MouldScrapInBill_BarCodeQtyField;
+
+ private string sc_MouldScrapOutBill_AutoCheckField;
+
+ private string sc_MouldScrapOutBill_BarCodeQtyField;
+
+ private string sc_MouldProdMoveBill_AutoCheckField;
+
+ private string sc_MouldProdMoveBill_BarCodeQtyField;
+
+ private string sc_MouldMoveStockStepOutBill_AutoCheckField;
+
+ private string sc_MouldMoveStockStepOutBill_BarCodeQtyField;
+
+ private string sc_MouldMoveStockStepInBill_AutoCheckField;
+
+ private string sc_MouldMoveStockStepInBill_BarCodeQtyField;
+
+ private string sc_MouldProdCheckStockBill_AutoCheckField;
+
private string sc_ICMOBill_AutoCheckField;
private string sc_ICMOBill_SaveAutoAddnewField;
@@ -37529,6 +37127,8 @@
private string sc_ProcessExchangeBill_AutoBarCodeField;
private string sc_ProcessExchangeBill_DeleterAndMakerMustSameField;
+
+ private string sc_ProcessExchangeBill_SaveDeptIsNullField;
private string mES_StationInBill_AutoCheckField;
@@ -37561,6 +37161,8 @@
private string mES_StationInBill_QtyRateCtlField;
private string mES_StationInBill_DyCentralInspectionControlField;
+
+ private string mES_StationInBill_DefQtyField;
private string mES_StationOutBill_AutoCheckField;
@@ -37595,6 +37197,8 @@
private string mES_StationOutBill_NextQtyCtlField;
private string mES_StationOutBill_QtyRateCtlField;
+
+ private string mES_StationOutBill_MustBeginWorkCtlField;
private string qC_NoPassProdCheckBill_AutoCheckField;
@@ -37635,6 +37239,10 @@
private string sc_MESBeginWorkBill_SaveAutoAddnewField;
private string sc_MESBeginWorkBill_DeleterAndMakerMustSameField;
+
+ private string sc_MESBeginWorkBill_SwipeCardStartField;
+
+ private string sc_MESBeginWorkBill_MouldUpperField;
private string sc_MESReturnWorkBill_AutoCheckField;
@@ -37684,6 +37292,8 @@
private string oA_ErrMsgBackBill_DeleterAndMakerMustSameField;
+ private string oA_ErrMsgBackBill_SendDingDingMsgField;
+
private string sc_MESProceReportWorkBill_AutoCheckField;
private string sc_MESProceReportWorkBill_SaveAutoAddnewField;
@@ -37714,15 +37324,7 @@
private string qC_ProcessCheckBill_QCSchemeSourceField;
- private string sc_MouldProdOutBill_AutoCheckField;
-
- private string sc_MouldProdOutBill_SaveAutoAddnewField;
-
- private string sc_MouldProdOutBill_DeleterAndMakerMustSameField;
-
- private string sc_MouldProdOutBill_MouldLifeCtrlField;
-
- private string sc_MouldProdOutBill_MouldLifeCtrlTypeField;
+ private string sB_EquipICMOTechParamBill_MustBeginWorkCtlField;
private string gy_RoutingBill_AutoCheckField;
@@ -37731,6 +37333,28 @@
private string gy_RoutingBill_DeleterAndMakerMustSameField;
private string gy_RoutingBill_SaveAutoLastProcField;
+
+ private string gy_RoutingBill_EnableMultiLevelField;
+
+ private string kf_StockInRequestBill_AutoCheckField;
+
+ private string cg_POOrderBill_AutoCheckField;
+
+ private string cg_PayableBill_AutoCheckField;
+
+ private string yF_PayMentBill_AutoCheckField;
+
+ private string xs_SeOrderBill_AutoCheckField;
+
+ private string xs_SeOutStockBill_AutoCheckField;
+
+ private string xs_ReceivableBill_AutoCheckField;
+
+ private string yS_ReceiveBill_AutoCheckField;
+
+ private string pay_WorkTimesBill_AutoCheckField;
+
+ private string sc_MouldLowerBill_MouldUpperField;
/// <remarks/>
public string Sc_ICMOReportBill_AutoCheck {
@@ -38073,6 +37697,36 @@
}
/// <remarks/>
+ public string Kf_POStockInBillCheck_MustQtyCtl {
+ get {
+ return this.kf_POStockInBillCheck_MustQtyCtlField;
+ }
+ set {
+ this.kf_POStockInBillCheck_MustQtyCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_POStockInBillCheck_WHSPCtl {
+ get {
+ return this.kf_POStockInBillCheck_WHSPCtlField;
+ }
+ set {
+ this.kf_POStockInBillCheck_WHSPCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_POStockInBillCheck_MultilineCtl {
+ get {
+ return this.kf_POStockInBillCheck_MultilineCtlField;
+ }
+ set {
+ this.kf_POStockInBillCheck_MultilineCtlField = value;
+ }
+ }
+
+ /// <remarks/>
public string Kf_ProductInBill_AutoCheck {
get {
return this.kf_ProductInBill_AutoCheckField;
@@ -38199,6 +37853,36 @@
}
set {
this.kf_ProductInBill_DeleterAndMakerMustSameField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_ProductInBillCheck_MustQtyCtl {
+ get {
+ return this.kf_ProductInBillCheck_MustQtyCtlField;
+ }
+ set {
+ this.kf_ProductInBillCheck_MustQtyCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_ProductInBillCheck_WHSPCtl {
+ get {
+ return this.kf_ProductInBillCheck_WHSPCtlField;
+ }
+ set {
+ this.kf_ProductInBillCheck_WHSPCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_ProductInBillCheck_MultilineCtl {
+ get {
+ return this.kf_ProductInBillCheck_MultilineCtlField;
+ }
+ set {
+ this.kf_ProductInBillCheck_MultilineCtlField = value;
}
}
@@ -41143,6 +40827,336 @@
}
/// <remarks/>
+ public string Sc_MouldProdInBill_AutoCheck {
+ get {
+ return this.sc_MouldProdInBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldProdInBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdInBill_BarCodeQty {
+ get {
+ return this.sc_MouldProdInBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldProdInBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdOutBill_AutoCheck {
+ get {
+ return this.sc_MouldProdOutBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldProdOutBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdOutBill_BarCodeQty {
+ get {
+ return this.sc_MouldProdOutBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldProdOutBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdOutBill_SaveAutoAddnew {
+ get {
+ return this.sc_MouldProdOutBill_SaveAutoAddnewField;
+ }
+ set {
+ this.sc_MouldProdOutBill_SaveAutoAddnewField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdOutBill_DeleterAndMakerMustSame {
+ get {
+ return this.sc_MouldProdOutBill_DeleterAndMakerMustSameField;
+ }
+ set {
+ this.sc_MouldProdOutBill_DeleterAndMakerMustSameField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdOutBill_MouldLifeCtrl {
+ get {
+ return this.sc_MouldProdOutBill_MouldLifeCtrlField;
+ }
+ set {
+ this.sc_MouldProdOutBill_MouldLifeCtrlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdOutBill_MouldLifeCtrlType {
+ get {
+ return this.sc_MouldProdOutBill_MouldLifeCtrlTypeField;
+ }
+ set {
+ this.sc_MouldProdOutBill_MouldLifeCtrlTypeField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdBackBill_AutoCheck {
+ get {
+ return this.sc_MouldProdBackBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldProdBackBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdBackBill_BarCodeQty {
+ get {
+ return this.sc_MouldProdBackBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldProdBackBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldRepairOutBill_AutoCheck {
+ get {
+ return this.sc_MouldRepairOutBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldRepairOutBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldRepairOutBill_BarCodeQty {
+ get {
+ return this.sc_MouldRepairOutBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldRepairOutBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldRepairInBill_AutoCheck {
+ get {
+ return this.sc_MouldRepairInBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldRepairInBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldRepairInBill_BarCodeQty {
+ get {
+ return this.sc_MouldRepairInBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldRepairInBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldOtherInBill_AutoCheck {
+ get {
+ return this.sc_MouldOtherInBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldOtherInBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldOtherInBill_BarCodeQty {
+ get {
+ return this.sc_MouldOtherInBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldOtherInBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldOtherOutBill_AutoCheck {
+ get {
+ return this.sc_MouldOtherOutBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldOtherOutBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldOtherOutBill_BarCodeQty {
+ get {
+ return this.sc_MouldOtherOutBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldOtherOutBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldBorrowInBill_AutoCheck {
+ get {
+ return this.sc_MouldBorrowInBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldBorrowInBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldBorrowInBill_BarCodeQty {
+ get {
+ return this.sc_MouldBorrowInBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldBorrowInBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldBorrowOutBill_AutoCheck {
+ get {
+ return this.sc_MouldBorrowOutBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldBorrowOutBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldBorrowOutBill_BarCodeQty {
+ get {
+ return this.sc_MouldBorrowOutBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldBorrowOutBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldScrapInBill_AutoCheck {
+ get {
+ return this.sc_MouldScrapInBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldScrapInBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldScrapInBill_BarCodeQty {
+ get {
+ return this.sc_MouldScrapInBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldScrapInBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldScrapOutBill_AutoCheck {
+ get {
+ return this.sc_MouldScrapOutBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldScrapOutBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldScrapOutBill_BarCodeQty {
+ get {
+ return this.sc_MouldScrapOutBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldScrapOutBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdMoveBill_AutoCheck {
+ get {
+ return this.sc_MouldProdMoveBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldProdMoveBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdMoveBill_BarCodeQty {
+ get {
+ return this.sc_MouldProdMoveBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldProdMoveBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldMoveStockStepOutBill_AutoCheck {
+ get {
+ return this.sc_MouldMoveStockStepOutBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldMoveStockStepOutBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldMoveStockStepOutBill_BarCodeQty {
+ get {
+ return this.sc_MouldMoveStockStepOutBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldMoveStockStepOutBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldMoveStockStepInBill_AutoCheck {
+ get {
+ return this.sc_MouldMoveStockStepInBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldMoveStockStepInBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldMoveStockStepInBill_BarCodeQty {
+ get {
+ return this.sc_MouldMoveStockStepInBill_BarCodeQtyField;
+ }
+ set {
+ this.sc_MouldMoveStockStepInBill_BarCodeQtyField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldProdCheckStockBill_AutoCheck {
+ get {
+ return this.sc_MouldProdCheckStockBill_AutoCheckField;
+ }
+ set {
+ this.sc_MouldProdCheckStockBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
public string Sc_ICMOBill_AutoCheck {
get {
return this.sc_ICMOBill_AutoCheckField;
@@ -41219,6 +41233,16 @@
}
set {
this.sc_ProcessExchangeBill_DeleterAndMakerMustSameField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_ProcessExchangeBill_SaveDeptIsNull {
+ get {
+ return this.sc_ProcessExchangeBill_SaveDeptIsNullField;
+ }
+ set {
+ this.sc_ProcessExchangeBill_SaveDeptIsNullField = value;
}
}
@@ -41379,6 +41403,16 @@
}
set {
this.mES_StationInBill_DyCentralInspectionControlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string MES_StationInBill_DefQty {
+ get {
+ return this.mES_StationInBill_DefQtyField;
+ }
+ set {
+ this.mES_StationInBill_DefQtyField = value;
}
}
@@ -41549,6 +41583,16 @@
}
set {
this.mES_StationOutBill_QtyRateCtlField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string MES_StationOutBill_MustBeginWorkCtl {
+ get {
+ return this.mES_StationOutBill_MustBeginWorkCtlField;
+ }
+ set {
+ this.mES_StationOutBill_MustBeginWorkCtlField = value;
}
}
@@ -41749,6 +41793,26 @@
}
set {
this.sc_MESBeginWorkBill_DeleterAndMakerMustSameField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MESBeginWorkBill_SwipeCardStart {
+ get {
+ return this.sc_MESBeginWorkBill_SwipeCardStartField;
+ }
+ set {
+ this.sc_MESBeginWorkBill_SwipeCardStartField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MESBeginWorkBill_MouldUpper {
+ get {
+ return this.sc_MESBeginWorkBill_MouldUpperField;
+ }
+ set {
+ this.sc_MESBeginWorkBill_MouldUpperField = value;
}
}
@@ -41993,6 +42057,16 @@
}
/// <remarks/>
+ public string OA_ErrMsgBackBill_SendDingDingMsg {
+ get {
+ return this.oA_ErrMsgBackBill_SendDingDingMsgField;
+ }
+ set {
+ this.oA_ErrMsgBackBill_SendDingDingMsgField = value;
+ }
+ }
+
+ /// <remarks/>
public string Sc_MESProceReportWorkBill_AutoCheck {
get {
return this.sc_MESProceReportWorkBill_AutoCheckField;
@@ -42143,52 +42217,12 @@
}
/// <remarks/>
- public string Sc_MouldProdOutBill_AutoCheck {
+ public string SB_EquipICMOTechParamBill_MustBeginWorkCtl {
get {
- return this.sc_MouldProdOutBill_AutoCheckField;
+ return this.sB_EquipICMOTechParamBill_MustBeginWorkCtlField;
}
set {
- this.sc_MouldProdOutBill_AutoCheckField = value;
- }
- }
-
- /// <remarks/>
- public string Sc_MouldProdOutBill_SaveAutoAddnew {
- get {
- return this.sc_MouldProdOutBill_SaveAutoAddnewField;
- }
- set {
- this.sc_MouldProdOutBill_SaveAutoAddnewField = value;
- }
- }
-
- /// <remarks/>
- public string Sc_MouldProdOutBill_DeleterAndMakerMustSame {
- get {
- return this.sc_MouldProdOutBill_DeleterAndMakerMustSameField;
- }
- set {
- this.sc_MouldProdOutBill_DeleterAndMakerMustSameField = value;
- }
- }
-
- /// <remarks/>
- public string Sc_MouldProdOutBill_MouldLifeCtrl {
- get {
- return this.sc_MouldProdOutBill_MouldLifeCtrlField;
- }
- set {
- this.sc_MouldProdOutBill_MouldLifeCtrlField = value;
- }
- }
-
- /// <remarks/>
- public string Sc_MouldProdOutBill_MouldLifeCtrlType {
- get {
- return this.sc_MouldProdOutBill_MouldLifeCtrlTypeField;
- }
- set {
- this.sc_MouldProdOutBill_MouldLifeCtrlTypeField = value;
+ this.sB_EquipICMOTechParamBill_MustBeginWorkCtlField = value;
}
}
@@ -42229,6 +42263,116 @@
}
set {
this.gy_RoutingBill_SaveAutoLastProcField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Gy_RoutingBill_EnableMultiLevel {
+ get {
+ return this.gy_RoutingBill_EnableMultiLevelField;
+ }
+ set {
+ this.gy_RoutingBill_EnableMultiLevelField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Kf_StockInRequestBill_AutoCheck {
+ get {
+ return this.kf_StockInRequestBill_AutoCheckField;
+ }
+ set {
+ this.kf_StockInRequestBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Cg_POOrderBill_AutoCheck {
+ get {
+ return this.cg_POOrderBill_AutoCheckField;
+ }
+ set {
+ this.cg_POOrderBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Cg_PayableBill_AutoCheck {
+ get {
+ return this.cg_PayableBill_AutoCheckField;
+ }
+ set {
+ this.cg_PayableBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string YF_PayMentBill_AutoCheck {
+ get {
+ return this.yF_PayMentBill_AutoCheckField;
+ }
+ set {
+ this.yF_PayMentBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Xs_SeOrderBill_AutoCheck {
+ get {
+ return this.xs_SeOrderBill_AutoCheckField;
+ }
+ set {
+ this.xs_SeOrderBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Xs_SeOutStockBill_AutoCheck {
+ get {
+ return this.xs_SeOutStockBill_AutoCheckField;
+ }
+ set {
+ this.xs_SeOutStockBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Xs_ReceivableBill_AutoCheck {
+ get {
+ return this.xs_ReceivableBill_AutoCheckField;
+ }
+ set {
+ this.xs_ReceivableBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string YS_ReceiveBill_AutoCheck {
+ get {
+ return this.yS_ReceiveBill_AutoCheckField;
+ }
+ set {
+ this.yS_ReceiveBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Pay_WorkTimesBill_AutoCheck {
+ get {
+ return this.pay_WorkTimesBill_AutoCheckField;
+ }
+ set {
+ this.pay_WorkTimesBill_AutoCheckField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string Sc_MouldLowerBill_MouldUpper {
+ get {
+ return this.sc_MouldLowerBill_MouldUpperField;
+ }
+ set {
+ this.sc_MouldLowerBill_MouldUpperField = value;
}
}
}
@@ -42906,6 +43050,12 @@
private string hBillNoField;
+ private string hRemarkField;
+
+ private string hBackField;
+
+ private bool hSourceBarCodeFlagField;
+
/// <remarks/>
public long HItemID {
get {
@@ -43253,6 +43403,464 @@
}
set {
this.hBillNoField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HRemark {
+ get {
+ return this.hRemarkField;
+ }
+ set {
+ this.hRemarkField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HBack {
+ get {
+ return this.hBackField;
+ }
+ set {
+ this.hBackField = value;
+ }
+ }
+
+ /// <remarks/>
+ public bool HSourceBarCodeFlag {
+ get {
+ return this.hSourceBarCodeFlagField;
+ }
+ set {
+ this.hSourceBarCodeFlagField = value;
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_ProcExchReportMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackUnionBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackDoubleBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackSplitBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockStepOutBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockBillMain))]
+ [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_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))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_MESBeginWorkBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_StationInBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_SellOutBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockStepInBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_EntrustInBillMain_K3))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_EntrustInBillMain))]
+ [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_POStockInBillMain_K3))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_POStockInBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_OtherOutBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ICStockBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_EntrustOutBillMain))]
+ [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_MouldProdInBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_OtherInBillMain))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_MouldStockBillMain))]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+ [System.SerializableAttribute()]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
+ public partial class ClsXt_BaseBillMain {
+
+ private long hYearField;
+
+ private long hPeriodField;
+
+ private string hBillTypeField;
+
+ private string hBillSubTypeField;
+
+ private long hInterIDField;
+
+ private System.DateTime hDateField;
+
+ private string hBillNoField;
+
+ private int hBillStatusField;
+
+ private long hCheckItemNowIDField;
+
+ private long hCheckItemNextIDField;
+
+ private long hCheckFlowIDField;
+
+ private string hRemarkField;
+
+ private string hEmpCodeField;
+
+ private string hMakerField;
+
+ private string hMakeDateField;
+
+ private string hUpDaterField;
+
+ private string hUpDateDateField;
+
+ private string hCheckerField;
+
+ private string hCheckDateField;
+
+ private string hBackerField;
+
+ private string hBackDateField;
+
+ private string hBackRemarkField;
+
+ private string hCloseManField;
+
+ private string hCloseDateField;
+
+ private bool hCloseTypeField;
+
+ private string hDeleteManField;
+
+ private string hDeleteDateField;
+
+ private long hBillerIDField;
+
+ private string hMainSourceBillNoField;
+
+ private string hMainSourceBillTypeField;
+
+ private long hMainSourceInterIDField;
+
+ private long hMainSourceEntryIDField;
+
+ /// <remarks/>
+ public long HYear {
+ get {
+ return this.hYearField;
+ }
+ set {
+ this.hYearField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HPeriod {
+ get {
+ return this.hPeriodField;
+ }
+ set {
+ this.hPeriodField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HBillType {
+ get {
+ return this.hBillTypeField;
+ }
+ set {
+ this.hBillTypeField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HBillSubType {
+ get {
+ return this.hBillSubTypeField;
+ }
+ set {
+ this.hBillSubTypeField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HInterID {
+ get {
+ return this.hInterIDField;
+ }
+ set {
+ this.hInterIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public System.DateTime HDate {
+ get {
+ return this.hDateField;
+ }
+ set {
+ this.hDateField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HBillNo {
+ get {
+ return this.hBillNoField;
+ }
+ set {
+ this.hBillNoField = value;
+ }
+ }
+
+ /// <remarks/>
+ public int HBillStatus {
+ get {
+ return this.hBillStatusField;
+ }
+ set {
+ this.hBillStatusField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HCheckItemNowID {
+ get {
+ return this.hCheckItemNowIDField;
+ }
+ set {
+ this.hCheckItemNowIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HCheckItemNextID {
+ get {
+ return this.hCheckItemNextIDField;
+ }
+ set {
+ this.hCheckItemNextIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HCheckFlowID {
+ get {
+ return this.hCheckFlowIDField;
+ }
+ set {
+ this.hCheckFlowIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HRemark {
+ get {
+ return this.hRemarkField;
+ }
+ set {
+ this.hRemarkField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HEmpCode {
+ get {
+ return this.hEmpCodeField;
+ }
+ set {
+ this.hEmpCodeField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HMaker {
+ get {
+ return this.hMakerField;
+ }
+ set {
+ this.hMakerField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HMakeDate {
+ get {
+ return this.hMakeDateField;
+ }
+ set {
+ this.hMakeDateField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HUpDater {
+ get {
+ return this.hUpDaterField;
+ }
+ set {
+ this.hUpDaterField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HUpDateDate {
+ get {
+ return this.hUpDateDateField;
+ }
+ set {
+ this.hUpDateDateField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HChecker {
+ get {
+ return this.hCheckerField;
+ }
+ set {
+ this.hCheckerField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HCheckDate {
+ get {
+ return this.hCheckDateField;
+ }
+ set {
+ this.hCheckDateField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HBacker {
+ get {
+ return this.hBackerField;
+ }
+ set {
+ this.hBackerField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HBackDate {
+ get {
+ return this.hBackDateField;
+ }
+ set {
+ this.hBackDateField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HBackRemark {
+ get {
+ return this.hBackRemarkField;
+ }
+ set {
+ this.hBackRemarkField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HCloseMan {
+ get {
+ return this.hCloseManField;
+ }
+ set {
+ this.hCloseManField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HCloseDate {
+ get {
+ return this.hCloseDateField;
+ }
+ set {
+ this.hCloseDateField = value;
+ }
+ }
+
+ /// <remarks/>
+ public bool HCloseType {
+ get {
+ return this.hCloseTypeField;
+ }
+ set {
+ this.hCloseTypeField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HDeleteMan {
+ get {
+ return this.hDeleteManField;
+ }
+ set {
+ this.hDeleteManField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HDeleteDate {
+ get {
+ return this.hDeleteDateField;
+ }
+ set {
+ this.hDeleteDateField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HBillerID {
+ get {
+ return this.hBillerIDField;
+ }
+ set {
+ this.hBillerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HMainSourceBillNo {
+ get {
+ return this.hMainSourceBillNoField;
+ }
+ set {
+ this.hMainSourceBillNoField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HMainSourceBillType {
+ get {
+ return this.hMainSourceBillTypeField;
+ }
+ set {
+ this.hMainSourceBillTypeField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HMainSourceInterID {
+ get {
+ return this.hMainSourceInterIDField;
+ }
+ set {
+ this.hMainSourceInterIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HMainSourceEntryID {
+ get {
+ return this.hMainSourceEntryIDField;
+ }
+ set {
+ this.hMainSourceEntryIDField = value;
}
}
}
@@ -49648,6 +50256,239 @@
}
/// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+ [System.SerializableAttribute()]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
+ public partial class ClsSc_MouldStockBillMain : ClsXt_BaseBillMain {
+
+ private long hSCWHIDField;
+
+ private long hSupIDField;
+
+ private long hEmpIDField;
+
+ private long hManagerIDField;
+
+ private long hWHIDField;
+
+ private long hSecManagerIDField;
+
+ private long hKeeperIDField;
+
+ private long hDeptIDField;
+
+ private string hExplanationField;
+
+ private string hInnerBillNoField;
+
+ private bool hRedBlueFlagField;
+
+ private string hRepairTypeField;
+
+ private long hCorrespondentTypeIDField;
+
+ /// <remarks/>
+ public long HSCWHID {
+ get {
+ return this.hSCWHIDField;
+ }
+ set {
+ this.hSCWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSupID {
+ get {
+ return this.hSupIDField;
+ }
+ set {
+ this.hSupIDField = 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 HWHID {
+ get {
+ return this.hWHIDField;
+ }
+ set {
+ this.hWHIDField = 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 HRepairType {
+ get {
+ return this.hRepairTypeField;
+ }
+ set {
+ this.hRepairTypeField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HCorrespondentTypeID {
+ get {
+ return this.hCorrespondentTypeIDField;
+ }
+ set {
+ this.hCorrespondentTypeIDField = value;
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ public delegate void get_CheckTypeByMouldSourceCompletedEventHandler(object sender, get_CheckTypeByMouldSourceCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class get_CheckTypeByMouldSourceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal get_CheckTypeByMouldSourceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public ClsKf_ICStockBill_Mould Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((ClsKf_ICStockBill_Mould)(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.3752.0")]
+ public delegate void getMouldSourceBillListCompletedEventHandler(object sender, getMouldSourceBillListCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class getMouldSourceBillListCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal getMouldSourceBillListCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public ClsKf_ICStockBill_Mould Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((ClsKf_ICStockBill_Mould)(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.3752.0")]
public delegate void Get_CheckTypeByMouldBarCode_ProdCheckStockCompletedEventHandler(object sender, Get_CheckTypeByMouldBarCode_ProdCheckStockCompletedEventArgs e);
@@ -51895,6 +52736,48 @@
get {
this.RaiseExceptionIfNecessary();
return ((string)(this.results[7]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ public delegate void get_InfoByBarCode_SourceCompletedEventHandler(object sender, get_InfoByBarCode_SourceCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class get_InfoByBarCode_SourceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal get_InfoByBarCode_SourceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public ClsGy_BarCodeBill_WMS_Model_View Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((ClsGy_BarCodeBill_WMS_Model_View)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public bool sBool {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[1]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[2]));
}
}
}
@@ -55105,60 +55988,26 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void get_CheckTypeByMouldSourceCompletedEventHandler(object sender, get_CheckTypeByMouldSourceCompletedEventArgs e);
+ public delegate void GetJXBarCode_SiMoErCompletedEventHandler(object sender, GetJXBarCode_SiMoErCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class get_CheckTypeByMouldSourceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class GetJXBarCode_SiMoErCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- internal get_CheckTypeByMouldSourceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ internal GetJXBarCode_SiMoErCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
/// <remarks/>
- public ClsKf_ICStockBill_Mould Result {
+ public bool Result {
get {
this.RaiseExceptionIfNecessary();
- return ((ClsKf_ICStockBill_Mould)(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.3752.0")]
- public delegate void getMouldSourceBillListCompletedEventHandler(object sender, getMouldSourceBillListCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class getMouldSourceBillListCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal getMouldSourceBillListCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public ClsKf_ICStockBill_Mould Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((ClsKf_ICStockBill_Mould)(this.results[0]));
+ return ((bool)(this.results[0]));
}
}
@@ -55380,6 +56229,74 @@
private object[] results;
internal set_SaveOtherInBill_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.3752.0")]
+ public delegate void set_SaveOtherInBill_CLD_BillCheckCompletedEventHandler(object sender, set_SaveOtherInBill_CLD_BillCheckCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class set_SaveOtherInBill_CLD_BillCheckCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal set_SaveOtherInBill_CLD_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.3752.0")]
+ public delegate void set_SaveOtherInBill_CLD_BillCheck_VerifyCompletedEventHandler(object sender, set_SaveOtherInBill_CLD_BillCheck_VerifyCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class set_SaveOtherInBill_CLD_BillCheck_VerifyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal set_SaveOtherInBill_CLD_BillCheck_VerifyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
@@ -57469,48 +58386,6 @@
get {
this.RaiseExceptionIfNecessary();
return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void get_InfoByBarCode_SourceCompletedEventHandler(object sender, get_InfoByBarCode_SourceCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class get_InfoByBarCode_SourceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal get_InfoByBarCode_SourceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public ClsGy_BarCodeBill_WMS_Model_View Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((ClsGy_BarCodeBill_WMS_Model_View)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public bool sBool {
- get {
- this.RaiseExceptionIfNecessary();
- return ((bool)(this.results[1]));
- }
- }
-
- /// <remarks/>
- public string sErrMsg {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[2]));
}
}
}
diff --git a/WebAPI/Web References/WebS/Reference.map b/WebAPI/Web References/WebS/Reference.map
index 164e0a1..b8ffde2 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.DiscoveryDocumentReference" url="http://192.168.0.81/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />
- <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://192.168.0.81/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://192.168.0.11/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://192.168.0.11/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />
</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 a6596e9..c207c4d 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://192.168.0.81/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://192.168.0.81/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
- <soap address="http://192.168.0.81/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
- <soap address="http://192.168.0.81/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+ <contractRef ref="http://192.168.0.11/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://192.168.0.11/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+ <soap address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+ <soap address="http://192.168.0.11/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 dc40be4..4f87e92 100644
--- a/WebAPI/Web References/WebS/WebService1.wsdl
+++ b/WebAPI/Web References/WebS/WebService1.wsdl
@@ -2,6 +2,80 @@
<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="get_CheckTypeByMouldSource">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <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="0" maxOccurs="1" name="HHMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_CheckTypeByMouldSourceResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="get_CheckTypeByMouldSourceResult" type="tns:ClsKf_ICStockBill_Mould" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:complexType name="ClsKf_ICStockBill_Mould">
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HItemID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBarType" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HWhID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HWhNumber" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HWhName" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSPFlag" type="s:boolean" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSPID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSPNumber" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSPName" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HDeptNumber" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HDeptName" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSupNumber" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSupName" type="s:string" />
+ <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="HOWNERNAME" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HCustom" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HMulSourceFlag" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HStockStyle" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockInOrgID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HStockInOrgName" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockOutOrgID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HStockOutOrgName" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ <s:element name="getMouldSourceBillList">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <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="0" maxOccurs="1" name="HHMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="getMouldSourceBillListResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="getMouldSourceBillListResult" type="tns:ClsKf_ICStockBill_Mould" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="Get_CheckTypeByMouldBarCode_ProdCheckStock">
<s:complexType>
<s:sequence>
@@ -345,6 +419,9 @@
<s:element minOccurs="0" maxOccurs="1" name="HStockOutOrgName" type="s:string" />
<s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
<s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HRemark" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBack" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSourceBarCodeFlag" type="s:boolean" />
</s:sequence>
</s:complexType>
<s:element name="get_CheckTypeByBarCode_PackUnion">
@@ -1137,6 +1214,9 @@
<s:element minOccurs="0" maxOccurs="1" name="Kf_POStockInBill_SourceWHSPCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_POStockInBill_AutoBarCode" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_POStockInBill_DeleterAndMakerMustSame" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_POStockInBillCheck_MustQtyCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_POStockInBillCheck_WHSPCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_POStockInBillCheck_MultilineCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_ProductInBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_ProductInBill_SaveAutoAddnew" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_ProductInBill_ERPMode" type="s:string" />
@@ -1150,6 +1230,9 @@
<s:element minOccurs="0" maxOccurs="1" name="Kf_ProductInBill_SourceWHSPCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_ProductInBill_Display" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_ProductInBill_DeleterAndMakerMustSame" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_ProductInBillCheck_MustQtyCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_ProductInBillCheck_WHSPCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_ProductInBillCheck_MultilineCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_OtherInBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_OtherInBill_SaveAutoAddnew" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Kf_OtherInBill_ERPMode" type="s:string" />
@@ -1444,6 +1527,39 @@
<s:element minOccurs="0" maxOccurs="1" name="BarCode_AutoMateOutBackBillWMS" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="BarCode_AutoSellOutBackBillWMS" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="BarCode_DeleterAndMakerMustSame" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdInBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdInBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdOutBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdOutBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdOutBill_SaveAutoAddnew" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdOutBill_DeleterAndMakerMustSame" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdOutBill_MouldLifeCtrl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdOutBill_MouldLifeCtrlType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdBackBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdBackBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldRepairOutBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldRepairOutBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldRepairInBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldRepairInBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldOtherInBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldOtherInBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldOtherOutBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldOtherOutBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldBorrowInBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldBorrowInBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldBorrowOutBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldBorrowOutBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldScrapInBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldScrapInBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldScrapOutBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldScrapOutBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdMoveBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdMoveBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldMoveStockStepOutBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldMoveStockStepOutBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldMoveStockStepInBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldMoveStockStepInBill_BarCodeQty" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdCheckStockBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_ICMOBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_ICMOBill_SaveAutoAddnew" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_ICMOBill_AutoProcExchBill" type="s:string" />
@@ -1452,6 +1568,7 @@
<s:element minOccurs="0" maxOccurs="1" name="Sc_ProcessExchangeBill_SaveAutoAddnew" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_ProcessExchangeBill_AutoBarCode" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_ProcessExchangeBill_DeleterAndMakerMustSame" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_ProcessExchangeBill_SaveDeptIsNull" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="MES_StationInBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="MES_StationInBill_FIFOCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="MES_StationInBill_FullMoveCtl" type="s:string" />
@@ -1468,6 +1585,7 @@
<s:element minOccurs="0" maxOccurs="1" name="MES_StationInBill_PreQtyCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="MES_StationInBill_QtyRateCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="MES_StationInBill_DyCentralInspectionControl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="MES_StationInBill_DefQty" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="MES_StationOutBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="MES_StationOutBill_QtyCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="MES_StationOutBill_QtyPreQtyCtl" type="s:string" />
@@ -1485,6 +1603,7 @@
<s:element minOccurs="0" maxOccurs="1" name="MES_StationOutBill_DeleteRelationCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="MES_StationOutBill_NextQtyCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="MES_StationOutBill_QtyRateCtl" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="MES_StationOutBill_MustBeginWorkCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="QC_NoPassProdCheckBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="QC_NoPassProdCheckBill_QtyCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="QC_NoPassProdCheckBill_BadReasonQtyCtrl" type="s:string" />
@@ -1505,6 +1624,8 @@
<s:element minOccurs="0" maxOccurs="1" name="Sc_MESBeginWorkBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_MESBeginWorkBill_SaveAutoAddnew" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_MESBeginWorkBill_DeleterAndMakerMustSame" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MESBeginWorkBill_SwipeCardStart" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MESBeginWorkBill_MouldUpper" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_MESReturnWorkBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_MESReturnWorkBill_SaveAutoAddnew" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_MESReturnWorkBill_DeleterAndMakerMustSame" type="s:string" />
@@ -1529,6 +1650,7 @@
<s:element minOccurs="0" maxOccurs="1" name="OA_ErrMsgBackBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="OA_ErrMsgBackBill_SaveAutoAddnew" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="OA_ErrMsgBackBill_DeleterAndMakerMustSame" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="OA_ErrMsgBackBill_SendDingDingMsg" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_MESProceReportWorkBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_MESProceReportWorkBill_SaveAutoAddnew" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Sc_MESProceReportWorkBill_DeleterAndMakerMustSame" type="s:string" />
@@ -1544,15 +1666,22 @@
<s:element minOccurs="0" maxOccurs="1" name="QC_ProcessCheckBill_SaveAutoAddnew" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="QC_ProcessCheckBill_DeleterAndMakerMustSame" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="QC_ProcessCheckBill_QCSchemeSource" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdOutBill_AutoCheck" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdOutBill_SaveAutoAddnew" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdOutBill_DeleterAndMakerMustSame" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdOutBill_MouldLifeCtrl" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldProdOutBill_MouldLifeCtrlType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="SB_EquipICMOTechParamBill_MustBeginWorkCtl" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Gy_RoutingBill_AutoCheck" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Gy_RoutingBill_SaveAutoAddnew" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Gy_RoutingBill_DeleterAndMakerMustSame" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Gy_RoutingBill_SaveAutoLastProc" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Gy_RoutingBill_EnableMultiLevel" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Kf_StockInRequestBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Cg_POOrderBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Cg_PayableBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="YF_PayMentBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Xs_SeOrderBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Xs_SeOutStockBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Xs_ReceivableBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="YS_ReceiveBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Pay_WorkTimesBill_AutoCheck" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Sc_MouldLowerBill_MouldUpper" type="s:string" />
</s:sequence>
</s:complexType>
<s:element name="set_SavePonderationBillMain_Temp_BarCode_MoveStockBillCheckResponse">
@@ -1959,36 +2088,6 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:complexType name="ClsKf_ICStockBill_Mould">
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="HItemID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HBarType" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HWhID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HWhNumber" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HWhName" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HSPFlag" type="s:boolean" />
- <s:element minOccurs="1" maxOccurs="1" name="HSPID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HSPNumber" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HSPName" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HDeptNumber" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HDeptName" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HSupNumber" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HSupName" type="s:string" />
- <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="HOWNERNAME" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HCustom" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HMulSourceFlag" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HStockStyle" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HStockInOrgID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HStockInOrgName" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HStockOutOrgID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HStockOutOrgName" type="s:string" />
- </s:sequence>
- </s:complexType>
<s:element name="DeleteMould">
<s:complexType>
<s:sequence>
@@ -2047,6 +2146,25 @@
<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="get_InfoByBarCode_Source">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="sBarCode" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="sInterID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="sBool" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_InfoByBarCode_SourceResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="get_InfoByBarCode_SourceResult" type="tns:ClsGy_BarCodeBill_WMS_Model_View" />
+ <s:element minOccurs="1" maxOccurs="1" name="sBool" type="s:boolean" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -4152,46 +4270,19 @@
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="get_CheckTypeByMouldSource">
+ <s:element name="GetJXBarCode_SiMoEr">
<s:complexType>
<s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
- <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="0" maxOccurs="1" name="HHMaker" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sBarCode" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HQty" type="s:double" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="get_CheckTypeByMouldSourceResponse">
+ <s:element name="GetJXBarCode_SiMoErResponse">
<s:complexType>
<s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="get_CheckTypeByMouldSourceResult" type="tns:ClsKf_ICStockBill_Mould" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="getMouldSourceBillList">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
- <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="0" maxOccurs="1" name="HHMaker" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="getMouldSourceBillListResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="getMouldSourceBillListResult" type="tns:ClsKf_ICStockBill_Mould" />
+ <s:element minOccurs="1" maxOccurs="1" name="GetJXBarCode_SiMoErResult" type="s:boolean" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -4363,6 +4454,38 @@
<s:complexType>
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="set_SaveOtherInBill_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_SaveOtherInBill_CLD_BillCheck">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_OtherInBillMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SaveOtherInBill_CLD_BillCheckResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="set_SaveOtherInBill_CLD_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_SaveOtherInBill_CLD_BillCheck_Verify">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_OtherInBillMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SaveOtherInBill_CLD_BillCheck_VerifyResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="set_SaveOtherInBill_CLD_BillCheck_VerifyResult" type="s:boolean" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -5751,25 +5874,6 @@
<s:complexType>
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="Get_CheckWhAndSP_BeUpdateResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="get_InfoByBarCode_Source">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="sBarCode" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="sInterID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="sBool" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="get_InfoByBarCode_SourceResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="get_InfoByBarCode_SourceResult" type="tns:ClsGy_BarCodeBill_WMS_Model_View" />
- <s:element minOccurs="1" maxOccurs="1" name="sBool" type="s:boolean" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -13977,6 +14081,18 @@
</s:element>
</s:schema>
</wsdl:types>
+ <wsdl:message name="get_CheckTypeByMouldSourceSoapIn">
+ <wsdl:part name="parameters" element="tns:get_CheckTypeByMouldSource" />
+ </wsdl:message>
+ <wsdl:message name="get_CheckTypeByMouldSourceSoapOut">
+ <wsdl:part name="parameters" element="tns:get_CheckTypeByMouldSourceResponse" />
+ </wsdl:message>
+ <wsdl:message name="getMouldSourceBillListSoapIn">
+ <wsdl:part name="parameters" element="tns:getMouldSourceBillList" />
+ </wsdl:message>
+ <wsdl:message name="getMouldSourceBillListSoapOut">
+ <wsdl:part name="parameters" element="tns:getMouldSourceBillListResponse" />
+ </wsdl:message>
<wsdl:message name="Get_CheckTypeByMouldBarCode_ProdCheckStockSoapIn">
<wsdl:part name="parameters" element="tns:Get_CheckTypeByMouldBarCode_ProdCheckStock" />
</wsdl:message>
@@ -14372,6 +14488,12 @@
</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="get_InfoByBarCode_SourceSoapIn">
+ <wsdl:part name="parameters" element="tns:get_InfoByBarCode_Source" />
+ </wsdl:message>
+ <wsdl:message name="get_InfoByBarCode_SourceSoapOut">
+ <wsdl:part name="parameters" element="tns:get_InfoByBarCode_SourceResponse" />
</wsdl:message>
<wsdl:message name="get_InfoByBarCodeForReportSoapIn">
<wsdl:part name="parameters" element="tns:get_InfoByBarCodeForReport" />
@@ -14865,17 +14987,11 @@
<wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiSoapOut">
<wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiResponse" />
</wsdl:message>
- <wsdl:message name="get_CheckTypeByMouldSourceSoapIn">
- <wsdl:part name="parameters" element="tns:get_CheckTypeByMouldSource" />
+ <wsdl:message name="GetJXBarCode_SiMoErSoapIn">
+ <wsdl:part name="parameters" element="tns:GetJXBarCode_SiMoEr" />
</wsdl:message>
- <wsdl:message name="get_CheckTypeByMouldSourceSoapOut">
- <wsdl:part name="parameters" element="tns:get_CheckTypeByMouldSourceResponse" />
- </wsdl:message>
- <wsdl:message name="getMouldSourceBillListSoapIn">
- <wsdl:part name="parameters" element="tns:getMouldSourceBillList" />
- </wsdl:message>
- <wsdl:message name="getMouldSourceBillListSoapOut">
- <wsdl:part name="parameters" element="tns:getMouldSourceBillListResponse" />
+ <wsdl:message name="GetJXBarCode_SiMoErSoapOut">
+ <wsdl:part name="parameters" element="tns:GetJXBarCode_SiMoErResponse" />
</wsdl:message>
<wsdl:message name="set_CheckOtherInBillSoapIn">
<wsdl:part name="parameters" element="tns:set_CheckOtherInBill" />
@@ -14918,6 +15034,18 @@
</wsdl:message>
<wsdl:message name="set_SaveOtherInBill_BillCheckSoapOut">
<wsdl:part name="parameters" element="tns:set_SaveOtherInBill_BillCheckResponse" />
+ </wsdl:message>
+ <wsdl:message name="set_SaveOtherInBill_CLD_BillCheckSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SaveOtherInBill_CLD_BillCheck" />
+ </wsdl:message>
+ <wsdl:message name="set_SaveOtherInBill_CLD_BillCheckSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SaveOtherInBill_CLD_BillCheckResponse" />
+ </wsdl:message>
+ <wsdl:message name="set_SaveOtherInBill_CLD_BillCheck_VerifySoapIn">
+ <wsdl:part name="parameters" element="tns:set_SaveOtherInBill_CLD_BillCheck_Verify" />
+ </wsdl:message>
+ <wsdl:message name="set_SaveOtherInBill_CLD_BillCheck_VerifySoapOut">
+ <wsdl:part name="parameters" element="tns:set_SaveOtherInBill_CLD_BillCheck_VerifyResponse" />
</wsdl:message>
<wsdl:message name="set_SaveMouldProdInBill_NewSoapIn">
<wsdl:part name="parameters" element="tns:set_SaveMouldProdInBill_New" />
@@ -15302,12 +15430,6 @@
</wsdl:message>
<wsdl:message name="Get_CheckWhAndSP_BeUpdateSoapOut">
<wsdl:part name="parameters" element="tns:Get_CheckWhAndSP_BeUpdateResponse" />
- </wsdl:message>
- <wsdl:message name="get_InfoByBarCode_SourceSoapIn">
- <wsdl:part name="parameters" element="tns:get_InfoByBarCode_Source" />
- </wsdl:message>
- <wsdl:message name="get_InfoByBarCode_SourceSoapOut">
- <wsdl:part name="parameters" element="tns:get_InfoByBarCode_SourceResponse" />
</wsdl:message>
<wsdl:message name="set_SaveEntrustOutBill_BillCheckSoapIn">
<wsdl:part name="parameters" element="tns:set_SaveEntrustOutBill_BillCheck" />
@@ -17362,6 +17484,14 @@
<wsdl:part name="parameters" element="tns:GetSc_ICMOBackBillListResponse" />
</wsdl:message>
<wsdl:portType name="WebService1Soap">
+ <wsdl:operation name="get_CheckTypeByMouldSource">
+ <wsdl:input message="tns:get_CheckTypeByMouldSourceSoapIn" />
+ <wsdl:output message="tns:get_CheckTypeByMouldSourceSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="getMouldSourceBillList">
+ <wsdl:input message="tns:getMouldSourceBillListSoapIn" />
+ <wsdl:output message="tns:getMouldSourceBillListSoapOut" />
+ </wsdl:operation>
<wsdl:operation name="Get_CheckTypeByMouldBarCode_ProdCheckStock">
<wsdl:input message="tns:Get_CheckTypeByMouldBarCode_ProdCheckStockSoapIn" />
<wsdl:output message="tns:Get_CheckTypeByMouldBarCode_ProdCheckStockSoapOut" />
@@ -17625,6 +17755,10 @@
<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="get_InfoByBarCode_Source">
+ <wsdl:input message="tns:get_InfoByBarCode_SourceSoapIn" />
+ <wsdl:output message="tns:get_InfoByBarCode_SourceSoapOut" />
</wsdl:operation>
<wsdl:operation name="get_InfoByBarCodeForReport">
<wsdl:input message="tns:get_InfoByBarCodeForReportSoapIn" />
@@ -17954,13 +18088,9 @@
<wsdl:input message="tns:set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiSoapIn" />
<wsdl:output message="tns:set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiSoapOut" />
</wsdl:operation>
- <wsdl:operation name="get_CheckTypeByMouldSource">
- <wsdl:input message="tns:get_CheckTypeByMouldSourceSoapIn" />
- <wsdl:output message="tns:get_CheckTypeByMouldSourceSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="getMouldSourceBillList">
- <wsdl:input message="tns:getMouldSourceBillListSoapIn" />
- <wsdl:output message="tns:getMouldSourceBillListSoapOut" />
+ <wsdl:operation name="GetJXBarCode_SiMoEr">
+ <wsdl:input message="tns:GetJXBarCode_SiMoErSoapIn" />
+ <wsdl:output message="tns:GetJXBarCode_SiMoErSoapOut" />
</wsdl:operation>
<wsdl:operation name="set_CheckOtherInBill">
<wsdl:input message="tns:set_CheckOtherInBillSoapIn" />
@@ -17989,6 +18119,14 @@
<wsdl:operation name="set_SaveOtherInBill_BillCheck">
<wsdl:input message="tns:set_SaveOtherInBill_BillCheckSoapIn" />
<wsdl:output message="tns:set_SaveOtherInBill_BillCheckSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="set_SaveOtherInBill_CLD_BillCheck">
+ <wsdl:input message="tns:set_SaveOtherInBill_CLD_BillCheckSoapIn" />
+ <wsdl:output message="tns:set_SaveOtherInBill_CLD_BillCheckSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="set_SaveOtherInBill_CLD_BillCheck_Verify">
+ <wsdl:input message="tns:set_SaveOtherInBill_CLD_BillCheck_VerifySoapIn" />
+ <wsdl:output message="tns:set_SaveOtherInBill_CLD_BillCheck_VerifySoapOut" />
</wsdl:operation>
<wsdl:operation name="set_SaveMouldProdInBill_New">
<wsdl:input message="tns:set_SaveMouldProdInBill_NewSoapIn" />
@@ -18245,10 +18383,6 @@
<wsdl:operation name="Get_CheckWhAndSP_BeUpdate">
<wsdl:input message="tns:Get_CheckWhAndSP_BeUpdateSoapIn" />
<wsdl:output message="tns:Get_CheckWhAndSP_BeUpdateSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="get_InfoByBarCode_Source">
- <wsdl:input message="tns:get_InfoByBarCode_SourceSoapIn" />
- <wsdl:output message="tns:get_InfoByBarCode_SourceSoapOut" />
</wsdl:operation>
<wsdl:operation name="set_SaveEntrustOutBill_BillCheck">
<wsdl:input message="tns:set_SaveEntrustOutBill_BillCheckSoapIn" />
@@ -19621,6 +19755,24 @@
</wsdl:portType>
<wsdl:binding name="WebService1Soap" type="tns:WebService1Soap">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="get_CheckTypeByMouldSource">
+ <soap:operation soapAction="http://tempuri.org/get_CheckTypeByMouldSource" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="getMouldSourceBillList">
+ <soap:operation soapAction="http://tempuri.org/getMouldSourceBillList" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="Get_CheckTypeByMouldBarCode_ProdCheckStock">
<soap:operation soapAction="http://tempuri.org/Get_CheckTypeByMouldBarCode_ProdCheckStock" style="document" />
<wsdl:input>
@@ -20208,6 +20360,15 @@
</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="get_InfoByBarCode_Source">
+ <soap:operation soapAction="http://tempuri.org/get_InfoByBarCode_Source" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -20953,17 +21114,8 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="get_CheckTypeByMouldSource">
- <soap:operation soapAction="http://tempuri.org/get_CheckTypeByMouldSource" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getMouldSourceBillList">
- <soap:operation soapAction="http://tempuri.org/getMouldSourceBillList" style="document" />
+ <wsdl:operation name="GetJXBarCode_SiMoEr">
+ <soap:operation soapAction="http://tempuri.org/GetJXBarCode_SiMoEr" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -21027,6 +21179,24 @@
</wsdl:operation>
<wsdl:operation name="set_SaveOtherInBill_BillCheck">
<soap:operation soapAction="http://tempuri.org/set_SaveOtherInBill_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_SaveOtherInBill_CLD_BillCheck">
+ <soap:operation soapAction="http://tempuri.org/set_SaveOtherInBill_CLD_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_SaveOtherInBill_CLD_BillCheck_Verify">
+ <soap:operation soapAction="http://tempuri.org/set_SaveOtherInBill_CLD_BillCheck_Verify" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -21603,15 +21773,6 @@
</wsdl:operation>
<wsdl:operation name="Get_CheckWhAndSP_BeUpdate">
<soap:operation soapAction="http://tempuri.org/Get_CheckWhAndSP_BeUpdate" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="get_InfoByBarCode_Source">
- <soap:operation soapAction="http://tempuri.org/get_InfoByBarCode_Source" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -24700,6 +24861,24 @@
</wsdl:binding>
<wsdl:binding name="WebService1Soap12" type="tns:WebService1Soap">
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="get_CheckTypeByMouldSource">
+ <soap12:operation soapAction="http://tempuri.org/get_CheckTypeByMouldSource" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="getMouldSourceBillList">
+ <soap12:operation soapAction="http://tempuri.org/getMouldSourceBillList" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="Get_CheckTypeByMouldBarCode_ProdCheckStock">
<soap12:operation soapAction="http://tempuri.org/Get_CheckTypeByMouldBarCode_ProdCheckStock" style="document" />
<wsdl:input>
@@ -25287,6 +25466,15 @@
</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="get_InfoByBarCode_Source">
+ <soap12:operation soapAction="http://tempuri.org/get_InfoByBarCode_Source" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -26032,17 +26220,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="get_CheckTypeByMouldSource">
- <soap12:operation soapAction="http://tempuri.org/get_CheckTypeByMouldSource" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getMouldSourceBillList">
- <soap12:operation soapAction="http://tempuri.org/getMouldSourceBillList" style="document" />
+ <wsdl:operation name="GetJXBarCode_SiMoEr">
+ <soap12:operation soapAction="http://tempuri.org/GetJXBarCode_SiMoEr" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -26106,6 +26285,24 @@
</wsdl:operation>
<wsdl:operation name="set_SaveOtherInBill_BillCheck">
<soap12:operation soapAction="http://tempuri.org/set_SaveOtherInBill_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_SaveOtherInBill_CLD_BillCheck">
+ <soap12:operation soapAction="http://tempuri.org/set_SaveOtherInBill_CLD_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_SaveOtherInBill_CLD_BillCheck_Verify">
+ <soap12:operation soapAction="http://tempuri.org/set_SaveOtherInBill_CLD_BillCheck_Verify" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -26682,15 +26879,6 @@
</wsdl:operation>
<wsdl:operation name="Get_CheckWhAndSP_BeUpdate">
<soap12:operation soapAction="http://tempuri.org/Get_CheckWhAndSP_BeUpdate" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="get_InfoByBarCode_Source">
- <soap12:operation soapAction="http://tempuri.org/get_InfoByBarCode_Source" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -29779,10 +29967,10 @@
</wsdl:binding>
<wsdl:service name="WebService1">
<wsdl:port name="WebService1Soap" binding="tns:WebService1Soap">
- <soap:address location="http://192.168.0.81/WEBS-WMS/WebService1.asmx" />
+ <soap:address location="http://192.168.0.11/WEBS-WMS/WebService1.asmx" />
</wsdl:port>
<wsdl:port name="WebService1Soap12" binding="tns:WebService1Soap12">
- <soap12:address location="http://192.168.0.81/WEBS-WMS/WebService1.asmx" />
+ <soap12:address location="http://192.168.0.11/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 b480901..858394e 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -8,10 +8,10 @@
- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
- </sectionGroup>
- </configSections>
+ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+ <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+ </sectionGroup>
+ </configSections>
<connectionStrings>
<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />
@@ -106,15 +106,15 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://localhost/webs-web/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
+ <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
</client>
</system.serviceModel>
- <applicationSettings>
- <WebAPI.Properties.Settings>
- <setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://localhost/webs-web/webservice1.asmx</value>
- </setting>
- </WebAPI.Properties.Settings>
- </applicationSettings>
+ <applicationSettings>
+ <WebAPI.Properties.Settings>
+ <setting name="WebAPI_WebS_WebService1" serializeAs="String">
+ <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value>
+ </setting>
+ </WebAPI.Properties.Settings>
+ </applicationSettings>
</configuration>
<!--ProjectGuid: 5B60CE0C-963C-4DC2-91B3-0B471AAC5438-->
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 85f36ee..47a90a7 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -354,10 +354,10 @@
<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
- <Content Include="Web References\WebS\Reference.map">
+ <None Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
- </Content>
+ </None>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
<SubType>Designer</SubType>
@@ -452,6 +452,8 @@
<Compile Include="Controllers\ZLGL\BaseSet\Gy_QualityController.cs" />
<Compile Include="Controllers\浜轰簨绠＄悊\浜哄憳灞ュ巻\HR_PersonnelResumeController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\Kf_MoveStockBillController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\鍩虹璧勬枡\Gy_BaseInformationController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillController.cs" />
<Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBeginDotCheckBillController.cs" />
@@ -732,6 +734,7 @@
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
<Compile Include="DLL\ClsGy_BadPhenomena_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_EnvironmentTestItem_Ctl.cs" />
<Compile Include="DLL\ClsGy_ProcMul_Ctl.cs" />
<Compile Include="DLL\ClsGy_TechnologyParameterType_Ctl.cs" />
<Compile Include="DLL\ClsGy_InspectInstruMent_Ctl.cs" />
@@ -1273,10 +1276,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://192.168.0.81/WEBS-WMS/WebService1.asmx">
+ <WebReferenceUrl Include="http://192.168.0.11/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://192.168.0.81/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://192.168.0.11/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index dd419e5..545fe10 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,25 +1,8 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
- <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
- <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
- <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
- <WebStackScaffolding_LayoutPageFile />
- <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
- <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
- <UseIISExpress>true</UseIISExpress>
- <Use64BitIISExpress />
- <IISExpressSSLPort />
- <IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
- <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
- <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
- <UseGlobalApplicationHostFile />
- <ProjectView>ProjectFiles</ProjectView>
- <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
- <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index b3a6f35..d6e21aa 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index cdbf68a..c0d4d5f 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,6 +1,15 @@
+<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+=======
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+>>>>>>> b75c484393ae95535edada81e805d05c56652931
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
deleted file mode 100644
index f67032a..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
--
Gitblit v1.9.1