From f4c9c486078f80aad9b9d28cbfc92bb4b78239b3 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 27 八月 2021 16:54:30 +0800
Subject: [PATCH] 1
---
OCX/AxInterop.grdes6Lib.dll | 0
Kanban/Kanban.csproj | 23
WebAPI/Controllers/QC_ManagementController.cs | 2
WebAPI/WebAPI.csproj.user | 2
OAM/OAM.csproj | 23
ProM/ProM.csproj | 46
WebAPI/Controllers/生产管理/QC_OutCompCheckBillController.cs | 0
WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs | 2
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 224 ++++++
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 65 +
Pub_Class/CustomerCls/WebClsPub.cs | 147 +++
SelM/SelM.csproj | 46
WebAPI/Controllers/生产管理/Sc_PPBomBillController.cs | 0
WebAPI/Controllers/生产管理/Sc_MESBeginWorkBillController.cs | 7
WebAPI/Controllers/生产管理/QC_LastPieceCheckBillController.cs | 0
WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs | 2
DAL/生产管理/模具管理/ClsSc_MouldDotCheckBill.cs | 4
DAL/生产管理/模具管理/ClsSc_MouldMaintainBill.cs | 41
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 4
APSM/APSM.csproj | 23
Model/生产管理/设备管理/ClsSb_EquipDotCheckBillSub.cs | 1
WorkM/WorkM.csproj | 46
DAL/生产管理/设备管理/ClsSb_EquipDotCheckBill.cs | 4
OCX/Interop.grdes6Lib.dll | 0
WebAPI/Controllers/生产管理/Sc_ICMOReportBillController.cs | 0
OCX/AxInterop.gregn6Lib.dll | 0
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 10
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WebAPI/ListModels.cs | 1
WebAPI/Models/Gy_Mould.cs | 11
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 45
Pub_Class/Pub_Class.csproj | 1
WebAPI/WebAPI.csproj | 19
PlanM/PlanM.csproj | 23
.gitignore | 4
Model/车间管理/ClsSc_ProcessExchangeBillSub.cs | 6
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 152 ++--
Model/生产管理/模具管理/ClsSc_MouldMaintainRuleBillSub_Item.cs | 2
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 93 +
WebAPI/Models/ClsSb_EquipRepairWorkBillSub.cs | 2
WebAPI/Controllers/LMESController.cs | 13
WebAPI/Controllers/生产管理/Sc_MaterToSourceBillController.cs | 0
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 80 ++
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 4
WebAPI/Controllers/生产管理/Sc_MESStopWorkBillController.cs | 0
BLL/BLL.csproj | 23
SCM/SCM.csproj | 23
WarM/WarM.csproj | 23
OCX/Interop.gregn6Lib.dll | 0
BaseSet/BaseSet.csproj | 23
OCX/MainToolPic.jpg | 0
WebAPI/Controllers/生产管理/Sc_MESEndWorkBillController.cs | 0
WebAPI/Controllers/生产管理/Sc_MESProductReportBillController.cs | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 133 +++
WebAPI/Controllers/PublicPageMethodController.cs | 669 ++++++++++++++++++
WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs | 2
/dev/null | 76 --
EAM/EAM.csproj | 23
WebAPI/Controllers/ReportPlatFormController.cs | 20
60 files changed, 1,674 insertions(+), 519 deletions(-)
diff --git a/.gitignore b/.gitignore
index 14fcf85..a5668fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,4 @@
/WorkM/obj/Debug
/WorkM/obj/Release
/WorkM/obj/x86/Debug
-/WorkM/obj/x86/Release
-/DBUtility/bin/x86/Debug
-/DBUtility/obj/x86/Debug
\ No newline at end of file
+/WorkM/obj/x86/Release
\ No newline at end of file
diff --git a/APSM/APSM.csproj b/APSM/APSM.csproj
index 4a2e7b7..80b8897 100644
--- a/APSM/APSM.csproj
+++ b/APSM/APSM.csproj
@@ -49,6 +49,13 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -614,22 +621,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
diff --git a/BLL/BLL.csproj b/BLL/BLL.csproj
index 9659e2a..63f24b5 100644
--- a/BLL/BLL.csproj
+++ b/BLL/BLL.csproj
@@ -67,6 +67,13 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="Kingdee.BOS.WebApi.Client">
<HintPath>..\OCX\Kingdee.BOS.WebApi.Client.dll</HintPath>
</Reference>
@@ -553,22 +560,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index 33282d9..5e2b2ac 100644
--- a/BaseSet/BaseSet.csproj
+++ b/BaseSet/BaseSet.csproj
@@ -68,6 +68,13 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\OCX\NPOI.dll</HintPath>
@@ -1547,22 +1554,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
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_MouldDotCheckBill.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_MouldDotCheckBill.cs"
index f8e012d..0a6711c 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_MouldDotCheckBill.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_MouldDotCheckBill.cs"
@@ -46,7 +46,7 @@
",HPeriod='" + omodel.HPeriod.ToString() + "'" +
//",HStockType='" + omodel.HStockType + "'" +
",HRemark='" + omodel.HRemark + "'" +
- ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
",HUpDateDate=getdate()" +
//========================================
",HPlanNo='" + omodel.HPlanNo + "'" +
@@ -123,7 +123,7 @@
",HEndDate,HPlanNo,HPlanInterID" +
",HInnerBillNo,HExplanation" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
"," + omodel.HMouldID.ToString() + ",'" + omodel.HBeginDate + "'" +
",'" + omodel.HEndDate + "','" + omodel.HPlanNo + "'," + omodel.HPlanInterID.ToString() +
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_MouldMaintainBill.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_MouldMaintainBill.cs"
index 11dc22d..5e0c1c2 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_MouldMaintainBill.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_MouldMaintainBill.cs"
@@ -74,25 +74,26 @@
DeleteBillSub2(lngBillKey);
omodel.HInterID = lngBillKey;
//鎻掑叆淇濆吇椤瑰瓙琛�
- foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oSub in DetailCol)
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item Item in DetailCol)
{
- oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
- " (HInterID,HEntryID,HMaintainItemID" +
- ",HMaintainPart,HClaim" +
- ",HManagerID" +
- ",HCloseMan,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaintainItemID.ToString() +
- ",'" + oSub.HMaintainPart.ToString() + "','" + oSub.HClaim.ToString() + "'" +
- "," + oSub.HManagerID.ToString() +
- ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- ") ");
+ oCn.RunProc("Insert into Sc_MouldMaintainBillSub_Item" +
+ " (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainItem.ToString() + "'" +
+ ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
+ "," + Item.HManagerID.ToString() +
+ ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
+ "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
+ ") ");
}
//鎻掑叆閰嶄欢椤瑰瓙琛�
foreach (Model.ClsSc_MouldMaintainBillSub oSub in DetailColl)
{
+
oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
" (HInterID,HEntryID,HMaterID" +
",HQty,HUnitID" +
@@ -157,7 +158,7 @@
if (DetailCol.Count > 0)
{
//鎻掑叆淇濆吇椤瑰瓙琛�
- foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oSub in DetailCol)
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item Item in DetailCol)
{
oCn.RunProc("Insert into Sc_MouldMaintainBillSub_Item" +
" (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
@@ -166,11 +167,11 @@
",HCloseMan,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaintainItemID.ToString() + ",'" + oSub.HMaintainItem.ToString() + "'" +
- ",'" + oSub.HMaintainPart.ToString() + "','" + oSub.HClaim.ToString() + "'" +
- "," + oSub.HManagerID.ToString() +
- ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainItem.ToString() + "'" +
+ ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
+ "," + Item.HManagerID.ToString() +
+ ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
+ "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
") ");
}
}
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBill.cs"
index 26ecff7..ad8f03f 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBill.cs"
@@ -126,13 +126,13 @@
" (HInterID,HEntryID," +
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
"HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
- "HDotCheckItem,HDotCheckPart,HClaim," +
+ "HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim," +
"HManagerID,HManagerNumber" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim +
+ ",'" + oSub.HDotCheckItemID+","+oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim +
"'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'" +
") ");
}
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index a6c3598..9ca1058 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -304,6 +304,71 @@
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
{
+
+ string HInterID = omodel.HInterID.ToString();
+ string HEntryID = oSub.HEntryID.ToString();
+ string HBillNo = omodel.HBillNo;
+ string HCloseMan = oSub.HCloseMan;
+ string HEntryCloseDate = oSub.HEntryCloseDate.ToString();
+ string HCloseType = Convert.ToString(oSub.HCloseType ? 1 : 0);
+ string HRemark = oSub.HRemark;
+ string HSourceInterID = oSub.HSourceInterID.ToString();
+ string HSourceEntryID = oSub.HSourceEntryID.ToString();
+ string HSourceBillNo = oSub.HSourceBillNo;
+ string HSourceBillType = oSub.HSourceBillType;
+ string HRelationQty = oSub.HRelationQty.ToString();
+ string HRelationMoney = oSub.HRelationMoney.ToString();
+ string HProcNo = oSub.HProcNo.ToString();
+ string HProcID = oSub.HProcID.ToString();
+ string HProcNumber = oSub.HProcNumber;
+ string HWorkRemark = oSub.HWorkRemark;
+ string HCenterID = oSub.HCenterID.ToString();
+ string HDeptID = oSub.HDeptID.ToString();
+ string HDeptNumber = oSub.HDeptNumber;
+ string HGroupID = oSub.HGroupID.ToString();
+ string HGroupNumber = oSub.HGroupNumber;
+ string HWorkerID = oSub.HWorkerID.ToString();
+ string HWorkerNumber = oSub.HWorkerNumber;
+ string HSourceID = oSub.HSourceID.ToString();
+ string HQty = oSub.HQty.ToString();
+ string HTimeUnit = oSub.HTimeUnit;
+ string HPlanWorkTimes = oSub.HPlanWorkTimes.ToString();
+ string HPlanBeginDate = oSub.HPlanBeginDate.ToShortDateString();
+ string HPlanEndDate = oSub.HPlanEndDate.ToShortDateString();
+ string HRelBeginDate = oSub.HRelBeginDate.ToShortDateString();
+ string HRelEndDate = oSub.HRelEndDate.ToShortDateString();
+ string HReadyTime = oSub.HReadyTime.ToString();
+ string HQueueTime = oSub.HQueueTime.ToString();
+ string HMoveTime = oSub.HMoveTime.ToString();
+ string HBeginDayQty = oSub.HBeginDayQty.ToString();
+ string HBeginFixQty = oSub.HBeginFixQty.ToString();
+ string HFixWorkDays = oSub.HFixWorkDays.ToString();
+ string HTrunWorkDays = oSub.HTrunWorkDays.ToString();
+ string HReadyTimes = oSub.HReadyTimes.ToString();
+ string HMyWorkDays = oSub.HMyWorkDays.ToString();
+ string HOutPrice = oSub.HOutPrice.ToString();
+ string HOutMoney = oSub.HOutMoney.ToString();
+ string HPassRate = oSub.HPassRate.ToString();
+ string HLastProc = oSub.HLastProc;
+ string HKeyProc = oSub.HKeyProc;
+ string HFstProc = oSub.HFstProc;
+ string HICMOInterID = oSub.HICMOInterID.ToString();
+ string HICMOBillNo = oSub.HICMOBillNo;
+ string HWWOrderInterID = oSub.HWWOrderInterID.ToString();
+ string HWWOrderEntryID = oSub.HWWOrderEntryID.ToString();
+ string HWWOrderBillNo = oSub.HWWOrderBillNo;
+ string HReportQty = oSub.HReportQty.ToString();
+ string HBackProc = Convert.ToString(oSub.HBackProc ? 1 : 0);
+ string HSupID = oSub.HSupID.ToString();
+ string HSupFlag = Convert.ToString(oSub.HSupFlag ? 1 : 0);
+ string HOverRate = oSub.HOverRate.ToString();
+ string HMaxQty = oSub.HMaxQty.ToString();
+ string HTechnologyParameter = oSub.HTechnologyParameter;
+ string HProcCheckNote = oSub.HProcCheckNote;
+ string HPicNum = oSub.HPicNum;
+ string HMouldNo = oSub.HMouldNo.ToString();
+ string HProcWorkNum = oSub.HProcWorkNum.ToString();
+
oCn.RunProc("Insert into Sc_ProcessExchangeBillSub " +
" (HInterID,HEntryID,HBillNo_bak," +
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..9fa8240
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/EAM/EAM.csproj b/EAM/EAM.csproj
index d0ee140..c51da52 100644
--- a/EAM/EAM.csproj
+++ b/EAM/EAM.csproj
@@ -59,6 +59,13 @@
<OutputPath>bin\x86\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -1228,22 +1235,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
diff --git a/Kanban/Kanban.csproj b/Kanban/Kanban.csproj
index 224ac8b..3cdaf15 100644
--- a/Kanban/Kanban.csproj
+++ b/Kanban/Kanban.csproj
@@ -59,6 +59,13 @@
<OutputPath>bin\x86\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -435,22 +442,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..67556ba
--- /dev/null
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
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_MouldMaintainRuleBillSub_Item.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBillSub_Item.cs"
index 4ebd423..8096866 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBillSub_Item.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBillSub_Item.cs"
@@ -8,7 +8,7 @@
{
//============
- public Int64 HMaintainItemID;// int --保养项目ID
+ public Int64 HMaintainItemID;// int --保养项目ID
public string HMaintainItem;// varchar(100) --保养项目
public string HMaintainPart;// varchar(100) --保养部位
public string HClaim;// varchar(100) --具体要求
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBillSub.cs"
index 36fb691..c7e8bc9 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipDotCheckBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_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/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
index 924e656..f1b67f1 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
@@ -65,9 +65,9 @@
public Single HSumPassRate;//累计良率
public double HOverRate;// dec(18,4) --超额比例
public double HMaxQty;// dec(18,4) --最高上限
- public string HProcCheckNote;
- public string HPicNum;
- public string HTechnologyParameter;
+ public string HProcCheckNote;//本工序确认记录
+ public string HPicNum;//图纸编号
+ public string HTechnologyParameter;//工艺参数
public string HMouldNo;//模具编号
public string HProcWorkNum;//程序号
}
diff --git a/OAM/OAM.csproj b/OAM/OAM.csproj
index 60c040b..fde3144 100644
--- a/OAM/OAM.csproj
+++ b/OAM/OAM.csproj
@@ -68,6 +68,13 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -1095,22 +1102,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
diff --git a/OCX/AxInterop.grdes6Lib.dll b/OCX/AxInterop.grdes6Lib.dll
new file mode 100644
index 0000000..fbd0ebf
--- /dev/null
+++ b/OCX/AxInterop.grdes6Lib.dll
Binary files differ
diff --git a/OCX/AxInterop.gregn6Lib.dll b/OCX/AxInterop.gregn6Lib.dll
new file mode 100644
index 0000000..f33f9ae
--- /dev/null
+++ b/OCX/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/OCX/Interop.Excel.rar b/OCX/Interop.Excel.rar
deleted file mode 100644
index 0bfa837..0000000
--- a/OCX/Interop.Excel.rar
+++ /dev/null
Binary files differ
diff --git a/OCX/Interop.grdes6Lib.dll b/OCX/Interop.grdes6Lib.dll
new file mode 100644
index 0000000..826cd23
--- /dev/null
+++ b/OCX/Interop.grdes6Lib.dll
Binary files differ
diff --git a/OCX/Interop.gregn6Lib.dll b/OCX/Interop.gregn6Lib.dll
new file mode 100644
index 0000000..4e0dd81
--- /dev/null
+++ b/OCX/Interop.gregn6Lib.dll
Binary files differ
diff --git a/OCX/MainToolPic.jpg b/OCX/MainToolPic.jpg
new file mode 100644
index 0000000..bb444d4
--- /dev/null
+++ b/OCX/MainToolPic.jpg
Binary files differ
diff --git a/PlanM/PlanM.csproj b/PlanM/PlanM.csproj
index 69140c6..971037a 100644
--- a/PlanM/PlanM.csproj
+++ b/PlanM/PlanM.csproj
@@ -67,6 +67,13 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\OCX\NPOI.dll</HintPath>
@@ -208,22 +215,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
diff --git a/ProM/ProM.csproj b/ProM/ProM.csproj
index fb86a29..6ceecc4 100644
--- a/ProM/ProM.csproj
+++ b/ProM/ProM.csproj
@@ -67,6 +67,20 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.grdes6Lib">
+ <HintPath>..\OCX\AxInterop.grdes6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.grdes6Lib">
+ <HintPath>..\OCX\Interop.grdes6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -490,38 +504,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgrdes6Lib">
- <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="grdes6Lib">
- <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
diff --git a/Pub_Class/CustomerCls/WebClsPub.cs b/Pub_Class/CustomerCls/WebClsPub.cs
new file mode 100644
index 0000000..ce19349
--- /dev/null
+++ b/Pub_Class/CustomerCls/WebClsPub.cs
@@ -0,0 +1,147 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace Pub_Class
+{
+
+ public class WebClsPub
+ {
+ public static string ComputerName;
+ public static string IPAddress;
+
+ //鍒ゆ柇鏄兘瀛樺湪鏉冮檺,骞跺啓鍏ユ棩蹇�
+ public static bool Security_Log(string gnsy, int LogTF, bool Msg, string CurUserName,ref string StrMessage)
+ {
+ //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)
+ {
+ StrMessage="娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ }
+ 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)
+ {
+ StrMessage = "娌℃湁鎵惧埌褰撳墠鎿嶄綔鍛橈紒";
+ }
+ 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)
+ {
+ StrMessage = "鎮ㄦ病鏈夋潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ }
+ }
+ }
+ //闇�瑕佸啓鍏ユ棩蹇�
+ 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, ref StrMessage);
+ }
+ return HavRight;
+ }
+ catch (Exception e)
+ {
+ if (Msg == true)
+ {
+ StrMessage = "鍒ゆ柇鏉冮檺鏃跺彂鐜伴敊璇�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ }
+ return false;
+ }
+ }
+
+ //鍐欏叆鏃ュ織
+ /// <summary>
+ /// 鍐欏叆鏃ュ織
+ /// </summary>
+ /// <param name="UserID">鏃犵敤</param>
+ /// <param name="WorkList">鎿嶄綔鏃ュ織</param>
+ /// <param name="CurUserName">鎿嶄綔鍛�</param>
+ /// <returns></returns>
+ public static bool Add_Log(string UserID, string WorkList, string CurUserName,ref string StrMessage)
+ {
+ ClsSqlHelper oCn = new ClsSqlHelper();
+ try
+ {
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + CurUserName + "','" + ComputerName + "','" + WorkList + "','ERP绯荤粺','" + IPAddress + "','杩涘叆')"
+ );
+ return true;
+ }
+ catch (Exception e)
+ {
+ StrMessage = "鍐欏叆鏃ュ織鏃跺彂鐜伴敊,鍘熷洜鏄細" + e.Message;
+ return false;
+ }
+ }
+ }
+}
diff --git a/Pub_Class/Pub_Class.csproj b/Pub_Class/Pub_Class.csproj
index 0542373..eb30a24 100644
--- a/Pub_Class/Pub_Class.csproj
+++ b/Pub_Class/Pub_Class.csproj
@@ -87,6 +87,7 @@
<Compile Include="CustomerCls\ClsPub.cs" />
<Compile Include="CustomerCls\Cell.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="CustomerCls\WebClsPub.cs" />
</ItemGroup>
<ItemGroup>
<COMReference Include="stdole">
diff --git a/SCM/SCM.csproj b/SCM/SCM.csproj
index 5dc6ae1..cd33038 100644
--- a/SCM/SCM.csproj
+++ b/SCM/SCM.csproj
@@ -68,6 +68,13 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -435,22 +442,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
diff --git a/SelM/SelM.csproj b/SelM/SelM.csproj
index b9f1531..7dd04cf 100644
--- a/SelM/SelM.csproj
+++ b/SelM/SelM.csproj
@@ -67,6 +67,20 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.grdes6Lib">
+ <HintPath>..\OCX\AxInterop.grdes6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.grdes6Lib">
+ <HintPath>..\OCX\Interop.grdes6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -357,38 +371,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgrdes6Lib">
- <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="grdes6Lib">
- <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 49b98f6..7fb208d 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -67,6 +67,13 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\OCX\NPOI.dll</HintPath>
@@ -682,22 +689,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index aeba8ab..c8fe01b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -31,11 +31,11 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_BadReasonList where 绂佺敤鏍囪='' " + sWhere, "h_v_IF_BadReasonList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_BadReasonList " + sWhere, "h_v_IF_BadReasonList");
}
else
{
- string sql1 = "select * from h_v_IF_BadReasonList where 绂佺敤鏍囪='' ";
+ string sql1 = "select * from h_v_IF_BadReasonList where 1 = 1 ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_BadReasonList");
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 9d103f0..88755bc 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -511,7 +511,7 @@
[HttpPost]
public object AddBill([FromBody] JObject sMainSub)
{
- var _value = sMainSub["sMainSub"].ToString();
+ var _value = sMainSub["oMain"].ToString();
string msg1 = _value.ToString();
oCN.BeginTran();
//淇濆瓨涓昏〃
@@ -540,12 +540,13 @@
{
msg2 = "[" + msg2.ToString() + "]";
List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
- string BillType = "7507";
- long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string BillType = "3899";
+ //寰楀埌mainid
+ long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
DateTime HDate = mainList[0].HDate;//鏃ユ湡
- int HYear = 2021;
- double HPeriod = 1;
+ int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
+ double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
string HMouldNo = mainList[0].HMouldNo;
string HName = mainList[0].HName;
string HModel = mainList[0].HModel;
@@ -556,7 +557,7 @@
string HPICNo = mainList[0].HPICNo;
string HWorkMaterModel = mainList[0].HWorkMaterModel;
long HMaterID = mainList[0].HMaterID;
- long HMouleTypeID = mainList[0].HMouldTypeID;
+ long HMouleTypeID = mainList[0].HMouleTypeID;
long HUnitID = mainList[0].HUnitID;
DateTime HOutComDate = mainList[0].HOutComDate;
string HOutComNo = mainList[0].HOutComNo;
@@ -580,6 +581,7 @@
string HSupNumber = mainList[0].HSupNumber;
long HPrintQty = mainList[0].HPrintQty;
+
//涓昏〃
oCN.RunProc("Insert Into Gy_MouldFileMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
@@ -612,6 +614,7 @@
" values('" + HInterID + "',0,''" +
",0,0,'','',0,0 " +
") ");
+
if (objJsonResult.code == "0")
{
objJsonResult.code = "0";
@@ -657,18 +660,16 @@
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_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
- string BillType = "7507";
+
long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
DateTime HDate = mainList[0].HDate;//鏃ユ湡
- int HYear = 2021;
- double HPeriod = 1;
+ int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
+ double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
string HMouldNo = mainList[0].HMouldNo;
string HName = mainList[0].HName;
string HModel = mainList[0].HModel;
@@ -679,7 +680,7 @@
string HPICNo = mainList[0].HPICNo;
string HWorkMaterModel = mainList[0].HWorkMaterModel;
long HMaterID = mainList[0].HMaterID;
- long HMouleTypeID = mainList[0].HMouldTypeID;
+ long HMouleTypeID = mainList[0].HMouleTypeID;
long HUnitID = mainList[0].HUnitID;
DateTime HOutComDate = mainList[0].HOutComDate;
string HOutComNo = mainList[0].HOutComNo;
@@ -710,15 +711,52 @@
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
- oCN.RunProc("Update Gy_MouldFileMain set " +
- " HMouldNo='" + HMouldNo + "'" +
- ",HName='" + HName + "'" +
- ",HModel='" + HModel + "'" +
- ",HModel2= '" + HModel2 + "' Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc("UpDate Gy_MouldFileMain set " +
+ " HBillNo='" + HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + HDate + "'" +
+ ",HYear='" + HYear.ToString() + "'" +
+ ",HPeriod='" + HPeriod.ToString() + "'" +
+ ",HRemark='" + HRemark + "'" +
+ ",HUpDater='" + HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HMouldNo='" + HMouldNo + "'" +
+ ",HName='" + HName + "'" +
+ ",HModel='" + HModel + "'" +
+ ",HModel2='" + HModel2 + "'" +
+ ",HDiameter='" + HDiameter + "'" +
+ ",HSubjoin='" + HSubjoin + "'" +
+ ",HSubjoin2='" + HSubjoin2 + "'" +
+ ",HPICNo='" + HPICNo + "'" +
+ ",HWorkMaterModel='" + HWorkMaterModel + "'" +
+ ",HMaterID=" + HMaterID.ToString() +
+ ",HMaterNumber='" + HMaterNumber + "'" +
+ ",HMouldType=" + HMouleTypeID.ToString() +
+ ",HUnitID=" + HUnitID.ToString() +
+ ",HOutComDate='" + HOutComDate + "'" +
+ ",HOutComNo='" + HOutComNo + "'" +
+ ",HDeptID=" + HDeptID.ToString() +
+ ",HSupID=" + HSupID.ToString() +
+ ",HSupNumber='" + HSupNumber + "'" +
+ ",HPrintQty=" + HPrintQty.ToString() +
+ ",HMouldStatus='" + HMouldStatus + "'" +
+ ",HWhID=" + HWHID.ToString() +
+ ",HRoutingID=" + HRoutingID.ToString() +
+ ",HBomID=" + HBOMID.ToString() +
+ ",HVersion='" + HVersion + "'" +
+ ",HSPGroupID=" + HSPGroupID.ToString() +
+ ",HSPID=" + HSPID.ToString() +
+ ",HDesignLife=" + HDesignLife.ToString() +
+ ",HUseLife=" + HUseLife.ToString() +
+ ",HLeaveLife=" + HLeaveLife.ToString() +
+ ",HProdQty=" + HProdQty.ToString() +
+ ",HProdWeight=" + HProdWeight.ToString() +
+ " where HInterID=" + HInterID.ToString());
+
//淇敼瀛愰」鐩唬鐮�
//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=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ // oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
//
oCN.Commit();
objJsonResult.code = "1";
@@ -738,6 +776,8 @@
}
}
+
+
/// <summary>
/// 纾ㄥ叿妗ｆ淇敼鎸夐挳鏂规硶
///鍙傛暟锛歴tring sql銆�
@@ -749,7 +789,7 @@
{
try
{
- ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList where hmainid=" + HInterID, "h_v_Gy_MouldFileList");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -774,12 +814,12 @@
/// </summary>
[Route("Gy_Mould_Edit/Delete_Json")]
[HttpGet]
- public object Delete_Json(long HItemID)
+ public object Delete_Json(long hmainid)
{
DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
try
{
- if (oBill.DeleteBill(HItemID, ref DBUtility.ClsPub.sExeReturnInfo))
+ if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
{
//鍐欏叆鏃ュ織
ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oBill.omodel.HMouldNo + ",鍚嶇О锛�" + oBill.omodel.HName, ClsPub.CurUserName);
@@ -800,11 +840,6 @@
}
//ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛";
- objJsonResult.data = null;
- return objJsonResult;
}
catch (Exception e)
{
@@ -812,10 +847,8 @@
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
- return objJsonResult;
}
+ return objJsonResult;
}
-
- //
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
index 16dc3b3..11109f9 100644
--- a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
@@ -244,7 +244,7 @@
"(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag) " +
" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HItemID + "'" +
- ",'1',0,'" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','0')");
+ ",'1',0,'" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','鏈娇鐢�')");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
if (list[0].HItemID.ToString() != "")
{
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index ce1908d..97ddaa3 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -358,6 +358,86 @@
}
}
+ /// <summary>
+ /// 渚涘簲鍟嗗垪琛ㄥ垹闄�
+ /// </summary>
+ /// <param name="HItemID">鍒犻櫎鍒楃殑ID</param>
+ /// <param name="User">褰撳墠鐧诲綍鐢ㄦ埛</param>
+ /// <param name="ModRightNameDelete"></param>
+ /// <returns></returns>
+ [Route("Gy_Supplier/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
+ {
+ DAL.ClsGy_Supplier_Ctl oGroup = new DAL.ClsGy_Supplier_Ctl();
+ DAL.ClsGy_Supplier_View oGroupHlp = new DAL.ClsGy_Supplier_View();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oGroupHlp.GetInfoByID(HItemID))
+ {
+ if (oGroup.HavChildCodes(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒犻櫎鍓嶅垽鏂槸鍚� 宸蹭娇鐢� 20141020
+ if (oGroupHlp.omodel.HUseFlag != "鏈娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //
+ if (oGroup.DeleteByID(HItemID))
+ {
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oGroupHlp.omodel.HNumber + ",鍚嶇О锛�" + oGroupHlp.omodel.HName, ClsPub.CurUserName);
+ //鏇存柊涓婄骇涓� 鏈骇
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
+
+ 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;
+ }
+ }
//
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 5310ecf..b6fe620 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -584,6 +584,139 @@
}
#endregion
+ #region 鍙嶅鏍�
+ [Route("Cj_StationInBill/set_AbandonCheck")]
+ [HttpGet]
+ public object set_AbandonCheck(int HInterID, string CurUserName)
+ {
+ try
+ {
+ if (HInterID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓�0锛屼笉鑳藉弽瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill();
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍�
+ if (Cj_StationInBillAbandonCheckBill(HInterID, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鍙嶅鏍�
+ public bool Cj_StationInBillAbandonCheckBill(Int64 lngBillKey, string CurUserName, ref string sReturn)
+ {
+ if (Cj_StationInBillisUse(lngBillKey, ref sReturn))
+ {
+ return false;
+ }
+ try
+ {
+ string HChecker = CurUserName;
+ string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
+ oCN.BeginTran();
+ ds = oCN.RunProcReturn("Select * from Sc_StationInBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_StationInBillMain");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+
+ oCN.RunProc(" Update Sc_StationInBillMain set HChecker='',HCheckDate=null Where HInterID=" + lngBillKey.ToString());
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Check_In " + lngBillKey.ToString() + ",-1");
+ //鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭
+ DataSet ds1;
+ ds1 = oCN.RunProcReturn("select HLastProc,HFstProc " +
+ " from Sc_ProcessExchangeBillMain a " +
+ " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
+ " Where a.HInterID=(Select HProcExchInterID from Sc_StationInBillMain Where HInterID=55) " +
+ " and b.HEntryID=(Select HProcExchEntryID from Sc_StationInBillMain Where HInterID=55)", "Sc_ProcessExchangeBillMain");
+ if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ {
+ }
+ else if (Pub_Class.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�")
+ {
+ }
+ sReturn = sReturn + "鍙嶅鏍稿姛鑳斤紒";
+ oCN.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCN.RollBack();
+ return false; ;
+ }
+ }
+
+ //鏄惁琚叧鑱�
+ public bool Cj_StationInBillisUse(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ //Ds = oCN.RunProcReturn("Select HinterID from " + MvarItemKeySub + " Where HInterID=" + lngBillKey.ToString() + " and isnull(HRelationQty,0)<>0 ", MvarItemKey);
+ //if (Ds.Tables[0].Rows.Count != 0)
+ //{
+ // sReturn = "鍗曟嵁宸茶鍏宠仈,涓嶈兘鎿嶄綔锛�";
+ // return true;
+ //}
+ sReturn = "";
+ return false;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ #endregion
//
}
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 65cd472..0b47d2c 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -112,6 +112,14 @@
BillNew.omodel.HMaterIDD = ClsPub.isStrNull(mainList[0].HMaterIDD);
List<Model.ClsSc_ProcessExchangeBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(msg3);
BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
+ if (BillNew.omodel.HICMOInterID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨浠诲姟鍗曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
for (int i = 0; i < subList.ToArray().Length; i++)
{
if (DBUtility.ClsPub.isInt(subList[i].HProcID) != 0)//HQty
@@ -208,6 +216,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(subList[i].HTechnologyParameter);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(subList[i].HPicNum);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(subList[i].HProcCheckNote);
+ oSub.HMouldNo = "";
+ oSub.HProcWorkNum = "";
BillNew.DetailColl.Add(oSub);
}
}
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 0321edb..1d9e72a 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -14,6 +14,7 @@
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
/// <summary>
/// 杩斿洖杩涚珯鎵弿鍒楄〃|宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
@@ -221,17 +222,7 @@
DataSet ds;
try
{
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select top 500 * from h_v_IF_ICMOBillList ", "h_v_IF_ICMOBillList");
- }
- else
- {
- string sql1 = "select * from h_v_IF_ICMOBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillList");
- }
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by hmainid desc", "h_v_IF_ICMOBillList");
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 6c97202..2ec055e 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -2322,5 +2322,674 @@
#endregion
+ #region 閫夋嫨宸ヨ壓璺嚎鍩虹璧勬枡
+
+ #region 鏉′欢鏌ヨ宸ヨ壓璺嚎鍒楄〃
+ [Route("PublicPageMethod/RouteList")]
+ [HttpGet]
+ public object RouteList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select HItemID,'' HParentID,HNumber,HName from h_v_IF_MouldRouting " + sWhere + " Order by HItemID ", "h_v_IF_MouldRouting");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲伐鑹鸿矾绾挎暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+
+ #region 閫夋嫨BOM缁勫熀纭�璧勬枡
+
+ #region 鏉′欢鏌ヨBOM缁勫垪琛�
+ [Route("PublicPageMethod/BomGroupList")]
+ [HttpGet]
+ public object BomGroupList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_ICBomGroup " + sWhere + " Order by HItemID ", "Gy_ICBomGroup");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃燘OM鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍规嵁鏍戝瀷id鏌ユ壘BOM缁勫垪琛�
+ [Route("Gy_MaintenanceMode/BomGroupCX")]
+ [HttpGet]
+ public object BomGroupCX(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (select * from Gy_ICBomGroup WHERE HitemID=" + HInterID + " UNION ALL select s.* from Gy_ICBomGroup AS s,a WHERE s.hparentid=a.HitemID) SELECT * FROM a"), "Gy_ICBomGroup");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍戝瀷鍒楄〃BOM缁勫垪琛ㄦ暟鎹�
+ [Route("Gy_MaintenanceMode/BomGroupLoadTree")]
+ [HttpGet]
+ public object BomGroupLoadTree(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 HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_ICBomGroup " + sWhere + "", "Gy_ICBomGroup");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃燘OM鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+
+ #region 閫夋嫨浠撲綅缁勫熀纭�璧勬枡
+
+ #region 鏉′欢鏌ヨ浠撲綅缁勫垪琛�
+ [Route("PublicPageMethod/HSPGroupList")]
+ [HttpGet]
+ public object HSPGroupList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_StockPlaceGroup " + sWhere + " Order by HItemID ", "Gy_StockPlaceGroup");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱粨浣嶇粍鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍规嵁鏍戝瀷id鏌ユ壘浠撲綅缁勫垪琛�
+ [Route("Gy_MaintenanceMode/HSPGroupCX")]
+ [HttpGet]
+ public object HSPGroupCX(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (select * from Gy_StockPlaceGroup WHERE HitemID=" + HInterID + " UNION ALL select s.* from Gy_StockPlaceGroup AS s,a WHERE s.hparentid=a.HitemID) SELECT * FROM a"), "Gy_StockPlaceGroup");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍戝瀷鍒楄〃浠撲綅缁勫垪琛ㄦ暟鎹�
+ [Route("Gy_MaintenanceMode/HSPGroupLoadTree")]
+ [HttpGet]
+ public object HSPGroupLoadTree(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 HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_StockPlaceGroup " + sWhere + "", "Gy_StockPlaceGroup");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱粨浣嶇粍鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+
+ #region 閫夋嫨鍦板尯鍩虹璧勬枡
+
+ #region 鏉′欢鏌ヨ鍦板尯鍒楄〃
+ [Route("PublicPageMethod/AreaList")]
+ [HttpGet]
+ public object AreaList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_AreaSet " + sWhere + " Order by HItemID ", "Gy_AreaSet");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲湴鍖烘暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍规嵁鏍戝瀷id鏌ユ壘鍦板尯鍒楄〃
+ [Route("Gy_MaintenanceMode/AreaCX")]
+ [HttpGet]
+ public object AreaCX(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (select * from Gy_AreaSet WHERE HitemID=" + HInterID + " UNION ALL select s.* from Gy_AreaSet AS s,a WHERE s.hparentid=a.HitemID) SELECT * FROM a"), "Gy_AreaSet");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍戝瀷鍒楄〃鍦板尯鍒楄〃鏁版嵁
+ [Route("Gy_MaintenanceMode/AreaLoadTree")]
+ [HttpGet]
+ public object AreaLoadTree(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 HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_AreaSet " + sWhere + "", "Gy_AreaSet");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱粨浣嶇粍鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+
+ #region 閫夋嫨璐у竵鍩虹璧勬枡
+
+ #region 鏉′欢鏌ヨ璐у竵鍒楄〃
+ [Route("PublicPageMethod/CurrencyList")]
+ [HttpGet]
+ public object CurrencyList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_Currency " + sWhere + " Order by HItemID ", "Gy_Currency");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺揣甯佹暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍规嵁鏍戝瀷id鏌ユ壘璐у竵鍒楄〃
+ [Route("Gy_MaintenanceMode/CurrencyCX")]
+ [HttpGet]
+ public object CurrencyCX(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (select * from Gy_Currency WHERE HitemID=" + HInterID + " UNION ALL select s.* from Gy_Currency AS s,a WHERE s.hparentid=a.HitemID) SELECT * FROM a"), "Gy_Currency");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍戝瀷鍒楄〃璐у竵鍒楄〃鏁版嵁
+ [Route("Gy_MaintenanceMode/CurrencyLoadTree")]
+ [HttpGet]
+ public object CurrencyLoadTree(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 HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_Currency " + sWhere + "", "Gy_Currency");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺揣甯佹暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+
+ #region 閫夋嫨缁撶畻鏂瑰紡鍩虹璧勬枡
+
+ #region 鏉′欢鏌ヨ缁撶畻鏂瑰紡鍒楄〃
+ [Route("PublicPageMethod/SettleStyleList")]
+ [HttpGet]
+ public object SettleStyleList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_SettleStyle " + sWhere + " Order by HItemID ", "Gy_SettleStyle");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵粨绠楁柟寮忔暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍规嵁鏍戝瀷id鏌ユ壘缁撶畻鏂瑰紡鍒楄〃
+ [Route("Gy_MaintenanceMode/SettleStyleCX")]
+ [HttpGet]
+ public object SettleStyleCX(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (select * from Gy_SettleStyle WHERE HitemID=" + HInterID + " UNION ALL select s.* from Gy_SettleStyle AS s,a WHERE s.hparentid=a.HitemID) SELECT * FROM a"), "Gy_SettleStyle");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍戝瀷鍒楄〃缁撶畻鏂瑰紡鍒楄〃鏁版嵁
+ [Route("Gy_MaintenanceMode/SettleStyleLoadTree")]
+ [HttpGet]
+ public object SettleStyleLoadTree(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 HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_SettleStyle " + sWhere + "", "Gy_SettleStyle");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺揣甯佹暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+
+ #region 閫夋嫨瀹㈡埛鍒嗙被鍩虹璧勬枡
+
+ #region 鏉′欢鏌ヨ瀹㈡埛鍒嗙被鍒楄〃
+ [Route("PublicPageMethod/CusTypeList")]
+ [HttpGet]
+ public object CusTypeList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_CusType " + sWhere + " Order by HItemID ", "Gy_CusType");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲鎴峰垎绫绘暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍规嵁鏍戝瀷id鏌ユ壘瀹㈡埛鍒嗙被鍒楄〃
+ [Route("Gy_MaintenanceMode/CusTypeCX")]
+ [HttpGet]
+ public object CusTypeCX(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (select * from Gy_CusType WHERE HitemID=" + HInterID + " UNION ALL select s.* from Gy_CusType AS s,a WHERE s.hparentid=a.HitemID) SELECT * FROM a"), "Gy_CusType");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍戝瀷鍒楄〃瀹㈡埛鍒嗙被鍒楄〃鏁版嵁
+ [Route("Gy_MaintenanceMode/CusTypeLoadTree")]
+ [HttpGet]
+ public object CusTypeLoadTree(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 HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_CusType " + sWhere + "", "Gy_CusType");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲鎴峰垎绫绘暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
}
}
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index fcfa9fd..0e51805 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -522,7 +522,6 @@
oItem.HMaker = "";
oItem.HStandard = false;
oItem.HMainSourceInterID = oItem.HInterID;
- oItem.HMaterTypeID = 0;
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
@@ -565,7 +564,6 @@
oItemSub.HRelationQty = 0;
oItemSub.HRelationMoney = 0;
oItemSub.HCloseMan = "";
- oItemSub.HRemark = "";
oBill.DetailColl.Add(oItemSub);
}
diff --git a/WebAPI/Controllers/ReportPlatFormController.cs b/WebAPI/Controllers/ReportPlatFormController.cs
index 5817b98..072aca9 100644
--- a/WebAPI/Controllers/ReportPlatFormController.cs
+++ b/WebAPI/Controllers/ReportPlatFormController.cs
@@ -70,17 +70,17 @@
try
{
- ds = oCN.RunProcReturn("select * from Gy_SourceRelationSet where HSourceID='" + HSourceID + "'", "Gy_SourceRelationSet");
- if (ds.Tables[0].Rows.Count > 0)
- {
+ //ds = oCN.RunProcReturn("select * from Gy_SourceRelationSet where HSourceID='" + HSourceID + "'", "Gy_SourceRelationSet");
+ //if (ds.Tables[0].Rows.Count > 0)
+ //{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇璧勬簮宸插瓨鍦紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.BeginTran();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鐢熶骇璧勬簮宸插瓨鍦紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //oCN.BeginTran();
//鍐欏叆浜х嚎缁戝畾
string sql = string.Format(@"insert into Gy_SourceRelationSet (HSourceID,HUserName,HGroupID,HManagerID,HRemark,HCreateDate,HCreator,HNowFlag,HCheckManID)
values('" + HSourceID + "','" + HUserName + "','" + HGroupID + "','" + HManagerID + "','" + HRemark + "','" + DateTime.Parse(HCreateDate).ToShortDateString() + "','" + HUserName + "','0','')");
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
index 78af215..c2eeaac 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
@@ -186,6 +186,7 @@
}
}
#endregion
+
#region [璁惧鐐规璁板綍琛ㄥ垹闄ゅ姛鑳絔
/// <summary>
/// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
@@ -279,6 +280,7 @@
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
#endregion
+
#region[璁惧鐐规璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁]
[Route("Sb_EquipDotCheckBill/Sb_EquipDotCheckBillListProjectDetai")]
[HttpGet]
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
deleted file mode 100644
index 6e6da0f..0000000
--- a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-锘縰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
-{
- //鐢熶骇璐ㄩ噺姹囨姤Controller
- public class Sc_QualityReportBillController : 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("Sc_QualityReportBill/list")]
- [HttpGet]
- public object list(string sWhere)
- {
- try
- {
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Sc_QualityReportBillListDetail " + sWhere, "h_v_Sc_QualityReportBillListDetail");
- }
- else
- {
- string sql1 = "select * from h_v_Sc_QualityReportBillListDetail where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Sc_QualityReportBillListDetail");
- }
- 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;
- }
- }
-
-
-
-
- //
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index d4d3b9b..29b5852 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -184,9 +184,9 @@
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
- [Route("Sb_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList")]
+ [Route("Sb_EqpRepairWorkBill/SaveGetEqpRepairWorkBillWebList")]
[HttpPost]
- public object SaveGetMouldRepairWorkBillList([FromBody] JObject msg)
+ public object SaveGetEqpRepairWorkBillWebList([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index 3077862..d576b54 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -219,7 +219,18 @@
public static DataSet Sc_MouldMaintainBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainBillList ", "h_v_Sc_MouldMaintainBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintain", "h_v_Sc_MouldMaintain");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldMaintain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMaintain");
+
+ }
+ //return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainBillList ", "h_v_Sc_MouldMaintainBillList");
}
#endregion
@@ -317,7 +328,7 @@
public static DataSet Sc_MouldDotCheckBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList ", "h_v_Sc_MouldDotCheckBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 "+sWhere+" ", "h_v_Sc_MouldDotCheckBillList");
}
#endregion
@@ -464,7 +475,11 @@
public static DataSet Sc_MouldConkBookBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList ", "h_v_Sc_MouldConkBookBillList");
+ if (sWhere != "" || sWhere != null)
+ {
+ sWhere = " where 1=1 " + sWhere;
+ }
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList "+sWhere+"", "h_v_Sc_MouldConkBookBillList");
}
#endregion
@@ -1362,7 +1377,7 @@
if (sqlWhere == null || sqlWhere.Equals(""))
{
//ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
- ds = oCN.RunProcReturn("select HRepairSonID HRepairID, 瀛愮淮淇」鐩唬鐮� HRepairCode,瀛愮淮淇」鐩� HRepairName,瀛愮淮淇姹� HRepairExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,缁翠慨璐圭敤 HMoney,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit", "h_v_Sc_MouldRepairWorkBillList_Edit");
+ ds = oCN.RunProcReturn("select HRepairID, 瀛愮淮淇」鐩唬鐮� HRepairCode,瀛愮淮淇」鐩� HRepairName,瀛愮淮淇姹� HRepairExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,缁翠慨璐圭敤 HMoney,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit", "h_v_Sc_MouldRepairWorkBillList_Edit");
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -1371,7 +1386,7 @@
else
{
//string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub where 1 = 1 ";
- string sql1 = "select HRepairSonID HRepairID, 瀛愮淮淇」鐩唬鐮� HRepairCode,瀛愮淮淇」鐩� HRepairName,瀛愮淮淇姹� HRepairExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,缁翠慨璐圭敤 HMoney,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit where 1 = 1 ";
+ string sql1 = "select HRepairID,瀛愮淮淇」鐩唬鐮� HRepairCode,瀛愮淮淇」鐩� HRepairName,瀛愮淮淇姹� HRepairExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,缁翠慨璐圭敤 HMoney,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList_Edit");
objJsonResult.code = "0";
@@ -2441,6 +2456,7 @@
#endregion
#endregion
+
#region 妯″叿淇濆吇璁板綍琛�
#region 妯″叿淇濆吇璁板綍琛� 淇濆瓨/缂栬緫
@@ -2602,7 +2618,6 @@
}
#endregion
-
#region[妯″叿淇濆吇璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
[Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai")]
[HttpGet]
@@ -2617,6 +2632,7 @@
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
#endregion
+
#region[妯″叿淇濆吇璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁]
[Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetai")]
[HttpGet]
@@ -2680,8 +2696,8 @@
string sql = "select HMaintainItemID, 淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldMaintainBillListItem where 1 = 1 " + Swhere + "";
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillListItem");
//鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
- string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HUnitID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,瀹為檯鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldMaintainBillListItem where 1 = 1 " + Swhere + "";
- ds1 = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillListItem");
+ string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HUnitID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,瀹為檯鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldMaintainBillList where 1 = 1 " + Swhere + "";
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainBillList");
list.Add(ds.Tables[0]);
list.Add(ds1.Tables[0]);
objJsonResult.code = "0";
@@ -2700,8 +2716,7 @@
}
#endregion
-
- #region [妯″叿淇濆吇璁板綍琛ㄥ垹闄ゅ姛鑳絔
+ #region [妯″叿淇濆吇璁板綍琛ㄥ垹闄ゅ姛鑳絔
/// <summary>
/// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
/// </summary>
@@ -2781,8 +2796,8 @@
}
#endregion
-
#endregion
+
#region 妯″叿鐐规璁板綍琛�
#region 妯″叿鐐规璁板綍琛� 淇濆瓨/缂栬緫
@@ -2944,7 +2959,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select HDotCheckItem,HDotCheckPart,HClaim,HRemark,HManagerID from Sc_MouldDotCheckBillSub", "Sc_MouldMaintainBillSub");
+ ds = oCN.RunProcReturn("select 鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,琛ㄤ綋澶囨敞 HRemark,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sc_MouldDotCheckBillList", "h_v_Sc_MouldDotCheckBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -2952,9 +2967,9 @@
}
else
{
- string sql1 = "select HDotCheckItem,HDotCheckPart,HClaim,HRemark,HManagerID from Sc_MouldDotCheckBillSub where 1 = 1 ";
+ string sql1 = "select 鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,琛ㄤ綋澶囨敞 HRemark,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sc_MouldDotCheckBillList where 1 = 1 ";
string sql = sql1 + sqlWhere;
- ds = oCN.RunProcReturn(sql, "Sc_MouldDotCheckBillSub");
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -2971,7 +2986,6 @@
return objJsonResult;
}
#endregion
-
#region [妯″叿鐐规璁板綍琛ㄥ垹闄ゅ姛鑳絔
/// <summary>
@@ -3055,6 +3069,7 @@
#endregion
+
#region 妯″叿鐐规璁″垝琛�
#region 妯″叿鐐规璁″垝琛� 淇濆瓨/缂栬緫
diff --git a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/QC_LastPieceCheckBillController.cs"
similarity index 100%
rename from WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
rename to "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/QC_LastPieceCheckBillController.cs"
diff --git a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/QC_OutCompCheckBillController.cs"
similarity index 100%
rename from WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
rename to "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/QC_OutCompCheckBillController.cs"
diff --git a/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBillController.cs"
similarity index 100%
rename from WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
rename to "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBillController.cs"
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESBeginWorkBillController.cs"
similarity index 99%
rename from WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
rename to "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESBeginWorkBillController.cs"
index adbe425..2832ddd 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESBeginWorkBillController.cs"
@@ -909,16 +909,17 @@
[HttpGet]
public object MESProductAuditProcessReportList(int HSourceID,int HSourceInterID,int HSourceEntryID,string HSourceBillNo, int HICMOInterID,int HICMOEntryID, int HInterID, int IsAudit, string CurUserName)
{
- string ModRightNameCheck = "Sc_ICMOReportBill_Check";
+ string ModRightNameCheck = "MES_ProcExchReport_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
+ string StrMessage = "";
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!WebClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName,ref StrMessage))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.Message = StrMessage;
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESEndWorkBillController.cs"
similarity index 100%
rename from WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
rename to "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESEndWorkBillController.cs"
diff --git a/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESProductReportBillController.cs"
similarity index 100%
rename from WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
rename to "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESProductReportBillController.cs"
diff --git a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESStopWorkBillController.cs"
similarity index 100%
rename from WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
rename to "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESStopWorkBillController.cs"
diff --git a/WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MaterToSourceBillController.cs"
similarity index 100%
rename from WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs
rename to "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MaterToSourceBillController.cs"
diff --git a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_PPBomBillController.cs"
similarity index 100%
rename from WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
rename to "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_PPBomBillController.cs"
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
new file mode 100644
index 0000000..98240e4
--- /dev/null
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -0,0 +1,224 @@
+锘縰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
+{
+ //璐ㄩ噺姹囨姤鍗旵ontroller
+ //鏁版嵁搴撲富琛⊿c_QualityReportBillMain
+ //鏁版嵁搴撳瓙琛⊿c_QualityReportBillSub
+ public class Sc_QualityReportBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 杩斿洖鐢熶骇璐ㄩ噺姹囨姤鍗曞垪琛�
+ [Route("Sc_QualityReportBill/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_QualityReportBillList " + sWhere, "h_v_Sc_QualityReportBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_QualityReportBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_QualityReportBillList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璐ㄩ噺姹囨姤鍗曟牴鎹簮鍗曠被鍨嬭幏鍙栦俊鎭�-婧愬崟涓虹敓浜х姸鎬佷复鏃惰〃锛�3722锛�
+ [Route("Sc_QualityReportBill/get_ICMOBillStatus_Tmp")]
+ [HttpGet]
+ public object get_ICMOBillStatus_Tmp(int HInterID, int HEntryID, string HBillType)
+ {
+ try
+ {
+ if (HInterID == 0 || HBillType.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙傛暟涓嶅叏锛岃幏鍙栨簮鍗曚俊鎭け璐ワ紒HInterID锛�" + HInterID + "锛汬EntryID锛�" + HEntryID + "锛汬BillType锛�" + HBillType + "锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn
+ ("select a.HInterID,a.HBillType,a.HICMOBillNo,a.HICMOInterID,a.HMaterID" +
+ ",m.HNumber HMaterNumber,m.HName HMaterName,m.HModel HMaterModel " +
+ " from Sc_ICMOBillStatus_Tmp a " +
+ " left join Gy_Material m on a.HMaterID=m.HItemID " +
+ " Where a.HInterID=" + HInterID + " and a.HBillType="+ HBillType, "Sc_ICMOBillStatus_Tmp");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璐ㄩ噺姹囨姤鍗曟壂涓嶈壇鏉＄爜淇濆瓨淇℃伅
+ [Route("Sc_QualityReportBill/set_SaveBarCode")]
+ [HttpPost]
+ public object set_SaveBarCode([FromBody] JObject oMain)
+ {
+ var msg1 = oMain["oMain"].ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = AddBillMain(msg1);
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg = sArray[0].ToString();
+ string OperationType = sArray[1].ToString().Trim();
+ bool bResult;
+ try
+ {
+ msg = "[" + msg.ToString() + "]";
+ List<Model.Sc_ICMOBillQualityStatus_Tmp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOBillQualityStatus_Tmp>>(msg);
+ DAL.ClsQC_FirstPieceCheckBill BillNew = new DAL.ClsQC_FirstPieceCheckBill();
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ 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.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ BillNew.omodel.HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ BillNew.omodel.HDate = HDate;
+ BillNew.omodel.HRemark = mainList[0].HRemark;//澶囨敞
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HSourceID = ClsPub.isLong(mainList[0].HSourceID);
+ BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+ BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ BillNew.omodel.HICMOQty = ClsPub.isLong(mainList[0].HICMOQty);
+ BillNew.omodel.HProcExchInterID = ClsPub.isLong(mainList[0].HProcExchInterID);
+ BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);
+ BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
+ BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty);
+ BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
+ BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
+ BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);
+ BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
+ BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);
+ BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);
+ BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);
+ BillNew.omodel.HBillStatus = 1;
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (OperationType.Equals("1") || OperationType.Equals("2"))
+ {
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ }
+ else if (OperationType.Equals("3"))
+ {
+ bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ ClsPub.sExeReturnInfo = "鏃犳晥鐨勬搷浣滅被鍨嬶紒";
+ bResult = false;
+ }
+ //鎻愮ず
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ //objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ 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
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
index 30edd5d..70d9ca3 100644
--- a/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
+++ b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
@@ -253,7 +253,7 @@
//===================================================
oSub.HRepairExplanation = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRepairExplanation"]);
- oSub.HRepairID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HRepairID"]);
+ oSub.HRepairID1 = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HRepairID"]);
oSub.HEmpID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEmpID"]);
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index d4fe727..1c5c267 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1254,5 +1254,6 @@
List<Models.ClsSc_ICMOBillWorkQtyStatus_Tmp> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ICMOBillWorkQtyStatus_Tmp>>(jsonString);
return list;
}
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSb_EquipRepairWorkBillSub.cs b/WebAPI/Models/ClsSb_EquipRepairWorkBillSub.cs
index cc4855e..599b327 100644
--- a/WebAPI/Models/ClsSb_EquipRepairWorkBillSub.cs
+++ b/WebAPI/Models/ClsSb_EquipRepairWorkBillSub.cs
@@ -10,7 +10,7 @@
public string HRemark;// varchar(200) --备注
- public Int64 HRepairID; // int --维修项目
+ //public Int64 HRepairID; // int --维修项目
public Int64 HEmpID; // int --负责人
public string HRepairExplanation; // varchar(500)维修要求
diff --git a/WebAPI/Models/Gy_Mould.cs b/WebAPI/Models/Gy_Mould.cs
index fbb5e9e..a19da8b 100644
--- a/WebAPI/Models/Gy_Mould.cs
+++ b/WebAPI/Models/Gy_Mould.cs
@@ -5,12 +5,9 @@
namespace WebAPI.Models
{
- public class Gy_Mould
+ public class Gy_Mould : DBUtility.ClsXt_BaseBillMain
{
- public long HInterID { get; set; }
- public string HBillNo { get; set; }
- public DateTime HDate { get; set; }
- public string HRemark { get; set; }
+
public string HMouldNo { get; set; }
public string HName { get; set; }
public string HModel { get; set; }
@@ -22,7 +19,7 @@
public string HWorkMaterModel { get; set; }
public long HMaterID { get; set; }
public string HMaterNumber { get; set; }
- public long HMouldTypeID { get; set; }
+ public long HMouleTypeID { get; set; }
public long HUnitID { get; set; }
public DateTime HOutComDate { get; set; }
public string HOutComNo { get; set; }
@@ -58,8 +55,6 @@
public long HLifeUnitID { get; set; }
public long HBOMID { get; set; }
-
- public string HMaker { get; set; }
public long HPrintQty { get; set; }
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 24ebc55..1add0b7 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,11 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2021-08-27T03:31:34.0855073Z;True|2021-08-26T14:50:48.1152466+08:00;True|2021-08-26T14:48:10.2465840+08:00;True|2021-08-26T14:37:43.0241862+08:00;True|2021-08-26T14:29:55.2528390+08:00;True|2021-08-26T14:09:28.0729976+08:00;True|2021-08-26T13:54:39.3698711+08:00;True|2021-08-26T13:49:22.1874130+08:00;True|2021-08-26T13:44:45.1308881+08:00;True|2021-08-26T10:40:38.2582311+08:00;True|2021-08-26T10:23:57.8897095+08:00;True|2021-08-26T10:15:07.6944380+08:00;True|2021-08-26T10:08:50.2220681+08:00;True|2021-08-26T09:10:51.0709619+08:00;True|2021-08-26T09:09:24.0034305+08:00;True|2021-08-26T09:07:28.2131374+08:00;True|2021-08-26T08:44:38.4263337+08:00;True|2021-08-25T09:57:54.2264578+08:00;True|2021-08-25T09:43:36.6669108+08:00;True|2021-08-25T09:12:53.8071251+08:00;True|2021-08-25T09:03:02.8382732+08:00;True|2021-08-25T09:01:10.0452148+08:00;True|2021-08-25T08:51:56.8723869+08:00;True|2021-08-25T08:48:42.5846073+08:00;False|2021-08-25T08:48:00.4079916+08:00;True|2021-08-25T08:41:56.1928941+08:00;True|2021-08-24T16:50:32.1356498+08:00;True|2021-08-24T16:47:26.7536090+08:00;True|2021-08-24T16:30:15.0868921+08:00;True|2021-08-24T16:26:15.1989339+08:00;True|2021-08-24T15:18:32.1194836+08:00;True|2021-08-24T15:15:31.0341783+08:00;True|2021-08-24T15:13:19.4657519+08:00;True|2021-08-24T15:01:07.8726143+08:00;True|2021-08-24T14:52:09.0075698+08:00;True|2021-08-24T14:42:40.0324692+08:00;True|2021-08-24T14:19:53.6541860+08:00;True|2021-08-24T11:22:23.7070706+08:00;True|2021-08-24T11:08:35.1139784+08:00;True|2021-08-24T11:07:06.4049068+08:00;True|2021-08-23T10:55:11.2177426+08:00;True|2021-08-23T10:53:09.8373449+08:00;True|2021-08-23T10:46:57.9488111+08:00;True|2021-08-23T10:33:52.2091558+08:00;True|2021-08-23T10:30:33.4452523+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>False|2021-08-27T08:01:21.2791979Z;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 16:43:40</publishTime>
@@ -18,31 +18,31 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/27/2021 11:31:14</publishTime>
+ <publishTime>08/26/2021 16:00:33</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/27/2021 11:31:14</publishTime>
+ <publishTime>08/26/2021 16:00:33</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/27/2021 11:31:09</publishTime>
+ <publishTime>08/26/2021 16:00:32</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/27/2021 11:31:09</publishTime>
+ <publishTime>08/26/2021 16:00:32</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/27/2021 11:31:06</publishTime>
+ <publishTime>08/26/2021 16:00:30</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/27/2021 11:31:06</publishTime>
+ <publishTime>08/26/2021 16:00:30</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
- <publishTime>08/27/2021 11:31:11</publishTime>
+ <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>08/25/2021 20:46:09</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -60,37 +60,37 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/27/2021 11:31:07</publishTime>
+ <publishTime>08/26/2021 16:00:30</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/27/2021 11:31:07</publishTime>
+ <publishTime>08/26/2021 16:00:30</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/04/2014 04:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/27/2021 11:31:03</publishTime>
+ <publishTime>08/26/2021 16:00:29</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/27/2021 11:31:03</publishTime>
+ <publishTime>08/26/2021 16:00:29</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/27/2021 11:31:04</publishTime>
+ <publishTime>08/26/2021 16:00:29</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/27/2021 11:31:04</publishTime>
+ <publishTime>08/26/2021 16:00:29</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/27/2021 11:31:05</publishTime>
+ <publishTime>08/26/2021 16:00:29</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/27/2021 11:31:05</publishTime>
+ <publishTime>08/26/2021 16:00:29</publishTime>
</File>
<File Include="bin/stdole.dll">
- <publishTime>08/04/2021 08:30:53</publishTime>
+ <publishTime>05/09/2021 13:35:37</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -156,7 +156,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -189,10 +189,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/27/2021 11:31:17</publishTime>
+ <publishTime>08/26/2021 16:00:35</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/27/2021 11:31:17</publishTime>
+ <publishTime>08/26/2021 16:00:35</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -204,166 +204,166 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/25/2021 20:46:11</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/27/2021 11:31:32</publishTime>
+ <publishTime>08/26/2021 16:00:44</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 51ae3a8..16864fe 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -328,6 +328,7 @@
<Compile Include="Controllers\ReportPlatFormController.cs" />
<Compile Include="Controllers\SCGL\Sc_QualityReportBillListController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESProductReportBillController.cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
@@ -336,27 +337,27 @@
<Compile Include="Controllers\SBGL\Sb_EquipMaintainPlanBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipDotCheckPlanBillController.cs" />
<Compile Include="Controllers\Sb_CheckEqpRepairWorkBillController.cs" />
- <Compile Include="Controllers\SCGL\Sc_MaterToSourceBillController.cs" />
- <Compile Include="Controllers\SCGL\Sc_MESEndWorkBillController.cs" />
- <Compile Include="Controllers\SCGL\Sc_MESStopWorkBillController.cs" />
- <Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.cs" />
- <Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" />
- <Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
- <Compile Include="Controllers\SCGL\Sc_QualityReportBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MaterToSourceBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESEndWorkBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESStopWorkBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESBeginWorkBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\QC_LastPieceCheckBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\QC_OutCompCheckBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_ICMOReportBillController.cs" />
<Compile Include="Controllers\Sc_MouldOtherInBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" />
<Compile Include="Controllers\LMESController.cs" />
<Compile Include="Controllers\LookingForBillController.cs" />
<Compile Include="Controllers\NewApiController.cs" />
- <Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" />
- <Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_PPBomBillController.cs" />
<Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index e034e8d..c934955 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
- <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index fda2dd1..b7c1a36 100644
--- a/WorkM/WorkM.csproj
+++ b/WorkM/WorkM.csproj
@@ -67,6 +67,20 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.grdes6Lib">
+ <HintPath>..\OCX\AxInterop.grdes6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.grdes6Lib">
+ <HintPath>..\OCX\Interop.grdes6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -785,38 +799,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgrdes6Lib">
- <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="grdes6Lib">
- <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
--
Gitblit v1.9.1