From 25031728291c8560934d25c5bc99e6204f324f2f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 03 一月 2023 08:59:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 11acd9b..8dcf6b9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -195,8 +195,12 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PackType.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_EquipStatus.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_EquipStatusEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSup.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSupEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatus.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Operator.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionEdit.html" />
@@ -844,6 +848,8 @@
<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" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBillList.html" />
@@ -873,6 +879,10 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapOutBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapRequestBill.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapRequestBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBill.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱BatchGen_MouldFile.html" />
@@ -1065,6 +1075,8 @@
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileBillResume.html" />
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainList.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鐘舵�乗Sb_EquipStatusChangeBill.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鐘舵�乗Sb_EquipStatusChangeBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧缁翠慨娲惧伐鍗昞Sb_EquipRepairSendWorkBillEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧缁翠慨娲惧伐鍗昞Sb_EquipRepairSendWorkBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleEdit.html" />
--
Gitblit v1.9.1