From 727ee25aeb5fcaf84e2cf009b2eacd3a86bcb3ca Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 28 十一月 2024 12:55:23 +0800
Subject: [PATCH] 新增 环境检测方案,环境检测单

---
 WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit_PDA.html |  129 ++++++++++++++-----------------------------
 1 files changed, 42 insertions(+), 87 deletions(-)

diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
index 210557d..f6247bb 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
@@ -96,7 +96,7 @@
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <th>鎿嶄綔鍛�:</th>
+                                                <th>鎿嶄綔鍛�:<span style="color:red">*</span></th>
                                                 <td class="bz_td">
                                                     <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="鎿嶄綔鍛�" style="border-radius: 50px;">
                                                     <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
@@ -112,7 +112,7 @@
                                                 </td>
                                             </tr>
                                             <tr class="hide">
-                                                <th>鐢熶骇璧勬簮:</th>
+                                                <th>鐢熶骇璧勬簮:<span style="color:red">*</span></th>
                                                 <td class="bz_td">
                                                     <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="鐢熶骇璧勬簮" style="border-radius: 50px;">
                                                     <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
@@ -270,8 +270,8 @@
 
             //鑾峰彇鍒跺崟浜� 鍒跺崟鏃ユ湡
             $("#HMaker").val(sessionStorage["HUserName"]);
-            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
-            $("#HScanDate").val(Format(new Date(), "yyyy-MM-dd"));
+            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+            $("#HScanDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
             $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
 
             if (OperationType == 1 || OperationType == 2 || OperationType == 5) {
@@ -403,6 +403,7 @@
             // 鎻愪氦鎸夐挳
             form.on('submit(Saver)', function (data) {//鎻愪氦
 
+
                 if ($("#HProcExchBillNo").val() == "" && $("#HICMOBillNo").val() == "") {
                     layer.msg("婧愬崟鍗曞彿娌℃湁杈撳叆锛�");
                     return;
@@ -434,6 +435,8 @@
                 data.field.HOrgID = sessionStorage["OrganizationID"];//缁勭粐
                 var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
                 var index = layer.load();
+                if (AllowLoadData(oMain)) {
+                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "Sc_MouldUpperBill/AddSc_MouldLowerBill_PDA",
@@ -444,7 +447,7 @@
                         if (result.count == 1) {
                             layer.close(index);
                             layer.msg("鎻愪氦鎴愬姛");
-                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
+
                             $('#HBarCode').attr("disabled", true);//淇濆瓨鍚庢潯鐮佹绂佺敤
                             //if (result.Verify == "Y") {
                             //    location.replace('Sc_MouldUpperBillEdit_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
@@ -460,11 +463,26 @@
                         layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 });
+            }
             });
 
             //#endregion
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            //闈炵┖楠岃瘉
+            function AllowLoadData(sSubStr) {
+                if ($("#HEmpName").val() == 0) {
+                    layer.msg("鎿嶄綔鍛樻病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+
+                if ($("#HSourceName").val() == 0) {
+                    layer.msg("鐢熶骇璧勬簮娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+
+                return true;
+            }
 
             // 淇濆瓨鍚庢祻瑙堟柟娉�
             function ReRoadBillMain() {
@@ -502,96 +520,33 @@
 
             //鏉″舰鐮佸洖杞︽柟娉�
             function txtHBarCode_KeyDown(HBarCode) {
-                var BillNoType2 = HBarCode.substr(0, 2);
-                var BillNoType3 = HBarCode.substr(0, 5);
-                var BillNoType4 = HBarCode.substr(0, 4);
-                var BillNoType5 = HBarCode.substr(0, 8);
 
+                //HBarCode = HBarCode.substr(23,(HBarCode.length - 23));
+                var sWhere = " and 鏉″舰鐮�='" + HBarCode +"' order by 鍒跺崟鏃ユ湡 desc"
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Sc_MouldUpperBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Sc_MouldLowerBill/Sc_MouldUpperBillList",
                     type: "GET",
-                    data: { "HBarCode": HBarCode, "UserID": sessionStorage["Czybm"], "HBillType": "Sc_MouldLowerBill" },
+                    data: { "sWhere": sWhere},
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
 
-                            switch (BillNoType2) {
-                                //鐢熶骇璧勬簮
-                                case "BM":
-                                case "SS":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HSourceID": data.HItemID,
-                                        "HSourceName": data.HName,
-                                    });
-                                    break;
-                                //鐢熶骇璁㈠崟
-                                case "MO":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HICMOBillNo": data.鍗曟嵁鍙�,
-                                        "HICMOInterID": data.hmainid,
-                                        "HICMOEntryID": data.HEntryID
-                                    });
-                                    break;
-                            }
-
-                            switch (BillNoType3) {
-                                //鍣ㄥ叿妗f
-                                case "MJD":
-                                case "PAK":
-                                case "https":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HMouldID": data.hmainid,
-                                        "HMouldNumber": data.妯″叿缂栧彿,
-                                        "HMouldName": data.妯″叿鍚嶇О,
-                                        "HMouldModel": data.妯″叿鍨嬪彿,
-                                        "HQty": 1,
-                                    });
-                                    break;
-                            }
-
-                            switch (BillNoType4) {
-                                //娴佽浆鍗�
-                                case "GXLX":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                        "HProcExchInterID": data.hmainid,
-                                        "HProcExchEntryID": data.HEntryID,
-                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                        "HICMOInterID": data.hicmointerid,
-                                        "HICMOEntryID": data.HICMOEntryID
-                                    });
-                                    break;
-                            }
-
-                            if (BillNoType5.length == 8) {
-                                BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);
-                            }
-
-                            if (isValidDate(BillNoType5)) {
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                    "HProcExchInterID": data.hmainid,
-                                    "HProcExchEntryID": data.HEntryID,
-                                    "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                    "HICMOInterID": data.hicmointerid,
-                                    "HICMOEntryID": data.HICMOEntryID
-                                });
-                            }
-
-                            switch (BillNoType5) {
-                                //娴佽浆鍗�
-                                case "GXLX":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                        "HProcExchInterID": data.hmainid,
-                                        "HProcExchEntryID": data.HEntryID,
-                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                        "HICMOInterID": data.hicmointerid,
-                                        "HICMOEntryID": data.HICMOEntryID
-                                    });
-                                    break;
-                            }
+                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HProcExchBillNo": data.HProcExchBillNo,
+                                "HProcExchInterID": data.HProcExchInterID,
+                                "HProcExchEntryID": data.HProcExchEntryID,
+                                "HICMOBillNo": data.HICMOBillNo,
+                                "HICMOInterID": data.HICMOInterID,
+                                "HICMOEntryID": data.HICMOEntryID,
+                                "HSourceID": data.HSourceID,
+                                "HSourceName": data.鐢熶骇璧勬簮,
+                                "HMouldID": data.HMouldID,
+                                "HMouldNumber": data.妯″叿缂栫爜,
+                                "HMouldName": data.妯″叿鍚嶇О,
+                                "HMouldModel": data.妯″叿瑙勬牸,
+                                "HQty": 1,
+                            });
 
                             $("#HBarCode").val("");
                             layer.close(index);

--
Gitblit v1.9.1