From fc0bb82d051f2fcddd24d2253986f69fd08a4bc4 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期六, 07 十月 2023 10:15:55 +0800 Subject: [PATCH] 生产领料单:子表数据校验增加对用量的非空、非零、格式校验,对物料公式的校验 --- WebTM/WebTM.csproj.user | 2 WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html | 13 ++++ WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 119 +++++++++++++++++++++++---------------- WebTM/layuiadmin/Scripts/webConfig.js | 4 4 files changed, 86 insertions(+), 52 deletions(-) diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user index 1f62077..21c48e3 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/28/2023 15:05:45</publishTime> + <publishTime>10/07/2023 10:03:51</publishTime> </File> <File Include="bin/WebTM.pdb"> - <publishTime>09/28/2023 15:05:45</publishTime> + <publishTime>10/07/2023 10:03:51</publishTime> </File> <File Include="HtmlPage1.html"> <publishTime>04/11/2023 16:34:42</publishTime> @@ -720,7 +720,7 @@ <publishTime>04/11/2023 16:34:42</publishTime> </File> <File Include="layuiadmin/Scripts/webConfig.js"> - <publishTime>09/14/2023 14:06:07</publishTime> + <publishTime>10/07/2023 10:07:49</publishTime> </File> <File Include="layuiadmin/serial-reader.js"> <publishTime>08/28/2023 13:54:42</publishTime> @@ -1024,6 +1024,9 @@ </File> <File Include="views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView2.html"> <publishTime>07/21/2023 16:24:53</publishTime> + </File> + <File Include="views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView3.html"> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html"> <publishTime>07/21/2023 16:25:22</publishTime> @@ -1431,7 +1434,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/index.html"> - <publishTime>09/14/2023 13:59:10</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/indexMenu.html"> <publishTime>08/28/2023 09:22:18</publishTime> @@ -1449,7 +1452,7 @@ <publishTime>09/22/2023 08:58:26</publishTime> </File> <File Include="views/index_QiaoYi.html"> - <publishTime>09/21/2023 16:29:12</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/IpadIndex.html"> <publishTime>04/11/2023 16:34:43</publishTime> @@ -1944,7 +1947,7 @@ <publishTime>08/11/2023 16:05:45</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html"> - <publishTime>04/11/2023 16:34:43</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Warehouse.html"> <publishTime>04/11/2023 16:34:43</publishTime> @@ -2022,7 +2025,7 @@ <publishTime>07/21/2023 16:59:26</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html"> - <publishTime>07/21/2023 16:59:23</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍝佽川绠$悊/鎴愬搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html"> <publishTime>04/11/2023 16:34:43</publishTime> @@ -2040,7 +2043,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html"> - <publishTime>04/11/2023 16:34:43</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html"> <publishTime>08/27/2021 09:06:17</publishTime> @@ -2049,7 +2052,7 @@ <publishTime>07/21/2023 16:59:28</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html"> - <publishTime>07/21/2023 16:59:23</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department.html"> <publishTime>08/16/2021 17:24:30</publishTime> @@ -2100,7 +2103,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html"> - <publishTime>09/18/2023 15:40:42</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html"> <publishTime>07/21/2023 16:47:22</publishTime> @@ -2118,10 +2121,10 @@ <publishTime>07/21/2023 16:48:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html"> - <publishTime>07/21/2023 16:48:45</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PackType.html"> - <publishTime>07/21/2023 16:49:16</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html"> <publishTime>07/21/2023 16:49:49</publishTime> @@ -2166,7 +2169,7 @@ <publishTime>05/24/2021 10:08:23</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html"> - <publishTime>07/21/2023 16:58:50</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html"> <publishTime>07/21/2023 16:49:49</publishTime> @@ -2181,7 +2184,7 @@ <publishTime>05/24/2021 10:08:23</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html"> - <publishTime>07/21/2023 16:58:50</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html"> <publishTime>07/21/2023 16:55:14</publishTime> @@ -2202,7 +2205,7 @@ <publishTime>07/21/2023 16:56:45</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkStationList.html"> - <publishTime>07/21/2023 16:57:11</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkType.html"> <publishTime>07/21/2023 16:58:37</publishTime> @@ -2625,7 +2628,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillEdit.html"> - <publishTime>04/11/2023 16:34:43</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillList.html"> <publishTime>07/24/2023 08:25:25</publishTime> @@ -2679,7 +2682,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html"> - <publishTime>07/24/2023 08:40:24</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html"> <publishTime>04/11/2023 16:34:43</publishTime> @@ -2691,7 +2694,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html"> - <publishTime>08/30/2023 14:34:32</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html"> <publishTime>04/26/2023 13:31:31</publishTime> @@ -3392,6 +3395,9 @@ <File Include="views/鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList_Web.html"> <publishTime>04/11/2023 16:34:43</publishTime> </File> + <File Include="views/鐢熶骇绠$悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html"> + <publishTime>10/07/2023 09:12:15</publishTime> + </File> <File Include="views/鐢熶骇绠$悊/鍗虫椂搴撳瓨/JIT_InventoryList.html"> <publishTime>07/24/2023 08:52:38</publishTime> </File> @@ -3474,7 +3480,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html"> - <publishTime>07/24/2023 08:52:38</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html"> <publishTime>06/14/2023 13:28:26</publishTime> @@ -3534,7 +3540,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html"> - <publishTime>09/14/2023 13:59:10</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList - 澶嶅埗.html"> <publishTime>04/11/2023 16:34:43</publishTime> @@ -3573,7 +3579,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇宸ヤ綅/Gy_SourceWorkStationSet.html"> - <publishTime>08/22/2023 16:34:18</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鐢熶骇宸ヤ綅/Gy_SourceWorkStationSetList.html"> <publishTime>08/22/2023 16:34:18</publishTime> @@ -4002,13 +4008,13 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html"> - <publishTime>09/07/2023 13:13:34</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html"> - <publishTime>09/07/2023 13:13:34</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html"> - <publishTime>09/02/2023 18:53:25</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html"> <publishTime>09/07/2023 13:13:34</publishTime> @@ -4038,7 +4044,7 @@ <publishTime>07/20/2021 01:15:26</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html"> - <publishTime>09/07/2023 13:13:34</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html"> <publishTime>09/07/2023 13:13:34</publishTime> @@ -4098,13 +4104,13 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html"> - <publishTime>09/07/2023 13:13:34</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html"> - <publishTime>09/07/2023 13:13:34</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html"> - <publishTime>09/02/2023 18:53:25</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html"> <publishTime>09/07/2023 13:13:34</publishTime> @@ -4122,7 +4128,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html"> - <publishTime>09/07/2023 13:13:34</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html"> <publishTime>09/07/2023 13:13:34</publishTime> @@ -4206,7 +4212,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul_RYQ.html"> - <publishTime>04/11/2023 16:34:43</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_ColorRecordBill_PDA.html"> <publishTime>09/14/2023 13:59:10</publishTime> @@ -4266,13 +4272,13 @@ <publishTime>09/14/2023 13:59:10</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeArrangement.html"> - <publishTime>09/22/2023 08:58:26</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html"> - <publishTime>09/18/2023 15:40:42</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html"> - <publishTime>09/22/2023 08:58:26</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_LookDown.html"> <publishTime>06/28/2023 16:08:50</publishTime> @@ -4281,7 +4287,7 @@ <publishTime>07/24/2023 08:52:38</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillSubList.html"> - <publishTime>09/22/2023 08:58:26</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_CF.html"> <publishTime>04/26/2023 13:31:31</publishTime> @@ -4299,7 +4305,7 @@ <publishTime>05/17/2021 19:07:00</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_Mul.html"> - <publishTime>09/14/2023 13:59:10</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssue.html"> <publishTime>04/11/2023 16:34:43</publishTime> @@ -4382,6 +4388,9 @@ <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Kf_DryFinalizeOutReport.html"> <publishTime>09/14/2023 13:59:10</publishTime> </File> + <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Kf_EmbossingOutReport.html"> + <publishTime>10/07/2023 09:12:15</publishTime> + </File> <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Kf_FinalizeOutReport.html"> <publishTime>09/14/2023 13:59:10</publishTime> </File> @@ -4427,6 +4436,9 @@ <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Kf_SizingFinalizeOutReport.html"> <publishTime>09/14/2023 13:59:10</publishTime> </File> + <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Kf_StereoscopicFlowerOutReport.html"> + <publishTime>10/07/2023 09:12:15</publishTime> + </File> <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport.html"> <publishTime>04/11/2023 16:34:43</publishTime> </File> @@ -4455,7 +4467,10 @@ <publishTime>07/24/2023 08:52:38</publishTime> </File> <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/sc_ICOMReport.html"> - <publishTime>09/14/2023 13:59:10</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> + </File> + <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/sc_ICOMRKBanReport.html"> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/sc_ICOMRKReport.html"> <publishTime>09/06/2023 13:38:38</publishTime> @@ -4477,6 +4492,9 @@ </File> <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport.html"> <publishTime>04/11/2023 16:34:43</publishTime> + </File> + <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/SemiFinishedProductsReport.html"> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/杞﹂棿绠$悊/杞﹂棿鏀舵枡/JIT_SendGoodsBillList.html"> <publishTime>04/11/2023 16:34:43</publishTime> @@ -4524,25 +4542,25 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Add_Edit_Xs_SeOutStockBillList.html"> - <publishTime>04/11/2023 16:34:43</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html"> - <publishTime>09/06/2023 13:10:55</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Kf_ICStockBillMainList.html"> <publishTime>12/27/2021 13:54:32</publishTime> </File> <File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html"> - <publishTime>09/06/2023 13:07:32</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html"> - <publishTime>04/11/2023 16:34:43</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillDyColList.html"> <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html"> - <publishTime>09/06/2023 13:21:24</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/閲囪喘绠$悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html"> <publishTime>09/14/2023 13:59:10</publishTime> @@ -4557,13 +4575,13 @@ <publishTime>09/14/2023 13:59:10</publishTime> </File> <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html"> - <publishTime>09/06/2023 13:10:55</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html"> - <publishTime>09/06/2023 13:07:32</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html"> - <publishTime>09/06/2023 13:21:24</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/閿�鍞鐞�/閿�鍞��璐у崟/Add_Edit_Kf_ICStockBillMainList.html"> <publishTime>04/11/2023 16:34:43</publishTime> @@ -4706,11 +4724,14 @@ <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_FastList.html"> <publishTime>04/11/2023 16:34:43</publishTime> </File> - <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html"> - <publishTime>09/06/2023 13:03:26</publishTime> + <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html"> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html"> - <publishTime>09/06/2023 13:03:26</publishTime> + <publishTime>10/07/2023 09:12:15</publishTime> + </File> + <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html"> + <publishTime>10/07/2023 09:12:15</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_CheckList_New.html"> <publishTime>06/29/2023 15:20:45</publishTime> @@ -4737,7 +4758,7 @@ <publishTime>08/16/2021 17:24:30</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html"> - <publishTime>10/07/2023 09:02:46</publishTime> + <publishTime>10/07/2023 10:14:15</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html"> <publishTime>10/07/2023 08:45:18</publishTime> @@ -4869,7 +4890,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="Web.config"> - <publishTime>09/28/2023 15:05:48</publishTime> + <publishTime>10/07/2023 09:47:06</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user index 667b643..ebfee46 100644 --- a/WebTM/WebTM.csproj.user +++ b/WebTM/WebTM.csproj.user @@ -1,7 +1,7 @@ 锘�<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <NameOfLastUsedPublishProfile>D:\涔斾竴璁¢噺鍗曚綅鍒楄〃\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile> + <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ProjectFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js index a9e22eb..2ebdf5f 100644 --- a/WebTM/layuiadmin/Scripts/webConfig.js +++ b/WebTM/layuiadmin/Scripts/webConfig.js @@ -3,9 +3,9 @@ //var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒 //var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/ //var WEBURL = "http://61.164.86.218:8099/ABAPI/"; - var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃� + //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃� //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆 - //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆 + var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆 //var WEBURL = "http://localhost:81/API/"; //闄堥洴闈欐湰鍦伴厤缃� //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆 //var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺) 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 f37721b..8ccfad2 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" @@ -1902,6 +1902,18 @@ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); return Result = false; } + if (sSubStr[i].HMaterRuleType == null || sSubStr[i].HMaterRuleType == "") { + layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡鍏紡涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + temp = sSubStr[i].HRate + ""; + if (temp == "" || temp *1 == "0") { + layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢ㄩ噺涓虹┖鎴栦负0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } else if (!ref.test(temp)) { + layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢ㄩ噺璇疯緭鍏ラ潪璐熸暟!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } //if (sSubStr[i].HWHID == "") { // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戞枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); // return Result = false; @@ -1920,6 +1932,7 @@ temp = option.data[i]["HMaterID"]; if ($.inArray(temp, num) != -1) { layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡閲嶅锛岃閲嶆柊閫夋嫨锛�"); + console.log(option); return Result = false; } num.push(temp); -- Gitblit v1.9.1