From 60713bf81b379f3d53398c7e0e22fc267494bc18 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 16 十月 2023 10:58:35 +0800
Subject: [PATCH] 生产领料单:子表增加 实际称重

---
 WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html    |   14 +++++++++++---
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user |   24 ++++++++++++------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 2311978..000424b 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>10/15/2023 20:57:37</publishTime>
+      <publishTime>10/16/2023 09:59:58</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
-      <publishTime>10/15/2023 20:57:37</publishTime>
+      <publishTime>10/16/2023 09:59:58</publishTime>
     </File>
     <File Include="HtmlPage1.html">
       <publishTime>04/11/2023 16:34:42</publishTime>
@@ -3507,7 +3507,7 @@
       <publishTime>04/11/2023 16:34:43</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html">
-      <publishTime>06/14/2023 13:28:26</publishTime>
+      <publishTime>10/16/2023 09:58:41</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html">
       <publishTime>04/11/2023 16:34:43</publishTime>
@@ -3666,16 +3666,16 @@
       <publishTime>04/26/2023 13:31:31</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html">
-      <publishTime>10/15/2023 20:35:49</publishTime>
+      <publishTime>10/16/2023 09:58:41</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html">
       <publishTime>07/24/2023 08:52:38</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html">
-      <publishTime>04/11/2023 16:34:43</publishTime>
+      <publishTime>10/16/2023 09:58:41</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/Sc_ShopCalendar.html">
-      <publishTime>08/28/2023 13:54:42</publishTime>
+      <publishTime>10/16/2023 09:58:41</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBillList.html">
       <publishTime>09/08/2021 08:34:08</publishTime>
@@ -3705,7 +3705,7 @@
       <publishTime>04/11/2023 16:34:43</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html">
-      <publishTime>09/14/2023 13:59:10</publishTime>
+      <publishTime>10/16/2023 09:58:41</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteMaterialDetailList.html">
       <publishTime>04/11/2023 16:34:43</publishTime>
@@ -3843,10 +3843,10 @@
       <publishTime>08/24/2023 08:50:29</publishTime>
     </File>
     <File Include="views/璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
-      <publishTime>09/14/2023 13:59:10</publishTime>
+      <publishTime>10/16/2023 09:58:41</publishTime>
     </File>
     <File Include="views/璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
-      <publishTime>09/14/2023 13:59:10</publishTime>
+      <publishTime>10/16/2023 09:58:41</publishTime>
     </File>
     <File Include="views/璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillimport.html">
       <publishTime>04/11/2023 16:34:43</publishTime>
@@ -4287,7 +4287,7 @@
       <publishTime>10/07/2023 09:12:15</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
-      <publishTime>10/07/2023 09:12:15</publishTime>
+      <publishTime>10/16/2023 09:58:41</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_LookDown.html">
       <publishTime>06/28/2023 16:08:50</publishTime>
@@ -4794,7 +4794,7 @@
       <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html">
-      <publishTime>10/08/2023 16:47:44</publishTime>
+      <publishTime>10/16/2023 10:56:40</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
       <publishTime>10/07/2023 08:45:18</publishTime>
@@ -4932,7 +4932,7 @@
       <publishTime>04/11/2023 16:34:43</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>10/15/2023 20:33:12</publishTime>
+      <publishTime>10/16/2023 10:00:02</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 78f248f..7ef0e94 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"
@@ -381,7 +381,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType":"", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType":"", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HWeight": "0" };
                 console.log(NewRow);
                 switch (obj.event) {
                     //鏂板涓�琛�
@@ -1139,6 +1139,7 @@
                     , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 100, hide: true}
                     , { field: 'HRate', title: '鐢ㄩ噺鈥�', edit: 'text', width: 100 }
                     , { field: 'HQty', title: '閲嶉噺', width: 100 }
+                    , { field: 'HWeight', 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 }
@@ -1198,7 +1199,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterRuleType": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HRate":0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterRuleType": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HRate":0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HWeight": "0"}];
                 table.render(option);
             }
             //#endregion
@@ -1209,7 +1210,11 @@
                 option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                
+
+                for (var i = 0; i < option.data.length; i++) {
+                    option.data[i].HWeight = "0";
+                }
+
                 table.render(option);
 
                 //瑕嗙洊鍗曟嵁鍐呯爜銆佸崟鎹彿銆佹棩鏈�
@@ -1384,6 +1389,9 @@
                     var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
                     table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                     option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    //璁剧疆澶嶅埗寰楀埌鐨勮褰曠殑瀹為檯绉伴噸涓�0
+                    option.data[option.data.length - 1].HWeight = "0";
+
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
                 }
             }

--
Gitblit v1.9.1