From 7df042662e1929abdd667cfd7b037f4e10e8c2ad Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 14 三月 2024 11:27:56 +0800
Subject: [PATCH] 其他应付单 增加子表保存,目录放到采购管理,其他入库单编辑模块 并完善 其他出库单 列表功能;( 常规 功能, 新增,修改,删除,审核,作废,关闭,自定义过滤,源单类型列表(源单 手工录入), 合计行,保存控制,审核控制,删除控制,关联数回填 等等 ) (注: 基础资料选择, 均用 基础资料列表 的方式)

---
 WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html |  523 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 362 insertions(+), 161 deletions(-)

diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index e3a69d8..c4bf787 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -12,12 +12,16 @@
         .layui-col-xs4 {
             width: 12.333333%
         }
+
+         .layui-col-xs8 {
+            width: 55.666667%;
+        }
     </style>
 </head>
 <body>
-    <div class="layui-fluid">
-        <div class="layui-card" style="padding: 1px">
-            <div class="layui-card-body" style="padding: 1px;">
+    <div class="layui-fluid" style="padding: 0px">
+        <div class="layui-card">
+            <div class="layui-card-body" style="padding: 0px; height:800px;">
                 <form class="layui-form" action="" lay-filter="component-form-group">
                     <div style="background-color:#0085E8;">
                         <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鍏朵粬鍏ュ簱鍗�</span>
@@ -27,7 +31,7 @@
                             <div class="layui-col-xs3">
                                 <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
                             </div>
-                            <div class="layui-col-xs5">
+                            <div class="layui-col-xs8">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                             </div>
                             <div class="layui-col-xs2">
@@ -40,7 +44,7 @@
                                     <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
                                 </div>
                                 <div class="layui-col-xs8">
-                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
                                 </div>
                             </div>
                         </div>
@@ -48,10 +52,10 @@
                     <div class="layui-tab" lay-filter="tab-Kf_OtherInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <!-- <li lay-id="1">婧愬崟淇℃伅</li>-->
-                            <li lay-id="1">婧愬崟淇℃伅</li>
-                            <li lay-id="2">鍗曟嵁淇℃伅</li>
-                            <li lay-id="3">鐗╂枡娓呭崟</li>
-                            <li lay-id="4">鏃ュ織</li>
+                            <li lay-id="1" style="padding:1px;">婧愬崟淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+                            <li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
+                            <li lay-id="4" style="padding:1px;">鏃ュ織</li>
                         </ul>
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show">
@@ -61,7 +65,7 @@
                                             <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟绫诲瀷</label>
                                         </div>
                                         <div class="layui-col-xs8">
-                                            <select name=" HBillType" id="HBillType">
+                                            <select name="HBillType" id="HBillType">
                                                 <option value="1241">鍏ュ簱鐢宠鍗�</option>
                                                 <option value="-1">鎵嬪伐褰曞叆</option>
                                             </select>
@@ -74,7 +78,7 @@
                                             <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
                                         </div>
                                         <div class="layui-col-xs8">
-                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input" onfocus="this.select();">
                                         </div>
                                         <div class="layui-col-xs2">
                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
@@ -93,6 +97,16 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                             <div class="layui-tab-item">
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
@@ -101,7 +115,7 @@
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" onfocus="this.select();">
                                             <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
                                             <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
                                         </div>
@@ -116,7 +130,7 @@
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input" onfocus="this.select();">
                                             <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
@@ -144,7 +158,7 @@
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">淇濈</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HKeeper" id="HKeeper" lay-verify="HKeeper" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HKeeper" id="HKeeper" lay-verify="HKeeper" autocomplete="off" class="layui-input" onfocus="this.select();">
                                             <input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
@@ -158,7 +172,7 @@
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">楠屾敹</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" autocomplete="off" class="layui-input" onfocus="this.select();">
                                             <input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
@@ -185,7 +199,7 @@
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">閮ㄩ棬</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input" onfocus="this.select();">
                                             <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
@@ -245,6 +259,7 @@
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
+                , laydate = layui.laydate
                 , element = layui.element;
 
             //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
@@ -268,7 +283,23 @@
             $("#HOrgID").val(sessionStorage["OrganizationID"]);
             $("#HOrgID").hide();
             $("#HBillSubType").val(sessionStorage["HBillSubType"]);
+            $("#HDate").val(formatDate(sessionStorage["HDate"]));
+            var HSourceFlag = sessionStorage["SourceFlag"];
             //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+
+            // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝f柟寮�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
 
 
             //鑾峰彇鍙傛暟
@@ -286,6 +317,17 @@
             var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
             var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
 
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom() {
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate'
+                });
+            }
+
             function RoadBillMain(linterid)//鍔犺浇琛ㄥご
             {
                 $.ajax({
@@ -296,14 +338,36 @@
                         // console.log(d.data);
                         $("#HInterID").val(d.data[0].HInterID);
                         $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HBillType").val(d.data[0].HSourceBillType);
+                        $("#HBillType").val(d.data[0].HSourceBillType == null ? "1241" : d.data[0].HSourceBillType);
+                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                        if (d.data[0].HSourceBillType == "1241") {
+                            $("#HBillType").empty();
+                            $("#HBillType").val("1241");
+                            var optionHtml = '';
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鍏ュ簱鐢宠鍗�' + "</option>";
+                            $("#HBillType").append(optionHtml);
+                            layui.form.render('select');
+                            $("#HBillType").attr("readonly", "readonly");
+                        }
+                        else {
+                            $("#HBillType").empty();
+                            $("#HBillType").val("-1");
+                            var optionHtml = '';
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+                            $("#HBillType").append(optionHtml);
+                            layui.form.render('select');
+                            $("#HBillType").attr("readonly", "readonly");
+                        }
                         $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+                        $("#HSourceBillNo").attr("disabled", "true");
+                        $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
                         //$("#HWHID").val(d.data[0].HWhID);
                         //$("#HKeeperID").val(d.data[0].HKeeperID);
                         //$("#HSecManagerID").val(d.data[0].HSecManagerID);
                         //$("#HDeptID").val(d.data[0].HDeptID);
                         //$("#HBarCode").val(d.data[0].HBarCode);
                         //$("#HQty").val(d.data[0].HQty);
+                        HSourceFlag = true;
                     }
                 })
                 //鑾峰彇鍗曟嵁瀛愮被鍨�
@@ -332,7 +396,9 @@
                 table.render({
                     elem: '#wl-table'
                     , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                    , toolbar: '#toolbarDemo'
+                    //, toolbar: '#toolbarDemo'
+                    , page: true
+                    , limit: 100
                     , where: { HBillID: linterid, HBillType: '1203', sWhere: '' }
                     , cols: [[
                         { type: 'radio' }
@@ -375,6 +441,7 @@
                         //console.log(d.data);
                         $("#HInterID").val(d.data[0].HInterID);
                         $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
                     }
                 });
                 //鑾峰彇鍗曟嵁瀛愮被鍨�
@@ -447,7 +514,9 @@
                 table.render({
                     elem: '#wl-table'
                     , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                    , toolbar: '#toolbarDemo'
+                    //, toolbar: '#toolbarDemo'
+                    , page: true
+                    , limit: 100
                     , where: { HBillID: linterid, HBillType: '1203', sWhere: '' }
                     , cols: [[
                         { type: 'radio' }
@@ -475,7 +544,9 @@
                 table.render({
                     elem: '#wl-table'
                     , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                    , toolbar: '#toolbarDemo'
+                    //, toolbar: '#toolbarDemo'
+                    , page: true
+                    , limit: 100
                     , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
                     , cols: [[
                         { type: 'radio' }
@@ -656,7 +727,7 @@
                 //parent.location.href = "../../../views/index.html"
                 //window.close();//鍏抽棴褰撳墠椤�
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    window.close();
+                    parent.location.href = "../../../views/index_Mobile.html";
                 });
             })
 
@@ -726,7 +797,9 @@
                         table.render({
                             elem: '#wl-table'
                             , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                            , toolbar: '#toolbarDemo'
+                            //, toolbar: '#toolbarDemo'
+                            , page: true
+                            , limit: 100
                             , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
                             , cols: [[
                                 { type: 'radio' }
@@ -775,7 +848,7 @@
                 //                table.render({
                 //                    elem: '#wl-table'
                 //                    , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                //                    , toolbar: '#toolbarDemo'
+                //                    //, toolbar: '#toolbarDemo'
                 //                    , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
                 //                    , cols: [[
                 //                        { type: 'radio' }
@@ -875,7 +948,8 @@
                             dataType: "json",
                             success: function (data) {
                                 if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.confirm("鐢熸垚鍏朵粬鍏ュ簱鍗�" + data.Message + $("#HBillNo").val(), {
+                                    layer.confirm(data.Message, {
+                                    //layer.confirm("鐢熸垚鍏朵粬鍏ュ簱鍗�" + data.Message + $("#HBillNo").val(), {
                                         icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
                                         btn2: function () {
                                             //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
@@ -885,21 +959,21 @@
                                     }, function () { window.location.reload(); });//鏂板
                                 }
                                 else {
-                                    layer.msg(data.Message, { icon: 5 });
+                                    layer.confirm(data.Message, { icon: 5 });
                                     //鐏板害鎻愪氦鎸夐挳Saver
                                     document.getElementById("Saver").disabled = false;
                                 }
                                 layer.closeAll("loading");
                             },
                             error: function (err) {
-                                layer.msg("閿欒:" + err, { icon: 5 });
+                                layer.confirm("閿欒:" + err, { icon: 5 });
                                 //鐏板害鎻愪氦鎸夐挳Saver
                                 document.getElementById("Saver").disabled = false;
                             }
                         });
                 }
                 else {
-                    layer.msg("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
+                    layer.confirm("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
                     //鐏板害鎻愪氦鎸夐挳Saver
                     document.getElementById("Saver").disabled = false;
                 }
@@ -946,6 +1020,39 @@
                 }
             });
 
+            //鎵粨搴�
+            $('#HWHNAME').on('keydown', function (event) {
+                var HBarCode = $('#HWHNAME').val()
+                if (event.keyCode == 13) {
+                    if (!HBarCode) {
+                        layer.msg('鏃犱粨搴撴潯鐮佷俊鎭紒');
+                        return;
+                    }
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getWHName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //$("#HStockPlaceName").val(result.data[0].HName);
+                                //$("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHID").val(result.data[0].HItemID);
+                                $("#HWHNAME").val(result.data[0].HName);
+                                element.tabChange('tab-POStockInBill', '2');
+                            }
+                            else {
+                                // $("#verifycode").click();
+                                //layer.msg(result.Message, { icon: 5 });
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                    // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+                }
+            });
+
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
                 if (event.keyCode == 13) {
@@ -972,12 +1079,13 @@
             table.render({
                 elem: '#mx-table'
                 // , url: 'http://localhost:8083/OtherInStockBill/GetHBarCodeShowBillSub'
-                //, toolbar: '#toolbarDemo'
+                ////, toolbar: '#toolbarDemo'
                 // , where: { sMsg: linterid, sMsg2: lentryid }
                 , cols: [[
                     , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
                 ]]
                 , page: true
+                , limit: 100
                 , height: 500
                 , done: function () {
                 }
@@ -1000,153 +1108,246 @@
                 var sMouldManagerCtl = 'N'
                 var sFIFOCtl = 'N'
                 var HBillType = '1203'
-                //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
-                if (sBarCode == '') {
-                    playSound();
-                    layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-                if (sBarCode != "") {
-                    $('#HBarCode').val("");
-                    //sessionStorage["SourceFlag"] = false;
-                }
-                //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
-                $.ajax({
-                    //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
-                    type: "GET",
-                    data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": sessionStorage["SourceFlag"], "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
-                    success: function (result) {
-                        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-Kf_OtherInBill', '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-Kf_OtherInBill', '2');//璺宠浆椤电
-                            }
-                            else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
-                                $("#HDeptName").val(result.data.HDeptName);
-                                $("#HDeptID").val(result.data.HDeptID);
-                                $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
-                                element.tabChange('tab-Kf_OtherInBill', '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);
-                                sessionStorage["SourceFlag"] = true;
-                                //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                if (result.data.HSourceBillType == "1241") {
-                                    $("#HBillType").val("1241");
+                var HDeleteFlag = sBarCode.substring(0, 1);
 
+                if (HDeleteFlag == "*") {
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    var sBarCode_Del = sBarCode.slice(1);
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/ProductIn/Delete_Json",
+                            async: true,
+                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HBarCode": sBarCode_Del },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    playSound1();
+                                    table.render({
+                                        elem: '#wl-table'
+                                        , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+                                        //, toolbar: '#toolbarDemo'
+                                        , defaultToolbar: []
+                                        , page: true
+                                        , limit: 3000
+                                        , totalRow: true
+                                        , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+                                        , cols: [[
+                                            { type: 'radio' }
+                                            , { field: 'HQty', title: '閲嶉噺', width: 150, totalRow: true }
+                                            , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
+                                            , { 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 }
+                                            , { field: 'HBarcodeQtys', title: '鏉$爜鏁伴噺', width: 150 }
+                                        ]]
+                                        // , data: [linterid]
+                                        // , page: true
+                                        , height: 500
+                                        , done: function () {
+                                            layer.closeAll("loading");
+                                        }
+                                    })                                    
+                                    //娓呯┖鏁伴噺
+                                    $("#HQty").val("");
                                 }
                                 else {
-                                    $("#HBillType").val("鎵嬪伐褰曞叆");
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                 }
-                                $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
-                                element.tabChange('tab-Kf_OtherInBill', '3');
+                            },
+                            error: function (err) {
+                                playSound();
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
-                            else {
-                                if (sessionStorage["SourceFlag"] == "true") {
-                                    element.tabChange('tab-Kf_OtherInBill', '3');
+                        });
+                } else {
+                    //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
+                    if (sBarCode == '') {
+                        playSound();
+                        layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                        //sessionStorage["SourceFlag"] = false;
+                    }
+
+                    //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
+                    $.ajax({
+                        //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
+                        type: "GET",
+                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                if (result.data.hBarTypeField == '浠撳簱鏉$爜') {
+                                    $("#HWHNAME").val(result.data.hWhNameField);
+                                    $("#HWHID").val(result.data.hWhIDField);
+                                    $("#HStockPlaceName").val("");
+                                    $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+                                    element.tabChange('tab-Kf_OtherInBill', '2');  //璺宠浆椤电
+                                    return;
                                 }
-                                else {
-                                    //$("#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);
-                                    sessionStorage["SourceFlag"] = true;
+                                else if (result.data.hBarTypeField == '浠撲綅鏉$爜') {
+                                    $("#HStockPlaceName").val(result.data.hSPNameField);
+                                    $("#HStockPlaceID").val(result.data.hSPIDField);
+                                    $("#HWHNAME").val(result.data.hWhNameField);
+                                    $("#HWHID").val(result.data.hWhIDField);
+                                    $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+                                    element.tabChange('tab-Kf_OtherInBill', '2');//璺宠浆椤电
+                                    return;
+                                }
+                                else if (result.data.hBarTypeField == '閮ㄩ棬鏉$爜') {
+                                    $("#HDeptName").val(result.data.hDeptNameField);
+                                    $("#HDeptID").val(result.data.hDeptIDField);
+                                    $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+                                    element.tabChange('tab-Kf_OtherInBill', '2');//璺宠浆椤电
+                                    return;
+                                }
+                                else if (result.data.hBarTypeField == '婧愬崟鏉$爜') {
+                                    $("#HSupName").val(result.data.hSupNameField);
+                                    $("#HSupID").val(result.data.hSupIDField);
+                                    $("#HDeptName").val(result.data.hDeptNameField);
+                                    $("#HDeptID").val(result.data.hDeptIDField);
+                                    $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+                                    HSourceFlag = true;
                                     //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                    if (result.data.HSourceBillType == "1241") {
+                                    if (result.data.hSourceBillType == "1241") {
                                         $("#HBillType").val("1241");
 
                                     }
-                                    else if (result.data.HSourceBillType == "1601") {
-                                        $("#HBillType").val("1601");
+                                    else {
+                                        $("#HBillType").val("鎵嬪伐褰曞叆");
                                     }
-                                    $("#HNote").val(";鐗╂枡鏉$爜");
+                                    $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
                                     element.tabChange('tab-Kf_OtherInBill', '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: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                            //    , toolbar: '#toolbarDemo'
-                            //    , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
-                            //    , cellMinWidth: 90
-                            //    , 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 }
-                            //        , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 150 }
-                            //        , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
-                            //    ]]
-                            //    , height: 500
-                            //    , done: function () {
-                            //        layer.closeAll("loading");
-                            //    }
-                            //});
-                            $.ajax({
-                                url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
-                                type: "GET",
-                                data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
-                                success: function (result) {
-                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                        listOption.data = result.data.list;
-                                        table.render(listOption);
-                                        listOption1.data = result.data.list2;
-                                        table.render(listOption1);
-
-                                        //console.log(result.data.list2);
-                                        var count = 0;
-                                        var count1 = 0;
-                                        for (var i = 0; i < result.data.list.length; i++) {
-                                            count += result.data.list[i].HQty;
-                                            count1 += result.data.list[i].HPieceQty;
-                                        }
-                                        $("#HSumQtys").val(count);
-                                        $("#HBarCodeQtys").val(count1);
-                                        //return;
+                                else {
+                                    if (HSourceFlag == true) {
+                                        element.tabChange('tab-Kf_OtherInBill', '3');
                                     }
                                     else {
-                                        layer.msg(result.Message);
+                                        //$("#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);
+                                        //sessionStorage["SourceFlag"] = true;
+                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                        //if (result.data.HSourceBillType == "1241") {
+                                        //    $("#HBillType").val("1241");
+
+                                        //}
+                                        //else if (result.data.HSourceBillType == "1601") {
+                                        //    $("#HBillType").val("1601");
+                                        //}
+
+
+                                        HSourceFlag = true;
+                                        $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+                                        $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1241" : result.data.hSourceBillTypeField);
+                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                        if (result.data.hSourceBillTypeField == "1241") {
+                                            $("#HBillType").empty();
+                                            $("#HBillType").val("1241");
+                                            var optionHtml = '';
+                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍏ュ簱鐢宠鍗�' + "</option>";
+                                            $("#HBillType").append(optionHtml);
+                                            layui.form.render('select');
+                                            $("#HBillType").attr("readonly", "readonly");
+                                        }
+                                        else {
+                                            //$("#HBillType").empty();
+                                            $("#HBillType").val("-1");
+                                            var optionHtml = '';
+                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+                                            $("#HBillType").append(optionHtml);
+                                            layui.form.render('select');
+                                            $("#HBillType").attr("readonly", "readonly");
+                                        }
+                                        $("#HSourceBillNo").attr("readonly", "readonly");
+                                        $("#HNote").val(";鐗╂枡鏉$爜");
+                                        element.tabChange('tab-Kf_OtherInBill', '3');
                                     }
-                                    layer.closeAll("loading");
                                 }
-                            });
+                                //$("#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: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+                                //    //, toolbar: '#toolbarDemo'
+                                //    , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+                                //    , cellMinWidth: 90
+                                //    , 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 }
+                                //        , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 150 }
+                                //        , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+                                //    ]]
+                                //    , height: 500
+                                //    , done: function () {
+                                //        layer.closeAll("loading");
+                                //    }
+                                //});
+                                $.ajax({
+                                    url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+                                    type: "GET",
+                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+                                    success: function (result) {
+                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            listOption.data = result.data.list;
+                                            table.render(listOption);
+                                            listOption1.data = result.data.list2;
+                                            table.render(listOption1);
+
+                                            //console.log(result.data.list2);
+                                            var count = 0;
+                                            var count1 = 0;
+                                            for (var i = 0; i < result.data.list.length; i++) {
+                                                count += result.data.list[i].HQty;
+                                                count1 += result.data.list[i].HPieceQty;
+                                            }
+                                            $("#HSumQtys").val(count);
+                                            $("#HBarCodeQtys").val(count1);
+                                            //return;
+                                        }
+                                        else {
+                                            layer.msg(result.Message);
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                                //娓呯┖鏁伴噺
+                                $("#HQty").val("");
+                            }
+                            else {
+                                // $("#verifycode").click();
+                                //layer.msg(result.Message, { icon: 5 });
+                                layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            }
+                            layer.closeAll("loading");
                         }
-                        else {
-                            // $("#verifycode").click();
-                            //layer.msg(result.Message, { icon: 5 });
-                            layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                        layer.closeAll("loading");
-                    }
-                });
+                    });
+                }               
             }
             function playSound() {
                 //var audio = document.getElementById("cs");
@@ -1162,7 +1363,7 @@
 
             var listOption = {
                 elem: '#wl-table'
-                , toolbar: '#toolbarDemo'
+                //, toolbar: '#toolbarDemo'
                 , cellMinWidth: 90
                 ,limit:3000
                 , totalRow: true
@@ -1187,7 +1388,7 @@
             }
             var listOption1 = {
                 elem: '#mx-table'
-                , toolbar: '#toolbarDemo'
+                //, toolbar: '#toolbarDemo'
                 , cellMinWidth: 90
                 , cols: [[
                     { type: 'radio' }
@@ -1236,13 +1437,13 @@
                             element.tabChange('tab-Kf_OtherInBill', '2'); 
                             playSound1();
                             HSourceFlag = true;
-                            sessionStorage["SourceFlag"] = true;
+                            //sessionStorage["SourceFlag"] = true;
                             layer.load(3)
                             //table.render({
                             //    elem: '#wl-table'
                             //    //, url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
                             //    , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                            //    , toolbar: '#toolbarDemo'
+                            //    //, toolbar: '#toolbarDemo'
                             //    , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl  }
                             //    , cols: [[
                             //        { type: 'radio' }

--
Gitblit v1.9.1