From 93c726c837be5eecadc040253cc6c24acd16efe0 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 25 十月 2022 23:46:20 +0800
Subject: [PATCH] 合并
---
WebTM/WebTM.csproj | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d052ad4..0235f1d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -98,14 +98,24 @@
<Content Include="layuiadmin\PubCustom.js" />
<Content Include="layuiadmin\PubJs\PubCheck.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadCountDevelopWHList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_LineCenter.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_MouldList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_OrganizationtList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingBillList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingGroup.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseListNew.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WasterWHList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WHList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WWBadWHList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WWWasterWHList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseList_JIT.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessExchangeBillListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckItemListView.html" />
@@ -128,6 +138,7 @@
<Content Include="views\index - 澶嶅埗.html" />
<Content Include="views\indexMenu.html" />
<Content Include="views\IpadStepIndex.html" />
+ <Content Include="views\PublicPage\MaterialInfo.html" />
<Content Include="views\PublicPage\MouldDotCheckRuleInterList.html" />
<Content Include="views\PublicPage\MouldMaintainRuleInterList.html" />
<Content Include="views\PublicPage\OrderBackInfomation.html" />
@@ -161,11 +172,11 @@
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryList_WMS.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Gy_BarCodeBill.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkPayType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Pay_PeriodInfoSet.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MateMouldList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterUnitList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterUnit_Add_Edit_.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameter_Add_Edit_.html" />
@@ -679,6 +690,7 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckList.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MateMould.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckList.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairEdit.html" />
@@ -733,6 +745,17 @@
<Content Include="views\宸ヨ祫绠＄悊\Gy_WorkTypeBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\澶栬喘澧欏竷宸ヨ祫\Pay_PurchaseWallclothBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\澶栬喘澧欏竷宸ヨ祫\Pay_PurchaseWallclothBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_EmpPayMentSumReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_EmpWorkQtyEntryReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PayMentDeptSendList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PayMentDeptYearReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PayMentSendList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PayMentYearReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_SingleBalBillEntryReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_SingleBalBillSumReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_WorkTimesList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_WorkTimesPayMentEntryReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_WorkTimesPayMentSumReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\ReportList2.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\ReportList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillEdit.html" />
@@ -884,6 +907,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍖呰鍗昞Sc_PackUnionBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍖呰鍗昞Sc_PackUnionBillEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍙枡骞冲彴\JIT_ComplementGoodBillMain.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍙枡骞冲彴\JIT_ComplementGoodPT.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍙枡骞冲彴\JIT_HlpBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瀹屽伐鍗昞Sc_Add_MESEndWorkBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瀹屽伐鍗昞Sc_Add_MESEndWorkBillList.html" />
@@ -926,9 +950,13 @@
<Content Include="views\绯荤粺绠＄悊\妯″潡绠＄悊\Xt_Xtgnb_Edit.html" />
<Content Include="views\绯荤粺绠＄悊\妯″潡绠＄悊\Xt_XtgnbList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByOrg.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByUser.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByWorkStation.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserCustomer.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserDept.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserEmployee.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserGroup.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserMater.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserStock.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserGroupList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserList.html" />
@@ -1004,6 +1032,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangePlanDate.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssue.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssueBillList.html" />
@@ -1013,8 +1042,12 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞MES_StationInBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\DefectiveDetailedYieldReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Mes_OrderProcFlowAllReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Mes_WIPProcReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\ProductionPlanReportList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_StationInBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_StationOutSumReport.html" />
<Content Include="views\杞﹂棿绠＄悊\杞﹂棿鏀舵枡\JIT_SendGoodsBillList.html" />
<Content Include="views\閲囪喘绠＄悊\鏀舵枡閫氱煡鍗昞Add_Edit_Cg_POInStockBillList.html" />
<Content Include="views\閲囪喘绠＄悊\閫�鏂欓�氱煡鍗昞Add_Edit_Cg_POInStockBackBillList.html" />
--
Gitblit v1.9.1