From ef517af50613c209b8f78fc29f276f748a98a2b0 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 02 九月 2022 09:36:20 +0800
Subject: [PATCH] 生产资源列表 新增字段 mac地址  HMacAddr varchar(100) //设备MAC地址 设备档案列表 新增字段 生产资源  HSourceID    int      //对应生产资源(Gy_Source)

---
 WebAPI/WebAPI.csproj |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 45b5324..5592753 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -306,6 +306,7 @@
     </Content>
     <None Include="Web References\WebS\Reference.map">
       <Generator>MSDiscoCodeGenerator</Generator>
+      <LastGenOutput>Reference1.cs</LastGenOutput>
     </None>
     <None Include="Web References\WebS\WebService1.disco" />
     <Content Include="Web.config">
@@ -350,6 +351,7 @@
     <Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
+    <Compile Include="Controllers\BaseSet\Xt_grdAlignment_WMESController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
     <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
     <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -371,11 +373,13 @@
     <Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
     <Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
+    <Compile Include="Controllers\CJGL\ProductionPlanReportController.cs" />
     <Compile Include="Controllers\CJGL\Sc_ProcessExchangeBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
     <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
+    <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ComplementGoodBillController.cs" />
@@ -383,6 +387,7 @@
     <Compile Include="Controllers\SCGL\Sc_ICBomBillController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBillController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormImportController.cs" />
+    <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_ICMOSortBillController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱NpoiHelper.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_JIT_ComplementGoodBillController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_CompleteController..cs" />
@@ -425,6 +430,9 @@
     <Compile Include="Controllers\浠撳瓨绠$悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" />
     <Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
+    <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_MonthlySalaryReportController.cs" />
+    <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_PieceRateWageReportController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Gy_ClassTimePrjBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Gy_ClassTimePrjSubController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_OtherBalBillController.cs" />
@@ -532,6 +540,7 @@
     <Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
     <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
     <Compile Include="DLL\ClsSc_PackUnionBill.cs" />
+    <Compile Include="DLL\ClsSc_PHPCruxBillBill.cs" />
     <Compile Include="DLL\ClsSc_ProcessPlan.cs" />
     <Compile Include="DLL\ClsWW_PPBomBill.cs" />
     <Compile Include="DLL\宸ヨ祫绠$悊\ClsPay_GroupBalBill.cs" />
@@ -540,6 +549,8 @@
     <Compile Include="HttpClient.cs" />
     <Compile Include="InvokeHelper.cs" />
     <Compile Include="Log.cs" />
+    <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
+    <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
     <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
     <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
     <Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
@@ -569,6 +580,7 @@
     <Compile Include="Models\Sc_WorkBillSortBillSub.cs" />
     <Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
     <Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
+    <Compile Include="Models\鍔ㄦ�佸垪\OptionListModel.cs" />
     <Compile Include="Models\宸ヨ祫绠$悊\ClsGy_ClassTimePrj_Model.cs" />
     <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillEmp.cs" />
     <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillMain.cs" />
@@ -825,8 +837,10 @@
     <Folder Include="Views\Gy_EquipType\" />
     <Folder Include="Views\Gy_ICBomBill\" />
     <Folder Include="Views\Gy_RoutingGroup\" />
+    <Folder Include="Views\Gy_WorkStation\" />
     <Folder Include="Views\JIT_DayPlanPlatFormBill\" />
     <Folder Include="Views\JIT_DayPlanPlatFormImport\" />
+    <Folder Include="Views\JIT_ICMOSortBillList\" />
     <Folder Include="Views\KF_ICInventoryList_WMSBill\" />
     <Folder Include="Views\Kf_ICStockBillMain\" />
     <Folder Include="Views\Kf_ICStockInOutBill\" />
@@ -835,6 +849,7 @@
     <Folder Include="Views\kf_StepFoldinBill\" />
     <Folder Include="Views\Kf_StepFoldOutBill\" />
     <Folder Include="Views\MoveStockBill\" />
+    <Folder Include="Views\ProductionPlanReport\" />
     <Folder Include="Views\ProductionReturnBill\" />
     <Folder Include="Views\QC_Management\" />
     <Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
@@ -847,6 +862,7 @@
     <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
     <Folder Include="Views\Sc_WorkBillSortBill\" />
     <Folder Include="Views\Sc_WorkDemandPlanBill\" />
+    <Folder Include="Views\Xt_grdAlignment_WMES\" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />

--
Gitblit v1.9.1