From 24c17d84fcf660d5b51125728720389a461d4e71 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 26 八月 2025 17:00:36 +0800
Subject: [PATCH] 修改 公用基础资料 物料编辑 和领料出库缓存

---
 WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html     |    4 +++-
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html |   48 ++++++++++++++++++++++++------------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 37db2c6..c9d262a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -1422,8 +1422,8 @@
                                 , "HTela_M": data.姣涚罕鍚嶇О鍙婅鏍�
                                 , "HUnderTela_M": data.搴曚笣
                                 , "HSizing_M": data.瀹氬瀷娴嗘枡
-                                , "HLotcardQty": data.鍗曚釜娴佽浆鍗℃暟閲�
-                                , "HCubicleQty": data.宸ヤ綅鏁伴噺
+                                , "HLotcardQty": data.鍗曚釜娴佽浆鍗℃暟閲� || 0
+                                , "HCubicleQty": data.宸ヤ綅鏁伴噺 || 0
                                 , "HMakeEmp": data["鍒涘缓浜�"]
                                 , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
                                 , "HCheckEmp": data["瀹℃牳浜�"]
@@ -1679,29 +1679,29 @@
                     }
                 }
 
-                var HMinPickQty = $('#HMinPickQty').val();
-                if (HMinPickQty.substring(HMinPickQty.length - 1, HMinPickQty.length) == ".") {
-                    layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
-                    return;
-                } else {
-                    var ref = /^[0-9]+\.?[0-9]*$/;
-                    if (!ref.test(HMinPickQty)) {
-                        layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝g‘鍏ユ暟瀛楋紒");
-                        return;
-                    }
-                }
+                //var HMinPickQty = $('#HMinPickQty').val();
+                //if (HMinPickQty.substring(HMinPickQty.length - 1, HMinPickQty.length) == ".") {
+                //    layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HMinPickQty)) {
+                //        layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
 
-                var HLotcardQty = $('#HLotcardQty').val();
-                if (HLotcardQty.substring(HLotcardQty.length - 1, HLotcardQty.length) == ".") {
-                    layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
-                    return;
-                } else {
-                    var ref = /^[0-9]+\.?[0-9]*$/;
-                    if (!ref.test(HLotcardQty)) {
-                        layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝g‘鍏ユ暟瀛楋紒");
-                        return;
-                    }
-                }
+                //var HLotcardQty = $('#HLotcardQty').val();
+                //if (HLotcardQty.substring(HLotcardQty.length - 1, HLotcardQty.length) == ".") {
+                //    layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HLotcardQty)) {
+                //        layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
 
                 var HPERUNITSTANDHOUR = $('#HPERUNITSTANDHOUR').val();
                 if (HPERUNITSTANDHOUR.substring(HPERUNITSTANDHOUR.length - 1, HPERUNITSTANDHOUR.length) == ".") {
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 2282f70..7f4d3b3 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"
@@ -846,8 +846,10 @@
                 if (HEndDate) {
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
                 }
-                if(subType) {
+                if (subType) {
                     sWhere += " and HBillSubType = N'" + subType + "'";  // 鏍规嵁閫掑叆鍗曟嵁绫诲瀷鐨勪笉鍚岀瓫閫変笉鍚岀殑鍗曟嵁
+                } else {
+                    sWhere += " and HBillSubType = N'1204'"
                 }
                 $.ajax({
                     url: GetWEBURL() + '/Kf_MateOutBill/GetMateOutBillList',

--
Gitblit v1.9.1