From 12a1ad9f234738d6153b26626a0cc85b0f7b96a7 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 04 二月 2021 21:11:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/WebTM
---
WebTM/Properties/PublishProfiles/webtm.pubxml.user | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index f53e97a..14f0cc8 100644
--- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -13,10 +13,10 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>01/15/2021 12:52:07</publishTime>
+ <publishTime>01/24/2021 11:27:32</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>01/15/2021 12:52:07</publishTime>
+ <publishTime>01/24/2021 11:27:32</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>01/14/2021 10:06:23</publishTime>
@@ -580,7 +580,7 @@
<publishTime>01/14/2021 10:06:23</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>01/14/2021 10:06:23</publishTime>
+ <publishTime>01/26/2021 15:38:51</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -726,6 +726,9 @@
<File Include="views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html">
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
+ <File Include="views/Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html">
+ <publishTime>01/18/2021 09:49:20</publishTime>
+ </File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html">
<publishTime>01/14/2021 20:55:55</publishTime>
</File>
@@ -737,6 +740,9 @@
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html">
<publishTime>01/14/2021 10:06:24</publishTime>
+ </File>
+ <File Include="views/Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html">
+ <publishTime>01/19/2021 22:26:49</publishTime>
</File>
<File Include="views/component/anim/index.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -946,7 +952,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>01/14/2021 17:44:54</publishTime>
+ <publishTime>01/26/2021 13:29:38</publishTime>
</File>
<File Include="views/senior/echarts/bar.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1045,7 +1051,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/user/login.html">
- <publishTime>01/15/2021 11:10:33</publishTime>
+ <publishTime>01/26/2021 00:29:42</publishTime>
</File>
<File Include="views/user/reg.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1078,22 +1084,49 @@
<publishTime>01/14/2021 14:48:04</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationInBillList.html">
- <publishTime>01/14/2021 15:07:03</publishTime>
+ <publishTime>01/26/2021 13:03:12</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">
- <publishTime>01/15/2021 14:22:58</publishTime>
+ <publishTime>01/26/2021 00:32:20</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationOutBill.html">
- <publishTime>01/14/2021 15:28:59</publishTime>
+ <publishTime>01/19/2021 22:22:31</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationOutBillList.html">
- <publishTime>01/14/2021 15:07:10</publishTime>
+ <publishTime>01/26/2021 13:32:30</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">
- <publishTime>01/14/2021 17:17:09</publishTime>
+ <publishTime>01/26/2021 10:54:43</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
+ <publishTime>01/21/2021 15:23:36</publishTime>
</File>
<File Include="views/缁勮鍗�/Sc_AssemblyBill_Fast.html">
<publishTime>01/14/2021 10:06:24</publishTime>
+ </File>
+ <File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
+ <publishTime>01/21/2021 15:28:28</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
+ <publishTime>01/22/2021 16:21:03</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
+ <publishTime>01/22/2021 11:22:39</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">
+ <publishTime>01/24/2021 13:23:03</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_ProductionProcessDetailsReport.html">
+ <publishTime>01/22/2021 16:38:54</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkProcReport.html">
+ <publishTime>01/22/2021 16:03:10</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport - 澶嶅埗%282%29.html">
+ <publishTime>01/22/2021 16:16:06</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport.html">
+ <publishTime>01/22/2021 17:04:03</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBackBill_Fast.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1126,7 +1159,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html">
- <publishTime>01/14/2021 10:06:24</publishTime>
+ <publishTime>02/04/2021 21:07:00</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1204,7 +1237,7 @@
<publishTime>05/08/2020 23:33:42</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/14/2021 23:06:12</publishTime>
+ <publishTime>01/21/2021 11:58:13</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1