From 70d4b8bd7a6ccdd1edb2c1e89cd04884a63ba7dc Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 19 一月 2022 08:47:40 +0800
Subject: [PATCH] 新增了拆箱单

---
 WebTM/views/home/console.html                     |   16 +
 WebTM/views/生产管理/生产拆箱单/Sc_PackSplitBill_Fast.html |  354 +++++++++++---------------------------------------
 WebTM/WebTM.csproj                                |    2 
 3 files changed, 89 insertions(+), 283 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ea54503..b617e96 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -790,6 +790,7 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList - 澶嶅埗.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎷嗙鍗昞Sc_PackSplitBill_Fast.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNew.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" />
@@ -1176,7 +1177,6 @@
   <ItemGroup>
     <Folder Include="views\浠撳瓨绠$悊\璋冩嫧鍗曟牳瀵筡" />
     <Folder Include="views\浠撳瓨绠$悊\璋冩嫧鍗曠ń鏍竆" />
-    <Folder Include="views\鐢熶骇绠$悊\鐢熶骇鎷嗙鍗昞" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index e72d63d..1f8a8d6 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -99,12 +99,18 @@
                                                     <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite>
                                                 </a>
                                             </li>
-                                            <!--<li class="layui-col-xs3">
-                                                <a lay-href="set/user/info.html">
-                                                    <i class="layui-icon layui-icon-set"></i>
-                                                    <cite>鎴戠殑璧勬枡</cite>
+                                            <li class="layui-col-xs3">
+                                                <a href="../鐢熶骇绠$悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame">
+                                                    <i class="layui-icon layui-icon-find-fill"></i>
+                                                    <cite>鐢熶骇鎷嗙鍗�</cite>
                                                 </a>
-                                            </li>-->
+                                            </li>
+                                            <!--<li class="layui-col-xs3">
+        <a lay-href="set/user/info.html">
+            <i class="layui-icon layui-icon-set"></i>
+            <cite>鎴戠殑璧勬枡</cite>
+        </a>
+    </li>-->
                                         </ul>
                                     </div>
                                     <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
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 ca5d05b..9f6edfe 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"
@@ -503,76 +503,24 @@
             var checkStatus = table.checkStatus('wl-table')
             , data = checkStatus.data;
             var sInterID = $('#HInterID').val()
-            var sMaterID = data[0].HMaterID
-            var sBillType = '1202'
-            var sAuxPropID = data[0].HAuxPropID
-            //var sMTONo = data[0].HMTONo
-            var sMTONo = ''
-            var sSourceInterID = data[0].HSourceInterID
-            var sSourceEntryID = data[0].HSourceEntryID
-            var HBillNo = $("#HBillNo").val()
-            var sMouldManagerCtl = 'N'
-            var sFIFOCtl = 'N'
+            var HBarCode = data[0].HBarCode
             $.ajax(
                {
                    type: "Get",
-                   //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    url: GetWEBURL() + "/ProductIn/Delete_Json_AN",
+                    url: GetWEBURL() + "/PackSplit/Delete",
                    async: true,
-                   data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+                    data: { "HInterID": sInterID, "HBarCode": HBarCode, "HBillType": '3784'},
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                         //  table.render({
-                         //      elem: '#wl-table'
-                         //      //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Mate_Webs_Json'
-                         //      , url: GetWEBURL() + '/ProductIn/DisPlayBarCodeList_Json'
-                         //, cellMinWidth: 80
-                         //, toolbar: '#toolbarDemo'
-                         //      , where: { HBillID: sInterID, HBillNo: HBillNo, HBillType: '1202', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl}
-                         //, cols: [[
-                         //       { type: 'radio' }
-                         //       , { field: 'HQty', title: '鏁伴噺', width: 80 }
-                         //       , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
-                         //       , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
-                         //       , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                         //       , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
-                         //       , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
-                         //       , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
-                         //       , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                         //       , { field: 'HBatchNo', title: '鎵规', width: 100 }
-                         //       , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
-                         //       , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
-                         //       , { field: 'HMaterID', title: '鐗╂枡ID', width: 100 }
-                         //]]
-                         //, height: 500
-                         //  })
-                           table.render({
-                               elem: '#wl-table'
-                               //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
-                               , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
-                               , toolbar: '#toolbarDemo'
-                               , defaultToolbar: []
-                               , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
-                               , cols: [[
-                                   { type: 'radio' }
-                                   , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                   , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                   , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
-                                   , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                   , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                                   , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-                                   , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-                                   , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                                   , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                               ]]
-                               // , data: [linterid]
-                               // , page: true
-                               , height: 500
-                               , done: function () {
-                                   layer.closeAll("loading");
-                               }
-                           })
+                           layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                               // 寰楀埌frame绱㈠紩
+                               var index = layer.getFrameIndex(window.name);
+                               //鍏抽棴褰撳墠frame
+                               layer.close(index);
+                               //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                               window.location.reload();
+                           });
                        }
                        else {
                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -586,37 +534,24 @@
 
         //鎻愪氦
         form.on('submit(Saver)', function (data) {//鎻愪氦
-            //debugger;
-            if ($("#HExplanation").val() == "") {
-                if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
-                    $("#HWHNAME").val("");
-                    $("#HWHID").val("");
-                    layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                else
-                {
-                    $("#HExplanation").val($("#HWHNAME").val());
-                }
-            }
-            var sMainStr = JSON.stringify(data.field);
-            var sSubStr = table.cache['wl-table'];
-            //var sSourceType = $("#HBillType").val();
-            var sSourceType = "3711";
+            var sInterID = $('#HInterID').val()
+            var sBillNo = $("#HBillNo").val()
+            var HTBarCode = $('#HTBarCode').val()
+            var HOrgID = sessionStorage["OrganizationID"]
+            var sMaker = sessionStorage["HUserName"]
             if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
             {
                 layer.load(3);
                 $.ajax(
                 {
                     type: "POST",
-                    //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/set_SaveProductInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    url: GetWEBURL() + "/ProductIn/set_SaveProductInBill_Json",
+                        url: GetWEBURL() + "/PackSplit/set_SavePackSplitBill_Json",
                     async: true,
-                    data: { "oMain": sMainStr  },
-                    dataType: "json",
+                        data: { "sInterID": sInterID, "HBillType": '3784', "sBillNo": sBillNo, "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
+                    //dataType: "json",
                     success: function (data) {
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                            layer.confirm("鐢熸垚浜у搧鍏ュ簱鍗�" + data.Message + $("#HBillNo").val(), {
+                            layer.confirm("鐢熸垚鎷嗙鍗�" + data.Message + $("#HBillNo").val(), {
                                 icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
                                 btn2: function () {
                                     //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
@@ -649,73 +584,13 @@
             }
         });
 
-        //鎵潯鐮�
-            $('#HBarCode').on('keydown', function (event) {  //鎵潯鐮�
-                var sOldBarCode = $('#HBarCode').val()
-                var HDeleteFlag = sOldBarCode.substring(0, 1);
-                var sBarCode = sOldBarCode.slice(1);
-                var sSubStr = table.cache['wl-table'];
+        //鎵弿鎷嗙鏉$爜
+            $('#HBarCode').on('keydown', function (event) {  //鎵弿鎷嗙鏉$爜
                 var sInterID = $("#HInterID").val()
                 var sBillNo = $("#HBillNo").val()
-                var sQty = $("#HQty").val()
-                var sHBillType = $("#HBillType").val()  //婧愬崟绫诲瀷
-                var sBillType = '1202'
-                var sHWHID = $("#HWHID").val()
-                var sHSPID = $("#HStockPlaceID").val()
-                var sSourceBillNo = $("#HSourceBillNo").val()
+                var HBarCode = $('#HBarCode').val()
+                var HTBarCode = $('#HTBarCode').val()
                 if (event.keyCode == 13) {
-                if (HDeleteFlag == "*")
-                {
-                    if (sBarCode != "") {
-                        $('#HBarCode').val("");
-                    }
-                    var sBarCode = sOldBarCode.slice(1);
-                    $.ajax(
-                        {
-                            type: "Get",
-                            url: GetWEBURL() + "/ProductIn/Delete_Json",
-                            async: true,
-                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode},
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                                    table.render({
-                                        elem: '#wl-table'
-                                        //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
-                                        , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
-                                        , toolbar: '#toolbarDemo'
-                                        , defaultToolbar: []
-                                        , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
-                                        , cols: [[
-                                            { type: 'radio' }
-                                            , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                            , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
-                                            , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                            , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                                            , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-                                            , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-                                            , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                                            , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                        ]]
-                                        // , data: [linterid]
-                                        // , page: true
-                                        , height: 500
-                                        , done: function () {
-                                            layer.closeAll("loading");
-                                        }
-                                    })
-                                }
-                                else {
-                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                }
-                            },
-                            error: function (err) {
-                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        });
-                }
-                else {
                     var sBarCode = $('#HBarCode').val()
                     //var Flag = sessionStorage["SourceFlag"];
                     if (sQty == "") {
@@ -730,110 +605,41 @@
                         if (sBarCode != "") {
                             $('#HBarCode').val("");
                         }
-                        if (sQty != "") {
-                            $('#HQty').val("");
-                        }
-                        if (sHWHID == "184154") {
-                            if (sHSPID == "0") {
-                                layer.msg("浠撲綅涓虹┖锛岃閫夋嫨浠撲綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                return false;
-                            }
-                        }
-                        //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
                         $.ajax({
-                            //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
-                            url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
+                            url: GetWEBURL() + "/PackSplit/get_CheckTypeByBarCode_Json",
                             type: "GET",
-                            data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+                            data: { "HBarCode": HBarCode, "sInterID": sInterID, "HBillType": '3784', "sBillNo": sBillNo, "HTBarCode": HTBarCode, "sMaker": sessionStorage["HUserName"], "HOWNERID": sessionStorage["OrganizationID"] },
                             success: function (result) {
                                 //debugger;
                                 playSound1();
                                 if (result.count == 1) {
-                                    if (result.data.HBarType == '浠撳簱鏉$爜') {
-                                        $("#HWHNAME").val(result.data.HWhName);
-                                        $("#HWHID").val(result.data.HWhID);
-                                        $("#HStockPlaceName").val("");
-                                        $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
-                                        element.tabChange('tab-ProductlnBill', '2');  //璺宠浆椤电
-                                    }
-                                    else if (result.data.HBarType == '浠撲綅鏉$爜') {
-                                        $("#HStockPlaceName").val(result.data.HSPName);
-                                        $("#HStockPlaceID").val(result.data.HSPID);
-                                        $("#HWHNAME").val(result.data.HWhName);
-                                        $("#HWHID").val(result.data.HWhID);
-                                        $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
-                                        element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
-                                    }
-                                    else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
-                                        $("#HDeptName").val(result.data.HDeptName);
-                                        $("#HDeptID").val(result.data.HDeptID);
-                                        $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
-                                        element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
-                                    }
-                                    else if (result.data.HBarType == '婧愬崟鏉$爜') {
-                                        $("#HSupName").val(result.data.HSupName);
-                                        $("#HSupID").val(result.data.HSupID);
-                                        $("#HDeptName").val(result.data.HDeptName);
-                                        $("#HDeptID").val(result.data.HDeptID);
-                                        $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                        HSourceFlag = true;
-                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                        //if (result.data.HSourceBillType == "3711") {
-                                        //    $("#HBillType").val("3711");
-                                        //}
-                                        //else {
-                                        //    $("#HBillType").val("-1");
-                                        //}
                                         $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
                                         element.tabChange('tab-ProductlnBill', '3');
                                     }
                                     else {
-                                        if (HSourceFlag == "true") {
-                                            element.tabChange('tab-ProductlnBill', '3');
-                                        }
-                                        else {
-                                            $("#HSupName").val(result.data.HSupName);
-                                            $("#HSupID").val(result.data.HSupID);
-                                            //$("#HDeptName").val(result.data.HDept);
-                                            //$("#HDeptID").val(result.data.HDeptID);
-                                            $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                            HSourceFlag = true;
-                                            //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                            //if (result.data.HSourceBillType == "3711") {
-                                            //    $("#HBillType").val("3711");
-
-                                            //}
-
-                                            //else {
-                                            //    $("#HBillType").val("-1");
-                                            //}
                                             $("#HNote").val(";鐗╂枡鏉$爜");
                                             element.tabChange('tab-ProductlnBill', '3');
-                                        }
+                                        //}
                                     }
-                                    //$("#HSupID").val(result.data.HSupID);
-                                    //$("#HSupName").val(result.data.HSupName);
-                                    //$("#HDeptID").val(result.data.HDeptID);
-                                    //$("#HDeptName").val(result.data.HDeptName);
                                     layer.load(3)
                                     table.render({
                                         elem: '#wl-table'
-                                        //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
-                                        , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+                                        , url: GetWEBURL() + '/PackSplitBill/GetBillEntry_TmpList_Pack'
                                         , toolbar: '#toolbarDemo'
                                         , defaultToolbar: []
-                                        , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+                                        , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '3784', sWhere: '' }
                                         , cols: [[
                                             { type: 'radio' }
-                                            , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                            , { field: 'HPieceQty', title: '浠舵暟', width: 150 }
+                                            , { field: 'HBarCode', title: '瀛愭潯鐮佺紪鍙�', width: 150 }
                                             , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
                                             , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
                                             , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                            , { field: 'HMaterID', title: '鐗╂枡ID', width: 150 }
+                                            , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
                                             , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
                                             , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-                                            , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                                            , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
                                         ]]
                                         // , data: [linterid]
                                         // , page: true
@@ -842,11 +648,6 @@
                                             layer.closeAll("loading");
                                         }
                                     });
-                                }
-                                else {
-                                    playSound();
-                                    layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                }
                                 layer.closeAll("loading");
                             },
                             error: function (err) {
@@ -855,7 +656,6 @@
                                 console.log(err);
                             }
                         });
-                    }
                 }
             });
 
@@ -882,8 +682,8 @@
                 audio.play();
             }
 
-        //鎵簮鍗�
-            $('#HTBarCode').on('keydown', function (event) {   //鎵簮鍗�
+        //鎵嫋鏉$爜
+            $('#HTBarCode').on('keydown', function (event) {   
             var HTBarCode = $('#HTBarCode').val()
             var sInterID = $("#HInterID").val()
             var sBillNo = $("#HBillNo").val()
@@ -917,10 +717,10 @@
                                 , url: GetWEBURL() + '/PackSplitBill/GetBillEntry_TmpList_Pack'
                                 , toolbar: '#toolbarDemo'
                                 , defaultToolbar: []
-                              , where: { HBillID: sInterID, HBillType: '3784', sWhere: '' }
+                                , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '3784', sWhere: '' }
                               , cols: [[
                                   { type: 'radio' }
-                                , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                , { field: 'HPieceQty', title: '浠舵暟', width: 150 }
                                 , { field: 'HBarCode', title: '瀛愭潯鐮佺紪鍙�', width: 150 }
                                 , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
                                 , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -929,7 +729,7 @@
                                 , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
                                 , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
                                 , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-                                , { field: 'HBarCodeQty', title: '鏉$爜鏁伴噺', width: 150 }
+                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
                               ]]
                                 // , data: [linterid]
                                 // , page: true
@@ -1059,19 +859,19 @@
         //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
         //    return false;
         //}
-        if($("#HDeptName").val()=='')
-        {
-            layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if ($("#HSecManager").val() == '') {
-            layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if ($("#HKeeper").val() == '') {
-            layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
+        //if($("#HDeptName").val()=='')
+        //{
+        //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+        //    return false;
+        //}
+        //if ($("#HSecManager").val() == '') {
+        //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+        //    return false;
+        //}
+        //if ($("#HKeeper").val() == '') {
+        //    layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+        //    return false;
+        //}
         //if ($("#HWHNAME").val() == '') {
         //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
         //    return false;
@@ -1084,31 +884,31 @@
             layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
             return false;
         }
-        if (typeof (sSubStr) == "undefined")
-        {
-            layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if (!typeof (sSubStr) == "undefined") {
-            //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-            //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-            //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-            //        {
-            //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' }); 
-            //            return false;
-            //        }
-            //    }
-            //}
-            for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                if (parseFloat(sSubStr[i].HQty) > 0) {
-                    s = 1;
-                }
-            }
-            if (s == 0) {
-                layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-        }
+        //if (typeof (sSubStr) == "undefined")
+        //{
+        //    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+        //    return false;
+        //}
+        //if (!typeof (sSubStr) == "undefined") {
+        //    //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+        //    //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+        //    //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
+        //    //        {
+        //    //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' }); 
+        //    //            return false;
+        //    //        }
+        //    //    }
+        //    //}
+        //    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+        //        if (parseFloat(sSubStr[i].HQty) > 0) {
+        //            s = 1;
+        //        }
+        //    }
+        //    if (s == 0) {
+        //        layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+        //        return false;
+        //    }
+        //}
         else
         {
             return true;

--
Gitblit v1.9.1