From a087eb72fffa717cbb1f421e39f115cdff493055 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 30 五月 2024 09:56:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d9e3c18..0e9d0ed 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -135,7 +135,6 @@
<Content Include="layuiadmin\myicon\绯荤粺璁剧疆.svg" />
<Content Include="layuiadmin\myicon\杞﹂棿绠＄悊.svg" />
<Content Include="layuiadmin\Scripts\echarts.min.js" />
- <Content Include="layuiadmin\Scripts\webConfig2.js" />
<Content Include="layuiadmin\serial-reader.js" />
<Content Include="layuiadmin\soulTable.slim.js" />
<Content Include="layuiadmin\treeTable.js" />
@@ -282,7 +281,6 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBillList_PDA.html" />
- <Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBackBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBill_PDA.html" />
@@ -324,9 +322,6 @@
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MaintainLev.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PreventErrMould.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ColorClassList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckNoteItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaintainLev.html" />
@@ -350,7 +345,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBillList_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBillList_PDA.html" />
- <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldLifeUseReport .html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldLifeUseReport.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿璋冩嫧\Sc_MouldProdMoveBillList_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿璋冩嫧\Sc_MouldProdMoveBill_PDA.html" />
@@ -398,12 +393,16 @@
<Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Qc_PreventErrMouldCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Qc_PreventErrMouldCheckBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘鍚堝悓\Add_Edit_Cg_ContractBillList.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘鍚堝悓\Cg_ContractBillList.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderReceiveDaySumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderReceiveSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderBillSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POInStockBillSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POMaterialPriceReport.html" />
- <Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderBillProcessSumReport .html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderBillProcessSumReport.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Add_Edit_Xs_ContractBillList.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Xs_ContractBillList.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_ProjectClass.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ColorClass.html" />
@@ -1456,16 +1455,15 @@
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鐐规瑙勭▼鍗昞Sc_MouldDotCheckRuleBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillList.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA_old.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA_old.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBill_PDA_old.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA_old.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA_old.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿缁翠慨璁板綍鍗昞Sc_MouldRepairWorkBill_PDA.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA_old.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA_old.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBill_PDA_old.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldLifeUseBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldLifeUseBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutBill.html" />
@@ -1484,7 +1482,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairInBillList.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍏ュ簱鍗昞Sc_MouldScrapInBill_PDA_old.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍏ュ簱鍗昞Sc_MouldScrapInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldLifeChangeBillList.html" />
@@ -1501,7 +1499,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapRequestBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBillList.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA_OLD.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱BatchGen_MouldFile.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBill_Out.html" />
@@ -1834,8 +1832,6 @@
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkReportWeekBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBillList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBill.html" />
- <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_ProjectClass.html" />
- <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_TaskClass.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBillList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBillList.html" />
@@ -2492,6 +2488,7 @@
<Folder Include="Files\" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
+ <Folder Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--
Gitblit v1.9.1