From 81ad9c5cd22045e4739d70d8001a0fcf6941dace Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 19 四月 2022 10:43:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html                |    1 
 WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html              |    3 
 WebTM/WebTM.csproj.user                                       |    2 
 WebTM/views/验收入库/其他入库/Kf_OtherOutBill_CheckList_New.html      |  228 ++
 WebTM/views/验收入库/其他入库/Kf_OtherOutBill_Check_New.html          |  966 ++++++++++
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html              |    1 
 WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNew.html         |   11 
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user             |    3 
 WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html   |  489 +++++
 WebTM/views/index_Mobile.html                                 |    6 
 WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html |  489 +++++
 WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html        |  473 +++++
 WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNewList.html     |  307 +++
 WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html        |  381 ++++
 WebTM/views/home/console_Mobile.html                          |   30 
 WebTM/views/生产管理/组托单编辑/Sc_GroupOrderBillEdit_Fast.html        |  197 ++
 WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html |  439 ++++
 WebTM/layuiadmin/Scripts/webConfig.js                         |    1 
 WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html   |  439 ++++
 WebTM/views/index.html                                        |    8 
 WebTM/HtmlPage1.html                                          | 1140 ++++++++++++
 WebTM/WebTM.csproj                                            |   11 
 22 files changed, 5,617 insertions(+), 8 deletions(-)

diff --git a/WebTM/HtmlPage1.html b/WebTM/HtmlPage1.html
new file mode 100644
index 0000000..7b5c7fe
--- /dev/null
+++ b/WebTM/HtmlPage1.html
@@ -0,0 +1,1140 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>澶栬喘鍏ュ簱</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-table-cell {
+            height: auto;
+            white-space: normal;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 5px; height:800px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>澶栬喘鍏ュ簱鍗�</span>
+                    </div>
+                    <div class="layui-form-item" style="padding:15px;margin:0px">
+                        <div class="layui-row" style="display:none;">
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width:60px;padding-left:0px;">MES搴撲綅</label>
+                            </div>
+                            <div class="layui-col-xs8">
+                                <input type="text" name="HMESSPName" id="HMESSPName" autocomplete="off" class="layui-input">
+                                <input type="hidden" name="HMESSPID" id="HMESSPID" value="0" autocomplete="off" class="layui-input">
+                                <input type="hidden" name="HExplanation" id="HExplanation" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
+                            </div>
+                            <div class="layui-col-xs8">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab layui-col-xs12" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">婧愬崟淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+                            <li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
+                            <li lay-id="4" style="padding:1px;">鍚堣淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--婧愬崟淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <select name="HBillType" id="HBillType">
+                                                <option value="1103">鏀舵枡閫氱煡鍗�</option>
+                                                <option value="1102">閲囪喘璁㈠崟</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍗曟嵁淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">渚涘簲鍟�</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input" disabled="disabled">
+                                            <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupID-BT" disabled="disabled">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">淇濈</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HKeeper" id="HKeeper" lay-verify="HKeeper" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">楠屾敹</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;display:none">鍒跺崟浜�</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HBillerID" id="HBillerID" lay-verify="HBillerID" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HMakerID" id="HMakerID" lay-verify="HMakerID" value="0" autocomplete="off" class="layui-input" style="display : none">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">閮ㄩ棬</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鐗╂枡娓呭崟-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+                                                </div>
+                                                <div class="layui-col-xs8">
+                                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍚堣淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs3">
+                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉$爜鏁伴噺</label>
+                                    </div>
+                                    <div class="layui-col-xs8 layui-input-inline mobile">
+                                        <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" value="0" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-row">
+                                    <div class="layui-col-xs3">
+                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鎬绘暟閲�</label>
+                                    </div>
+                                    <div class="layui-col-xs8 layui-input-inline mobile">
+                                        <input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" value="0" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-row">
+                                    <div class="layui-col-xs3">
+                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ュ織</label>
+                                    </div>
+                                    <div class="layui-col-xs8 layui-input-inline mobile">
+                                        <input type="text" name="HNote" id="HNote" lay-verify="HNote" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <!--<div class="layui-form-item" style="margin-bottom: 20px;">
+                            <div class="layui-row">
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                                </div>
+                            </div>
+                        </div>-->
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            //娓呯┖鐣岄潰  new
+
+
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+            $("#HWHID").val(sessionStorage["HWHID"]);
+            $("#HWHNAME").val(sessionStorage["HWHName"]);
+            $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+            $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+            //$("#HSupID").val(sessionStorage["HSupID"]);
+            //$("#HSupName").val(sessionStorage["HSupName"]);
+            $("#HDeptID").val(sessionStorage["HDeptID"]);
+            $("#HDeptName").val(sessionStorage["HDept"]);
+            $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
+            $("#HSecManager").val(sessionStorage["HSecManager"]);
+            $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+            $("#HKeeper").val(sessionStorage["HKeeper"]);
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMaker").hide();
+            $("#HMakerID").hide();
+            $("#HBillerID").val(sessionStorage["HBillerID"]);
+            $("#HBillerID").hide();
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            var params = getUrlVars();
+            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetPonderationBill",
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (d) {
+                        // console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HBillType").val(d.data[0].HSourceBillType);
+                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+                        //$("#HWHID").val(d.data[0].HWhID);
+                        //$("#HKeeperID").val(d.data[0].HKeeperID);
+                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);
+                        //$("#HDeptID").val(d.data[0].HDeptID);
+                        //$("#HBarCode").val(d.data[0].HBarCode);
+                        //$("#HQty").val(d.data[0].HQty);
+                        RoadSup();
+                    }
+                })
+            }
+
+            function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇渚涘簲鍟�
+            {
+                //var sInterID = $("#HInterID").val()
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
+                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                if (HSourceBillNo == "" || sInterID <= 0) {
+                    layer.msg($('#HSourceBillNo').val(), { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                else {
+                    $.ajax({
+                        url: GetWEBURL() + "/POStockInBill/get_GetCg_POOrderBillList",
+                        type: "GET",
+                        data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HSupID").val(result.data[0].HSupID);
+                                $("#HSupName").val(result.data[0].HSupName);
+                                $("#HDeptID").val(result.data[0].HDeptID);
+                                $("#HDeptName").val(result.data[0].HDeptName);
+                                sessionStorage["SourceFlag"] = true;
+                                element.tabChange('tab-POStockInBill', '2');
+                                layer.load(3);
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            }
+
+            function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            {
+                table.render({
+                    elem: '#wl-table'
+                    , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+                    , where: { HBillID: linterid, HBillType: '1201', sWhere: '' }
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HQty', title: '鏁伴噺', sort: true }
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', sort: true }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true }
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true }
+                        , { field: 'HBatchNo', title: '鎵规', sort: true }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    //url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    type: "GET",
+                    data: { "HBillType": '1201' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid);
+                RoadBillSub(linterid);
+            }
+            //濡傛灉淇敼鍒欒蛋涓嬮潰 new
+
+
+
+
+            //杩涘叆鐗╂枡鏄庣粏椤电銆佹潯鐮佹 鍏夋爣鐒︾偣   new
+            if (1 == 2) {
+                element.tabChange('tab-POStockInBill', '3');
+                var pFocus = $("#HBarCode");
+                pFocus.focus();
+                pFocus.select();
+            }
+            else {
+                element.tabChange('tab-POStockInBill', '1');
+                var pFocus = $("#HSourceBillNo");
+                pFocus.focus();
+                pFocus.select();
+            }
+            //
+            //
+            form.on('submit(HWHID-BT)', function () {//閫夋嫨璋冨叆浠撳簱
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            form.on('submit(HSpID-BT)', function () {//閫夋嫨璋冨叆浠撲綅
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            form.on('submit(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '渚涘簲鍟嗗垪琛�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+
+            //form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '淇濈鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
+            //    var sMainStr = JSON.stringify(data.field);
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '楠屾敹鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+
+            form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeper").val(checkStatus.data[0].HName);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+            form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨鍙戣揣
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManager").val(checkStatus.data[0].HName);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+
+
+
+
+
+
+            form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閮ㄩ棬鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            form.on('submit(Cancel)', function () {
+                sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏄庣粏鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+                // }
+            });
+
+            form.on('submit(cmdDelete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                // console.log(data);
+                var sInterID = $('#HInterID').val()
+                var sMaterID = data[0].HMaterID
+                var sBillType = '1201'
+                var sAuxPropID = data[0].HAuxPropID
+                //var sMTONo = data[0].HMTONo
+                var sMTONo = ''
+                var sSourceInterID = data[0].HSourceInterID
+                var sSourceEntryID = data[0].HSourceEntryID
+                $.ajax(
+                    {
+                        type: "Get",
+                        //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/POStockInBill/Delete_Json",
+                        async: true,
+                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": '1103', },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //layer.msg(data.Message, { icon: 1 });
+                                table.render({
+                                    elem: '#wl-table'
+                                    //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Mate_Webs_Json'
+                                    //, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Mate_Webs_Json'
+                                    , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+                                    , cellMinWidth: 80
+                                    , toolbar: '#toolbarDemo'
+                                    , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+                                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
+                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
+                                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
+                                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                                        , { field: 'HBatchNo', title: '鎵规', width: 100 }
+                                        , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
+                                        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
+                                    ]]
+                                    , height: 500
+                                })
+                            }
+                            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: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+            });
+
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                if ($("#HExplanation").val() == "") {
+                    if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
+                        $("#HWHNAME").val("");
+                        $("#HWHID").val("");
+                        layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                }
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                var sSourceType = $("#HBillType").val();
+                if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePOStockInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            url: GetWEBURL() + "/POStockInBill/set_SavePOStockInBill_Json",
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    sessionStorage["SourceFlag"] = false;
+                                    layer.confirm("鏀舵枡" + data.Message + $("#HBillNo").val(), {
+                                        icon: 1,
+                                        skin: 'layui-layer-lan',
+                                        closeBtn: 0,
+                                        btn: ['纭'],
+                                        btn2: function () {
+                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                            //window.location.reload();//鏂板
+                                            parent.location.href = "../../../views/index.html"
+                                        }//鍏抽棴
+                                    }
+                                        , function () { parent.location.href = "../../../views/index.html"; }//鏂板
+                                    );
+                                }
+                                else {
+                                    //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                layer.closeAll("loading");
+                                layui.form.render();
+                            },
+                            error: function (err) {
+                                //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    return false;
+                }
+            });
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //鎵潯鐮�
+            $('#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 = '1201'
+                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") {
+                        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: GetWEBURL() + "/POStockInBill/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": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": '1103', "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-POStockInBill', '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-POStockInBill', '2');//璺宠浆椤电
+                                }
+                                else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
+                                    $("#HDeptName").val(result.data.HDeptName);
+                                    $("#HDeptID").val(result.data.HDeptID);
+                                    $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+                                    element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
+                                }
+                                else if (result.data.HBarType == '婧愬崟鏉$爜') {
+                                    $("#HSupName").val(result.data.HSupName);
+                                    $("#HSupID").val(result.data.HSupID);
+                                    $("#HDeptName").val(result.data.HDeptName);
+                                    $("#HDeptID").val(result.data.HDeptID);
+                                    $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                    sessionStorage["SourceFlag"] = true;
+                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                    if (result.data.HSourceBillType == "1102") {
+                                        $("#HBillType").val("1102");
+
+                                    }
+                                    else if (result.data.HSourceBillType == "1103") {
+                                        $("#HBillType").val("1103");
+                                    }
+                                    else {
+                                        $("#HBillType").val("鎵嬪伐褰曞叆");
+                                    }
+                                    $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
+                                    element.tabChange('tab-POStockInBill', '3');
+                                }
+                                else {
+                                    if (sessionStorage["SourceFlag"] == "true") {
+                                        element.tabChange('tab-POStockInBill', '3');
+                                    }
+                                    else {
+                                        $("#HSupName").val(result.data.hSupNameField);
+                                        $("#HSupID").val(result.data.hSupIDField);
+                                        //$("#HDeptName").val(result.data.HDept);
+                                        //$("#HDeptID").val(result.data.HDeptID);
+                                        $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+                                        sessionStorage["SourceFlag"] = true;
+                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                        if (result.data.hSourceBillTypeField == "1102") {
+                                            $("#HBillType").val("1102");
+
+                                        }
+                                        else if (result.data.hSourceBillTypeField == "1103") {
+                                            $("#HBillType").val("1103");
+                                        }
+                                        else {
+                                            $("#HBillType").val("鎵嬪伐褰曞叆");
+                                        }
+                                        $("#HNote").val(";鐗╂枡鏉$爜");
+                                        element.tabChange('tab-POStockInBill', '3');
+                                    }
+                                }
+                                //$("#HSupID").val(result.data.HSupID);
+                                //$("#HSupName").val(result.data.HSupName);
+                                //$("#HDeptID").val(result.data.HDeptID);
+                                //$("#HDeptName").val(result.data.HDeptName);
+                                layer.load(3)
+                                table.render({
+                                    elem: '#wl-table'
+                                    , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+                                    , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
+                                    , cellMinWidth: 115
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', sort: true }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true }
+                                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', sort: true }
+                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }
+                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true }
+                                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true }
+                                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true }
+                                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true }
+                                        , { field: 'HBatchNo', title: '鎵规', sort: 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");
+                        }
+                    });
+                }
+                //else
+                //{
+                //    layer.msg(result.Message, { icon: 5 });
+                //}
+                //layer.closeAll("loading");
+                //}
+            });
+
+            //鎵簮鍗�
+            $('#HSourceBillNo').on('keydown', function (event) {      //鎵簮鍗�
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    if (HSourceBillNo == "" || sInterID <= 0) {
+                        layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    //
+                    $.ajax({
+                        //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                        url: GetWEBURL() + "/POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                        type: "GET",
+                        data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HSupID").val(result.data[0].HSupID);
+                                $("#HSupName").val(result.data[0].HSupName);
+                                //$("#HDeptID").val(result.data[0].HDeptID);
+                                //$("#HDeptName").val(result.data[0].HDeptName);
+                                sessionStorage["SourceFlag"] = true;
+                                layer.load(3);
+                                element.tabChange('tab-POStockInBill', '2');
+                                table.render({
+                                    elem: '#wl-table'
+                                    , cellMinWidth: 80
+                                    //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
+                                    , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+                                    //, toolbar: '#toolbarDemo'
+                                    , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', sort: true }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true }
+                                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', sort: true }
+                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }
+                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true }
+                                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true }
+                                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true }
+                                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true }
+                                        , { field: 'HBatchNo', title: '鎵规' }
+                                    ]]
+                                    // , 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");
+                        }
+                    });
+                    // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+                }
+            });
+
+
+            $('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HStockPlaceName').val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                $("#HWHNAME").val(result.data[0].HWhName);
+                                element.tabChange('tab-POStockInBill', '2');
+                            }
+                            else {
+                                // $("#verifycode").click();
+                                //layer.msg(result.Message, { icon: 5 });
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                    // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+                }
+            });
+            //鍒锋柊鏄庣粏椤电
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+
+            //鎵玀ES浠撲綅
+            $('#HMESSPName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HMESSPName').val();
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                $("#HMESSPID").val(result.data[0].HWHID);
+                                $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
+                                $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
+                                $.ajax({
+                                    url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+                                    type: "GET",
+                                    data: { "HERPWHID": result.data[0].HWHID },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            $("#HWHID").val(result.data[0].HMESWHID);
+                                            $("#HWHNAME").val(result.data[0].HMESWHNAME);
+                                            $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
+                                            $("#HMESSPName").css("background-color", "#efefef4d");
+                                        }
+                                        else {
+                                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
+        {
+            $("#HWHNAME").val(obj[0].HName);
+            //sessionStorage["HWHID"] = obj[0].HItemID;
+            $("#HWHID").val(obj[0].HItemID);
+        }
+        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+            $("#HStockPlaceName").val(obj[0].HName);
+            $("#HStockPlaceID").val(obj[0].HItemID);
+        }
+        function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+            $("#HSupName").val(obj[0].HName);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+        function GetHKeeperValue(obj) {  //杩斿洖淇濈
+            $("#HKeeper").val(obj[0].HName);
+            $("#HKeeperID").val(obj[0].HItemID);
+        }
+        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+            $("#HSecManager").val(obj[0].HName);
+            $("#HSecManagerID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
+            //if ($("#HSourceBillNo").val() == '') {
+            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+            //    return false;
+            //}
+            if ($("#HDeptName").val() == '') {
+                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HSecManager").val() == '') {
+                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HKeeper").val() == '') {
+                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //if ($("#HSupName").val() == '') {
+            //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+            //    return false;
+            //}
+            //if ($("#HWHNAME").val() == '') {
+            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+            //    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;
+            }
+            if (typeof (sSubStr) == "undefined") {
+                //layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (bnt == 'Saver') {
+                if (!typeof (sSubStr) == "undefined") {
+                    //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                    //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                    //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                    //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+                    //            return false;
+                    //        }
+                    //    }
+                    //}
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        if (parseFloat(sSubStr[i].HQty) > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        layer.msg("澶栬喘鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                }
+            }
+            else {
+                return true;
+            }
+        }
+    </script>
+
+</body>
+</html>
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 50b029f..0400e90 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -23,6 +23,9 @@
     <File Include="bin/WebTM.pdb">
       <publishTime>04/13/2022 10:16:48</publishTime>
     </File>
+    <File Include="HtmlPage1.html">
+      <publishTime>03/14/2022 15:07:22</publishTime>
+    </File>
     <File Include="layuiadmin/config.js">
       <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 830dc5c..4abfb9f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -63,6 +63,7 @@
     <Reference Include="System.EnterpriseServices" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="HtmlPage1.html" />
     <Content Include="layuiadmin\echarts.min.js" />
     <Content Include="layuiadmin\layui\css\global.css" />
     <Content Include="layuiadmin\layui\css\layui - 澶嶅埗.css" />
@@ -821,6 +822,12 @@
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
     <Content Include="views\鐢熶骇绠$悊\鎷f枡閰嶉�佸崟\JIT_ComplementGoodsBill.html" />
     <Content Include="views\鐢熶骇绠$悊\鎷f枡閰嶉�佸崟\JIT_ComplementGoodsList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Add.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Gy_WorkWarehouseBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Gy_WorkWarehouseBill_Add.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Add.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList - 澶嶅埗.html" />
@@ -837,6 +844,7 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎷嗙鍗昞Sc_PackSplitBill_Fast.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNewList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNew.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鐗╂枡娓呭崟\sc_Gy_ICBomBillMainList.html" />
@@ -845,6 +853,7 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇瑁呯鍗昞QK_PackingBill.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇瑁呯鍗昞Sc_PackUnionBill_Fast.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
+    <Content Include="views\鐢熶骇绠$悊\缁勬墭鍗曠紪杈慭Sc_GroupOrderBillEdit_Fast.html" />
     <Content Include="views\鐢熶骇绠$悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
@@ -954,6 +963,8 @@
     <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
+    <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherOutBill_Check_New.html" />
+    <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherOutBill_CheckList_New.html" />
     <Content Include="views\楠屾敹鍏ュ簱\澶栬喘鍏ュ簱\Add_Edit_Kf_POStockInBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\澶栬喘鍏ュ簱\Kf_POStockInBackBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\澶栬喘鍏ュ簱\Kf_POStockInBillList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 87674ea..c147982 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
     <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index fef5b00..0e6ed35 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,6 +2,7 @@
 function GetWEBURL() {
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴
+    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
     //var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 115d469..6a75b59 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -89,11 +89,41 @@
                                   </a>
                               </li>
                               <li class="layui-col-xs3">
+                                  <a href="../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>鐢熶骇姹囨姤鍗�</cite>
+                                  </a>
+                              </li>
+                              <li class="layui-col-xs3">
                                   <a href="../浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame">
                                       <i class="layui-icon layui-icon-find-fill"></i>
                                       <cite>鏉$爜搴撳瓨</cite>
                                   </a>
                               </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../鐢熶骇绠$悊/缁勬墭鍗曠紪杈�/Sc_GroupOrderBillEdit_Fast.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>缁勬墭鍗曠紪杈�</cite>
+                                  </a>
+                              </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherOutBill_Check_New.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>鍏朵粬鍑哄簱鍗曟牎楠�</cite>
+                                  </a>
+                              </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherOutBill_CheckList_New.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>鍏朵粬鍑哄簱鍗曟牎楠岀紦瀛樺垪琛�</cite>
+                                  </a>
+                              </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNewList.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>鐢熶骇姹囨姤鍗曠紦瀛樺垪琛�</cite>
+                                  </a>
+                              </li>
                           </ul>
                       </div>
                   </div>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 1057be5..ddbd4f8 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -357,6 +357,14 @@
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </dd>
+                                <dd>
+                                    <a>鏃ヨ鍒掑钩鍙�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
                             </dl>
                         </li>
                         <!-- 杞﹂棿绠$悊 -->
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index ef9be0d..7fa9838 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -394,6 +394,12 @@
                           </a>
                       </dd>
                       <dd>
+                          <a href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鐢熶骇姹囨姤鍗�
+                          </a>
+                      </dd>
+                      <dd>
                           <a href="" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鏉$爜鏌ヨn
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 24bf5db..56753bf 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"
@@ -1181,6 +1181,7 @@
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             playSound1();
+                            HSourceFlag = true;
                             if (result.data[0].HSourceBillType == '1243') {
                                 $("#HStockStyle").val(result.data[0].HStockStyle);
                                 $("#HStockInOrgID").val(result.data[0].HSTOCKINORGID);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
new file mode 100644
index 0000000..f972ac6
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
@@ -0,0 +1,439 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鎻愭枡璁″垝淇℃伅鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="HSupplierID" name="HSupplierID" id="HSupplierID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="HSupplierIDName" name="HSupplierIDName" id="HSupplierIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupplierID" id="btnHSupplierID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>
+
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" readonly>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    var treeCkData = { id: 0 };
+    var TagId = "";
+    var TagParentId = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+            };
+        });
+        //#endregion
+
+        //#region 渚涘簲鍟�
+        form.on('submit(btnHSupplierID)', function (data) {
+            btnHSupplierID();
+        });
+        //#endregion
+
+        //#region 鐗╂枡
+        form.on('submit(btnHMaterID)', function (data) {
+            btnHMaterID();
+        });
+        //#endregion
+
+        //#region 閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-50'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'hmainid', title: 'hmainid', hide: true }
+                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                    , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
+                    //, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+                    , { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
+                    , { field: '閫�鍥炴棩鏈�', title: '閫�鍥炴棩鏈�' }
+                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+                    , { field: '淇敼浜�', title: '淇敼浜�' }
+                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
+                    , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+                    //, { field: '涓绘簮鍗曠被鍨�', title: '涓绘簮鍗曠被鍨�' }
+                    //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+                    //, { field: '婧愬崟鍙�', title: '婧愬崟鍙�' }
+                    //, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
+                    , { field: '缁勭粐', title: '缁勭粐' }
+                    , { field: '鏁版嵁鐘舵��', title: '鏁版嵁鐘舵��' }
+                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+                    //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+                    //, { field: '婧愬崟ID', title: '婧愬崟ID' }
+                    //, { field: '婧愬崟瀛怚D', title: '婧愬崟瀛怚D' }
+                    //, { field: '瀛愭簮鍗曠被鍨�', title: '瀛愭簮鍗曠被鍨�' }
+                    , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                    , { field: 'JIT鐗╂枡鍒嗙被', title: 'JIT鐗╂枡鍒嗙被' }
+                    , { field: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', title: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�' }
+                    , { field: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', title: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�' }
+                    , { field: 'JIT鎻愯揣鎵归噺', title: 'JIT鎻愯揣鎵归噺' }
+                    , { field: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡' }
+                    , { field: 'JIT渚涜揣鎻愬墠鏈�', title: 'JIT渚涜揣鎻愬墠鏈�' }
+                    , { field: 'JIT鍒拌揣鍓嶇疆鏈�', title: 'JIT鍒拌揣鍓嶇疆鏈�' }
+                    , { field: 'JIT閫佽揣鏂瑰紡', title: 'JIT閫佽揣鏂瑰紡' }
+                    , { field: 'JIT閫佽揣鎺у埗澶╂暟', title: 'JIT閫佽揣鎺у埗澶╂暟' }
+                ]]
+            };
+        }
+        //#endregion
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        option.data = result.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HBillNo = $("#HBillNo").val();
+            var HSupplierIDName = $("#HSupplierIDName").val();//渚涘簲鍟�
+            var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+            var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠g爜
+            var HMaterModel = $("#HMaterModel").val();//瑙勬牸鍨嬪彿
+
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%' ";
+            }
+            if (HSupplierIDName) {
+                sWhere += " and 渚涘簲鍟嗗悕绉� = '" + HSupplierIDName + "' ";
+            }
+            if (HMaterName) {
+                sWhere += " and 鐗╂枡鍚嶇О = '" + HMaterName + "' ";
+            }
+            if (HMaterNumber) {
+                sWhere += " and 鐗╂枡浠g爜 = '" + HMaterNumber + "' ";
+            }
+            if (HMaterModel) {
+                sWhere += " and 瑙勬牸鍨嬪彿 = '" + HMaterModel + "' ";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HBillNo").val("");
+            $("#HSupplierID").val("");
+            $("#HSupplierIDName").val("");
+            $("#HMaterID").val("");
+            $("#HMaterName").val("");
+            $("#HMaterNumber").val("");
+            $("#HMaterModel").val("");
+            sWhere = "";
+        }
+        //#endregion
+
+        //渚涘簲鍟嗗垪琛�
+        function btnHSupplierID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '渚涘簲鍟嗗垪琛�'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HSupplierID").val(checkStatus.data[0].HItemID);//渚涘簲鍟唅d
+                    $("#HSupplierIDName").val(checkStatus.data[0].HName);//渚涘簲鍟嗗悕绉�
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+
+        }
+
+        //鐗╂枡鍒楄〃
+        function btnHMaterID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                    $("#HMaterName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
+                    $("#HMaterModel").val(checkStatus.data[0].HModel);//鐗╂枡瑙勬牸鍨嬪彿
+                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠g爜
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //鍒犻櫎
+        function set_DeleteBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+                        var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/DelPODemandPlanConfigBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '鎻愭枡璁″垝淇℃伅鍒楄〃-鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+        //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+                var linteridSub = data[0].hsubid;
+
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鎻愭枡璁″垝淇℃伅鍒楄〃-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+            //#endregion
+
+        //#endregion
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
new file mode 100644
index 0000000..295a2e9
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
@@ -0,0 +1,489 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鎻愭枡璁″垝淇℃伅鏂板</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{
+                "HSupplierID": "", "HSupplierNumber": "", "HSupplierName": "", "HMaterID": "","HMaterNumber":"", "HMaterName": "", "HMaterModel": ""
+                , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
+                , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+            }];
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍔犺浇缁勭粐
+            get_Organ();
+            //鍒跺崟浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                linteridSub = -1;
+                OperationType = 1;
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '4611' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid, linteridSub);
+                //RoadBillSub(linterid);
+            }
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , cellMinWidth: 120
+                , height: 'full-170'
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HSupplierID', title: 'HSupplierID', hide: true }
+                    , { field: 'HSupplierNumber', title: '渚涘簲鍟�', edit: 'text', event: "HSupplierID" }
+                    , { field: 'HSupplierName', title: '渚涘簲鍟嗗悕绉�' }
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡', edit: 'text', event: "HMaterID" }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿'}
+                    , { field: 'HJITMaterGroup', title: 'JIT鐗╂枡鍒嗙被', edit: 'text' }
+                    , { field: 'HJITSafeStock', title: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', edit: 'text', width: 200 }
+                    , { field: 'HJITMaterDemand', title: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', edit: 'text', width:200}
+                    , { field: 'HJITBatchQty', title: 'JIT鎻愯揣鎵归噺', edit: 'text' }
+                    , { field: 'HDeliveryPeriod', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', edit: 'text', width: 200}
+                    , { field: 'HLeadTime', title: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', edit: 'text', width: 200 }
+                    , { field: 'HLeadTime_Sec', title: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', edit: 'text', width: 200}
+                    , { field: 'HDeliveryMode', title: 'JIT閫佽揣鏂瑰紡', edit: 'text' }
+                    , { field: 'HDeliveryDaysCtrl', title: 'JIT閫佽揣鎺у埗澶╂暟', edit: 'text', width: 200 }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                ]]
+            }
+
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HSupplierID": "","HSupplierNumber":"", "HSupplierName": "", "HMaterID": "","HMaterNumber":"", "HMaterName": "", "HMaterModel": ""
+                    , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
+                    , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+
+                        form.render('select');
+                        form.render('checkbox');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            form.render('select');
+                            form.render('checkbox');
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+                    Pub_Close(1);
+                } else {
+                    Pub_Close(2);
+                }
+            })
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                set_AddNew(data);
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //缁勭粐閫夋嫨椤甸潰
+            function get_Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HPRDORGID").append(Organization);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //琛屽揩鎹烽敭
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //渚涘簲鍟�
+                        if (obj.event == "HSupplierID") {
+                            //鎵撳紑渚涘簲鍟嗗皬绐椾綋
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "渚涘簲鍟嗗垪琛�"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HSupplierID": checkStatus.data[0].HItemID
+                                        , "HSupplierNumber": checkStatus.data[0].HNumber
+                                        , "HSupplierName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            //鎵撳紑鐗╂枡  灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HMaterID": checkStatus.data[0].HItemID
+                                        , "HMaterNumber": checkStatus.data[0].HNumber
+                                        , "HMaterName": checkStatus.data[0].HName
+                                        , "HMaterModel": checkStatus.data[0].HModel
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        return false;
+                    }
+
+                })
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+
+                        //涓昏〃
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID": d.data[0].hmainid
+                            , "HPRDORGID": d.data[0].缁勭粐
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [{
+                            "HSupplierID": d.data[0].HSupplierID, "HSupplierNumber": d.data[0].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[0].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠g爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
+                            , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
+                            , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
+                        }];
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    }
+                })
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/AddPODemandPlanConfigBillList",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg("淇濆瓨鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#endregion
+
+        });
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
new file mode 100644
index 0000000..655402a
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
@@ -0,0 +1,381 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>杞﹂棿浠撳簱瀵圭収鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <!--<div class="layui-colla-content">
+                <div class="layui-inline">
+                    <div class="layui-inline">
+                        <span>鍏朵粬鏉′欢></span>
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="鐗╂枡浠g爜" id="鐗╂枡浠g爜">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">璧勬簮浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="璧勬簮浠g爜" id="璧勬簮浠g爜">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="width: 85px;">閮ㄩ棬浠g爜</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
+                        <input type="text" class="layui-input" name="閮ㄩ棬浠g爜" id="閮ㄩ棬浠g爜">
+                    </div>
+                </div>
+            </div>-->
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    var treeCkData = { id: 0 };
+    var TagId = "";
+    var TagParentId = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+            };
+        });
+        //#endregion
+
+        //#region 鐢熶骇杞﹂棿
+        form.on('submit(btnHWorkShopID)', function (data) {
+            btnHWorkShopID();
+        });
+        //#endregion
+
+        //#region 閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-50'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'hmainid', title: 'hmainid', hide: true }
+                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                    , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
+                    //, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+                    , { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
+                    , { field: '閫�鍥炴棩鏈�', title: '閫�鍥炴棩鏈�' }
+                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+                    , { field: '淇敼浜�', title: '淇敼浜�' }
+                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
+                    , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+                    //, { field: '涓绘簮鍗曠被鍨�', title: '涓绘簮鍗曠被鍨�' }
+                    //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+                    //, { field: '婧愬崟鍙�', title: '婧愬崟鍙�' }
+                    //, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
+                    , { field: '缁勭粐', title: '缁勭粐' }
+                    , { field: '鏁版嵁鐘舵��', title: '鏁版嵁鐘舵��' }
+                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+                    //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+                    //, { field: '婧愬崟ID', title: '婧愬崟ID' }
+                    //, { field: '婧愬崟瀛怚D', title: '婧愬崟瀛怚D' }
+                    //, { field: '瀛愭簮鍗曠被鍨�', title: '瀛愭簮鍗曠被鍨�' }
+                    , { field: '杞﹂棿浠g爜', title: '杞﹂棿浠g爜' }
+                    , { field: '杞﹂棿鍚嶇О', title: '杞﹂棿鍚嶇О' }
+                    , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜' }
+                    , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
+                ]]
+            };
+        }
+        //#endregion
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/ComplementGoodBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        option.data = result.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HBillNo = $("#HBillNo").val();
+            var HWorkShopIDName = $("#HWorkShopIDName").val();
+         
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            if (HWorkShopIDName) {
+                sWhere += " and 杞﹂棿鍚嶇О = '" + HWorkShopIDName + "'";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HWorkShopIDName").val("");
+            $("#HBillNo").val("");
+            $("#HWorkShopID").val("");
+            sWhere = "";
+        }
+        //#endregion
+
+        //鐢熶骇杞﹂棿鍒楄〃
+        function btnHWorkShopID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+
+        }
+
+        //鍒犻櫎
+        function set_DeleteBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+                        var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/DelComplementGoodBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+            //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+                var linteridSub = data[0].hsubid;
+
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+            //#endregion
+
+        //#endregion
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
new file mode 100644
index 0000000..6ba475e
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
@@ -0,0 +1,473 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>杞﹂棿浠撳簱瀵圭収鏂板</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{
+                "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": "","HWHNumber":"", "HWHName": "", "HRemark": ""
+            }];
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍔犺浇缁勭粐
+            get_Organ();
+            //鍒跺崟浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                linteridSub = -1;
+                OperationType = 1;
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '4612' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid, linteridSub);
+                //RoadBillSub(linterid);
+            }
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , cellMinWidth: 120
+                , height: 'full-170'
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
+                    , { field: 'HWorkShopNumber', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HWorkShopID" }
+                    , { field: 'HWorkShopName', title: '杞﹂棿鍚嶇О' }
+                    , { field: 'HWHID', title: 'HWHID', hide: true }
+                    , { field: 'HWHNumber', title: '浠撳簱', edit: 'text', event: "HWHID" }
+                    , { field: 'HWHName', title: '浠撳簱鍚嶇О' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                ]]
+            }
+
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": "","HWHNumber":"", "HWHName": "", "HRemark": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+                     
+                        form.render('select');
+                        form.render('checkbox');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            form.render('select');
+                            form.render('checkbox');
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+                    Pub_Close(1);
+                } else {
+                    Pub_Close(2);
+                }
+            })
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                set_AddNew(data);
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //缁勭粐閫夋嫨椤甸潰
+            function get_Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HPRDORGID").append(Organization);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //琛屽揩鎹烽敭
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //鐢熶骇杞﹂棿
+                        if (obj.event == "HWorkShopID") {
+                            //鎵撳紑鐢熶骇杞﹂棿灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐢熶骇杞﹂棿鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HWorkShopID": checkStatus.data[0].HItemID
+                                        , "HWorkShopNumber": checkStatus.data[0].HNumber
+                                        , "HWorkShopName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //浠撳簱
+                        if (obj.event == "HWHID") {
+                            //鎵撳紑浠撳簱  灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "浠撳簱鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HWHID": checkStatus.data[0].HItemID
+                                        , "HWHNumber": checkStatus.data[0].HNumber
+                                        , "HWHName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        return false;
+                    }
+
+                })
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/ComplementGoodBillList",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+
+                        //涓昏〃
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID": d.data[0].hmainid
+                            , "HPRDORGID": d.data[0].缁勭粐
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [{
+                            "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].杞﹂棿浠g爜, "HWorkShopName": d.data[0].杞﹂棿鍚嶇О, "HWHID": d.data[0].HWHID
+                            , "HWHNumber": d.data[0].浠撳簱浠g爜, "HWHName": d.data[0].浠撳簱鍚嶇О, "HRemark": d.data[0].琛ㄤ綋澶囨敞
+                        }];
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    }
+                })
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/AddComplementGoodBillList",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg("淇濆瓨鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#endregion
+
+        });
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
new file mode 100644
index 0000000..bb92a7b
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
@@ -0,0 +1,439 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>瑕佹枡璁″垝淇℃伅鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">杞﹂棿</label>
+                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHHWorkShopID" id="btnHSupplierID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                </div>
+
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" readonly>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    var treeCkData = { id: 0 };
+    var TagId = "";
+    var TagParentId = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //#region 澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_ShowBill': set_ShowBill();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+            };
+        });
+        //#endregion
+
+        //#region 杞﹂棿
+        form.on('submit(btnHHWorkShopID)', function (data) {
+            btnHHWorkShopID();
+        });
+        //#endregion
+
+        //#region 鐗╂枡
+        form.on('submit(btnHMaterID)', function (data) {
+            btnHMaterID();
+        });
+        //#endregion
+
+        //#region 閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+        });
+        //#endregion
+
+        //#region 鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display(sWhere);
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-50'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'hmainid', title: 'hmainid', hide: true }
+                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                    , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
+                    //, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+                    , { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
+                    , { field: '閫�鍥炴棩鏈�', title: '閫�鍥炴棩鏈�' }
+                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+                    , { field: '淇敼浜�', title: '淇敼浜�' }
+                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
+                    , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+                    //, { field: '涓绘簮鍗曠被鍨�', title: '涓绘簮鍗曠被鍨�' }
+                    //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+                    //, { field: '婧愬崟鍙�', title: '婧愬崟鍙�' }
+                    //, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
+                    , { field: '缁勭粐', title: '缁勭粐' }
+                    , { field: '鏁版嵁鐘舵��', title: '鏁版嵁鐘舵��' }
+                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+                    //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+                    //, { field: '婧愬崟ID', title: '婧愬崟ID' }
+                    //, { field: '婧愬崟瀛怚D', title: '婧愬崟瀛怚D' }
+                    //, { field: '瀛愭簮鍗曠被鍨�', title: '瀛愭簮鍗曠被鍨�' }
+                    , { field: '杞﹂棿鍚嶇О', title: '杞﹂棿鍚嶇О' }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                    , { field: 'JIT鐗╂枡鍒嗙被', title: 'JIT鐗╂枡鍒嗙被' }
+                    , { field: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', title: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�' }
+                    , { field: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', title: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�' }
+                    , { field: 'JIT鎻愯揣鎵归噺', title: 'JIT鎻愯揣鎵归噺' }
+                    , { field: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡' }
+                    , { field: 'JIT渚涜揣鎻愬墠鏈�', title: 'JIT渚涜揣鎻愬墠鏈�' }
+                    , { field: 'JIT鍒拌揣鍓嶇疆鏈�', title: 'JIT鍒拌揣鍓嶇疆鏈�' }
+                    , { field: 'JIT閫佽揣鏂瑰紡', title: 'JIT閫佽揣鏂瑰紡' }
+                    , { field: 'JIT閫佽揣鎺у埗澶╂暟', title: 'JIT閫佽揣鎺у埗澶╂暟' }
+                ]]
+            };
+        }
+        //#endregion
+
+        //#region 鏌ヨ
+        function get_Display(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/NeedMaterPlanConfigBillList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        option.data = result.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HBillNo = $("#HBillNo").val();
+            var HWorkShopIDName = $("#HWorkShopIDName").val();//杞﹂棿
+            var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+            var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠g爜
+            var HMaterModel = $("#HMaterModel").val();//瑙勬牸鍨嬪彿
+
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%' ";
+            }
+            if (HWorkShopIDName) {
+                sWhere += " and 杞﹂棿鍚嶇О = '" + HWorkShopIDName + "' ";
+            }
+            if (HMaterName) {
+                sWhere += " and 鐗╂枡鍚嶇О = '" + HMaterName + "' ";
+            }
+            if (HMaterNumber) {
+                sWhere += " and 鐗╂枡浠g爜 = '" + HMaterNumber + "' ";
+            }
+            if (HMaterModel) {
+                sWhere += " and 瑙勬牸鍨嬪彿 = '" + HMaterModel + "' ";
+            }
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HBillNo").val("");
+            $("#HWorkShopID").val("");
+            $("#HWorkShopIDName").val("");
+            $("#HMaterID").val("");
+            $("#HMaterName").val("");
+            $("#HMaterNumber").val("");
+            $("#HMaterModel").val("");
+            sWhere = "";
+        }
+        //#endregion
+
+        //杞﹂棿鍒楄〃
+        function btnHHWorkShopID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '杞﹂棿鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HSupplierID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+                    $("#HSupplierIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+
+        }
+
+        //鐗╂枡鍒楄〃
+        function btnHMaterID() {
+            layer.open({
+                type: 2 //绫诲瀷
+                , skin: 'layui-layer-rim'//鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                    $("#HMaterName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
+                    $("#HMaterModel").val(checkStatus.data[0].HModel);//鐗╂枡瑙勬牸鍨嬪彿
+                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠g爜
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //鍒犻櫎
+        function set_DeleteBill() {
+            var CheckStatus = table.checkStatus("mainTable");
+
+            if (CheckStatus.data.length != 1) {
+                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+            } else {
+                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function () {
+                        var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+                        var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+
+                        $.ajax({
+                            url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/DelNeedMaterPlanConfigBillList'
+                            , type: "GET"
+                            , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+                            , success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                        ////閲嶈浇tree
+                                        //tree.reload('treeDepartment', {});
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '瑕佹枡璁″垝淇℃伅鍒楄〃-鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+        //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+                var linteridSub = data[0].hsubid;
+
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '瑕佹枡璁″垝淇℃伅鍒楄〃-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+            //#endregion
+
+        //#endregion
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
new file mode 100644
index 0000000..82b2928
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
@@ -0,0 +1,489 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>瑕佹枡璁″垝淇℃伅鏂板</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+
+            //鍒濆琛ㄦ牸鏁版嵁
+            var rowdata = [{
+                "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HMaterID": "","HMaterNumber":"", "HMaterName": "", "HMaterModel": ""
+                , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
+                , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+            }];
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍔犺浇缁勭粐
+            get_Organ();
+            //鍒跺崟浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                linteridSub = -1;
+                OperationType = 1;
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '4611' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid, linteridSub);
+                //RoadBillSub(linterid);
+            }
+
+            var option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , cellMinWidth: 120
+                , height: 'full-170'
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
+                    , { field: 'HWorkShopNumber', title: '杞﹂棿', edit: 'text', event: "HWorkShopID" }
+                    , { field: 'HWorkShopName', title: '杞﹂棿鍚嶇О' }
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡', edit: 'text', event: "HMaterID" }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿'}
+                    , { field: 'HJITMaterGroup', title: 'JIT鐗╂枡鍒嗙被', edit: 'text' }
+                    , { field: 'HJITSafeStock', title: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', edit: 'text', width: 200 }
+                    , { field: 'HJITMaterDemand', title: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', edit: 'text', width:200}
+                    , { field: 'HJITBatchQty', title: 'JIT鎻愯揣鎵归噺', edit: 'text' }
+                    , { field: 'HDeliveryPeriod', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', edit: 'text', width: 200}
+                    , { field: 'HLeadTime', title: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', edit: 'text', width: 200 }
+                    , { field: 'HLeadTime_Sec', title: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', edit: 'text', width: 200}
+                    , { field: 'HDeliveryMode', title: 'JIT閫佽揣鏂瑰紡', edit: 'text' }
+                    , { field: 'HDeliveryDaysCtrl', title: 'JIT閫佽揣鎺у埗澶╂暟', edit: 'text', width: 200 }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                ]]
+            }
+
+            //鍒濆鍔犺浇琛ㄦ牸
+            option.data = rowdata;
+            table.render(option);
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HMaterID": "","HMaterNumber":"", "HMaterName": "", "HMaterModel": ""
+                    , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
+                    , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+
+                        form.render('select');
+                        form.render('checkbox');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            form.render('select');
+                            form.render('checkbox');
+                        }
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+                    Pub_Close(1);
+                } else {
+                    Pub_Close(2);
+                }
+            })
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                set_AddNew(data);
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //缁勭粐閫夋嫨椤甸潰
+            function get_Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HPRDORGID").append(Organization);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //琛屽揩鎹烽敭
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //杞﹂棿
+                        if (obj.event == "HWorkShopID") {
+                            //鎵撳紑杞﹂棿灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "杞﹂棿鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HWorkShopID": checkStatus.data[0].HItemID
+                                        ,"HWorkShopNumber": checkStatus.data[0].HNumber
+                                        , "HWorkShopName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            //鎵撳紑鐗╂枡  灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HMaterID": checkStatus.data[0].HItemID
+                                        , "HMaterNumber": checkStatus.data[0].HNumber
+                                        , "HMaterName": checkStatus.data[0].HName
+                                        , "HMaterModel": checkStatus.data[0].HModel
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        return false;
+                    }
+
+                })
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/NeedMaterPlanConfigBillList",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+
+                        //涓昏〃
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID": d.data[0].hmainid
+                            , "HPRDORGID": d.data[0].缁勭粐
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [{
+                            "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].杞﹂棿缂栫爜, "HWorkShopName": d.data[0].杞﹂棿鍚嶇О, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠g爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
+                            , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
+                            , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
+                        }];
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    }
+                })
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/AddNeedMaterPlanConfigBillList",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg("淇濆瓨鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#endregion
+
+        });
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNew.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNew.html"
index 86dadc8..e964a5c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNew.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNew.html"
@@ -60,8 +60,7 @@
                                         </div>
                                         <div class="layui-col-xs8">
                                             <select name="HBillType" id="HBillType">
-                                                <option value="1103">鏀舵枡閫氱煡鍗�</option>
-                                                <option value="1102">閲囪喘璁㈠崟</option>
+                                                <option value="3710">鐢熶骇璁㈠崟</option>
                                             </select>
                                         </div>
                                     </div>
@@ -293,7 +292,7 @@
                     //$("#HDeptID").val(d.data[0].HDeptID);
                     //$("#HBarCode").val(d.data[0].HBarCode);
                     //$("#HQty").val(d.data[0].HQty);
-                    RoadSup();
+                    //RoadSup();
                 }
             })
         }
@@ -339,7 +338,7 @@
             table.render({
                 elem: '#wl-table'
                 , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
-                , where: { HBillID: linterid, HBillType: '1201', sWhere: '' }
+                , where: { HBillID: linterid, HBillType: '3711', sWhere: '' }
                 , cols: [[
                     { type: 'radio' }
                 , { field: 'HQty', title: '鏁伴噺', sort: true }
@@ -812,7 +811,7 @@
                                             layer.load(3)
                                             table.render({
                                                     elem: '#wl-table'
-                                                , url: GetWEBURL() + '/ICMOReportBill/DisBillEntryList_Webs_Json'
+                                                , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
                                                   , where: { HBillID: sInterID, HBillType: '3711', sWhere: '' }
                                                   , cellMinWidth : 115
                                                   , cols: [[
@@ -880,7 +879,7 @@
                                 elem: '#wl-table'
                                 , cellMinWidth: 80
                               //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
-                                , url: GetWEBURL() + '/ICMOReportBill/DisBillEntryList_Webs_Json'
+                                , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
                               //, toolbar: '#toolbarDemo'
                               , where: { HBillID: sInterID, HBillType: '3711', sWhere: '' }
                               , cols: [[
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNewList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNewList.html"
new file mode 100644
index 0000000..be3b74b
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNewList.html"
@@ -0,0 +1,307 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>鐢熶骇姹囨姤鍗曠紦瀛樺垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <!--<div class="layui-form-item">
+                        <div class="layui-row">
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉$爜</label>
+                            </div>
+                            <div class="layui-col-xs7">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off"  class="layui-input">
+                            </div>
+                         </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-row">
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鏁伴噺</label>
+                            </div>
+                            <div class="layui-col-xs7">
+                                <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                            </div>
+                            </div>
+                    </div>-->
+                    <div class="layui-tab" lay-filter="tab-POStockInBillList">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1">缂撳瓨鍒楄〃</li>
+                            <li lay-id="2">宸蹭笂浼犲垪琛�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item  layui-show">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <table class="layui-hide" id="yd-table" lay-filter="yd-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="margin-bottom: 20px;">
+                            <div class="layui-row">
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <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">
+                                    <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdAdd">鏂板</button>-->
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+        , admin = layui.admin
+        , layer = layui.layer
+        , table = layui.table
+        , form = layui.form
+        , element = layui.element;
+        //娓呯┖鐣岄潰  new
+
+        //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+        //鍔犺浇婧愬崟绫诲瀷
+
+        //璇诲彇鍗曟嵁鍒楄〃
+        //
+
+        form.on('submit(Cancel)', function () {
+            parent.location.href = "../../../views/index.html"
+            //window.close();//鍏抽棴褰撳墠椤�
+        })
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                     , data = checkStatus.data;
+            //ajaxLabelData = data;
+            //layer.alert(rows);
+            layer.open({
+                type: 2
+                , area: ['100%', '100%']
+                , title: '鐢熶骇姹囨姤鍗�'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html?linterid=' + data[0].HInterID, 'yes']
+                , resize: false
+                , cancel: function () {
+                    $(".layui-btn").removeClass("layui-btn-disabled");
+                }
+            })
+        });
+
+        form.on('submit(cmdRefresh)', function () {//
+            var sBillType = '3711'
+            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");
+                      }
+            });
+        });
+
+
+        //鎾ら攢鍔熻兘
+        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 = '3711'
+            $.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(result.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;
+            var sInterID = data[0].HInterID
+            $.ajax(
+               {
+                   type: "Get",
+                   url: GetWEBURL() + "/Web/Delete_Json",
+                   async: true,
+                   data: { "sHInterID": sInterID },
+                   dataType: "json",
+                   success: function (data) {
+                       if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                           layer.msg(result.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 = '3711'
+        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: '鐗╂枡浠g爜', 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'
+            // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
+            //, toolbar: '#toolbarDemo'
+            // , where: { sMsg: linterid, sMsg2: lentryid }
+         , cols: [[
+           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+         ]]
+         , page: true
+         , height: 500
+         , done: function () {
+         }
+        });
+    });
+    //娓呯┖琛ㄥご
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\346\211\230\345\215\225\347\274\226\350\276\221/Sc_GroupOrderBillEdit_Fast.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\346\211\230\345\215\225\347\274\226\350\276\221/Sc_GroupOrderBillEdit_Fast.html"
new file mode 100644
index 0000000..7f842e8
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\346\211\230\345\215\225\347\274\226\350\276\221/Sc_GroupOrderBillEdit_Fast.html"
@@ -0,0 +1,197 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>缁勬墭鍗曠紪杈�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+
+<body>
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card">
+            <div class="layui-card-body" style="padding: 5px; height:800px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>缁勬墭鍗曠紪杈�</span>
+                    </div>
+                    <div class="layui-form-item" style="padding:15px;margin:0px">
+                        <div class="layui-row">
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鎵樻潯鐮�</label>
+                            </div>
+                            <div class="layui-col-xs8">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <table class="" id="wl-table" lay-filter="wl-table"></table>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>-->
+                        <input type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify" value="淇敼"/>
+                        <input type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete" value="鍒犻櫎"/>
+                        <input type="button" lay-submit="" class="layui-btn" lay-filter="Cancel" value="閫�鍑�"/>
+                    </div>
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element;
+
+
+            var option = {
+                id: 'wl-table'
+                , elem: '#wl-table'
+                , toolbar: '#toolbarDemo'
+                , page: false
+                , cellMinWidth: 120
+                , height: 200
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HBarCode', title: '瀛愭潯鐮佺紪鍙�', width: 150 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 150,edit:true }
+                ]]
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , done: function (res, curr, count) {
+                }
+            };
+            option.data = [];
+            table.render(option);
+            //娓呯┖鐣岄潰  new
+
+            $("#HBarCode").focus();
+
+             
+
+
+        //缂栬緫
+        form.on('submit(cmdModify)', function () {//缂栬緫
+
+        //鑾峰彇缃戞牸褰撳墠閫変腑琛岀殑鏉$爜銆佹暟閲�   淇敼鏉$爜妗f鏁伴噺   缁勬墭鍗曞瓙琛ㄦ暟閲�  閲嶆柊鎵ц鐢熸垚sum琛ㄥ瓨鍌ㄨ繃绋�
+        //var sSubStr = table.cache['wl-table'];
+            var checkStatus = table.checkStatus('wl-table');
+            var data = checkStatus.data;
+            if (data.length === 0) {
+                layer.msg("璇烽�変腑涓�琛屾暟鎹慨鏀�");
+                return;
+            }
+            var sQty = data[0].HQty
+            var HBarCode = data[0].HBarCode
+            $.ajax({
+                type: "Get",
+                url: GetWEBURL() + "/GroupOrderBill/Edit",
+                async: true,
+                data: { "HBarCode1": HBarCode, "HQty": sQty},
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) { 
+                        layer.alert(data.Message, { icon: 1, closeBtn: false }, function () {
+                            window.location.reload();
+                        });
+                    }
+                    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: "娓╅Θ鎻愮ず" });
+                }
+            });
+        });
+
+        form.on('submit(Cancel)', function () {
+            //sessionStorage["SourceFlag"] = false;
+            parent.location.href = "../../../views/index.html"
+            //window.close();//鍏抽棴褰撳墠椤�
+        })
+
+        //鍒犻櫎
+        form.on('submit(cmdDelete)', function () {//鍒犻櫎
+            var checkStatus = table.checkStatus('wl-table')
+            , data = checkStatus.data;
+            //var sInterID = $('#HInterID').val()
+            var HBarCode = data[0].HBarCode
+            $.ajax(
+               {
+                   type: "Get",
+                    url: GetWEBURL() + "/GroupOrderBill/Delete",
+                   async: true,
+                    data: {"HBarCode1": HBarCode},
+                   dataType: "json",
+                   success: function (data) {
+                       if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                           layer.alert(data.Message, { icon: 1, closeBtn: false }, function () {
+                               window.location.reload();
+                           });
+                       }
+                       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: "娓╅Θ鎻愮ず" });
+                   }
+               });
+        });
+
+
+        //鎵弿鎵樻潯鐮�
+            $('#HBarCode').on('keydown', function (event) {  //鎵弿鎵樻潯鐮�
+                var HBarCode = $('#HBarCode').val()
+                if (event.keyCode == 13) {
+                    var HBarCode = $('#HBarCode').val()
+                    if (HBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+
+                    $.ajax({
+                        url: GetWEBURL() + '/GroupOrder/GetBillEntry_TmpListGroupOrder',
+                        type: "GET",
+                        data: { HBarCode: HBarCode },
+                        success: function (result) {
+                            if (result.count === 1) {
+                                option.data = result.data;
+                                table.render(option);
+                            }
+                        }
+                    });
+                    return false;
+                }
+            });
+
+
+
+
+    });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index 3d621be..ac4557a 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -727,6 +727,7 @@
                                 $("#HStockPlaceName").val(result.data[0].HName);
                                 $("#HWHID").val(result.data[0].HWHID);
                                 $("#HWHNAME").val(result.data[0].HWhName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
                                 element.tabChange('tab-POStockInBill', '2');
                             }
                             else {
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_OtherOutBill_CheckList_New.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_OtherOutBill_CheckList_New.html"
new file mode 100644
index 0000000..65c0f09
--- /dev/null
+++ "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_OtherOutBill_CheckList_New.html"
@@ -0,0 +1,228 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>鍏朵粬鍑哄簱鏍¢獙缂撳瓨鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-POStockInBillList">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1">鍗曟嵁鍒楄〃</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item  layui-show">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="margin-bottom: 20px;">
+                            <div class="layui-row">
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <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="cmdCancel">閫�鍑�</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element;
+        //娓呯┖鐣岄潰  new
+
+        //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+        //鍔犺浇婧愬崟绫诲瀷
+
+        //璇诲彇鍗曟嵁鍒楄〃
+        //
+
+        form.on('submit(Cancel)', function () {
+            parent.location.href = "../../../views/index.html"
+            //window.close();//鍏抽棴褰撳墠椤�
+        })
+
+
+
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            layer.open({
+                type: 2
+                , area: ['100%', '100%']
+                , title: '鍏朵粬鍑哄簱鏍¢獙'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherOutBill_Check_New.html?linterid=' + data[0].HInterID + '&lBillNo=' + data[0].HBillNo, 'yes']
+                , resize: false
+                , cancel: function () {
+                    $(".layui-btn").removeClass("layui-btn-disabled");
+                }
+            })
+        });
+        var option = {
+            elem: '#dj-table'
+            , 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");
+            }
+        }
+        // url: GetWEBURL() + '/Web/chanpinruk',
+        form.on('submit(cmdRefresh)', function () {//鍒锋柊
+            table.render({
+                elem: '#dj-table'
+                ,url: GetWEBURL() + '/Web/chanpinruk'
+                , toolbar: '#toolbarDemo'
+                , defaultToolbar: []
+                , 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");
+                }
+            })
+        });
+
+
+
+        form.on('submit(cmdDelete)', function () {//鍒犻櫎
+            var checkStatus = table.checkStatus('dj-table')
+            , data = checkStatus.data;
+            var sInterID = data[0].HInterID
+            $.ajax(
+               {
+                   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 = '1206'
+                table.render({
+                    elem: '#dj-table'
+                    , url: GetWEBURL() + '/OtherOutBill_Check_New/DisPonderationBillMain_TempList_BillCheck'
+                    , toolbar: '#toolbarDemo'
+                    , defaultToolbar: []
+                    , 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: 'HOWNERName', title: '缁勭粐', width: 100 }
+                        ]]
+                      , height: 500
+                      , done: function () {
+                          layer.closeAll("loading");
+                      }
+                })
+
+        //鍒锋柊鏄庣粏椤电
+        table.render({
+            elem: '#mx-table'
+            // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
+            //, toolbar: '#toolbarDemo'
+            // , where: { sMsg: linterid, sMsg2: lentryid }
+         , cols: [[
+           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+         ]]
+         , page: true
+         , height: 500
+         , done: function () {
+         }
+        });
+    });
+    //娓呯┖琛ㄥご
+    </script>
+
+</body>
+</html>
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_OtherOutBill_Check_New.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_OtherOutBill_Check_New.html"
new file mode 100644
index 0000000..1d2255b
--- /dev/null
+++ "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_OtherOutBill_Check_New.html"
@@ -0,0 +1,966 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍏朵粬鍑哄簱鏍¢獙</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-col-xs4 {
+            width: 12.333333%
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_OtherInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <!-- <li lay-id="1">婧愬崟淇℃伅</li>-->
+                            <li lay-id="1">琛ㄥご淇℃伅</li>
+                            <li lay-id="2">鐗╂枡淇℃伅</li>
+                            <li lay-id="3">鍚堣淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input mobile">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="margin-bottom: 20px;">
+                            <div class="layui-row">
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver" id="Saver">鎻愪氦</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+            $("#HWHID").val(sessionStorage["HWHID"]);
+            $("#HWHNAME").val(sessionStorage["HWHName"]);
+            $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+            $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            var params = getUrlVars();
+            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lBillNo = params[params[1]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/OtherOutBill_Check_New/bj",
+                    type: "GET",
+                    data: { "HBillNo": lBillNo, "HBillType": '1206'},
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //console.log(JSON.stringify(result.data.hItemIDField))
+                            //return;
+                            $("#HStockPlaceName").val(result.data.hSPNameField);
+                            $("#HWHID").val(result.data.hWhIDField);
+                            $("#HWHNAME").val(result.data.hWhNameField);
+                            $('#HInterID').val(result.data.hInterIDField)
+                            $('#HBillNo').val(result.data.hBillNoField)
+                            var HBillID = $('#HInterID').val()
+                            element.tabChange('tab-Kf_OtherInBill', '2');
+                            table.render({
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: HBillID, HBillType: '1206', sWhere: '' }
+                                , cellMinWidth: 90
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                    , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+                                    , { field: 'HWHName', title: '浠撳簱', width: 150 }
+                                    , { field: 'HSPName', title: '浠撲綅', width: 150 }
+                                    , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+                                    , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                                ]]
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+
+            //function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            //{
+            //    table.render({
+            //        elem: '#wl-table'
+            //        , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json'
+            //        , toolbar: '#toolbarDemo'
+            //        , where: { HBillID: linterid, HBillType: '1206', sWhere: '' }
+            //        , cols: [[
+            //            { type: 'radio' }
+            //            , { field: 'HQty', title: '鏁伴噺', width: 150 }
+            //            , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+            //            , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+            //            , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+            //            , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+            //            , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+            //            , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+            //            , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+            //            , { field: 'HBatchNo', title: '鎵规', width: 150 }
+            //        ]]
+            //        , height: 500
+            //        , done: function () {
+            //            layer.closeAll("loading");
+            //        }
+            //    });
+            //}
+
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+
+
+
+
+
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '1206' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        //$("#HInterID").val(d.data[0].HInterID);
+                        //$("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid);
+            }
+
+
+            if (1 == 2) {
+                element.tabChange('tab-Kf_OtherInBill', '2');
+                var pFocus = $("#HBarCode");
+                pFocus.focus();
+                pFocus.select();
+            }
+            else {
+                element.tabChange('tab-Kf_OtherInBill', '1');
+                var pFocus = $("#HBillNo");
+                pFocus.focus();
+                pFocus.select();
+            }
+
+            //
+            function Sub_ClearBill() {
+                //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+                $("#HWHID").val(sessionStorage["HWHID"]);
+                $("#HWHNAME").val(sessionStorage["HWHName"]);
+                $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+                $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+               
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMaker").hide();
+                $("#HMakerID").hide();
+
+                //璁剧疆鍗曟嵁鍙�
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                //$.ajax({
+                //    url: GetWEBURL() + "/Web/GetMAXNum",
+                //    type: "GET",
+                //    data: { "HBillType": '1206' },
+                //    success: function (d) {
+                //        $("#HInterID").val(d.data[0].HInterID);
+                //        $("#HBillNo").val(d.data[0].HBillNo);
+                //    }
+                //});
+                //鐒︾偣
+                //鍒锋柊
+                var sInterID = $("#HInterID").val()
+                table.render({
+                    elem: '#wl-table'
+                    , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+                    , toolbar: '#toolbarDemo'
+                    , where: { HBillID: linterid, HBillType: '1203', sWhere: '' }
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                        , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+            //
+
+            form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //form.on('submit(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '渚涘簲鍟嗗垪琛�'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+
+
+            //form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '淇濈鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
+            //    var sMainStr = JSON.stringify(data.field);
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '楠屾敹鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeper").val(checkStatus.data[0].HName);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+            form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨鍙戣揣
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManager").val(checkStatus.data[0].HName);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+
+
+
+            form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閮ㄩ棬鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            form.on('submit(Cancel)', function () {
+                sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏄庣粏鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+                // }
+            });
+
+            form.on('submit(cmdDelete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                // console.log(data);
+                var sInterID = $('#HInterID').val()
+                var sMaterID = data[0].HMaterID
+                var sBillType = '1203'
+                var sAuxPropID = data[0].HAuxPropID
+                //var sMTONo = data[0].HMTONo
+                var sMTONo = ''
+                var sSourceInterID = data[0].HSourceInterID
+                var sSourceEntryID = data[0].HSourceEntryID
+                $.ajax(
+                    {
+                        type: "Get",
+                        //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/OtherInBill/Delete_Json",
+                        async: true,
+                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                table.render({
+                                    elem: '#wl-table'
+                                    , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+                                    , toolbar: '#toolbarDemo'
+                                    , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                                        , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                                    ]]
+                                    , height: 500
+                                    , done: function () {
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 2 });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, {
+                                icon: 5,
+                                time: 20000
+                            }, function () {
+                                //do something
+                            });
+                        }
+                    });
+            });
+
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //鐏板害鎻愪氦鎸夐挳Saver
+                document.getElementById("Saver").disabled = true;
+                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+                var sMainStr = JSON.stringify(data.field);
+                var sMain = sMainStr;
+                var sSubStr = table.cache['wl-table'];
+                var sSourceType = $("#HBillType").val();
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/OtherOutBill_Check_New/set_SaveOtherOutBill_Check_New_Json",
+                            async: true,
+                            data: { "oMain": sMain },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.confirm("鍏朵粬鍑哄簱鍗曟楠屾垚鍔燂紒" + data.Message + $("#HBillNo").val(), {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                                        btn2: function () {
+                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                            parent.location.href = "../../../views/index.html"
+                                        }//鍏抽棴
+                                    }, function () { window.location.reload(); });//鏂板
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5 });
+                                    //鐏板害鎻愪氦鎸夐挳Saver
+                                    document.getElementById("Saver").disabled = false;
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5 });
+                                //鐏板害鎻愪氦鎸夐挳Saver
+                                document.getElementById("Saver").disabled = false;
+                            }
+                        });
+                }
+                else {
+                    layer.msg("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
+                    //鐏板害鎻愪氦鎸夐挳Saver
+                    document.getElementById("Saver").disabled = false;
+                }
+            });
+
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //鎵崟鎹彿
+            $('#HBillNo').on('keydown', function (event) {
+                var HBillNo = $('#HBillNo').val()
+                //var HBillID = $('#HInterID').val()
+                var HBillType = '1206'
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + "/ProductIn/BillNo",
+                        type: "GET",
+                        data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": sessionStorage["HUserName"], "HOwnerID": sessionStorage["OrganizationID"]},
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //console.log(JSON.stringify(result.data.hItemIDField))
+                                //return;
+                                $("#HStockPlaceName").val(result.data.hSPNameField);
+                                $("#HWHID").val(result.data.hWhIDField);
+                                $("#HWHNAME").val(result.data.hWhNameField);
+                                $('#HInterID').val(result.data.hInterIDField)
+                                $('#HBillNo').val(result.data.hBillNoField)
+                                var HBillID = $('#HInterID').val()
+                                element.tabChange('tab-Kf_OtherInBill', '2');
+                                table.render({
+                                    elem: '#wl-table'
+                                    , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+                                    , toolbar: '#toolbarDemo'
+                                    , where: { HBillID: HBillID, HBillType: HBillType, sWhere: '' }
+                                    , cellMinWidth: 90
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                        , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                                        , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+                                        , { field: 'HWHName', title: '浠撳簱', width: 150 }
+                                        , { field: 'HSPName', title: '浠撲綅', width: 150 }
+                                        , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+                                        , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                                    ]]
+                                    , 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' });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                    // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+                }
+            });
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
+
+            //鎵簮鍗�
+            $('#HSourceBillNo').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageBySourceBillNo();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin2)', function (data) {
+                GetMeesageBySourceBillNo();
+            });
+
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://localhost:8083/OtherInStockBill/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sSubStr = table.cache['wl-table'];
+                var sBarCode = $('#HBarCode').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var sQty = $("#HQty").val()
+                if (sQty == "") {
+                    sQty = 0;
+                }
+                var sHBillType = '1206'
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var HOrgID = $("#HOrgID").val();//缁勭粐
+                //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
+                if (sBarCode == '') {
+                    playSound();
+                    layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (sBarCode != "") {
+                    $('#HBarCode').val("");
+                }
+                if (sQty != "") {
+                    $('#HQty').val("");
+                }
+                $.ajax({
+                    //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "/OtherOutBill_Check_New/get_InfoByBarCode_Source_Json",
+                    type: "GET",
+                    data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sHBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "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_OtherInBill', '2');  //璺宠浆椤电
+                            }
+                            else if (result.data.HBarType == '浠撲綅鏉$爜') {
+                                $("#HStockPlaceName").val(result.data.HSPName);
+                                $("#HStockPlaceID").val(result.data.HSPID);
+                                $("#HWHNAME").val(result.data.HWhName);
+                                $("#HWHID").val(result.data.HWhID);
+                                $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+                                element.tabChange('tab-Kf_OtherInBill', '2');//璺宠浆椤电
+                            }
+                            else {
+                                element.tabChange('tab-Kf_OtherInBill', '2');
+                            }
+                            layer.load(3)
+                            table.render({
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
+                                , cellMinWidth: 90
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                    , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+                                    , { field: 'HWHName', title: '浠撳簱', width: 150 }
+                                    , { field: 'HSPName', title: '浠撲綅', width: 150 }
+                                    , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+                                    , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                                ]]
+                                , 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' });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+            function playSound() {
+                var audio = document.getElementById("cs");
+                if (audio == null)
+                    $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+                var audio = document.getElementById("cs");
+                audio.play();
+            }
+            function playSound1() {
+                var audio = document.getElementById("cs2");
+                audio.play();
+            }
+            //鎵簮鍗�
+            function GetMeesageBySourceBillNo(obj) {
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                if (HSourceBillNo == "" || sInterID <= 0) {
+                    layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                //
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///OtherInStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                    url: GetWEBURL() + "/OtherInStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                    type: "GET",
+                    data: { "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.load(3)
+                            table.render({
+                                elem: '#wl-table'
+                                //, url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
+                                , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                                    , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                                ]]
+                                // , data: [linterid]
+                                // , page: true
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                            // $("#verifycode").click();
+                            //layer.msg(result.Message, { icon: 5 });
+                            layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+        });
+        //浠ヤ笂涓� Layui妯″潡
+        function GetHWHValue(obj)  //杩斿洖浠撳簱
+        {
+            $("#HWHNAME").val(obj[0].HName);
+            //sessionStorage["HWHID"] = obj[0].HItemID;
+            $("#HWHID").val(obj[0].HItemID);
+        }
+        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+            $("#HStockPlaceName").val(obj[0].HName);
+            $("#HStockPlaceID").val(obj[0].HItemID);
+        }
+        //function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+        //    $("#HSupName").val(obj[0].HName);
+        //    $("#HSupID").val(obj[0].HItemID);
+        //}
+        function GetHKeeperValue(obj) {  //杩斿洖淇濈
+            $("#HKeeper").val(obj[0].HName);
+            $("#HKeeperID").val(obj[0].HItemID);
+        }
+        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+            $("#HSecManager").val(obj[0].HName);
+            $("#HSecManagerID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+            //if ($("#HSourceBillNo").val() == '') {
+            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+            //    return false;
+            //}
+            //if($("#HDeptName").val()=='')
+            //{
+            //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HSecManager").val() == '') {
+            //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HKeeper").val() == '') {
+            //    layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HSupName").val() == '') {
+            //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HWHNAME").val() == '') {
+            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            if ($("#HBillNo").val() == '') {
+                layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5 });
+                return false;
+            }
+            if ($("#HInterID").val() == '') {
+                layer.msg("閿欒鐨勫唴鐮�!", { icon: 5 });
+                return false;
+            }
+            if (sSubStr == '' || sSubStr.length == 0) {
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5 });
+                return false;
+            }
+            if (sSubStr != '') {
+                for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5 });
+                            return false;
+                        }
+                    }
+                }
+                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                    if (parseFloat(sSubStr[i].HQty) > 0) {
+                        s = 1;
+                    }
+                }
+                if (s == 0) {
+                    layer.msg("鍏朵粬鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
+                    return false;
+                }
+            }
+            else {
+                return true;
+            }
+        }
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 2b1758e..cc18b08 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -111,7 +111,7 @@
                                             <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
-                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" >...</button>
                                         </div>
                                     </div>
                                 </div>
@@ -1110,6 +1110,7 @@
                             sessionStorage["SourceFlag"] = true;
                             layer.load(3);
                             element.tabChange('tab-POStockInBill', '2');
+
                             table.render({
                                 elem: '#wl-table'
                                 , cellMinWidth: 80

--
Gitblit v1.9.1