From 34c5c1737a20c8bd1fb8090a08d4bcbcc8d60cf8 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 29 十月 2021 17:20:31 +0800
Subject: [PATCH] 修改了 模具、设备保养、维修、点检方法
---
DAL/生产管理/模具管理/ClsSc_MouldRepairOutBill.cs | 39
LMES/ClsShowMod.cs | 8
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 192 +-
Model/Model.csproj | 6
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs | 4
WebAPI/Models/Xt_DataDictionary_Table.cs | 42
Model/生产管理/模具管理/ClsSc_MouldScrapInBillSub.cs | 55
Model/生产管理/模具管理/ClsSc_MouldRepairInBillMain.cs | 22
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs | 4
WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs | 330 +++++
WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs | 4
Model/生产管理/模具管理/ClsSc_MouldScrapInBillMain.cs | 22
WebAPI/Models/Xt_DataDictionary_Proc.cs | 33
WebAPI/Models/基础资料/Gy_ClassTimePrj.cs | 24
Model/生产管理/模具管理/ClsSc_MouldRepairInBillSub.cs | 55
WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs | 386 ++++++
WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs | 2
WebAPI/Controllers/Sc_MouldController.cs | 715 +++++++++++
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs | 4
Model/生产管理/模具管理/ClsSc_MouldRepairOutBillMain.cs | 22
WebAPI/Models/ClsSc_MouldDotCheckBillSub.cs | 2
WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs | 6
WebAPI/DLL/DAL.dll | 0
WebAPI/Models/Xt_DataDictionary_View.cs | 33
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 127 +
WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs | 4
WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs | 411 ++++++
WebAPI/Controllers/Sc_MouldOtherInBillController.cs | 4
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs | 4
Model/生产管理/模具管理/ClsSc_MouldRepairOutBillSub.cs | 55
/dev/null | 0
WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs | 418 ++----
BaseSet/BaseSet.csproj.user | 1
WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs | 4
WebAPI/ListModels.cs | 56
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 10
WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs | 1
WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs | 411 ++++++
WebAPI/WebAPI.csproj | 7
LMES/LMES.csproj.user | 13
WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs | 1
LMES/LMES.csproj | 22
WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs | 15
43 files changed, 3,129 insertions(+), 445 deletions(-)
diff --git a/BaseSet/BaseSet.csproj.user b/BaseSet/BaseSet.csproj.user
index b159ef0..eca3abc 100644
--- a/BaseSet/BaseSet.csproj.user
+++ b/BaseSet/BaseSet.csproj.user
@@ -9,5 +9,6 @@
<ErrorReportUrlHistory />
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
+ <ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairOutBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairOutBill.cs"
index 032d983..dfb88ac 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairOutBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairOutBill.cs"
@@ -141,18 +141,17 @@
oCn.BeginTran();
//涓昏〃
oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
- ",HRepairType" +
- ") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
- ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
- ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
- ",'"+omodel.HRepairType.ToString()+"'"+
- ") ");
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+ "" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
+ ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+ ") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
{
@@ -161,8 +160,8 @@
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
- ",HDesignLife,HLeaveLife,HUseLife,HNowModel,HNowLife" +
- ",HSCSPID,HSPGroupID,HBatchNo" +
+ ",HDesignLife,HLeaveLife,HUseLife,HNewLifeQty" +
+ ",HSCSPID,HSPGroupID,HBatchNo,HBackFlag,HNowModel,HNowLife" +
",HNewModel,HLastProdModel,HWallThickness,HHardness,HDiameter,HQtyRel" +
",HMouldType,HInitModel,HInitDesignLife,HLifeUnitID" +
") values("
@@ -170,16 +169,16 @@
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
"," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
- "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
- "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" +
+ "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() + "," + oSub.HNewLifeQty.ToString() +
+ "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "','" + oSub.HBackFlag + "','" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
",'" + oSub.HNewModel + "','" + oSub.HLastProdModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HDiameter + "'," + oSub.HQtyRel.ToString() +
- "," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() +
- ") ");
+ "," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() +
+ ") ");
oCn.RunProc("exec h_p_Sc_MouldFileChangeStatus " + oSub.HMaterID.ToString() + ",'" + oSub.HNowModel.ToString() + "'," + oSub.HNowLife.ToString() + ",'鏀瑰埗涓�'");
}
-
+
//foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
//{
// Ds = oCn.RunProcReturn("exec h_p_Sc_MouldRepairOutBill_Qty " + oSub.HICMOInterID, "");
@@ -195,7 +194,7 @@
DataSet Ds;
foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
{
- Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBill_CheckKF " + omodel.HInterID + "," + oSub.HMaterID + "," + oSub.HWHID + "," + oSub.HSPID + ", -1", "gy_czygl");
+ Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBill_CheckKF " + omodel.HInterID + "," + oSub.HMaterID + "," + oSub.HWHID + "," + oSub.HSPID + ", 1", "gy_czygl");
if (Ds.Tables[0].Rows.Count == 0)
{
oCn.RollBack();
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index be9a43c..41b473c 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -6607,8 +6607,15 @@
return;
try
{
+ MessageBox.Show("gnsy:"+gnsy + "gnmc:"+ gnmc);
switch (gnsy.ToLower())
{
+ case "gy_dotcheck"://点检项目
+ Gy_DotCheck oGy_DotCheck = new Gy_DotCheck();
+ oGy_DotCheck.MdiParent = oMain;
+ oGy_DotCheck.Show();
+ oMainForm.AddTabPage(oGy_DotCheck);
+ break;
case "gy_basedemo":
//权限
Gy_BaseDemo oGy_BaseDemo = new Gy_BaseDemo();
@@ -7681,6 +7688,7 @@
oGy_QCCheckItem.Show();
oMainForm.AddTabPage(oGy_QCCheckItem);
break;
+
case "":
//
break;
diff --git a/LMES/LMES.csproj b/LMES/LMES.csproj
index afd99a9..c001e8c 100644
--- a/LMES/LMES.csproj
+++ b/LMES/LMES.csproj
@@ -11,6 +11,21 @@
<AssemblyName>LMES</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -221,6 +236,13 @@
<Name>WorkM</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/LMES/LMES.csproj.user b/LMES/LMES.csproj.user
new file mode 100644
index 0000000..51efb67
--- /dev/null
+++ b/LMES/LMES.csproj.user
@@ -0,0 +1,13 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <PublishUrlHistory />
+ <InstallUrlHistory />
+ <SupportUrlHistory />
+ <UpdateUrlHistory />
+ <BootstrapperUrlHistory />
+ <ErrorReportUrlHistory />
+ <FallbackCulture>zh-CN</FallbackCulture>
+ <VerifyUploadedFiles>false</VerifyUploadedFiles>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/MES/bin/Debug/AxInterop.gregn6Lib.dll b/MES/bin/Debug/AxInterop.gregn6Lib.dll
deleted file mode 100644
index a99c570..0000000
--- a/MES/bin/Debug/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/BLL.dll b/MES/bin/Debug/BLL.dll
deleted file mode 100644
index 78eb782..0000000
--- a/MES/bin/Debug/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/BLL.pdb b/MES/bin/Debug/BLL.pdb
deleted file mode 100644
index 0592720..0000000
--- a/MES/bin/Debug/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/DAL.dll b/MES/bin/Debug/DAL.dll
deleted file mode 100644
index 4fbb83d..0000000
--- a/MES/bin/Debug/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/DAL.pdb b/MES/bin/Debug/DAL.pdb
deleted file mode 100644
index 51d7163..0000000
--- a/MES/bin/Debug/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/DBUtility.dll b/MES/bin/Debug/DBUtility.dll
deleted file mode 100644
index 7c156e8..0000000
--- a/MES/bin/Debug/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/Interop.Excel.dll b/MES/bin/Debug/Interop.Excel.dll
deleted file mode 100644
index 0e7f72e..0000000
--- a/MES/bin/Debug/Interop.Excel.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/Interop.gregn6Lib.dll b/MES/bin/Debug/Interop.gregn6Lib.dll
deleted file mode 100644
index d47045d..0000000
--- a/MES/bin/Debug/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/Kingdee.BOS.WebApi.Client.dll b/MES/bin/Debug/Kingdee.BOS.WebApi.Client.dll
deleted file mode 100644
index 25dd347..0000000
--- a/MES/bin/Debug/Kingdee.BOS.WebApi.Client.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/MES.exe b/MES/bin/Debug/MES.exe
deleted file mode 100644
index e46240e..0000000
--- a/MES/bin/Debug/MES.exe
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/MES.pdb b/MES/bin/Debug/MES.pdb
deleted file mode 100644
index ce51091..0000000
--- a/MES/bin/Debug/MES.pdb
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/Model.dll b/MES/bin/Debug/Model.dll
deleted file mode 100644
index d00ded3..0000000
--- a/MES/bin/Debug/Model.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/Model.pdb b/MES/bin/Debug/Model.pdb
deleted file mode 100644
index f9a4c46..0000000
--- a/MES/bin/Debug/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/Newtonsoft.Json.dll b/MES/bin/Debug/Newtonsoft.Json.dll
deleted file mode 100644
index 416bd37..0000000
--- a/MES/bin/Debug/Newtonsoft.Json.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/Pub_Class.dll b/MES/bin/Debug/Pub_Class.dll
deleted file mode 100644
index 6afcbf4..0000000
--- a/MES/bin/Debug/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/Pub_Control.dll b/MES/bin/Debug/Pub_Control.dll
deleted file mode 100644
index da2f7ad..0000000
--- a/MES/bin/Debug/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/SQLHelper.dll b/MES/bin/Debug/SQLHelper.dll
deleted file mode 100644
index 404882a..0000000
--- a/MES/bin/Debug/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/WarM.dll b/MES/bin/Debug/WarM.dll
deleted file mode 100644
index 333dce0..0000000
--- a/MES/bin/Debug/WarM.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/WarM.dll.config b/MES/bin/Debug/WarM.dll.config
deleted file mode 100644
index d767ae0..0000000
--- a/MES/bin/Debug/WarM.dll.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <configSections>
- </configSections>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/MES/bin/Debug/WarM.pdb b/MES/bin/Debug/WarM.pdb
deleted file mode 100644
index fecedb1..0000000
--- a/MES/bin/Debug/WarM.pdb
+++ /dev/null
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 142d606..2c96eb5 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -501,7 +501,13 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainRuleBillSub_Item.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockStepOutBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockStepOutBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldScrapInBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldScrapInBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairOutBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairInBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOtherInBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairOutBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairInBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOtherInBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOtherOutBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOtherOutBillSub.cs" />
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairInBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairInBillMain.cs"
new file mode 100644
index 0000000..53f7e73
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairInBillMain.cs"
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_MouldRepairInBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HSupID;// int --供应商
+ public Int64 HWHID;// int --仓库
+ public Int64 HSCWHID;// int --调出仓库
+ public Int64 HEmpID;// int --业务员
+ public Int64 HManagerID;// int --负责人
+ public Int64 HSecManagerID;// int --验收
+ public Int64 HKeeperID;// int --保管员
+ public Int64 HDeptID;// int --部门
+ public string HExplanation;// varchar(200) --摘要
+ public string HInnerBillNo;// varchar(50) --内部单据号
+ public string HRemark; //加工要求
+ public bool HRedBlueFlag;// bit --红蓝单
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairInBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairInBillSub.cs"
new file mode 100644
index 0000000..c8fabab
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairInBillSub.cs"
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_MouldRepairInBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
+ public string HRemark;// varchar(200) --备注
+ public Int64 HMaterID;// int --物料ID
+ public Int64 HPropertyID;// int --辅助属性
+ public Int64 HSecUnitID;// int --辅助计量单位
+ public Single HSecUnitRate;// money --换算率
+ public Int64 HUnitID;// int --计量单位
+ public double HDesignLife;// dec(18,8) --设计寿命
+ public double HLeaveLife;// dec(18,8) --剩余寿命
+ public double HUseLifeQty;// dec(18,8) --本次使用寿命
+ public double HUseLife;// dec(18,8) --使用寿命
+ public double HQtyMust;// dec(18,8) --应收数量
+ public double HQty;// dec(18,8) --实收数量
+ public double HPrice;// dec(18,8) --单价
+ public double HMoney;// dec(18,8) --金额
+ public Int64 HWHID;// int --收料仓库
+ public Int64 HSCWHID;// int --调出仓库ID
+ public Int64 HSPID;// int --仓位ID
+ public Int64 HSCSPID;// int --调出仓位ID
+ public Int64 HSPGroupID;// int --仓位组ID(仓库选择完自动带出)
+ public string HBatchNo;// varchar(50) --批次
+ public string HEngineNum;// varchar(50) --发动机号
+ public string HUnderPanNum;// varchar(50) --地盘号
+ public string HLeaveFactCard;// varchar(50) --出厂证
+ public Int64 HPOOrderInterID;// int --采购订单主内码
+ public Int64 HPOOrderEntryID;// int --采购订单子内码
+ public string HPOOrderBillNo;// varchar(50) --采购订单号
+ public Int64 HSeOrderInterID;// int --销售订单主内码
+ public Int64 HSeOrderEntryID;// int --销售订单子内码
+ public string HSeOrderBillNo;// varchar(50) --销售订单号
+ public string HBarCode;
+
+ public string HNewModel;// varchar(100) --新规格 addnew
+ public string HWallThickness;// varchar(100) --壁厚 addnew
+ public string HHardness;// varchar(100) --硬度 addnew
+ public string HLastProdModel;// varchar(100) --最后生产产品 addnew
+ public string HDiameter;// varchar(100) --直径 addnew
+ public string HBackFlag;// varchar(100)--退库类型（正常使用，调试不合格） addnew
+
+ public string HInitModel;
+ public Single HInitDesignLife;
+ public Int64 HLifeUnitID;
+ public Int64 HMouldType;
+ public double HNewLifeQty;
+
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairOutBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairOutBillMain.cs"
new file mode 100644
index 0000000..bb05a93
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairOutBillMain.cs"
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_MouldRepairOutBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HSupID;// int --供应商
+ public Int64 HWHID;// int --仓库
+ public Int64 HSCWHID;// int --调出仓库
+ public Int64 HEmpID;// int --业务员
+ public Int64 HManagerID;// int --负责人
+ public Int64 HSecManagerID;// int --验收
+ public Int64 HKeeperID;// int --保管员
+ public Int64 HDeptID;// int --部门
+ public string HExplanation;// varchar(200) --摘要
+ public string HInnerBillNo;// varchar(50) --内部单据号
+ public string HRemark; //加工要求
+ public bool HRedBlueFlag;// bit --红蓝单
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairOutBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairOutBillSub.cs"
new file mode 100644
index 0000000..441f2d7
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldRepairOutBillSub.cs"
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_MouldRepairOutBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
+ public string HRemark;// varchar(200) --备注
+ public Int64 HMaterID;// int --物料ID
+ public Int64 HPropertyID;// int --辅助属性
+ public Int64 HSecUnitID;// int --辅助计量单位
+ public Single HSecUnitRate;// money --换算率
+ public Int64 HUnitID;// int --计量单位
+ public double HDesignLife;// dec(18,8) --设计寿命
+ public double HLeaveLife;// dec(18,8) --剩余寿命
+ public double HUseLifeQty;// dec(18,8) --本次使用寿命
+ public double HUseLife;// dec(18,8) --使用寿命
+ public double HQtyMust;// dec(18,8) --应收数量
+ public double HQty;// dec(18,8) --实收数量
+ public double HPrice;// dec(18,8) --单价
+ public double HMoney;// dec(18,8) --金额
+ public Int64 HWHID;// int --收料仓库
+ public Int64 HSCWHID;// int --调出仓库ID
+ public Int64 HSPID;// int --仓位ID
+ public Int64 HSCSPID;// int --调出仓位ID
+ public Int64 HSPGroupID;// int --仓位组ID(仓库选择完自动带出)
+ public string HBatchNo;// varchar(50) --批次
+ public string HEngineNum;// varchar(50) --发动机号
+ public string HUnderPanNum;// varchar(50) --地盘号
+ public string HLeaveFactCard;// varchar(50) --出厂证
+ public Int64 HPOOrderInterID;// int --采购订单主内码
+ public Int64 HPOOrderEntryID;// int --采购订单子内码
+ public string HPOOrderBillNo;// varchar(50) --采购订单号
+ public Int64 HSeOrderInterID;// int --销售订单主内码
+ public Int64 HSeOrderEntryID;// int --销售订单子内码
+ public string HSeOrderBillNo;// varchar(50) --销售订单号
+ public string HBarCode;
+
+ public string HNewModel;// varchar(100) --新规格 addnew
+ public string HWallThickness;// varchar(100) --壁厚 addnew
+ public string HHardness;// varchar(100) --硬度 addnew
+ public string HLastProdModel;// varchar(100) --最后生产产品 addnew
+ public string HDiameter;// varchar(100) --直径 addnew
+ public string HBackFlag;// varchar(100)--退库类型（正常使用，调试不合格） addnew
+
+ public string HInitModel;
+ public Single HInitDesignLife;
+ public Int64 HLifeUnitID;
+ public Int64 HMouldType;
+ public double HNewLifeQty;
+
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldScrapInBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldScrapInBillMain.cs"
new file mode 100644
index 0000000..4e43e28
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldScrapInBillMain.cs"
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_MouldScrapInBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HSupID;// int --供应商
+ public Int64 HWHID;// int --仓库
+ public Int64 HSCWHID;// int --调出仓库
+ public Int64 HEmpID;// int --业务员
+ public Int64 HManagerID;// int --负责人
+ public Int64 HSecManagerID;// int --验收
+ public Int64 HKeeperID;// int --保管员
+ public Int64 HDeptID;// int --部门
+ public string HExplanation;// varchar(200) --摘要
+ public string HInnerBillNo;// varchar(50) --内部单据号
+ public string HRemark; //加工要求
+ public bool HRedBlueFlag;// bit --红蓝单
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldScrapInBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldScrapInBillSub.cs"
new file mode 100644
index 0000000..be49681
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldScrapInBillSub.cs"
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_MouldScrapInBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
+ public string HRemark;// varchar(200) --备注
+ public Int64 HMaterID;// int --物料ID
+ public Int64 HPropertyID;// int --辅助属性
+ public Int64 HSecUnitID;// int --辅助计量单位
+ public Single HSecUnitRate;// money --换算率
+ public Int64 HUnitID;// int --计量单位
+ public double HDesignLife;// dec(18,8) --设计寿命
+ public double HLeaveLife;// dec(18,8) --剩余寿命
+ public double HUseLifeQty;// dec(18,8) --本次使用寿命
+ public double HUseLife;// dec(18,8) --使用寿命
+ public double HQtyMust;// dec(18,8) --应收数量
+ public double HQty;// dec(18,8) --实收数量
+ public double HPrice;// dec(18,8) --单价
+ public double HMoney;// dec(18,8) --金额
+ public Int64 HWHID;// int --收料仓库
+ public Int64 HSCWHID;// int --调出仓库ID
+ public Int64 HSPID;// int --仓位ID
+ public Int64 HSCSPID;// int --调出仓位ID
+ public Int64 HSPGroupID;// int --仓位组ID(仓库选择完自动带出)
+ public string HBatchNo;// varchar(50) --批次
+ public string HEngineNum;// varchar(50) --发动机号
+ public string HUnderPanNum;// varchar(50) --地盘号
+ public string HLeaveFactCard;// varchar(50) --出厂证
+ public Int64 HPOOrderInterID;// int --采购订单主内码
+ public Int64 HPOOrderEntryID;// int --采购订单子内码
+ public string HPOOrderBillNo;// varchar(50) --采购订单号
+ public Int64 HSeOrderInterID;// int --销售订单主内码
+ public Int64 HSeOrderEntryID;// int --销售订单子内码
+ public string HSeOrderBillNo;// varchar(50) --销售订单号
+ public string HBarCode;
+
+ public string HNewModel;// varchar(100) --新规格 addnew
+ public string HWallThickness;// varchar(100) --壁厚 addnew
+ public string HHardness;// varchar(100) --硬度 addnew
+ public string HLastProdModel;// varchar(100) --最后生产产品 addnew
+ public string HDiameter;// varchar(100) --直径 addnew
+ public string HBackFlag;// varchar(100)--退库类型（正常使用，调试不合格） addnew
+
+ public string HInitModel;
+ public Single HInitDesignLife;
+ public Int64 HLifeUnitID;
+ public Int64 HMouldType;
+ public double HNewLifeQty;
+
+ }
+}
diff --git a/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs b/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs
new file mode 100644
index 0000000..c36b285
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs
@@ -0,0 +1,386 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class Gy_ClassTimePrjController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ClassTimePrj/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjList where 1=1 ", "h_v_Gy_ClassTimePrjList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_ClassTimePrjList where 1=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_ClassTimePrjList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ /// <summary>
+ /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ClassTimePrj/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjList where HitemID=" + HInterID, "h_v_Gy_ClassTimePrjList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //
+
+
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ClassTimePrj/AddNew")]
+ [HttpPost]
+ public object AddNew([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+
+ DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
+ DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
+ List<Gy_ClassTimePrj> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrj>>(msg1);
+
+ long HItemID = list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ long HParentID = list[0].HParentID; ;
+ long HDeptID = list[0].HDeptID; ;
+ long HGroupID = list[0].HGroupID;
+ bool HStopflag = list[0].HStopflag;
+ string HRemark = list[0].HRemark;
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert into Gy_ClassTimePrj" +
+ " (HNumber,HName,HParentID" +
+ ",HStopflag,HRemark,HDeptID,HGroupID) " +
+ " Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
+ "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID.ToString() + "," + HGroupID.ToString() + ")"
+ , ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_ClassTimePrj set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ClassTimePrj/ModifyByID")]
+ [HttpPost]
+ public object ModifyByID([FromBody] JObject oMain)
+ {
+ try
+ {
+ DAL.ClsGy_ClassTimePrj_Ctl oDept = new DAL.ClsGy_ClassTimePrj_Ctl();
+ DAL.ClsGy_ClassTimePrj_View oDeptHlp = new DAL.ClsGy_ClassTimePrj_View();
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[1].ToString();
+ //string msg4 = sArray[2].ToString();
+ //string msg5 = sArray[3].ToString();
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Gy_ClassTimePrj> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrj>>(msg2);//杩欏彞鏈夐棶棰�
+
+ long HItemID = list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ long HParentID = list[0].HParentID; ;
+ long HDeptID = list[0].HDeptID; ;
+ long HGroupID = list[0].HGroupID;
+ bool HStopflag = list[0].HStopflag;
+ string HRemark = list[0].HRemark;
+
+ ////鍒ゆ柇鏉冮檺
+ //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //if (oDept.HavSameNumber(HItemID, HNumber))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Insert into Gy_ClassTimePrj" +
+ " (HNumber,HName,HParentID" +
+ ",HStopflag,HRemark,HDeptID,HGroupID) " +
+ " Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
+ "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID.ToString() + "," + HGroupID.ToString() + ")"
+ , ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_ClassTimePrj set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_Warehouse set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HParentID=" + HParentID.ToString() +
+ ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ ",HDeptID=" + HDeptID.ToString() +
+ ",HGroupID=" + HGroupID.ToString() +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_ClassTimePrj set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCN.Commit();
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ /// <summary>
+ /// 浠撳簱鍒楄〃鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("DeltetGy_ClassTimePrj")]
+ [HttpGet]
+ public object DeltetGy_ClassTimePrj(string HItemID)
+ {
+ DataSet ds;
+ DataSet ds1;
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //{
+ // 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_ClassTimePrj where HItemID=" + HItemID, "Gy_ClassTimePrj");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ //if (HStopflag)
+ //{
+ // oCN.RollBack();//鍥炴粴浜嬪姟
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ ds1 = oCN.RunProcReturn("Select HItemID from Gy_ClassTimePrj Where HParentID='" + HItemID + "'", "Gy_ClassTimePrj");
+ if (ds1.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
+ if (HUseFlag == "宸蹭娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from Gy_ClassTimePrj where HItemID=" + HItemID);
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs
new file mode 100644
index 0000000..75c4796
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ProcController.cs
@@ -0,0 +1,411 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class Xt_DataDictionary_ProcController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DataDictionary_Proc/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Proc where 1=1 ", "h_v_IF_DataDictionary_Proc");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_DataDictionary_Proc where 1=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_Proc");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DataDictionary_Proc/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_ProcDetail where HitemID = " + HInterID, "h_v_IF_DataDictionary_ProcDetail");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("DeltetXt_DataDictionary_Proc")]
+ [HttpGet]
+ public object DeltetXt_DataDictionary_Proc(string HItemID)
+ {
+ DataSet ds;
+ //DataSet ds1;
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //{
+ // 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 h_v_IF_DataDictionary_Proc where HItemID=" + HItemID, "h_v_IF_DataDictionary_Proc");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ //ds1 = oCN.RunProcReturn("Select HItemID from h_v_IF_DataDictionary_View Where HParentID='" + HItemID + "'", "h_v_IF_DataDictionary_View");
+ //if (ds1.Tables[0].Rows.Count != 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
+ oCN.RunProc("delete from h_v_IF_DataDictionary_Proc 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;
+ }
+ }
+
+
+
+ /// <summary>
+ /// 绂佺敤鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DataDictionary_Proc/JY_Json")]
+ [HttpGet]
+ public object JY_Json(long HItemID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("update Xt_DataDictionary_Proc set HStopFlag = 1 where HItemID = " + HItemID, "Xt_DataDictionary_Proc");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍙嶇鐢ㄦ寜閽�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DataDictionary_Proc/FJY_Json")]
+ [HttpGet]
+ public object FJY_Json(long HItemID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("update Xt_DataDictionary_Proc set HStopFlag = 0 where HItemID = " + HItemID, "Xt_DataDictionary_Proc");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ ///// <summary>
+ ///// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ /////鍙傛暟锛歴tring sql銆�
+ /////杩斿洖鍊硷細object銆�
+ ///// </summary>
+ //[Route("Xt_DataDictionary_View/AddBill")]
+ //[HttpPost]
+ //public object AddBill([FromBody] JObject oMain)
+ //{
+ // try
+ // {
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+ // //鍙嶅簭鍒楀寲
+ // msg1 = "[" + msg1.ToString() + "]";
+
+ // //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
+ // //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+
+
+
+ // List<Xt_DataDictionary_View> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_View>>(msg1);
+
+ // long HItemID = list[0].HItemID;
+ // long HModNameID = list[0].HModNameID;
+ // long HBillTypeID = list[0].HBillTypeID;
+ // string HViewName = list[0].HViewName;
+ // string HViewCaption = list[0].HViewCaption;
+ // string HRemark = list[0].HRemark;
+ // bool HStopflag = list[0].HStopflag;
+ // DateTime HMakeTime = list[0].HMakeTime;
+ // string HMakeEmp = list[0].HMakeEmp;
+ // DateTime HModifyTime = list[0].HModifyTime;
+ // string HModifyEmp = list[0].HModifyEmp;
+
+
+ // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ // oCN.BeginTran();
+ // //涓昏〃
+ // oCN.RunProc("Insert Into Xt_DataDictionary_View " +
+ // "(HModNameID,HBillTypeID,HViewName,HViewCaption,HRemark" +
+ // ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
+ // ",HModifyEmp" +
+ // ") " +
+ // " values(" + HModNameID + "," + HBillTypeID + "," + HBillTypeID + ",'" + HViewName + "','" + HViewCaption + "'"+
+ // ",'" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
+ // ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
+ // ") ");
+ // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = null;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // catch (Exception e)
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.Message;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+
+
+ /// <summary>
+ /// 淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DataDictionary_Proc/AddBill1")]
+ [HttpPost]
+ public object AddBill1([FromBody] JObject oMain)
+ {
+
+ try
+ {
+ //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
+ //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[1].ToString();
+ //string msg4 = sArray[2].ToString();
+ //string msg5 = sArray[3].ToString();
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Xt_DataDictionary_Proc> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_Proc>>(msg2);
+
+ long HItemID = list[0].HItemID;
+ long HModNameID = list[0].HModNameID;
+ long HBillTypeID = list[0].HBillTypeID;
+ string HProcName = list[0].HProcName;
+ string HProcCaption = list[0].HProcCaption;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ DateTime HMakeTime = list[0].HMakeTime;
+ string HMakeEmp = list[0].HMakeEmp;
+ DateTime HModifyTime = list[0].HModifyTime;
+ string HModifyEmp = list[0].HModifyEmp;
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ //鏂板
+ oCN.BeginTran();
+ oCN.RunProc("Insert Into Xt_DataDictionary_Proc " +
+ "(HModNameID,HBillTypeID,HProcName,HProcCaption,HRemark" +
+ ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
+ ",HModifyEmp" +
+ ") " +
+ " values(" + HModNameID + "," + HBillTypeID + ",'" + HProcName + "','" + HProcCaption + "'" +
+ ",'" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
+ ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
+ ") ", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Xt_DataDictionary_Proc set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else
+ {
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Xt_DataDictionary_Proc set " +
+ " HModNameID= "+ HModNameID +
+ " HBillTypeID= " + HBillTypeID +
+ ",HProcName='" + HProcName + "'" +
+ ",HProcCaption='" + HProcCaption + "'" +
+ ",HRemark='" + HRemark + "'" +
+ ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ ",HMakeTime='" + HMakeTime + "'" +
+ ",HMakeEmp='" + HMakeEmp + "'" +
+ ",HModifyTime='" + HModifyTime + "'" +
+ ",HModifyEmp='" + HModifyEmp + "'" +
+ //",HUpdater='" + HUpdater + "'" +
+ //",HUpdateDate= getdate()" +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Xt_DataDictionary_Proc set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs
index c7c581e..45e70b1 100644
--- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs
@@ -19,57 +19,26 @@
/// <summary>
- /// 杩斿洖閮ㄩ棬鍒楄〃
+ /// 杩斿洖鍒楄〃
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
[Route("Xt_DataDictionary_Table/list")]
[HttpGet]
- public object list(string sWhere,string Organization)
+ public object list(string sWhere)
{
try
{
- string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_DepartmentList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_Table where 1=1 ", "h_v_IF_DataDictionary_Table");
}
else
{
- string sql = sql1 + sWhere + "order by HItemID desc";
- ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
+ string sql1 = "select * from h_v_IF_DataDictionary_Table where 1=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_Table");
}
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
-
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
-
- /// <summary>
- /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_Department/cx")]
- [HttpGet]
- public object cx(long HInterID)
- {
- try
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentListDetail where HitemID = " + HInterID, "h_v_IF_DepartmentListDetail");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -98,15 +67,54 @@
}
/// <summary>
- /// 閮ㄩ棬鍒楄〃鍒犻櫎鍔熻兘
+ /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DataDictionary_Table/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_TableDetail where HitemID = " + HInterID, "h_v_IF_DataDictionary_TableDetail");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
- [Route("DeltetGy_Department")]
+ [Route("DeltetXt_DataDictionary_Table")]
[HttpGet]
- public object DeltetGy_Department(string HItemID)
+ public object DeltetXt_DataDictionary_Table(string HItemID)
{
DataSet ds;
- DataSet ds1;
+ //DataSet ds1;
try
{
//鍒犻櫎鏉冮檺
@@ -129,7 +137,7 @@
return objJsonResult;
}
oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HItemID, "Gy_Department");
+ ds = oCN.RunProcReturn("select * from Xt_DataDictionary_Table where HItemID=" + HItemID, "Xt_DataDictionary_Table");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -138,37 +146,18 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- ds1 = oCN.RunProcReturn("Select HItemID from Gy_Department Where HParentID='" + HItemID + "'", "Gy_Department");
- if (ds1.Tables[0].Rows.Count != 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
- if (HUseFlag == "宸蹭娇鐢�")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //v
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
+ //ds1 = oCN.RunProcReturn("Select HItemID from Xt_DataDictionary_Table Where HParentID='" + HItemID + "'", "Xt_DataDictionary_Table");
+ //if (ds1.Tables[0].Rows.Count != 0)
//{
- // oCN.RollBack();//鍥炴粴浜嬪姟
// objJsonResult.code = "0";
// objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
+ // objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
// objJsonResult.data = null;
// return objJsonResult;
//}
-
- oCN.RunProc("delete from Gy_Department where HItemID=" + HItemID);
+
+
+ oCN.RunProc("delete from Xt_DataDictionary_Table where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -187,26 +176,20 @@
}
}
- //[Route("Gy_Department/LoadTree")]
- //[HttpGet]
- //public object LoadTree_Json()
- //{
- // DBUtility.Gy_BaseFun.LoadTree(tv, imageList1, this.Text, BillName);
- //}
-
+
/// <summary>
- /// 閮ㄩ棬鍒楄〃绂佺敤鎸夐挳
+ /// 绂佺敤鎸夐挳
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Gy_Department/JY_Json")]
+ [Route("Xt_DataDictionary_Table/JY_Json")]
[HttpGet]
public object JY_Json(long HItemID)
{
try
{
- ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 1 where HItemID = " + HItemID, "Gy_Department");
+ ds = oCN.RunProcReturn("update Xt_DataDictionary_Table set HStopFlag = 1 where HItemID = " + HItemID, "Xt_DataDictionary_Table");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -225,17 +208,17 @@
}
/// <summary>
- /// 閮ㄩ棬鍒楄〃鍙嶇鐢ㄦ寜閽�
+ /// 鍙嶇鐢ㄦ寜閽�
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Gy_Department/FJY_Json")]
+ [Route("Xt_DataDictionary_Table/FJY_Json")]
[HttpGet]
public object FJY_Json(long HItemID)
{
try
{
- ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 0 where HItemID = " + HItemID, "Gy_Department");
+ ds = oCN.RunProcReturn("update Xt_DataDictionary_Table set HStopFlag = 0 where HItemID = " + HItemID, "Xt_DataDictionary_Table");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -258,7 +241,7 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Gy_Department/AddBill")]
+ [Route("Xt_DataDictionary_Table/AddBill")]
[HttpPost]
public object AddBill([FromBody] JObject oMain)
{
@@ -269,69 +252,49 @@
//鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
- DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
- DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+ //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
+ //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
- List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg1);
+ List<Xt_DataDictionary_Table> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_Table>>(msg1);
long HItemID = list[0].HItemID;
- string HNumber = list[0].HNumber;
- string HName = list[0].HName;
- string HShortNumber = list[0].HShortNumber;
+ long HModNameID = list[0].HModNameID;
+ long HBillTypeID = list[0].HBillTypeID;
+ string HTableName = list[0].HTableName;
+ string HTableCaption = list[0].HTableCaption;
+ string HFieldName = list[0].HFieldName;
+ string HFieldCaption = list[0].HFieldCaption;
+ string HDataType = list[0].HDataType;
+ string HDefaultValue = list[0].HDefaultValue;
string HRemark = list[0].HRemark;
- string HUseFlag = list[0].HUseFlag;
- long HParentID = list[0].HParentID;
- string HBarCode = list[0].HBarCode;
- string HHelpCode = list[0].HHelpCode;
- long HSecManagerID = list[0].HSecManagerID;
- string HCreator = list[0].HCreator;
- long HCreateOrgID = list[0].HCreateOrgID;
- //DateTime HCreateDate = list[0].HCreateDate;
- long HUseOrgID = list[0].HUseOrgID;
- string HUpdater = list[0].HUpDater;
- //DateTime HUpdateDate = list[0].HUpDateDate;
- string HChecker = list[0].HChecker;
- //DateTime HCheckDate = list[0].HCheckDate;
- string HDeleteMan = list[0].HDeleteMan;
- //DateTime HDeleteDate = list[0].HDeleteDate;
-
-
- if (!DBUtility.ClsPub.AllowNumber(HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
+ bool HStopflag = list[0].HStopflag;
+ DateTime HMakeTime = list[0].HMakeTime;
+ string HMakeEmp = list[0].HMakeEmp;
+ DateTime HModifyTime = list[0].HModifyTime;
+ string HModifyEmp = list[0].HModifyEmp;
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
- oCN.RunProc("Insert Into Gy_Department " +
- "(HNumber,HShortNumber,HName,HParentID" +
- ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" +
- ",HCREATEORGID,HUSEORGID,HBarCode,HCreator" +
- ",HUpdater,HChecker,HDeleteMan" +
- ",HSecManagerID,HCreateDate" +
+ oCN.RunProc("Insert Into Xt_DataDictionary_Table " +
+ "(HModNameID,HBillTypeID,HTableName,HTableCaption" +
+ ",HFieldName,HFieldCaption,HDataType,HDefaultValue,HRemark" +
+ ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
+ ",HModifyEmp" +
") " +
- " values('" + HNumber + "','" + HShortNumber + "','" + HName + "',0" +
- ",'',0,'" + HRemark + "',0,''" +
- "," + HCreateOrgID + "," + HUseOrgID + ",'" + HBarCode + "','" + HCreator + "'" +
- ",'" + HUpdater + "','" + HChecker + "','" + HDeleteMan + "'" +
- "," + HSecManagerID + ", getdate()" +
+ " values(" + HModNameID + "," + HBillTypeID + ",'" + HTableName + "'"+
+ ",'" + HTableCaption + "','" + HFieldName + "','" + HFieldCaption + "','" + HDataType + "'" +
+ ",'" + HDefaultValue + "','" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
+ ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
") ");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
- //objJsonResult.data = null;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
return objJsonResult;
}
catch (Exception e)
@@ -351,82 +314,42 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Gy_Department/AddBill1")]
+ [Route("Xt_DataDictionary_Table/AddBill1")]
[HttpPost]
public object AddBill1([FromBody] JObject oMain)
{
try
{
- DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
- DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+ //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
+ //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
+ //string msg3 = sArray[1].ToString();
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
- List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2);
+ List<Xt_DataDictionary_Table> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_Table>>(msg2);
long HItemID = list[0].HItemID;
- string HNumber = list[0].HNumber;
- string HName = list[0].HName;
- string HShortNumber = list[0].HShortNumber;
+ long HModNameID = list[0].HModNameID;
+ long HBillTypeID = list[0].HBillTypeID;
+ string HTableName = list[0].HTableName;
+ string HTableCaption = list[0].HTableCaption;
+ string HFieldName = list[0].HFieldName;
+ string HFieldCaption = list[0].HFieldCaption;
+ string HDataType = list[0].HDataType;
+ string HDefaultValue = list[0].HDefaultValue;
string HRemark = list[0].HRemark;
- string HUseFlag = list[0].HUseFlag;
- long HParentID = list[0].HParentID;
- string HBarCode = list[0].HBarCode;
- string HHelpCode = list[0].HHelpCode;
- string HUpDater = list[0].HUpDater;
- long HEmpID = list[0].HEmpID;
bool HStopflag = list[0].HStopflag;
- long HSecManagerID = list[0].HSecManagerID;
- //string HCreator = list[0].HCreator;
- long HCreateOrgID = list[0].HCreateOrgID;
- //DateTime HCreateDate = list[0].HCreateDate;
- long HUseOrgID = list[0].HUseOrgID;
- string HUpdater = list[0].HUpDater;
- //DateTime HUpdateDate = list[0].HUpDateDate;
- string HChecker = list[0].HChecker;
- //DateTime HCheckDate = list[0].HCheckDate;
- string HDeleteMan = list[0].HDeleteMan;
- //DateTime HDeleteDate = list[0].HDeleteDate;
- long HLevel = 1;
- bool HEndFlag = true;
- long HEntityID = 1;
-
- //鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
- //if (!DBUtility.ClsPub.AllowNumber(HNumber))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- //if (oDept.HavSameNumber(HItemID, HNumber))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ DateTime HMakeTime = list[0].HMakeTime;
+ string HMakeEmp = list[0].HMakeEmp;
+ DateTime HModifyTime = list[0].HModifyTime;
+ string HModifyEmp = list[0].HModifyEmp;
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -434,35 +357,46 @@
{
//鏂板
oCN.BeginTran();
- oCN.RunProc("Insert into Gy_Department " +
- " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID) " +
- " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
- "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID + ",'" + HBarCode + "'" +
- "," + HEntityID.ToString() + "," + HUseOrgID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Insert Into Xt_DataDictionary_Table " +
+ "(HModNameID,HBillTypeID,HTableName,HTableCaption" +
+ ",HFieldName,HFieldCaption,HDataType,HDefaultValue,HRemark" +
+ ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
+ ",HModifyEmp" +
+ ") " + " values(" + HModNameID + "," + HBillTypeID + ",'" + HTableName + "'" +
+ ",'" + HTableCaption + "','" + HFieldName + "','" + HFieldCaption + "','" + HDataType + "'" +
+ ",'" + HDefaultValue + "','" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
+ ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
+ ") ", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Xt_DataDictionary_Table set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
}
else
{
oCN.BeginTran();
//涓昏〃
- oCN.RunProc("Update Gy_Department set " +
- " HNumber='" + HNumber + "'" +
- ",HName='" + HName + "'" +
- ",HHelpCode='" + HHelpCode + "'" +
- ",HShortNumber='" + HShortNumber + "'" +
- ",HParentID=" + HParentID +
- ",HEmpID=" + HEmpID.ToString() +
+ oCN.RunProc("Update Xt_DataDictionary_Table set " +
+ " HModNameID= "+ HModNameID +
+ " HBillTypeID= " + HBillTypeID +
+ ",HTableName='" + HTableName + "'" +
+ ",HTableCaption='" + HTableCaption + "'" +
+ ",HFieldName='" + HFieldName + "'" +
+ ",HDataType='" + HDataType + "'" +
+ ",HFieldName='" + HFieldName + "'" +
+ ",HFieldCaption='" + HFieldCaption + "'" +
+ //",HRemark='" + HRemark + "'" +
",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ ",HMakeTime='" + HMakeTime + "'" +
+ ",HMakeEmp='" + HMakeEmp + "'" +
+ ",HModifyTime='" + HModifyTime + "'" +
+ ",HModifyEmp='" + HModifyEmp + "'" +
//",HUpdater='" + HUpdater + "'" +
//",HUpdateDate= getdate()" +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("Update Xt_DataDictionary_Table set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
}
objJsonResult.code = "0";
@@ -483,91 +417,7 @@
}
}
- /// <summary>
- /// 鑾峰彇鏈�澶у熀纭�璧勬枡ID
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_Department/GetMAXBillID")]
- [HttpGet]
- public object GetMAXBillID()
- {
- try
- {
- ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_Department", "Gy_Department");
- 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;
- }
- }
-
-
- /// <summary>
- /// 閮ㄩ棬鍒楄〃淇敼鎸夐挳鏂规硶
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_Department/xg")]
- [HttpGet]
- public object xg(long HInterID)
- {
- try
- {
- ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HInterID, "Gy_Department");
-
- 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;
- }
- }
-
-
-
- [Route("Gy_Department/LoadTree")]
- [HttpGet]
- public object LoadTree_Json(string sWhere)
- {
- SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
- //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
- ds = oCN.RunProcReturn("select * from h_v_DepartmentLoadTree", "h_v_DepartmentLoadTree");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- }
diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
new file mode 100644
index 0000000..f4b8ec3
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_ViewController.cs
@@ -0,0 +1,411 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class Xt_DataDictionary_ViewController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DataDictionary_View/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_View where 1=1 ", "h_v_IF_DataDictionary_View");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_DataDictionary_View where 1=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_View");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DataDictionary_View/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_ViewDetail where HitemID = " + HInterID, "h_v_IF_DataDictionary_ViewDetail");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("DeltetXt_DataDictionary_View")]
+ [HttpGet]
+ public object DeltetXt_DataDictionary_View(string HItemID)
+ {
+ DataSet ds;
+ //DataSet ds1;
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //{
+ // 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 h_v_IF_DataDictionary_View where HItemID=" + HItemID, "h_v_IF_DataDictionary_View");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ //ds1 = oCN.RunProcReturn("Select HItemID from h_v_IF_DataDictionary_View Where HParentID='" + HItemID + "'", "h_v_IF_DataDictionary_View");
+ //if (ds1.Tables[0].Rows.Count != 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
+ oCN.RunProc("delete from h_v_IF_DataDictionary_View 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;
+ }
+ }
+
+
+
+ /// <summary>
+ /// 绂佺敤鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DataDictionary_View/JY_Json")]
+ [HttpGet]
+ public object JY_Json(long HItemID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("update Xt_DataDictionary_View set HStopFlag = 1 where HItemID = " + HItemID, "Xt_DataDictionary_View");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍙嶇鐢ㄦ寜閽�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DataDictionary_View/FJY_Json")]
+ [HttpGet]
+ public object FJY_Json(long HItemID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("update Xt_DataDictionary_View set HStopFlag = 0 where HItemID = " + HItemID, "Xt_DataDictionary_View");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ ///// <summary>
+ ///// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ /////鍙傛暟锛歴tring sql銆�
+ /////杩斿洖鍊硷細object銆�
+ ///// </summary>
+ //[Route("Xt_DataDictionary_View/AddBill")]
+ //[HttpPost]
+ //public object AddBill([FromBody] JObject oMain)
+ //{
+ // try
+ // {
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+ // //鍙嶅簭鍒楀寲
+ // msg1 = "[" + msg1.ToString() + "]";
+
+ // //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
+ // //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+
+
+
+ // List<Xt_DataDictionary_View> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_View>>(msg1);
+
+ // long HItemID = list[0].HItemID;
+ // long HModNameID = list[0].HModNameID;
+ // long HBillTypeID = list[0].HBillTypeID;
+ // string HViewName = list[0].HViewName;
+ // string HViewCaption = list[0].HViewCaption;
+ // string HRemark = list[0].HRemark;
+ // bool HStopflag = list[0].HStopflag;
+ // DateTime HMakeTime = list[0].HMakeTime;
+ // string HMakeEmp = list[0].HMakeEmp;
+ // DateTime HModifyTime = list[0].HModifyTime;
+ // string HModifyEmp = list[0].HModifyEmp;
+
+
+ // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ // oCN.BeginTran();
+ // //涓昏〃
+ // oCN.RunProc("Insert Into Xt_DataDictionary_View " +
+ // "(HModNameID,HBillTypeID,HViewName,HViewCaption,HRemark" +
+ // ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
+ // ",HModifyEmp" +
+ // ") " +
+ // " values(" + HModNameID + "," + HBillTypeID + "," + HBillTypeID + ",'" + HViewName + "','" + HViewCaption + "'"+
+ // ",'" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
+ // ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
+ // ") ");
+ // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = null;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // catch (Exception e)
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.Message;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+
+
+ /// <summary>
+ /// 淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DataDictionary_View/AddBill1")]
+ [HttpPost]
+ public object AddBill1([FromBody] JObject oMain)
+ {
+
+ try
+ {
+ //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
+ //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[1].ToString();
+ //string msg4 = sArray[2].ToString();
+ //string msg5 = sArray[3].ToString();
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Xt_DataDictionary_View> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_View>>(msg2);
+
+ long HItemID = list[0].HItemID;
+ long HModNameID = list[0].HModNameID;
+ long HBillTypeID = list[0].HBillTypeID;
+ string HViewName = list[0].HViewName;
+ string HViewCaption = list[0].HViewCaption;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ DateTime HMakeTime = list[0].HMakeTime;
+ string HMakeEmp = list[0].HMakeEmp;
+ DateTime HModifyTime = list[0].HModifyTime;
+ string HModifyEmp = list[0].HModifyEmp;
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (HItemID == 0)
+ {
+ //鏂板
+ oCN.BeginTran();
+ oCN.RunProc("Insert Into Xt_DataDictionary_View " +
+ "(HModNameID,HBillTypeID,HViewName,HViewCaption,HRemark" +
+ ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" +
+ ",HModifyEmp" +
+ ") " +
+ " values(" + HModNameID + "," + HBillTypeID + ",'" + HViewName + "','" + HViewCaption + "'" +
+ ",'" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" +
+ ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" +
+ ") ", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Xt_DataDictionary_View set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else
+ {
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Xt_DataDictionary_View set " +
+ " HModNameID= "+ HModNameID +
+ " HBillTypeID= " + HBillTypeID +
+ ",HViewName='" + HViewName + "'" +
+ ",HViewCaption='" + HViewCaption + "'" +
+ ",HRemark='" + HRemark + "'" +
+ ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ ",HMakeTime='" + HMakeTime + "'" +
+ ",HMakeEmp='" + HMakeEmp + "'" +
+ ",HModifyTime='" + HModifyTime + "'" +
+ ",HModifyEmp='" + HModifyEmp + "'" +
+ //",HUpdater='" + HUpdater + "'" +
+ //",HUpdateDate= getdate()" +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Xt_DataDictionary_View set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index a64e2ce..df9c210 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -27,20 +27,19 @@
/// </summary>
[Route("Cg_POOrderBill/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere, string user)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
+ //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄�
+ bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
+ if (!isCgjl)
{
- ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList " + sWhere, "h_v_IF_POOrderBillList");
+ sWhere += " and HEmpID in (select HEmpID from Gy_Czygl where Czymc='Admin' )";
}
- else
- {
- string sql1 = "select * from h_v_IF_POOrderBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
- }
+ string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 " + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
@@ -144,6 +143,116 @@
}
}
+
+
+
+ //鍒ゆ柇鏄惁瀛樺湪鏉冮檺,骞跺啓鍏ユ棩蹇�
+ public static bool Security_Log(string gnsy, int LogTF, bool Msg, string CurUserName)
+ {
+ //gnsy 鍔熻兘绱㈠紩,妯″潡
+ //usercode 褰撳墠鐢ㄦ埛浠ｇ爜
+ //LogTF 1鍒ゆ柇鏉冮檺骞跺啓鏃ュ織锛�2鍙啓鏃ュ織锛�3鍙垽鏂潈闄�
+ //Msg 娌℃湁鏉冮檺鏃� 鏄惁鎻愮ず妗�
+ string UserID = CurUserName;
+ try
+ {
+ ClsSqlHelper oCn = new ClsSqlHelper();
+ DataSet Ds = new DataSet();
+ DataSet DsUser = new DataSet();
+ DataSet DsJS = new DataSet();//瑙掕壊
+ long ModID = 0;
+ bool HavRight = false;
+ //鎵惧埌妯″潡鏉冮檺
+ Ds = oCn.RunProcReturn("select * from xt_xtgnb where gnsy='" + gnsy.Trim() + "'", "xt_xtgnb");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ if (Msg == true)
+ {
+ //MessageBox.Show("娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒", "鎻愮ず");
+ }
+ return false;
+ }
+ else
+ {
+ ModID = ClsPub.isLong(Ds.Tables[0].Rows[0]["ID"].ToString()); //杩斿洖妯″潡
+ }
+ if (LogTF == 1 || LogTF == 3)//闇�瑕佸垽鏂潈闄�
+ {
+ //鏍规嵁鐢ㄦ埛鍚嶇О鍒ゆ柇鏉冮檺
+ DsUser = oCn.RunProcReturn("select * from gy_czygl where czymc='" + UserID.Trim() + "'", "gy_czygl");
+ if (DsUser.Tables[0].Rows.Count == 0)
+ {
+ if (Msg == true)
+ {
+ //MessageBox.Show("娌℃湁鎵惧埌褰撳墠鎿嶄綔鍛橈紒", "鎻愮ず");
+ }
+ return false;
+ }
+ //鏍规嵁鐢ㄦ埛鍚嶇О鍒ゆ柇鏉冮檺
+ if ((bool)DsUser.Tables[0].Rows[0]["ManagerFlag"]) //鏄惁绠＄悊鍛�
+ {
+ HavRight = true;
+ }
+ else
+ {
+ if (DsUser.Tables[0].Rows[0]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1")
+ {
+ HavRight = true;
+ }
+ else
+ {
+ //鑾峰彇鐢ㄦ埛缁� 骞跺惊鐜垽鏂潈闄�
+ //鍒ゆ柇瑙掕壊鏄惁鏈夋潈闄�
+ DsJS = oCn.RunProcReturn("select isnull(AuthorityID,'') AuthorityID from System_UserGroupinfo a inner join System_UserGroup b on a.GroupID=b.GroupID " +
+ " Where a.USERID='" + UserID.Trim() + "'", "gy_czygl");
+ if (DsJS == null)
+ {
+ HavRight = false;
+ }
+ else
+ {
+ HavRight = false;
+ for (int i = 0; i < DsJS.Tables[0].Rows.Count; i++)
+ {
+ if (ClsPub.isStrNull(DsJS.Tables[0].Rows[i]["AuthorityID"]).Length > ModID)
+ {
+ if (DsJS.Tables[0].Rows[i]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1")
+ {
+ HavRight = true;
+ break;
+ }
+ }
+ }
+
+ }
+ }
+ }
+
+ if (HavRight == false)
+ {
+ if (Msg == true)
+ {
+ //MessageBox.Show("鎮ㄦ病鏈夋潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒", "鎻愮ず");
+ }
+ }
+ }
+ //闇�瑕佸啓鍏ユ棩蹇�
+ if ((LogTF == 1 && HavRight) || LogTF == 2)
+ {
+ //Add_Log(Ds.Tables[0].Rows[0]["id"].ToString().Trim(), gnsy + "," + Ds.Tables[0].Rows[0]["gnmc"].ToString().Trim(), CurUserName);
+ }
+ return HavRight;
+ }
+ catch (Exception e)
+ {
+ if (Msg == true)
+ {
+ //MessageBox.Show("鍒ゆ柇鏉冮檺鏃跺彂鐜伴敊璇�,璇蜂笌绠＄悊鍛樿仈绯伙紒", "鎻愮ず");
+ }
+ return false;
+ }
+ }
+
//
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
index a885694..de02065 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
@@ -92,7 +92,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -223,7 +223,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
index 16ac781..f4895c0 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
@@ -92,7 +92,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -224,7 +224,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
index 8c7ec4c..9e3ef9c 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
@@ -92,7 +92,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -222,7 +222,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index be3b1c1..6dd7a94 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -32,7 +32,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -409,6 +409,7 @@
public object Sc_MouldScrapInProdBillListProjectDetai(string sqlWhere)
{
DataSet ds;
+ DataSet ds1;
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -419,6 +420,11 @@
瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,
HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID
FROM h_v_Sc_MouldProdInHouseBillList"), "h_v_Sc_MouldProdInHouseBillList");
+ //鏌ユ眹鎬�
+ ds1 = oCN.RunProcReturn(string.Format(@"select 妯″叿浠ｇ爜,妯″叿鍚嶇О,鍗曟嵁鍙�,瑙勬牸鍨嬪彿,鎵规,瀹炴敹鏁伴噺,hwhid1,鏀舵枡浠撳簱浠ｇ爜,
+ 鏀舵枡浠撳簱,琛ㄤ綋澶囨敞,sum(HMaterID) from h_v_Sc_MouldProdInHouseBillList group by 妯″叿浠ｇ爜,
+ 妯″叿鍚嶇О,鍗曟嵁鍙�,瑙勬牸鍨嬪彿,鎵规,瀹炴敹鏁伴噺,hwhid1,鏀舵枡浠撳簱浠ｇ爜,鏀舵枡浠撳簱,琛ㄤ綋澶囨敞"),
+ "h_v_Sc_MouldProdInHouseBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -482,7 +488,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
index c02c96e..4e2781c 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
@@ -92,7 +92,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -224,7 +224,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
index 8a698fb..2bd0218 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
@@ -32,7 +32,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -430,7 +430,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -508,7 +508,7 @@
//oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
//oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
//oItem.HRemark = ""; //澶囨敞
-
+
//oItem.HMainSourceInterID = oItem.HInterID;
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
index ef0b978..f98d851 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
@@ -35,7 +35,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -196,7 +196,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
index c7f92e8..0e0cfac 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
@@ -328,7 +328,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs b/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
index ab795e5..f767a85 100644
--- a/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
+++ b/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
@@ -138,6 +138,52 @@
}
}
+
+ [Route("EquipMaintainBill/txtHBarCode")]
+ [HttpGet]
+ public object txtHBarCode(string HBarCode)
+ {
+ try
+ {
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_EquipFileMainList where HBarCode = '" + HBarCode + "'", "h_v_Gy_EquipFileMainList");
+ //ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
+ //鍐欏叆淇℃伅
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璁惧淇℃伅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
public bool set_SavePonderationBillMain_Temp(Model.ClsKF_PonderationBillMain_Temp oMain, ref string sErrMsg)
{
DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
@@ -246,6 +292,7 @@
//oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HMouldID = DBUtility.ClsPub.isLong(lsmain[0].HMouldID);
//oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
//oItem.HPeriod = 0;
//oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
@@ -289,6 +336,289 @@
//oItemSub.HRemark = ""; //澶囨敞
oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ oItemSub.HDotCheckItemID = DBUtility.ClsPub.isLong(ls[0].HDotCheckItemID);
+ oItemSub.HDotCheckItem = DBUtility.ClsPub.isStrNull(ls[0].HDotCheckItem);
+ oItemSub.HDotCheckPart = DBUtility.ClsPub.isStrNull(ls[0].HDotCheckPart);
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 璁惧鐐规璁板綍鎻愪氦
+
+ [Route("Sb_EquipDotCheckBill/savebill")]
+ [HttpPost]
+ public object savebill([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 = "";
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSb_EquipDotCheckBill oBill = new DLL.ClsSb_EquipDotCheckBill();
+ List<Models.ClsSb_EquipDotCheckBillMain> lsmain = new List<Models.ClsSb_EquipDotCheckBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_EquipCheckBillMain(msg2);
+ foreach (Models.ClsSb_EquipDotCheckBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ 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;
+ }
+
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3903";
+ oItem.HBillSubType = "3903";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HEquipID = DBUtility.ClsPub.isLong(lsmain[0].HEquipID);
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
+ //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
+ //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
+ //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
+ //oItem.HRemark = ""; //澶囨敞
+
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //瀛愯〃浣撴暟鎹�
+
+ List<Models.ClsSb_EquipDotCheckBillSub> ls = new List<Models.ClsSb_EquipDotCheckBillSub>();
+ ls = oListModels.getObjectByJson_Gy_EquipDotCheckBillSub(msg2);
+ int i = 0;
+ foreach (Models.ClsSb_EquipDotCheckBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
+ //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ oItemSub.HDotCheckItemID = DBUtility.ClsPub.isLong(ls[0].HDotCheckItemID);
+ oItemSub.HDotCheckItem = DBUtility.ClsPub.isStrNull(ls[0].HDotCheckItem);
+ oItemSub.HDotCheckPart = DBUtility.ClsPub.isStrNull(ls[0].HDotCheckPart);
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+ #region 璁惧缁翠慨璁板綍鎻愪氦
+
+ [Route("Sb_EquipRepairWorkBill/savebill1")]
+ [HttpPost]
+ public object savebill1([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 = "";
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSb_EquipRepairWorkBill oBill = new DLL.ClsSb_EquipRepairWorkBill();
+ List<Models.ClsSb_EquipRepairWorkBillMain> lsmain = new List<Models.ClsSb_EquipRepairWorkBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.wxmain(msg2);
+ foreach (Models.ClsSb_EquipRepairWorkBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ 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;
+ }
+
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3903";
+ oItem.HBillSubType = "3903";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HEquipID = DBUtility.ClsPub.isLong(lsmain[0].HEquipID);
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
+ //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
+ //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
+ //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
+ //oItem.HRemark = ""; //澶囨敞
+
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //瀛愯〃浣撴暟鎹�
+
+ List<Models.ClsSb_EquipRepairWorkBillSub> ls = new List<Models.ClsSb_EquipRepairWorkBillSub>();
+ ls = oListModels.wxsub(msg2);
+ int i = 0;
+ foreach (Models.ClsSb_EquipRepairWorkBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
+ //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
//oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
//oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index d08b222..71883bf 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -4222,7 +4222,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -4338,7 +4338,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index 2bc9e08..af82ab5 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -165,6 +165,607 @@
#endregion
+ #region 妯″叿鏀瑰埗鍏ュ簱鍗�
+
+ #region 妯″叿鏀瑰埗鍏ュ簱鍗曚繚瀛�
+
+ [Route("Sc_MouldRepairInBill/MouldRepairInBill_Save")]
+ [HttpPost]
+ public object MouldRepairInBillAdd([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = MouldRepairInAddBill(msg1);
+ }
+
+ public json MouldRepairInAddBill(string msg1)
+ {
+ //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ //string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[0].ToString();
+ bool bResult;
+ try
+ {
+ //msg2 = "[" + msg2.ToString() + "]";
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSc_MouldRepairInBill BillNew = new DAL.ClsSc_MouldRepairInBill();
+ List<Model.ClsSc_MouldRepairInBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldRepairInBillMain>>(msg1);
+ List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(msg1);
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HDate = HDate;
+ BillNew.omodel.HWHID = mainList[0].HWHID;
+ BillNew.omodel.HSupID = 0;
+ BillNew.omodel.HSCWHID = 0;
+ BillNew.omodel.HEmpID = 0;
+ BillNew.omodel.HManagerID = mainList[0].HManagerID;
+ BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+ BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
+ BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+
+ oSub.HEntryID = 1;
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+ oSub.HMaterID = DBUtility.ClsPub.isLong(subList[0].HMaterID);
+ oSub.HPropertyID = DBUtility.ClsPub.isLong(subList[0].HPropertyID);
+ oSub.HSecUnitID = DBUtility.ClsPub.isLong(subList[0].HSecUnitID);
+ oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(subList[0].HSecUnitRate);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID);
+ oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust);
+ oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty);
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode);
+ if (oSub.HQty <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+ if (oSub.HDesignLife < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice);
+ oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID);
+ oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID);
+ oSub.HSCWHID = 0;
+ oSub.HSCSPID = 0;
+ oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo);
+ oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel);
+ oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness);
+ oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness);
+ oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel);
+ oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
+ oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
+ BillNew.DetailColl.Add(oSub);
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ //鎻愮ず
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+
+ #region 妯″叿閲囪喘鍏ュ簱鍗�
+
+ #region 妯″叿閲囪喘鍏ュ簱鍗曚繚瀛�
+
+ [Route("Sc_MouldProdInBill/MouldProdInBill_Save")]
+ [HttpPost]
+ public object MouldProdInBillAdd([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = MouldProdInAddBill(msg1);
+ }
+
+ public json MouldProdInAddBill(string msg1)
+ {
+ //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ //string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[0].ToString();
+ bool bResult;
+ try
+ {
+ //msg2 = "[" + msg2.ToString() + "]";
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSc_MouldProdInBill BillNew = new DAL.ClsSc_MouldProdInBill();
+ List<Model.ClsSc_MouldProdInBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldProdInBillMain>>(msg1);
+ List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(msg1);
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HDate = HDate;
+ BillNew.omodel.HWHID = mainList[0].HWHID;
+ BillNew.omodel.HSupID = 0;
+ BillNew.omodel.HSCWHID = 0;
+ BillNew.omodel.HEmpID = 0;
+ BillNew.omodel.HManagerID = mainList[0].HManagerID;
+ BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+ BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
+ BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+
+ oSub.HEntryID = 1;
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+ oSub.HMaterID = DBUtility.ClsPub.isLong(subList[0].HMaterID);
+ oSub.HPropertyID = DBUtility.ClsPub.isLong(subList[0].HPropertyID);
+ oSub.HSecUnitID = DBUtility.ClsPub.isLong(subList[0].HSecUnitID);
+ oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(subList[0].HSecUnitRate);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID);
+ oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust);
+ oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty);
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode);
+ if (oSub.HQty <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+ if (oSub.HDesignLife < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice);
+ oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID);
+ oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID);
+ oSub.HSCWHID = 0;
+ oSub.HSCSPID = 0;
+ oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo);
+ oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel);
+ oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness);
+ oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness);
+ oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel);
+ oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
+ oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
+ BillNew.DetailColl.Add(oSub);
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ //鎻愮ず
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+
+ #region 妯″叿鏀瑰埗鍑哄簱鍗�
+
+ #region 妯″叿鏀瑰埗鍑哄簱鍗曚繚瀛�
+
+ [Route("Sc_MouldRepairOutBill/MouldRepairOutBill_Save")]
+ [HttpPost]
+ public object MouldRepairOutBillAdd([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = MouldRepairOutAddBill(msg1);
+ }
+
+ public json MouldRepairOutAddBill(string msg1)
+ {
+ //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ //string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[0].ToString();
+ bool bResult;
+ try
+ {
+ //msg2 = "[" + msg2.ToString() + "]";
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSc_MouldRepairOutBill BillNew = new DAL.ClsSc_MouldRepairOutBill();
+ List<Model.ClsSc_MouldRepairOutBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldRepairOutBillMain>>(msg1);
+ List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(msg1);
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HDate = HDate;
+ BillNew.omodel.HWHID = mainList[0].HWHID;
+ BillNew.omodel.HSupID = 0;
+ BillNew.omodel.HSCWHID = 0;
+ BillNew.omodel.HEmpID = 0;
+ BillNew.omodel.HManagerID = mainList[0].HManagerID;
+ BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+ BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
+ BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+
+ oSub.HEntryID = 1;
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+ oSub.HMaterID = DBUtility.ClsPub.isLong(subList[0].HMaterID);
+ oSub.HPropertyID = DBUtility.ClsPub.isLong(subList[0].HPropertyID);
+ oSub.HSecUnitID = DBUtility.ClsPub.isLong(subList[0].HSecUnitID);
+ oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(subList[0].HSecUnitRate);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID);
+ oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust);
+ oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty);
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode);
+ if (oSub.HQty <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+ if (oSub.HDesignLife < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice);
+ oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID);
+ oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID);
+ oSub.HSCWHID = 0;
+ oSub.HSCSPID = 0;
+ oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo);
+ oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel);
+ oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness);
+ oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness);
+ oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel);
+ oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
+ oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
+ BillNew.DetailColl.Add(oSub);
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ //鎻愮ず
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+
+ #region 妯″叿鎶ュ簾鍏ュ簱鍗�
+
+ #region 妯″叿鎶ュ簾鍏ュ簱鍗曚繚瀛�
+
+ [Route("Sc_MouldScrapInBill/MouldScrapInBill_Save")]
+ [HttpPost]
+ public object MouldScrapInBillAdd([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = MouldScrapInAddBill(msg1);
+ }
+
+ public json MouldScrapInAddBill(string msg1)
+ {
+ //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ //string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[0].ToString();
+ bool bResult;
+ try
+ {
+ //msg2 = "[" + msg2.ToString() + "]";
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSc_MouldScrapInBill BillNew = new DAL.ClsSc_MouldScrapInBill();
+ List<Model.ClsSc_MouldScrapInBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldScrapInBillMain>>(msg1);
+ List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(msg1);
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HDate = HDate;
+ BillNew.omodel.HWHID = mainList[0].HWHID;
+ BillNew.omodel.HSupID = 0;
+ BillNew.omodel.HSCWHID = 0;
+ BillNew.omodel.HEmpID = 0;
+ BillNew.omodel.HManagerID = mainList[0].HManagerID;
+ BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+ BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
+ BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+
+ oSub.HEntryID = 1;
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+ oSub.HMaterID = DBUtility.ClsPub.isLong(subList[0].HMaterID);
+ oSub.HPropertyID = DBUtility.ClsPub.isLong(subList[0].HPropertyID);
+ oSub.HSecUnitID = DBUtility.ClsPub.isLong(subList[0].HSecUnitID);
+ oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(subList[0].HSecUnitRate);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID);
+ oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust);
+ oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty);
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode);
+ if (oSub.HQty <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+ if (oSub.HDesignLife < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice);
+ oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID);
+ oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID);
+ oSub.HSCWHID = 0;
+ oSub.HSCSPID = 0;
+ oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo);
+ oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel);
+ oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness);
+ oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness);
+ oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel);
+ oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
+ oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
+ BillNew.DetailColl.Add(oSub);
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ //鎻愮ず
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+
+
#region 妯″叿鐢熶骇棰嗙敤鍗�
#region 妯″叿鐢熶骇棰嗙敤鍗曚繚瀛�
@@ -283,7 +884,7 @@
oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
BillNew.DetailColl.Add(oSub);
- bResult = BillNew.AddBill_PDA(ref ClsPub.sExeReturnInfo);
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
//鎻愮ず
if (bResult == true)
{
@@ -434,7 +1035,7 @@
oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
oSub.HUseLife = DBUtility.ClsPub.isLong(subList[0].HUseLife);
BillNew.DetailColl.Add(oSub);
- bResult = BillNew.AddBill_PDA(ref ClsPub.sExeReturnInfo);
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
//鎻愮ず
if (bResult == true)
{
@@ -879,6 +1480,116 @@
#endregion
+ #region 璁惧缁翠慨璁板綍鍗曚繚瀛�
+
+ [Route("Sb_EquipMaintainBill/EquipMaintainBill_Save")]
+ [HttpPost]
+ public object EquipMaintainBill_Save([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ return objJsonResult = EquipMaintainAddBill(msg1);
+ }
+
+ public json EquipMaintainAddBill(string msg1)
+ {
+ bool bResult;
+ try
+ {
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSb_MouldRepairWorkBill BillNew = new DAL.ClsSb_MouldRepairWorkBill();
+ List<Model.ClsSb_MouldRepairWorkBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillMain>>(msg1);
+ List<Model.ClsSb_MouldRepairWorkBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillSub>>(msg1);
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = mainList[0].HDate;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HDate = HDate;
+ BillNew.omodel.HMouldID = mainList[0].HMouldID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ BillNew.omodel.HEmpID = mainList[0].HEmpID;
+ BillNew.omodel.HRepairID = mainList[0].HRepairID;
+ BillNew.omodel.HManagerID = mainList[0].HManagerID;
+ BillNew.omodel.HRepairBeginDate = mainList[0].HRepairBeginDate;
+ BillNew.omodel.HRepairEndDate = mainList[0].HRepairEndDate;
+ BillNew.omodel.HRepairContent = mainList[0].HRepairContent;
+ BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
+ BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
+ BillNew.omodel.HTimes = mainList[0].HTimes;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ BillNew.omodel.HMouldID = mainList[0].HMouldID;
+ BillNew.omodel.HSupID = mainList[0].HSupID;
+ BillNew.omodel.HRepairType = mainList[0].HRepairType;
+ BillNew.omodel.HNewModel = mainList[0].HNewModel;
+ BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
+ BillNew.omodel.HEquipID = mainList[0].HEquipID;
+ BillNew.DetailColl = new List<Model.ClsSb_MouldRepairWorkBillSub>();
+ Model.ClsSb_MouldRepairWorkBillSub oSub = new Model.ClsSb_MouldRepairWorkBillSub();
+ oSub.HEntryID = 1;
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+ oSub.HRepairID = DBUtility.ClsPub.isLong(subList[0].HRepairID);
+ oSub.HManagerID = DBUtility.ClsPub.isLong(subList[0].HManagerID);
+ oSub.HMoney = DBUtility.ClsPub.isDoule(subList[0].HMoney);
+ oSub.HRepairExplanation = DBUtility.ClsPub.isStrNull(subList[0].HRepairExplanation);
+ BillNew.DetailColl.Add(oSub);
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#endregion
#region 妯″叿瀵垮懡璋冩暣鍗�
diff --git a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
index 653c4bd..e054928 100644
--- a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -92,7 +92,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -223,7 +223,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
index a8c2e7b..cef2724 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
@@ -3344,8 +3344,6 @@
#region 妯″叿鎶ュ簾鍏ュ簱鍗�
-
-
#region[妯″叿鎶ュ簾鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
[Route("Sc_MouldScrapInHouseBill/Sc_MouldScrapInHouseBillListCheckDetai")]
[HttpGet]
@@ -3442,7 +3440,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3609,9 +3607,6 @@
}
#endregion
-
-
-
#region 妯″叿鎶ュ簾鍏ュ簱鍗曚繚瀛�
[Route("Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA")]
@@ -3765,7 +3760,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3895,7 +3890,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -4379,7 +4374,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
@@ -4725,7 +4720,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs b/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
index c7e9544..d653986 100644
--- a/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
+++ b/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
@@ -46,14 +46,14 @@
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HDate," +
"HMaker,HMakeDate,HInnerBillNo,HRepairID,HDeptID,HRepairBeginDate,HRepairEndDate," +
"HCycleUnit,HPlanTimes,HTimes,HChangeNum,HEmpID,HManagerID,HRepairType,HSupID," +
- "HNewMaterID,HNewName,HNewModel,HNewModel2,HExplanation,HRepairContent,HRemark" +
+ "HNewMaterID,HNewName,HNewModel,HNewModel2,HExplanation,HRepairContent,HRemark,HChangeType" +
") " +
" values("+omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
",'" + omodel.HMaker + "',getdate()" +
",'" + omodel.HInnerBillNo+"',"+ omodel.HRepairID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HRepairBeginDate + "','" + omodel.HRepairEndDate +
"','" + omodel.HCycleUnit + "'," + omodel.HPlanTimes.ToString() + "," + omodel.HTimes.ToString() + "," + omodel.HChangeNum.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() +
",'" + omodel.HRepairType + "'," + omodel.HSupID.ToString() + "," + omodel.HNewMaterID.ToString() + ",'"+ omodel.HNewName + "','" + omodel.HNewModel + "','" + omodel.HNewModel2 + "','" + omodel.HExplanation + "','" + omodel.HRepairContent + "','" + omodel.HRemark+
- "') ");
+ "','"+omodel.HChangeType + "') ");
//鎻掑叆瀛愯〃
foreach (Models.ClsSc_MouldRepairChangeBillSub oSub in DetailColl)
{
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index 534a941..7a09d88 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index ed565f4..3fa16b9 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1315,7 +1315,7 @@
/// <summary>
- /// 澶勭悊鏂板鐐规璁板綍琛ㄥ崟琛ㄧ殑json
+ /// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄥ崟琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
@@ -1328,7 +1328,20 @@
/// <summary>
- /// 澶勭悊鏂板鐐规璁板綍鍗曞瓙琛ㄧ殑json
+ /// 澶勭悊鏂板璁惧鐐规璁板綍琛ㄥ崟琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipDotCheckBillMain> getObjectByJson_Gy_EquipCheckBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipDotCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿鐐规璁板綍鍗曞瓙琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
@@ -1341,6 +1354,45 @@
/// <summary>
+ /// 澶勭悊鏂板璁惧缁翠慨璁板綍琛ㄥ崟琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipRepairWorkBillMain> wxmain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipRepairWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairWorkBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿缁翠慨褰曞崟瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipRepairWorkBillSub> wxsub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipRepairWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairWorkBillSub>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板璁惧鐐规璁板綍鍗曞瓙琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipDotCheckBillSub> getObjectByJson_Gy_EquipDotCheckBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckBillSub>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
/// 澶勭悊鏂板淇濆吇璁板綍琛ㄥ崟琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
diff --git a/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs b/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs
index 0fa8434..33ad3df 100644
--- a/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs
+++ b/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs
@@ -16,6 +16,7 @@
public string HMaterNumber;
public string HMaterName;
public string HMaterModel;
+ public Int64 HDotCheckItemID;
public string HDotCheckItem;
public string HDotCheckPart;
public string HClaim;
diff --git a/WebAPI/Models/ClsSc_MouldDotCheckBillSub.cs b/WebAPI/Models/ClsSc_MouldDotCheckBillSub.cs
index 67c8964..92b477f 100644
--- a/WebAPI/Models/ClsSc_MouldDotCheckBillSub.cs
+++ b/WebAPI/Models/ClsSc_MouldDotCheckBillSub.cs
@@ -11,6 +11,8 @@
public string HDotCheckPart;// varchar(100) --点检部位
public string HClaim;// varchar(100) --具体要求
public long HManagerID;// int --负责人id(h_v_IF_Employee)
+ public long HDotCheckItemID;// int --负责人id(h_v_IF_Employee)
+
}
}
diff --git a/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs b/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs
index 114f0e8..3d19e8c 100644
--- a/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs
+++ b/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs
@@ -28,6 +28,7 @@
public string HNewBarCode; /*--鏀瑰埗鍚庢柊鏉＄爜*/
public string HNewDesignLife; /*--鏂拌璁″鍛�*/
public string HExplanation; /* --鏀瑰埗瑕佹眰*/
+ public string HChangeType; /* --鏀瑰瀷绫诲瀷*/
public string HRemark; /* --澶囨敞*/
public string HInnerBillNo; /* --鍐呴儴鍗曟嵁鍙�*/
}
diff --git a/WebAPI/Models/Xt_DataDictionary_Proc.cs b/WebAPI/Models/Xt_DataDictionary_Proc.cs
new file mode 100644
index 0000000..70d4931
--- /dev/null
+++ b/WebAPI/Models/Xt_DataDictionary_Proc.cs
@@ -0,0 +1,33 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Xt_DataDictionary_Proc
+ {
+ public long HItemID { get; set; }
+ public long HModNameID { get; set; }
+ public long HBillTypeID { get; set; }
+ public string HProcName { get; set; }
+
+ public string HProcCaption { get; set; }
+ public string HRemark { get; set; }
+ public bool HStopflag { get; set; }
+
+ public DateTime HMakeTime { get; set; }
+
+ public string HMakeEmp { get; set; }
+ public DateTime HModifyTime { get; set; }
+
+ public string HModifyEmp { get; set; }
+ public DateTime HStopTime { get; set; }
+
+ public string HStopEmp { get; set; }
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/Xt_DataDictionary_Table.cs b/WebAPI/Models/Xt_DataDictionary_Table.cs
new file mode 100644
index 0000000..037e44e
--- /dev/null
+++ b/WebAPI/Models/Xt_DataDictionary_Table.cs
@@ -0,0 +1,42 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Xt_DataDictionary_Table
+ {
+ public long HItemID { get; set; }
+ public long HModNameID { get; set; }
+ public long HBillTypeID { get; set; }
+ public string HTableName { get; set; }
+
+ public string HTableCaption { get; set; }
+
+ public string HFieldName { get; set; }
+
+ public string HFieldCaption { get; set; }
+
+ public string HDataType { get; set; }
+
+ public string HDefaultValue { get; set; }
+
+ public string HRemark { get; set; }
+ public bool HStopflag { get; set; }
+
+ public DateTime HMakeTime { get; set; }
+
+ public string HMakeEmp { get; set; }
+ public DateTime HModifyTime { get; set; }
+
+ public string HModifyEmp { get; set; }
+ public DateTime HStopTime { get; set; }
+
+ public string HStopEmp { get; set; }
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/Xt_DataDictionary_View.cs b/WebAPI/Models/Xt_DataDictionary_View.cs
new file mode 100644
index 0000000..e087e2b
--- /dev/null
+++ b/WebAPI/Models/Xt_DataDictionary_View.cs
@@ -0,0 +1,33 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Xt_DataDictionary_View
+ {
+ public long HItemID { get; set; }
+ public long HModNameID { get; set; }
+ public long HBillTypeID { get; set; }
+ public string HViewName { get; set; }
+
+ public string HViewCaption { get; set; }
+ public string HRemark { get; set; }
+ public bool HStopflag { get; set; }
+
+ public DateTime HMakeTime { get; set; }
+
+ public string HMakeEmp { get; set; }
+ public DateTime HModifyTime { get; set; }
+
+ public string HModifyEmp { get; set; }
+ public DateTime HStopTime { get; set; }
+
+ public string HStopEmp { get; set; }
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.cs"
new file mode 100644
index 0000000..def03a9
--- /dev/null
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.cs"
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_ClassTimePrj
+ {
+ public long HItemID { get; set; }
+
+ public string HName { get; set; }
+ public string HNumber { get; set; }
+ public long HParentID { get; set; }
+ public string HRemark { get; set; }
+
+ public long HDeptID { get; set; }
+ public long HGroupID { get; set; }
+ public bool HStopflag { get; set; }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index c66b4f3..84778a7 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,40 +9,40 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>10/25/2021 15:05:07</publishTime>
+ <publishTime>10/27/2021 13:50:19</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>10/25/2021 15:05:07</publishTime>
+ <publishTime>10/27/2021 13:50:19</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>10/25/2021 15:05:03</publishTime>
+ <publishTime>10/27/2021 13:50:17</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>10/25/2021 15:05:03</publishTime>
+ <publishTime>10/27/2021 13:50:17</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 22:52:40</publishTime>
+ <publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>10/25/2021 15:04:54</publishTime>
+ <publishTime>10/25/2021 09:28:38</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>10/25/2021 15:04:54</publishTime>
+ <publishTime>10/25/2021 09:28:38</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/09/2021 15:55:13</publishTime>
+ <publishTime>10/14/2021 09:42:44</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -51,49 +51,49 @@
<publishTime>09/20/2018 19:28:34</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/19/2015 01:02:50</publishTime>
+ <publishTime>03/18/2015 17:02:50</publishTime>
</File>
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 19:48:56</publishTime>
+ <publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>10/25/2021 15:04:56</publishTime>
+ <publishTime>10/26/2021 10:32:42</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>10/25/2021 15:04:56</publishTime>
+ <publishTime>10/26/2021 10:32:42</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/04/2014 04:33:56</publishTime>
+ <publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>10/25/2021 15:04:51</publishTime>
+ <publishTime>10/25/2021 09:28:37</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>10/25/2021 15:04:51</publishTime>
+ <publishTime>10/25/2021 09:28:37</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>10/25/2021 15:04:52</publishTime>
+ <publishTime>10/25/2021 09:28:38</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>10/25/2021 15:04:52</publishTime>
+ <publishTime>10/25/2021 09:28:38</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>10/25/2021 15:04:53</publishTime>
+ <publishTime>10/25/2021 09:28:38</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>10/25/2021 15:04:53</publishTime>
+ <publishTime>10/25/2021 09:28:38</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/16/2015 01:57:08</publishTime>
+ <publishTime>02/15/2015 17:57:08</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -117,13 +117,13 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 18:03:34</publishTime>
+ <publishTime>08/19/2014 10:03:34</publishTime>
</File>
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 21:00:36</publishTime>
+ <publishTime>11/28/2018 13:00:36</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -132,7 +132,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 20:58:44</publishTime>
+ <publishTime>11/28/2018 12:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -147,37 +147,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 21:01:26</publishTime>
+ <publishTime>11/28/2018 13:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 21:01:00</publishTime>
+ <publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 12:02:18</publishTime>
+ <publishTime>01/28/2015 04:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 23:26:04</publishTime>
+ <publishTime>02/11/2014 15:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 12:02:32</publishTime>
+ <publishTime>01/28/2015 04:02:32</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -186,184 +186,184 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 19:18:48</publishTime>
+ <publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>10/25/2021 15:05:11</publishTime>
+ <publishTime>10/29/2021 00:14:13</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>10/25/2021 15:05:11</publishTime>
+ <publishTime>10/29/2021 00:14:13</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>07/18/2013 01:03:52</publishTime>
+ <publishTime>07/17/2013 17:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 21:26:02</publishTime>
+ <publishTime>11/29/2018 13:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 21:26:30</publishTime>
+ <publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>10/27/2021 13:49:58</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>10/14/2021 09:42:47</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>10/25/2021 15:08:19</publishTime>
+ <publishTime>10/25/2021 09:28:44</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 19b67e6..d153499 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -278,6 +278,9 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
+ <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
+ <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
@@ -442,6 +445,9 @@
<Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
<Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
<Compile Include="Models\ClsGy_ProcPrice.cs" />
+ <Compile Include="Models\Xt_DataDictionary_Proc.cs" />
+ <Compile Include="Models\Xt_DataDictionary_View.cs" />
+ <Compile Include="Models\Xt_DataDictionary_Table.cs" />
<Compile Include="Models\Gy_User.cs" />
<Compile Include="Models\Gy_UserSupper.cs" />
<Compile Include="Models\Menu.cs" />
@@ -524,6 +530,7 @@
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
--
Gitblit v1.9.1