From d9ccb1dfdb438225014b0b95d642a4e2a0c3736b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 07 九月 2022 19:43:10 +0800
Subject: [PATCH] 隐藏列 维护 工艺路线 物料id 小写

---
 WebTM/views/生产管理/生产拆箱单/Sc_PackSplitBill_Fast.html |   60 ++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 32 insertions(+), 28 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
index 9f6edfe..2618460 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
@@ -225,12 +225,12 @@
                 return vars;
             }
 
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            if (sessionStorage.login != "login") {
-                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                }, function () { window.location.href = "../../user/login.html"; });
-            }
+            ////鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
 
             var params = getUrlVars();
             var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
@@ -305,7 +305,7 @@
                 $("#HInterID").val("");
                 $("#HBillNo").val(""); 
                 $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                     type: "GET",
                     data: { "HBillType": '3784' },
                     success: function (d) {
@@ -494,8 +494,11 @@
 
         form.on('submit(Cancel)', function () {
             //sessionStorage["SourceFlag"] = false;
-            parent.location.href = "../../../views/index.html"
+            //parent.location.href = "../../../views/index.html"
             //window.close();//鍏抽棴褰撳墠椤�
+            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                window.close();
+            });
         })
 
         //鍒犻櫎
@@ -539,12 +542,10 @@
             var HTBarCode = $('#HTBarCode').val()
             var HOrgID = sessionStorage["OrganizationID"]
             var sMaker = sessionStorage["HUserName"]
-            if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
-            {
                 layer.load(3);
                 $.ajax(
                 {
-                    type: "POST",
+                    type: "GET",
                         url: GetWEBURL() + "/PackSplit/set_SavePackSplitBill_Json",
                     async: true,
                         data: { "sInterID": sInterID, "HBillType": '3784', "sBillNo": sBillNo, "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
@@ -569,8 +570,6 @@
                         layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 });
-                return false;
-            } 
         });
 
         //鐩戝惉鎻愪氦
@@ -593,16 +592,13 @@
                 if (event.keyCode == 13) {
                     var sBarCode = $('#HBarCode').val()
                     //var Flag = sessionStorage["SourceFlag"];
-                    if (sQty == "") {
-                        sQty = 0;
-                    }
                     //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
-                    if (sBarCode == '') {
+                    if (HBarCode == '') {
                             playSound();
                             layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return false;
                         }
-                        if (sBarCode != "") {
+                        if (HBarCode != "") {
                             $('#HBarCode').val("");
                         }
                         $.ajax({
@@ -696,17 +692,17 @@
                     layer.msg("鎷栨潯鐮佷负绌猴紝涓嶈兘鎵弿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
-                if (HTBarCode != "") {
-                    $('#HTBarCode').val("");
-                }
+                //if (HTBarCode != "") {
+                //    $('#HTBarCode').val("");
+                //}
                 //
                 $.ajax({
                     url: GetWEBURL() + "/PackSplitBill/SetPackBarCode_Webs",
                     type: "GET",
-                    data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": '3784', "HTBarCode": HTBarCode, "sMaker": sMaker, "HOrgID": HOrgID },
+                    data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": '3784', "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            $('#HTBarCode').val(result.data.HSourceBillNo);
+                            //$('#HTBarCode').val(result.data.HSourceBillNo);
                             $("#HTBarCode").attr("disabled", "true");
 
                             layer.load(3)
@@ -838,10 +834,12 @@
         //sessionStorage["HWHID"] = obj[0].HItemID;
         $("#HWHID").val(obj[0].HItemID);
     }
-    function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-        $("#HStockPlaceName").val(obj[0].HName);
-        $("#HStockPlaceID").val(obj[0].HItemID);
-    }
+        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+            $("#HStockPlaceName").val(obj[0].HName);
+            $("#HStockPlaceID").val(obj[0].HItemID);
+            $("#HWHNAME").val(obj[0].HWhName);
+            $("#HWHID").val(obj[0].HWHID);
+        }
     function GetHKeeperValue(obj) {  //杩斿洖淇濈
         $("#HKeeper").val(obj[0].HName);
         $("#HKeeperID").val(obj[0].HItemID);
@@ -854,7 +852,13 @@
         $("#HDeptName").val(obj[0].HName);
         $("#HDeptID").val(obj[0].HItemID);
     }
-    function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+            //鏁板瓧姝e垯(鍖呭惈灏忔暟)
+            var reg = /^\d+(\.\d+)?$/;
+            if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+                layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
         //if ($("#HSourceBillNo").val() == '') {
         //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
         //    return false;

--
Gitblit v1.9.1