From 7271757d8a07b55b51adc7b88d6f2dfa302e8b40 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 02 一月 2022 19:14:09 +0800
Subject: [PATCH] 其他入库、委外入库、委外出库缓存列表功能

---
 WebTM/views/公共页面/Kf_BarCodeEditDlg.html               |  148 ++--
 WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html    |  162 ++++-
 WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_FastList.html |  244 ++++++--
 WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html      |  342 ++++++-----
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html      |  226 +++++---
 WebTM/views/验收入库/委外入库/Kf_EntrustInBill_FastList.html  |  211 +++++--
 WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html        |  284 ++++++---
 WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html        |    4 
 8 files changed, 1,025 insertions(+), 596 deletions(-)

diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index 3592db0..7ff5d02 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -728,8 +728,12 @@
 
             //鎵潯鐮�
             $('#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'];
-                var sBarCode = $('#HBarCode').val()
+                //var sBarCode = $('#HBarCode').val()
                 var sInterID = $("#HInterID").val()
                 var sBillNo = $("#HBillNo").val()
                 var sQty = $("#HQty").val()
@@ -740,96 +744,148 @@
                 var SCSPID = $("#HOutStockPlaceID").val()//璋冨嚭浠撲綅
                 var HMaker = $("#HMaker").val();//鍒跺崟浜�
                 var HOrgID = $("#HOrgID").val();//缁勭粐
+                var sBillType = '1207'
                 if (sQty == "") {
                     sQty = 0;
                 }
                 if (event.keyCode == 13) {
-                    if (sBarCode != "") {
-                        $('#HBarCode').val("");
-                    }
-                    if (sQty != "") {
-                        $('#HQty').val("");
-                    }
-                    if ($("#HWHNAME").val() == '') {
-                        layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return false;
-                    }
-                    //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
-                    //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    //    return false;
-                    //}
-                    //if ($("#HSCWHNAME").val() == '') {
-                    //    layer.msg("璋冨嚭浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    //    return false;
-                    //}
-                    if ($("#HBillNo").val() == '') {
-                        layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return false;
-                    }
-                    if ($("#HInterID").val() == '') {
-                        layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return false;
-                    }
-                    $.ajax({
-                        url: GetWEBURL() + "/MoveStockBill/get_InfoByBarCode_Source_Json",
-                        type: "GET",
-                        data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sQty": sQty, "HWHID": HWHID, "HSPID": HSPID, "SCWhID": SCWhID, "SCSPID": SCSPID, "HMaker": HMaker, "HOrgID": HOrgID },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                element.tabChange('tab-MoveStockBill', '3');
-                                //$("#HWHNAME").attr("readOnly", "true");//璋冨叆浠撳簱涓嶅彲鍙�
-                                //$("#HWHID-BT").attr("disabled", "true");
-                                //$("#HStockPlaceName").attr("readOnly", "true");//璋冨叆浠撲綅涓嶅彲鍙�
-                                //$("#HSpID-BT").attr("disabled", "true");
-                                //$("#HSCWHNAME").attr("readOnly", "true");//璋冨嚭浠撳簱涓嶅彲鍙�
-                                //$("#HSCWHID-BT").attr("disabled", "true");
-                                //$("#HOutStockPlaceName").attr("readOnly", "true");//璋冨叆浠撲綅涓嶅彲鍙�
-                                //$("#HOSpID-BT").attr("disabled", "true");
-                                layer.load(3)
-                                table.render({
-                                    elem: '#wl-table'
-                                    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
-                                    , toolbar: '#toolbarDemo'
-                                    , totalRow: true
-                                    , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
-                                    , cols: [[
-                                        { type: 'radio', totalRowText: '鍚堣' }
-                                        , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
-                                        , { field: '浠舵暟', title: '浠舵暟', width: 150, totalRow: true }
-                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', 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: 'HMaterID', title: '鐗╂枡鍐呯爜', width: 150, hide: true }
-                                        , { field: 'HAuxPropID', title: '', width: 150, hide: true }
-                                        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 150, hide: true }
-                                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
-                                    ]]
-                                    // , data: [linterid]
-                                    // , page: true
-                                    //, height: 500
-                                    , done: function () {
-                                        layer.closeAll("loading");
-                                    }
-                                });
-                                var sSubStr = table.cache['wl-table'];
-                            }
-                            else {
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                            layer.closeAll("loading");
+                    if (HDeleteFlag == "*") {
+                        if (sBarCode != "") {
+                            $('#HBarCode').val("");
                         }
-                        //,
-                        //error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        //    alert("璇锋眰瀵硅薄XMLHttpRequest: " + XMLHttpRequest);
-                        //    alert("閿欒绫诲瀷textStatus: " + textStatus);
-                        //    alert("寮傚父瀵硅薄errorThrown: " + errorThrown);
+                        $.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: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
+                                            , toolbar: '#toolbarDemo'
+                                            , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
+                                            , cols: [[
+                                                { type: 'radio' }
+                                                , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                                , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', 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 }
+                                                , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                                            ]]
+                                            // , 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()
+                        if (sBarCode != "") {
+                            $('#HBarCode').val("");
+                        }
+                        if (sQty != "") {
+                            $('#HQty').val("");
+                        }
+                        if ($("#HWHNAME").val() == '') {
+                            layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
+                        }
+                        //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
+                        //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //    return false;
                         //}
-                    });
+                        //if ($("#HSCWHNAME").val() == '') {
+                        //    layer.msg("璋冨嚭浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //    return false;
+                        //}
+                        if ($("#HBillNo").val() == '') {
+                            layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
+                        }
+                        if ($("#HInterID").val() == '') {
+                            layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
+                        }
+                        $.ajax({
+                            url: GetWEBURL() + "/MoveStockBill/get_InfoByBarCode_Source_Json",
+                            type: "GET",
+                            data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sQty": sQty, "HWHID": HWHID, "HSPID": HSPID, "SCWhID": SCWhID, "SCSPID": SCSPID, "HMaker": HMaker, "HOrgID": HOrgID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    element.tabChange('tab-MoveStockBill', '3');
+                                    //$("#HWHNAME").attr("readOnly", "true");//璋冨叆浠撳簱涓嶅彲鍙�
+                                    //$("#HWHID-BT").attr("disabled", "true");
+                                    //$("#HStockPlaceName").attr("readOnly", "true");//璋冨叆浠撲綅涓嶅彲鍙�
+                                    //$("#HSpID-BT").attr("disabled", "true");
+                                    //$("#HSCWHNAME").attr("readOnly", "true");//璋冨嚭浠撳簱涓嶅彲鍙�
+                                    //$("#HSCWHID-BT").attr("disabled", "true");
+                                    //$("#HOutStockPlaceName").attr("readOnly", "true");//璋冨叆浠撲綅涓嶅彲鍙�
+                                    //$("#HOSpID-BT").attr("disabled", "true");
+                                    layer.load(3)
+                                    table.render({
+                                        elem: '#wl-table'
+                                        , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
+                                        , toolbar: '#toolbarDemo'
+                                        , totalRow: true
+                                        , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
+                                        , cols: [[
+                                            { type: 'radio', totalRowText: '鍚堣' }
+                                            , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+                                            , { field: '浠舵暟', title: '浠舵暟', width: 150, totalRow: true }
+                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                            , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', 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: 'HMaterID', title: '鐗╂枡鍐呯爜', width: 150, hide: true }
+                                            , { field: 'HAuxPropID', title: '', width: 150, hide: true }
+                                            , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 150, hide: true }
+                                            , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                                        ]]
+                                        // , data: [linterid]
+                                        // , page: true
+                                        //, height: 500
+                                        , done: function () {
+                                            layer.closeAll("loading");
+                                        }
+                                    });
+                                    var sSubStr = table.cache['wl-table'];
+                                }
+                                else {
+                                    layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                layer.closeAll("loading");
+                            }
+                            //,
+                            //error: function (XMLHttpRequest, textStatus, errorThrown) {
+                            //    alert("璇锋眰瀵硅薄XMLHttpRequest: " + XMLHttpRequest);
+                            //    alert("閿欒绫诲瀷textStatus: " + textStatus);
+                            //    alert("寮傚父瀵硅薄errorThrown: " + errorThrown);
+                            //}
+                        });
+                    }
                 }
             });
 
diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html"
index 4bdb342..96c0366 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html"
@@ -102,7 +102,7 @@
             return vars;
         }
         //鑾峰彇椤甸潰璺宠浆鍙傛暟
-        var params = get_UrlVars();
+        var params = getUrlVars();
         if (typeof (params[params[0]]) == "undefined") {
             var OperationType = 1;//鎿嶄綔绫诲瀷
         } else {
@@ -139,7 +139,7 @@
                  ,url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
                 , where: {
                     "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
-                    , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
+                    , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType,sWhere: ''
                 },
              cols: [[
              { type: 'radio' }
@@ -154,7 +154,7 @@
 
 
             //#region 鍒犻櫎
-            function set_DeleteBill() {
+            form.on('submit(cmdDel)', function () {
                 var checkStatus = table.checkStatus('mx-table')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
@@ -188,81 +188,79 @@
                 else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
-            }
-
-
-            //缂栬緫
-            form.on('submit(cmdChange)', function () {//缂栬緫
-                var checkStatus = table.checkStatus('mx-table')
-                    , data = checkStatus.data;
-                var sQty = data[0].HQty.toString();
-                var iQty = $('#HQty').val()
-                    $.ajax(
-                        {
-                            type: "Get",
-                            //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            url: GetWEBURL() + "/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill",
-                            async: true,
-                            data: {
-                                "HInterID": HInterID, "HBillType": HBillType, "sBatchNo": HBatchNo, "sBarCode": HBarCode, "sSCWhID": HSCWHID
-                                , "sSCSPID": HSCSPID, "sAuxPropID": HAuxPropID, "sMTONo": HMTONo, "iQty": iQty
-                                , "HMaterID": HMaterID, "sWhID": HWhID, "sSPID": HSPID, "HSourceInterID": HSourceInterID
-                                , "HSourceEntryID": HSourceEntryID, "EndQty": EndQty, "sQty": sQty
-                            },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                                    table.render({
-                                        elem: '#mx-table'
-                                        //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
-                                        , url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
-                                        , where: {
-                                            "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
-                                            , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
-                                        },
-                                        cols: [[
-                                            { type: 'radio' }
-                                            , { field: 'HSonNo', title: '搴忓彿', width: 100 }
-                                            , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
-                                            , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                                            , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                            , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
-                                        ]]
-                                        // , data: [linterid]
-                                    });
-                                    alert("缂栬緫鎴愬姛锛�");
-                                }
-                                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: "娓╅Θ鎻愮ず" });
-                            }
-                        });
-                }
-
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '鏄庣粏鍒楄〃'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType=  ' + HBillType + '&HBarCode=  ' + HBarCode + ''
-                            , 'yes']
-                        , resize: false
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
             })
 
 
-    });
+            //缂栬緫
+            //form.on('submit(cmdChange)', function () {//缂栬緫
+            //    var checkStatus = table.checkStatus('mx-table')
+            //        , data = checkStatus.data;
+            //    var sQty = data[0].HQty.toString();
+            //    var iQty = $('#HQty').val()
+            //        $.ajax(
+            //            {
+            //                type: "Get",
+            //                //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+            //                url: GetWEBURL() + "/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill",
+            //                async: true,
+            //                data: {
+            //                    "HInterID": HInterID, "HBillType": HBillType, "sBatchNo": HBatchNo, "sBarCode": HBarCode, "sSCWhID": HSCWHID
+            //                    , "sSCSPID": HSCSPID, "sAuxPropID": HAuxPropID, "sMTONo": HMTONo, "iQty": iQty
+            //                    , "HMaterID": HMaterID, "sWhID": HWhID, "sSPID": HSPID, "HSourceInterID": HSourceInterID
+            //                    , "HSourceEntryID": HSourceEntryID, "EndQty": EndQty, "sQty": sQty
+            //                },
+            //                dataType: "json",
+            //                success: function (data) {
+            //                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+            //                        table.render({
+            //                            elem: '#mx-table'
+            //                            //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
+            //                            , url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
+            //                            , where: {
+            //                                "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
+            //                                , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
+            //                            },
+            //                            cols: [[
+            //                                { type: 'radio' }
+            //                                , { field: 'HSonNo', title: '搴忓彿', width: 100 }
+            //                                , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
+            //                                , { field: 'HQty', title: '鏁伴噺', width: 100 }
+            //                                , { field: 'HBatchNo', title: '鎵规', width: 150 }
+            //                                , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
+            //                            ]]
+            //                            // , data: [linterid]
+            //                        });
+            //                        alert("缂栬緫鎴愬姛锛�");
+            //                    }
+            //                    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: "娓╅Θ鎻愮ず" });
+            //                }
+            //            });
+
+            //        layer.open({
+            //            type: 2
+            //            , area: ['100%', '100%']
+            //            , title: '鏄庣粏鍒楄〃'
+            //            , shade: 0.6 //閬僵閫忔槑搴�
+            //            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //            , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType=  ' + HBillType + '&HBarCode=  ' + HBarCode + ''
+            //                , 'yes']
+            //            , resize: false
+            //            , cancel: function () {
+            //                //$(".layui-btn").removeClass("layui-btn-disabled");
+            //            }
+            //        })
+            //    } else {
+            //        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            //    }
+            })
+
+
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_FastList.html"
index e069701..7a3d8c7 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_FastList.html"
@@ -67,6 +67,9 @@
                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
                                 </div>
                                 <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">鎾ら攢</button>
+                                </div>
+                                <div class="layui-col-xs2">
                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
                                 </div>
                                 <div class="layui-col-xs2">
@@ -156,88 +159,183 @@
 
 
 
+        form.on('submit(cmdRefresh)', function () {//鍒锋柊
+            table.render({
+                elem: '#dj-table'
+                , url: GetWEBURL() + '/Web/chanpinruk'
+                , toolbar: '#toolbarDemo'
+                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                    , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            }),
+                table.render({
+                    elem: '#yd-table'
+                    , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+                    , toolbar: '#toolbarDemo'
+                    , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                        , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                        , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                })
+        });
+
+
+        //鎾ら攢鍔熻兘
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('yd-table')
+                , data = checkStatus.data;
+            var sInterID = data[0].HInterID
+            var sBillNo = data[0].HBillNo
+            var sBillType = '1211'
+            $.ajax(
+                {
+                    type: "Get",
+                    url: GetWEBURL() + "/Web/Rescind_Json",
+                    async: true,
+                    data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            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: 2 });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg('閿欒' + err, {
+                            icon: 5,
+                            time: 20000
+                        }, function () {
+                            //do something
+                        });
+                    }
+                });
+        });
+
+
+
         form.on('submit(cmdDelete)', function () {//鍒犻櫎
             var checkStatus = table.checkStatus('dj-table')
-            , data = checkStatus.data;
-            // console.log(data);
-            // var sInterID = $('#HInterID').val()
+                , data = checkStatus.data;
             var sInterID = data[0].HInterID
-            //var sMaterID = data[0].HMaterID   
-            //var sBillType = $('#HBillType').val()
-            //var sAuxPropID = data[0].HAuxPropID
-            ////var sMTONo = data[0].HMTONo
-            //var sMTONo = 0
-            //var sSourceInterID = data[0].HSourceInterID
-            //var sSourceEntryID = data[0].HSourceEntryID
             $.ajax(
-               {
-                   type: "Get",
-                   url: GetWEBURL() + "/Web/Delete_Json",
-                   async: true,
-                   data: { "sHInterID": sInterID },
-                   dataType: "json",
-                   success: function (data) {
-                       if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                           //layer.msg(data.Message, { icon: 1 });
-                           table.render({
-                               elem: '#dj-table'
-                               , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
-                               , cellMinWidth: 80
-                               , toolbar: '#toolbarDemo'
-                               , where: { HBillType: '1211', sWhere: '' }
-                               , cols: [[
-                                   { type: 'radio' }
-                                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
-                                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
-                                , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
-                                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
-                                , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                                , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
-                                , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
-                               ]]
-                         , height: 500
-                           })
-                       }
-                       else {
-                           layer.msg(data.Message, { icon: 2 });
-                       }
-                   },
-                   error: function (err) {
-                       layer.msg('閿欒' + err, {
-                           icon: 5,
-                           time: 20000
-                       }, function () {
-                           //do something
-                       });
-                   }
-               });
+                {
+                    type: "Get",
+                    url: GetWEBURL() + "/ProductInBillList/Delete_Json",
+                    async: true,
+                    data: { "sHInterID": sInterID },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�,
+                            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: 2 });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg('閿欒' + err, {
+                            icon: 5,
+                            time: 20000
+                        }, function () {
+                            //do something
+                        });
+                    }
+                });
         });
         
        
         
         var sBillType = '1211'
-                table.render({
-                    elem: '#dj-table'
-                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
-                    ,toolbar: '#toolbarDemo'
-                    , where: { HBillType: sBillType,sWhere:''}
-                    , cols: [[
-                          { type: 'radio' }
-                        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
-                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
-                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
-                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
-                        , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                        , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
-                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
-                        ]]
-                      , height: 500
-                      , done: function () {
-                          layer.closeAll("loading");
-                      }
-    })
+        table.render({
+            elem: '#dj-table'
+            , url: GetWEBURL() + '/Web/chanpinruk'
+            , toolbar: '#toolbarDemo'
+            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+            , cols: [[
+                { type: 'radio' }
+                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+            ]]
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
+        })
+
+
+        //宸蹭笂浼犲垪琛�
+        table.render({
+            elem: '#yd-table'
+            , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+            , toolbar: '#toolbarDemo'
+            , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+            , cols: [[
+                { type: 'radio' }
+                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+            ]]
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
+        })
         //鍒锋柊鏄庣粏椤电
         table.render({
             elem: '#mx-table'
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 697750f..d1e96cd 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -807,7 +807,12 @@
 
             //鎵潯鐮�-鐩存帴璋僿ebservice
             $('#HBarCode').on('keydown', function (event) {
-                var sBarCode = $('#HBarCode').val()//鏉＄爜
+                var sOldBarCode = $('#HBarCode').val()
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+
+
+                //var sBarCode = $('#HBarCode').val()//鏉＄爜
                 var sInterID = $("#HInterID").val()//鍗曟嵁鍙稩D
                 var sBillType = '1205'
                 var sBillNo = $("#HBillNo").val()//鍗曟嵁鍙�
@@ -818,71 +823,104 @@
                 //var SourceFlag = sessionStorage["SourceFlag"];
                 var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
                 var sHBillType = $("#HBillType").val()  //婧愬崟绫诲瀷-鍙戣揣閫氱煡鍗曪細1402锛岄攢鍞鍗�1401
-                
+                var sBillType = '1205'
                 if (sQty == "") {
                     sQty = 0;
                 }
                 if (event.keyCode == 13) {
-                    if (sBarCode == '') {
-                        layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                        return false;
-                    }
-                    if (sBarCode != "") {
-                        $('#HBarCode').val("");
-                    }
-                    $.ajax({
-                        url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
-                        type: "GET",
-                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
-                        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_SellOutBill', '3');  //璺宠浆椤电
-                                }
-                                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_SellOutBill', '3');//璺宠浆椤电
-                                }
-                                else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
-                                    $("#HDeptName").val(result.data.HDeptName);
-                                    $("#HDeptID").val(result.data.HDeptID);
-                                    $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
-                                    element.tabChange('tab-Kf_SellOutBill', '3');//璺宠浆椤电
-                                }
-                                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 == "1402") {
-                                        $("#HBillType").val("1402");
-
-                                    }
-                                    else if (result.data.HSourceBillType == "1401") {
-                                        $("#HBillType").val("1401");
+                    if (HDeleteFlag == "*") {
+                        if (sBarCode != "") {
+                            $('#HBarCode').val("");
+                        }
+                        $.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///OtherInStockBill/DisBillEntryList_Webs_Json'
+                                            , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+                                            , toolbar: '#toolbarDemo'
+                                            , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+                                            , cols: [[
+                                                { type: 'radio' }
+                                                , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                                , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', 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: 'HInterID', title: '鍗曟嵁ID', width: 150, hide: true }
+                                                , { field: 'HBilltype', title: '鍗曟嵁绫诲瀷', width: 150, hide: true }
+                                                , { field: 'Hbarcode', title: '鏉＄爜缂栧彿', width: 150, hide: true }
+                                                , { field: 'HSCWHID', title: '璋冨嚭浠撳簱ID', width: 150, hide: true }
+                                                , { field: 'HSCSPID', title: '璋冨嚭浠撲綅ID', width: 150, hide: true }
+                                                , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 150, hide: true }
+                                                , { field: 'HMTONo', title: 'MTO鍙�', width: 150, hide: true }
+                                                , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
+                                            ]]
+                                            // , data: [linterid]
+                                            // , page: true
+                                            //, height: 500
+                                            , done: function () {
+                                                layer.closeAll("loading");
+                                            }
+                                        })
                                     }
                                     else {
-                                        $("#HBillType").val("鎵嬪伐褰曞叆");
+                                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                     }
-                                    $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
-                                    element.tabChange('tab-Kf_SellOutBill', '3');
+                                },
+                                error: function (err) {
+                                    layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                 }
-                                else {
-                                    if (HSourceFlag == "true") {
-                                        element.tabChange('tab-Kf_SellOutBill', '3');
+                            });
+                    }
+                    else {
+                        var sBarCode = $('#HBarCode').val()
+                        if (sBarCode == '') {
+                            layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+                            return false;
+                        }
+                        if (sBarCode != "") {
+                            $('#HBarCode').val("");
+                        }
+                        $.ajax({
+                            url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
+                            type: "GET",
+                            data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+                            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_SellOutBill', '3');  //璺宠浆椤电
                                     }
-                                    else {
+                                    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_SellOutBill', '3');//璺宠浆椤电
+                                    }
+                                    else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
+                                        $("#HDeptName").val(result.data.HDeptName);
+                                        $("#HDeptID").val(result.data.HDeptID);
+                                        $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+                                        element.tabChange('tab-Kf_SellOutBill', '3');//璺宠浆椤电
+                                    }
+                                    else if (result.data.HBarType == '婧愬崟鏉＄爜') {
                                         //$("#HSupName").val(result.data.HSupName);
                                         $("#HSupID").val(result.data.HSupID);
                                         //$("#HDeptName").val(result.data.HDeptName);
@@ -897,63 +935,89 @@
                                         else if (result.data.HSourceBillType == "1401") {
                                             $("#HBillType").val("1401");
                                         }
-                                        //else if (result.data.HSourceBillType == "1601") {
-                                        //    $("#HBillType").val("1601");
-                                        //}
-                                        $("#HNote").val(";鐗╂枡鏉＄爜");
+                                        else {
+                                            $("#HBillType").val("鎵嬪伐褰曞叆");
+                                        }
+                                        $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
                                         element.tabChange('tab-Kf_SellOutBill', '3');
                                     }
+                                    else {
+                                        if (HSourceFlag == "true") {
+                                            element.tabChange('tab-Kf_SellOutBill', '3');
+                                        }
+                                        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);
+                                            HSourceFlag = true;
+                                            //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                            if (result.data.HSourceBillType == "1402") {
+                                                $("#HBillType").val("1402");
+
+                                            }
+                                            else if (result.data.HSourceBillType == "1401") {
+                                                $("#HBillType").val("1401");
+                                            }
+                                            //else if (result.data.HSourceBillType == "1601") {
+                                            //    $("#HBillType").val("1601");
+                                            //}
+                                            $("#HNote").val(";鐗╂枡鏉＄爜");
+                                            element.tabChange('tab-Kf_SellOutBill', '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///OtherInStockBill/DisBillEntryList_Webs_Json'
+                                        , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+                                        , toolbar: '#toolbarDemo'
+                                        , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+                                        , cols: [[
+                                            { type: 'radio' }
+                                            , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                            , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', 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: 'HInterID', title: '鍗曟嵁ID', width: 150, hide: true }
+                                            , { field: 'HBilltype', title: '鍗曟嵁绫诲瀷', width: 150, hide: true }
+                                            , { field: 'Hbarcode', title: '鏉＄爜缂栧彿', width: 150, hide: true }
+                                            , { field: 'HSCWHID', title: '璋冨嚭浠撳簱ID', width: 150, hide: true }
+                                            , { field: 'HSCSPID', title: '璋冨嚭浠撲綅ID', width: 150, hide: true }
+                                            , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 150, hide: true }
+                                            , { field: 'HMTONo', title: 'MTO鍙�', width: 150, hide: true }
+                                            , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
+                                        ]]
+                                        // , data: [linterid]
+                                        // , page: true
+                                        //, height: 500
+                                        , done: function () {
+                                            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: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
-                              , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
-                              , toolbar: '#toolbarDemo'
-                              , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
-                              , cols: [[
-                                  { type: 'radio' }
-                                , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', 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: 'HInterID', title: '鍗曟嵁ID', width: 150, hide: true }
-                                  , { field: 'HBilltype', title: '鍗曟嵁绫诲瀷', width: 150, hide: true }
-                                  , { field: 'Hbarcode', title: '鏉＄爜缂栧彿', width: 150, hide: true }
-                                  , { field: 'HSCWHID', title: '璋冨嚭浠撳簱ID', width: 150, hide: true }
-                                  , { field: 'HSCSPID', title: '璋冨嚭浠撲綅ID', width: 150, hide: true }
-                                  , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 150, hide: true }
-                                  , { field: 'HMTONo', title: 'MTO鍙�', width: 150, hide: true }
-                                  , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
-                              ]]
-                                    // , data: [linterid]
-                                    // , page: true
-                              //, height: 500
-                              , done: function () {
-                                  layer.closeAll("loading");
-                              }
-                                });
+                                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");
+                            },
+                            error: function (err) {
+                                layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
-                            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");
-                        },
-                        error: function (err) {
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                        });
+                    }
                 }
             });
 
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 2e91e43..73b2b93 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -721,8 +721,8 @@
                 $.ajax({
                     url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
                     type: "GET",
-                    data: { "sCode": '1001456360', "sInterID": 122554, "HBillType": '1204', "sBillNo": 'MATO00000055', "sMaker": sessionStorage["HUserName"], "WhID": 484080, "SPID": 0, "sQty": 0, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": 'PPBOM202112226', "sSourceType": '3720', "HOWNERID": sessionStorage["OrganizationID"] },
-                    //data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+                    //data: { "sCode": '1001456360', "sInterID": 122554, "HBillType": '1204', "sBillNo": 'MATO00000055', "sMaker": sessionStorage["HUserName"], "WhID": 484080, "SPID": 0, "sQty": 0, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": 'PPBOM202112226', "sSourceType": '3720', "HOWNERID": sessionStorage["OrganizationID"] },
+                    data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                     success: function (result) {
                         if (result.count == 1) {
                             if (result.data.HBarType == '浠撳簱鏉＄爜') {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index 1e1148a..de1d3a9 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -713,160 +713,208 @@
         });
 
         //鎵潯鐮�
-        $('#HBarCode').on('keydown', function (event) {  //鎵潯鐮�
-            var sSubStr = table.cache['wl-table'];
-            var sBarCode = $('#HBarCode').val()
-            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 Flag = sessionStorage["SourceFlag"];
-            if (sQty == "") {
-                sQty = 0;
-            }
-            if (event.keyCode == 13) {
-                //鍒ゆ柇鏉＄爜鏄惁涓虹┖  new
-                if (sBarCode == '') {
-                    layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-                if (sBarCode != "") {
-                    $('#HBarCode').val("");
-                }
-                if (sQty != "") {
-                    $('#HQty').val("");
-                }
-                if (sHWHID == "184154")
+            $('#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'];
+                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()
+                if (event.keyCode == 13) {
+                if (HDeleteFlag == "*")
                 {
-                    if (sHSPID == "0")
-                    {
-                        layer.msg("浠撲綅涓虹┖锛岃閫夋嫨浠撲綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return false;
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
                     }
-                }
-                //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
-                    url: GetWEBURL() + "/ProductIn/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"] },
-                    success: function (result) {
-                        //debugger;
-                        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');
+                    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'
+                                        , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+                                        , cols: [[
+                                            { type: 'radio' }
+                                            , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                            , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', 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 {
-                                    $("#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');
+                                    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: "娓╅Θ鎻愮ず" });
                             }
-                            //$("#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'
-                                , toolbar: '#toolbarDemo'
-                                , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
-                                , cols: [[
-                                    { type: 'radio' }
-                                , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', 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(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        layer.msg("鎺ュ彛璇锋眰寮傚父:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        console.log(err);
+                        });
+                }
+                else {
+                    var sBarCode = $('#HBarCode').val()
+                    //var Flag = sessionStorage["SourceFlag"];
+                    if (sQty == "") {
+                        sQty = 0;
                     }
-                });
-            }
-            //else
-            //{
-            //    layer.msg(result.Message, { icon: 5 });
-            //}
-            //layer.closeAll("loading");
-            //}
+                    
+                        //鍒ゆ柇鏉＄爜鏄惁涓虹┖  new
+                        if (sBarCode == '') {
+                            layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
+                        }
+                        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",
+                            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"] },
+                            success: function (result) {
+                                //debugger;
+                                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'
+                                        , toolbar: '#toolbarDemo'
+                                        , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+                                        , cols: [[
+                                            { type: 'radio' }
+                                            , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                            , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', 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(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+                                layer.msg("鎺ュ彛璇锋眰寮傚父:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                console.log(err);
+                            }
+                        });
+                    }
+                }
         });
 
         //鎵簮鍗�
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_FastList.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_FastList.html"
index a0a5b70..b53f063 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_FastList.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_FastList.html"
@@ -67,6 +67,9 @@
                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
                                 </div>
                                 <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">鎾ら攢</button>
+                                </div>
+                                <div class="layui-col-xs2">
                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
                                 </div>
                                 <div class="layui-col-xs2">
@@ -129,30 +132,95 @@
             })
         });
 
-        form.on('submit(cmdRefresh)', function () {//缂栬緫
-            var sBillType = '1203'
+
+        form.on('submit(cmdRefresh)', function () {//鍒锋柊
             table.render({
                 elem: '#dj-table'
-                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
-                    ,toolbar: '#toolbarDemo'
-                    , where: { HBillType: sBillType,sWhere:''}
+                , url: GetWEBURL() + '/Web/chanpinruk'
+                , toolbar: '#toolbarDemo'
+                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                    , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            }),
+                table.render({
+                    elem: '#yd-table'
+                    , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+                    , toolbar: '#toolbarDemo'
+                    , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                     , cols: [[
-                          { type: 'radio' }
+                        { type: 'radio' }
                         , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
                         , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
                         , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
                         , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
                         , { field: 'HQty', title: '鏁伴噺', width: 100 }
                         , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                        , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
-                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+                        , { field: 'HOrgID', title: '缁勭粐', width: 100 }
                     ]]
-                      , height: 500
-                      , done: function () {
-                          layer.closeAll("loading");
-                      }
-            });
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                })
         });
+
+
+        //鎾ら攢鍔熻兘
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('yd-table')
+                , data = checkStatus.data;
+            var sInterID = data[0].HInterID
+            var sBillNo = data[0].HBillNo
+            var sBillType = '1203'
+            $.ajax(
+                {
+                    type: "Get",
+                    url: GetWEBURL() + "/Web/Rescind_Json",
+                    async: true,
+                    data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            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: 2 });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg('閿欒' + err, {
+                            icon: 5,
+                            time: 20000
+                        }, function () {
+                            //do something
+                        });
+                    }
+                });
+        });
+
 
 
 
@@ -218,27 +286,53 @@
        
         
         var sBillType = '1203'
-                table.render({
-                    elem: '#dj-table'
-                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
-                    ,toolbar: '#toolbarDemo'
-                    , where: { HBillType: sBillType,sWhere:''}
-                    , cols: [[
-                          { type: 'radio' }
-                        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
-                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
-                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
-                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
-                        , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                        , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
-                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
-                        ]]
-                      , height: 500
-                      , done: function () {
-                          layer.closeAll("loading");
-                      }
-    })
+        table.render({
+            elem: '#dj-table'
+            , url: GetWEBURL() + '/Web/chanpinruk'
+            , toolbar: '#toolbarDemo'
+            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+            , cols: [[
+                { type: 'radio' }
+                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+            ]]
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
+        })
+
+
+        //宸蹭笂浼犲垪琛�
+        table.render({
+            elem: '#yd-table'
+            , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+            , toolbar: '#toolbarDemo'
+            , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+            , cols: [[
+                { type: 'radio' }
+                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+            ]]
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
+        })
         //鍒锋柊鏄庣粏椤电
         table.render({
             elem: '#mx-table'
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
index 0540836..6698b13 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
@@ -67,6 +67,9 @@
                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
                                 </div>
                                 <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">鎾ら攢</button>
+                                </div>
+                                <div class="layui-col-xs2">
                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
                                 </div>
                                 <div class="layui-col-xs2">
@@ -130,88 +133,130 @@
         });
 
         form.on('submit(cmdRefresh)', function () {//
-            var sBillType = '1210'
             table.render({
                 elem: '#dj-table'
-                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
+                , url: GetWEBURL() + '/Web/chanpinruk'
+                , toolbar: '#toolbarDemo'
+                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                    , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            }),
+                table.render({
+                    elem: '#yd-table'
+                    , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                     , toolbar: '#toolbarDemo'
-                    , where: { HBillType: sBillType, sWhere: '' }
+                    , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                     , cols: [[
-                          { type: 'radio' }
+                        { type: 'radio' }
                         , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
                         , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
                         , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
                         , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
                         , { field: 'HQty', title: '鏁伴噺', width: 100 }
                         , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                        , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
-                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+                        , { field: 'HOrgID', title: '缁勭粐', width: 100 }
                     ]]
-                      , height: 500
-                      , done: function () {
-                          layer.closeAll("loading");
-                      }
-            });
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                })
+        });
+
+
+        /鎾ら攢鍔熻兘
+        form.on('submit(cmdRescind)', function () {
+            var checkStatus = table.checkStatus('yd-table')
+                , data = checkStatus.data;
+            var sInterID = data[0].HInterID
+            var sBillNo = data[0].HBillNo
+            var sBillType = '1210'
+            $.ajax(
+                {
+                    type: "Get",
+                    url: GetWEBURL() + "/Web/Rescind_Json",
+                    async: true,
+                    data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            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: 2 });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg('閿欒' + err, {
+                            icon: 5,
+                            time: 20000
+                        }, function () {
+                            //do something
+                        });
+                    }
+                });
         });
 
 
 
         form.on('submit(cmdDelete)', function () {//鍒犻櫎
             var checkStatus = table.checkStatus('dj-table')
-            , data = checkStatus.data;
-            // console.log(data);
-            // var sInterID = $('#HInterID').val()
+                , data = checkStatus.data;
             var sInterID = data[0].HInterID
-            //var sMaterID = data[0].HMaterID   
-            //var sBillType = $('#HBillType').val()
-            //var sAuxPropID = data[0].HAuxPropID
-            ////var sMTONo = data[0].HMTONo
-            //var sMTONo = 0
-            //var sSourceInterID = data[0].HSourceInterID
-            //var sSourceEntryID = data[0].HSourceEntryID
             $.ajax(
-               {
-                   type: "Get",
-                   url: GetWEBURL() + "/Web/Delete_Json",
-                   async: true,
-                   data: { "sHInterID": sInterID },
-                   dataType: "json",
-                   success: function (data) {
-                       if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                           //layer.msg(data.Message, { icon: 1 });
-                           table.render({
-                               elem: '#dj-table'
-                               , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
-                               , cellMinWidth: 80
-                               , toolbar: '#toolbarDemo'
-                               , where: { HBillType: '1210', sWhere: '' }
-                               , cols: [[
-                                   { type: 'radio' }
-                                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
-                                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
-                                , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
-                                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
-                                , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                                , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
-                                , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
-                               ]]
-                         , height: 500
-                           })
-                       }
-                       else {
-                           layer.msg(data.Message, { icon: 2 });
-                       }
-                   },
-                   error: function (err) {
-                       layer.msg('閿欒' + err, {
-                           icon: 5,
-                           time: 20000
-                       }, function () {
-                           //do something
-                       });
-                   }
-               });
+                {
+                    type: "Get",
+                    url: GetWEBURL() + "/ProductInBillList/Delete_Json",
+                    async: true,
+                    data: { "sHInterID": sInterID },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�,
+                            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: 2 });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg('閿欒' + err, {
+                            icon: 5,
+                            time: 20000
+                        }, function () {
+                            //do something
+                        });
+                    }
+                });
         });
 
 
@@ -219,11 +264,11 @@
         var sBillType = '1210'
         table.render({
             elem: '#dj-table'
-            , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
+            , url: GetWEBURL() + '/Web/chanpinruk'
             , toolbar: '#toolbarDemo'
-            , where: { HBillType: sBillType, sWhere: '' }
+            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
             , cols: [[
-                  { type: 'radio' }
+                { type: 'radio' }
                 , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
                 , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
                 , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
@@ -233,10 +278,36 @@
                 , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
                 , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
             ]]
-              , height: 500
-              , done: function () {
-                  layer.closeAll("loading");
-              }
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
+        })
+
+
+        //宸蹭笂浼犲垪琛�
+        table.render({
+            elem: '#yd-table'
+            , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+            , toolbar: '#toolbarDemo'
+            , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+            , cols: [[
+                { type: 'radio' }
+                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+            ]]
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
         })
         //鍒锋柊鏄庣粏椤电
         table.render({

--
Gitblit v1.9.1