From fe1a4ed8d3a161bc555d4b3fbbce3a7e10a5fbcd Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 21 八月 2025 11:12:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/条码明细/Kf_BarCodeDetailQuery.html |  160 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 159 insertions(+), 1 deletions(-)

diff --git "a/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html" "b/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html"
index eb00df4..ce27d72 100644
--- "a/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html"
+++ "b/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html"
@@ -103,6 +103,7 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-save"><i class="layui-icon layui-icon-print"></i>淇濆瓨</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
@@ -163,9 +164,69 @@
                     case 'btn-print':
                         get_PrintReport();
                         break;
+                    case 'btn-save':
+                        save();
+                        break;
                 };
             });
 
+            //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            table.on('edit(mainTable)', function (obj) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+                topScroll = $('#mainTable').next('.layui-table-view').find('.layui-table-body').scrollTop();//鑾峰彇婊氬姩鏉′綅缃�
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+                switch (field) {
+                    case "HMaterialJQty":                                                       //鏁伴噺
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp)) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HMaterialJQty: oldText
+                            });
+                            table.render(option);
+                            layer.msg("閲嶉噺_缁存姢 璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                            return;
+                        }
+                        break;
+                    case "HWeight_TL":                                                       //鏁伴噺
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HWeight_TL: oldText
+                            });
+                            table.render(option);
+                            layer.msg("鎶曟枡鍏嬮噸_缁存姢 璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+                        break;
+                    case "HWeight_CP":                                                       //鏁伴噺
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp)) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HWeight_CP: oldText
+                            });
+                            table.render(option);
+                            layer.msg("瀹為檯鍏嬮噸_缁存姢 璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                            return;
+                        }
+                        break;
+                    default:
+                }
+            });
+            //#endregion
             
             //// 鏌ヨ鎸夐挳
             //form.on('submit(btnSearch)', function (data) {
@@ -272,7 +333,17 @@
                         for (var key in data1.list) {
                             if (data1.list[key].ColmCols == "HItemID") {
                                 col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: data1.list[key].ColmCols, width: 200, align: 'center', hide: true };
-                            } else {
+                            }
+                            else if (data1.list[key].ColmCols == "HMaterialJQty") {
+                                col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "閲嶉噺缁存姢", width: 200, align: 'center',edit:true};
+                            }
+                            else if (data1.list[key].ColmCols == "HWeight_TL") {
+                                col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "鎶曟枡鍏嬮噸缁存姢", width: 200, align: 'center',edit: true };
+                            }
+                            else if (data1.list[key].ColmCols == "HWeight_CP") {
+                                col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "瀹為檯鍏嬮噸缁存姢", width: 200, align: 'center',edit: true };
+                            }
+                            else {
                                 switch (data1.list[key].ColmCols) {
                                     case "鏁伴噺":
                                         col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: data1.list[key].ColmCols, width: 200, align: 'center', totalRow: true, sort: true };
@@ -282,6 +353,7 @@
                                 }
                             }
                         }
+
                         //涓鸿〃鏍兼覆鏌撶殑鍙傛暟璁惧畾鍊�
                         option.cols = [col];
                         option.data = data1.data;
@@ -448,6 +520,92 @@
             }
             //#endregion
 
+            //#region 淇濆瓨
+            function save() {
+                var data_temp = option.data;
+                for (var i = 0; i < data_temp.length; i++) {
+                    data_temp[i]["HInterID"] = HInterID;
+                    data_temp[i]["HBillNo"] = HBillNo;
+                    data_temp[i]["HBillType"] = HBillType;
+                    data_temp[i]["HBarCode"] = data_temp[i]["鏉$爜"];
+                }
+
+                if (!AllowLoadData(data_temp)) {
+                    return;
+                }
+
+                var sSubStr = JSON.stringify(option.data);
+                //鎷兼帴鍙傛暟
+                var sMainSub = sSubStr + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Kf_ICStockInOutBill/Kf_BarCodeDetailQuery_saveData", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                            layer.close(index);
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                            layer.close(index);
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        layer.close(index);
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鏁版嵁鏍¢獙
+            function AllowLoadData(data) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
+                //#region 瀛愯〃 鏁版嵁妫�楠�
+                for (var i = 0; i < data.length; i++) {
+                    //閲嶉噺鏍煎紡鏍¢獙
+                    temp = option.data[i]["HMaterialJQty"] + "";
+                    //if (temp == "0") {
+                    //    layer.msg("绗�" + (i+1) + "琛岋細閲嶉噺_缁存姢 涓嶈兘涓�0锛�");
+                    //    return false;
+                    //} else
+                        if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i+1) + "琛岋細閲嶉噺_缁存姢 璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+                    //瀹為檯鍏嬮噸鏍煎紡鏍¢獙
+                    temp = option.data[i]["HWeight_CP"] + "";
+                    //if (temp == "0") {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細瀹為檯鍏嬮噸_缁存姢 涓嶈兘涓�0锛�");
+                    //    return false;
+                    //} else
+                        if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細瀹為檯鍏嬮噸_缁存姢 璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+                    //鎶曟枡鍏嬮噸鏍煎紡鏍¢獙
+                    temp = option.data[i]["HWeight_TL"] + "";
+                    //if (temp == "0") {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細鎶曟枡鍏嬮噸_缁存姢 涓嶈兘涓�0锛�");
+                    //    return false;
+                    //} else
+                        if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鎶曟枡鍏嬮噸_缁存姢 璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+                }
+                return true;
+            }
+            //#endregion
+
             //// 閲嶇疆杩囨护鏉′欢
             //function set_ClearQuery() {
             //    //$("#HStartDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));

--
Gitblit v1.9.1