From df654f66c9ec6a586f705f795feb84247cd0dc34 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 22 九月 2023 10:34:53 +0800
Subject: [PATCH] 子表 物料分类 改为 物料公式
---
WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html | 24 ++++++------
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html | 2
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 65 +++++++++++++++++---------------
3 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 78d2598..5a48830 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -18,10 +18,10 @@
<publishTime>01/28/2016 14:22:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>09/18/2023 15:44:52</publishTime>
+ <publishTime>09/22/2023 09:36:13</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>09/18/2023 15:44:52</publishTime>
+ <publishTime>09/22/2023 09:36:13</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>04/11/2023 16:34:42</publishTime>
@@ -1440,16 +1440,16 @@
<publishTime>07/18/2023 08:41:53</publishTime>
</File>
<File Include="views/index_Mobile.html">
- <publishTime>09/06/2023 13:38:37</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/index_Mobile_KaiBeiNaiTe.html">
<publishTime>07/18/2023 08:40:58</publishTime>
</File>
<File Include="views/index_Mobile_QiaoYi.html">
- <publishTime>09/14/2023 13:59:10</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/index_QiaoYi.html">
- <publishTime>09/14/2023 13:59:10</publishTime>
+ <publishTime>09/21/2023 16:29:12</publishTime>
</File>
<File Include="views/IpadIndex.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -1500,7 +1500,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/PublicPage/HSourceReportHtml.html">
- <publishTime>08/22/2023 16:34:18</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/PublicPage/LocationGroupInformation.html">
<publishTime>08/27/2021 14:42:06</publishTime>
@@ -2358,7 +2358,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ProcessExchangeArrangement.aspx">
- <publishTime>09/18/2023 15:40:42</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ProcessExchangeBillList.aspx">
<publishTime>09/14/2023 13:59:10</publishTime>
@@ -3417,19 +3417,19 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList_Web.html">
- <publishTime>08/22/2023 16:34:18</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_MESEndStepWorkBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/宸ュ簭姹囨姤/Sc_Add_ProcessReportBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3441,7 +3441,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_MESBeginStepWorkBillList.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鐢熶骇姹囨姤/Sc_ICMOReportBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3510,7 +3510,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html">
- <publishTime>08/22/2023 16:34:18</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html">
<publishTime>08/22/2023 16:34:18</publishTime>
@@ -3618,7 +3618,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html">
- <publishTime>08/22/2023 09:28:23</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3627,7 +3627,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">
- <publishTime>06/28/2023 14:58:24</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html">
<publishTime>04/26/2023 13:31:31</publishTime>
@@ -3651,7 +3651,7 @@
<publishTime>04/26/2023 13:31:31</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html">
- <publishTime>09/14/2023 13:59:10</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html">
<publishTime>07/24/2023 08:52:38</publishTime>
@@ -4158,7 +4158,7 @@
<publishTime>09/02/2023 18:30:46</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">
- <publishTime>06/28/2023 10:24:11</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_Mul.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -4173,7 +4173,7 @@
<publishTime>08/03/2023 11:11:59</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">
- <publishTime>06/28/2023 10:42:38</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_Mul.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -4188,7 +4188,7 @@
<publishTime>09/02/2023 18:53:25</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
- <publishTime>09/14/2023 13:59:10</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillSubList.html">
<publishTime>09/14/2023 13:59:10</publishTime>
@@ -4219,6 +4219,9 @@
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_SampleRecordBill_PDA.html">
<publishTime>09/14/2023 13:59:10</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_Sc_ProcessExchangeBillMain_Note_PDA.html">
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -4263,13 +4266,13 @@
<publishTime>09/14/2023 13:59:10</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeArrangement.html">
- <publishTime>09/18/2023 15:40:42</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
<publishTime>09/18/2023 15:40:42</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
- <publishTime>09/14/2023 13:59:10</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_LookDown.html">
<publishTime>06/28/2023 16:08:50</publishTime>
@@ -4278,7 +4281,7 @@
<publishTime>07/24/2023 08:52:38</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillSubList.html">
- <publishTime>09/14/2023 13:59:10</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_CF.html">
<publishTime>04/26/2023 13:31:31</publishTime>
@@ -4311,19 +4314,19 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">
- <publishTime>08/03/2023 11:11:59</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillEdit.html">
<publishTime>04/26/2023 13:31:31</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillList.html">
- <publishTime>07/24/2023 08:52:38</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">
<publishTime>06/26/2023 09:03:54</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">
- <publishTime>07/24/2023 08:52:38</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/WindowPrint.html">
<publishTime>09/02/2023 18:53:25</publishTime>
@@ -4332,19 +4335,19 @@
<publishTime>08/03/2023 11:11:59</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/WW_EntrustWorkOrderBillList.html">
- <publishTime>08/03/2023 11:11:59</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
<publishTime>09/02/2023 18:53:25</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
- <publishTime>09/14/2023 13:59:10</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
<publishTime>09/02/2023 18:53:25</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
- <publishTime>09/14/2023 13:59:10</publishTime>
+ <publishTime>09/22/2023 08:58:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillSubList.html">
<publishTime>09/14/2023 13:59:10</publishTime>
@@ -4734,13 +4737,13 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html">
- <publishTime>09/19/2023 09:56:30</publishTime>
+ <publishTime>09/22/2023 09:35:14</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
- <publishTime>09/19/2023 10:16:00</publishTime>
+ <publishTime>09/22/2023 09:27:09</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
- <publishTime>09/19/2023 10:16:00</publishTime>
+ <publishTime>09/22/2023 09:27:09</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_CheckList_New.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -4866,7 +4869,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/18/2023 15:45:00</publishTime>
+ <publishTime>09/22/2023 09:36:17</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
index f7621d2..8e768ce 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
@@ -1079,22 +1079,22 @@
columns = [
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
- , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
- , { field: 'HMaterRuleType', title: '鐗╂枡鍒嗙被', edit: 'text', width: 100 }
- , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
- , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: 'HMaterRuleType', title: '鐗╂枡鍏紡', width: 100 }
+ , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
, { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100, hide: true }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text', width: 100 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', edit: 'text', width: 100, hide: true}
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 100, hide: true}
, { field: 'HRate', title: '鐢ㄩ噺鈥�', edit: 'text', width: 100 }
- , { field: 'HQty', title: '閲嶉噺', edit: 'text', width: 100 }
- , { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100, hide: true}
- , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100, hide: true}
- , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true, hide: true }
+ , { field: 'HQty', title: '閲嶉噺', width: 100 }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true}
+ , { field: 'HMoney', title: '閲戦', width: 100, hide: true}
+ , { field: 'HWHID', title: 'HWHID', width: 100, hide: true, hide: true }
, { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120, hide: true}
- , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', edit: 'text', width: 120, hide: true}
+ , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', width: 120, hide: true}
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
index d1dda7e..44cfc2c 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
@@ -297,7 +297,7 @@
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
- , { field: '鐗╂枡鍒嗙被', title: '鐗╂枡鍏紡', width: 200 }
+ , { field: '鐗╂枡鍏紡', title: '鐗╂枡鍏紡', width: 200 }
, { field: 'HUnitID', title: 'HUnitID', width: 200, hide: true }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
--
Gitblit v1.9.1