From f988af1194fa29e2983b32bd6552356c10880ca7 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期四, 25 三月 2021 11:52:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 89e5ec0..0a2be27 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -11,10 +11,10 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>03/24/2021 10:00:01</publishTime>
+ <publishTime>03/24/2021 16:35:44</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>03/24/2021 10:00:01</publishTime>
+ <publishTime>03/24/2021 16:35:44</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -581,7 +581,7 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>03/23/2021 14:37:09</publishTime>
+ <publishTime>03/24/2021 16:11:22</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -932,7 +932,7 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>03/24/2021 10:00:35</publishTime>
+ <publishTime>03/24/2021 16:33:50</publishTime>
</File>
<File Include="views/senior/echarts/bar.html">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -1084,11 +1084,17 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">
<publishTime>03/24/2021 09:17:43</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">
+ <publishTime>03/24/2021 14:06:30</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">
+ <publishTime>03/24/2021 10:54:34</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">
<publishTime>03/23/2021 16:28:14</publishTime>
</File>
- <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ProcessBillList.html">
- <publishTime>03/23/2021 15:48:21</publishTime>
+ <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">
+ <publishTime>03/24/2021 16:33:45</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/H_ProcessDetail.html">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -1099,6 +1105,18 @@
<File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">
<publishTime>03/24/2021 09:59:52</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">
+ <publishTime>03/24/2021 10:29:28</publishTime>
+ </File>
+ <File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">
+ <publishTime>03/24/2021 16:10:32</publishTime>
+ </File>
+ <File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">
+ <publishTime>03/24/2021 16:10:32</publishTime>
+ </File>
+ <File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">
+ <publishTime>03/24/2021 16:10:32</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
@@ -1106,24 +1124,6 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBillList.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBillList.html">
- <publishTime>03/23/2021 14:14:38</publishTime>
- </File>
- <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill.html">
@@ -1262,7 +1262,7 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/23/2021 15:50:53</publishTime>
+ <publishTime>03/24/2021 16:35:45</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1