From 33facb189ceb055cda8aabe019f67dc0483f32a3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 30 十月 2024 09:51:53 +0800
Subject: [PATCH] 产线包装单墨西哥

---
 WebTM/views/车间管理/产线/MES_WhiteLabelGeneration.html        |    4 
 WebTM/views/车间管理/产线/MES_ProductionLinePackaging_MXG.html | 1237 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebTM/views/index.html                                   |    1 
 WebTM/WebTM.csproj                                       |    1 
 4 files changed, 1,241 insertions(+), 2 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 3d78034..9778c3a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -557,6 +557,7 @@
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\Gy_WorkDay.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_AssemblyTraceability.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_AssemblyTraceabilityList.html" />
+    <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_ProductionLinePackaging_MXG.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_ProductionLinePackaging.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_ProductionLinePackagingList.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_WhiteLabelGeneration.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 06edaa3..56952ff 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -631,6 +631,7 @@
                                         <dd><a lay-href="杞﹂棿绠$悊/浜х嚎/MES_AssemblyTraceability.html">浜х嚎缁勮杩芥函鍗�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/浜х嚎/MES_AssemblyTraceabilityList.html">浜х嚎缁勮杩芥函鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/浜х嚎/MES_ProductionLinePackaging.html">浜х嚎鍖呰鍗�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/浜х嚎/MES_ProductionLinePackaging_MXG.html">浜х嚎鍖呰鍗昣澧ㄨタ鍝�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/浜х嚎/MES_ProductionLinePackagingList.html">浜х嚎鍖呰鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/浜х嚎/Sc_PackUnionBillCacheList.html">浜х嚎鍖呰鍗曠紦瀛樺垪琛�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/浜х嚎/Sc_GroupOrderBill.html">浜х嚎缁勬墭鍗�</a></dd>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
new file mode 100644
index 0000000..2605f43
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
@@ -0,0 +1,1237 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" style="background-color:white;">
+<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">
+    <script src="../../../layuiadmin/grwebapp.js"></script>
+    <style>
+        .layui-form-label {
+            font-size: 14px;
+            width: 85px;
+            text-align: inherit;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <!--<div class="layui-card-header"></div>-->
+            <div class="layui-card-body" style="padding: 15px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-form-item" style="margin-bottom: 20px;">
+                        <button type="button" lay-submit="" lay-filter="HAddBT" class="layui-btn layui-btn-radius">鏂板</button>
+                        <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
+                        <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+                        <button type="button" lay-submit="" lay-filter="Close" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+                        <div class="layui-inline">
+                            <div class="layui-input-block">
+                                <select name="city" lay-verify="required" id="dymb">
+                                    <!--<option value="鏈�夋嫨">璇烽�夋嫨鎵撳嵃妯℃澘</option>-->
+                                    <option value="HBarCodePrint">鐗╂枡鏉$爜妯℃澘</option>
+                                    <!--<option value="HPOInStockBill">閫佽揣鍗�</option>-->
+                                    <!--<option value="HPOInStockBill">閫佽揣鍗�(鏍囩绾�)</option>-->
+                                </select>
+                            </div>
+                        </div>
+                        <button type="button" lay-submit="" lay-filter="Print" id="Print" class="layui-btn layui-btn-radius">鎵撳嵃</button>
+                        <button type="button" lay-submit="" lay-filter="Print2" id="Print2" hidden="hidden" ></button>
+                        <div class="layui-inline" style="width: 200px;">
+                            <div class="layui-input-block">
+                                <select name="PrintName" lay-verify="required" id="PrintName">
+                                    <option value="鏂帿灏�" selected>鏂帿灏�</option>
+                                    <option value="鏅彶鐗�">鏅彶鐗�</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-block">
+                                <select name="LDM" lay-verify="required" id="LDM">
+                                    <option value="DU3" selected>DU3</option>
+                                    <option value="QDR">QDR</option>
+                                    <option value="AAA">15杞﹂棿</option>
+                                    <option value="鍏朵粬">鍏朵粬</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-block">
+                                <select name="BBM" lay-verify="required" id="BBM">
+                                    <option value="1099081-00-E">1099081-00-E</option>
+                                    <option value="1786947-00-B">1786947-00-B</option>
+                                    <option value="1607222-00-B">1607222-00-B</option>
+                                    <option value="1943600-00-B">1943600-00-B</option>
+                                    <option value="1941600-00-B">1941600-00-B</option>
+                                    <option value="1941600-00-C">1941600-00-C</option>
+                                    <option value="1943600-00-C">1943600-00-C</option>
+                                    <option value="鍏朵粬" selected>鍏朵粬</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-row" style="padding:10px 0">
+                            <div class="layui-col-xs3 layui-inline">
+                                <fieldset class="layui-elem-field layui-field-title" style="text-align:center;">
+                                    <legend>浜х嚎鍖呰鍗�</legend>
+                                </fieldset>
+                            </div>
+                            <div class="layui-col-xs1 layui-inline">
+                                <img src="222.jpg" style="width:70%;height:50%;" />
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <div class="">
+                                    <label class="layui-inline" style="width:60px;">娴佽浆鍗″彿</label>
+                                    <div class="layui-inline">
+                                        <input type="text" style="border-radius: 50px;width: 140%;" name="娴佽浆鍗″彿" id="HFbarcode" placeholder="璇疯緭鍏ユ祦杞崱鍙�" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="">
+                                    <label class="layui-inline" style="width:60px;">瀛愪欢鏉$爜鏁伴噺</label>
+                                    <div class="layui-inline">
+                                        <input type="text" lay-verify="verifyPcmQty" style="border-radius: 50px;width: 140%;" name="瀛愪欢鏉$爜鏁伴噺" id="pcmQty" autocomplete="off" placeholder="璇疯緭鍏ュ瓙浠舵潯鐮佹暟閲�" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="">
+                                    <label class="layui-inline" style="width:60px;">瀛愪欢鏉$爜</label>
+                                    <div class="layui-inline">
+                                        <input type="text" style="border-radius: 50px;width: 140%;" name="瀛愪欢鏉$爜" id="SubBarcode" autocomplete="off" placeholder="璇疯緭鍏ュ瓙浠舵潯鐮�" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="">
+                                    <label class="layui-inline" style="width:60px;">鏄惁娣风</label>
+                                    <div class="layui-inline">
+                                        <input type="checkbox" id="HMixedBox" name="HMixedBox" lay-skin="primary" value="" lay-filter="HMixedBox">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <div class="">
+                                    <label class="layui-inline" style="width:60px;">瑁呯鏁伴噺</label>
+                                    <div class="layui-inline">
+                                        <input type="text" style="border-radius: 50px;" name="" id="zxQty" placeholder="璇疯緭鍏ヨ绠辨暟閲�" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="">
+                                    <label class="layui-inline" style="width:60px;">涓嶆弧绠辨爣璇�</label>
+                                    <div class="layui-inline">
+                                        <input type="text" style="border-radius: 50px;" name="" id="HRemark" autocomplete="off" placeholder="璇疯緭鍏ヤ笉婊$鏍囪瘑" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="">
+                                    <label class="layui-inline" style="width:60px;">鐧芥爣鍙�</label>
+                                    <div class="layui-inline">
+                                        <input type="text" style="border-radius: 50px;" name="" id="HBarCode_White" autocomplete="off" placeholder="鐧芥爣鍙�" class="layui-input">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!--寰呮帴鏀跺伐鍗�&浠婃棩杩涚珯-->
+                    <div class="layui-card layui-form-item">
+                        <div class="layui-card-body">
+                            <div class="layui-tab">
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li data-status="" class="layui-this">鎵爜璁板綍</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="smjl-table" lay-filter="smjl-table"></table>
+                                                <script type="text/html" id="smjl-toolbar">
+                                                    <div class="layui-btn-container">
+                                                        <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                                                        <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
+                                                        <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>-->
+                                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>鍒犺</button>
+                                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                                        <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+                                                        <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+                                                    </div>
+                                                </script>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!--褰撳墠宸ュ崟&鍏朵粬淇℃伅-->
+                    <div class="layui-form-item">
+                        <div class="layui-col-md8 layui-card-body layui-inline">
+                            <div class="layui-tab">
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li data-status="" class="layui-this">鍖呰淇℃伅</li>
+                                    <li data-status="2">鍏朵粬淇℃伅</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show" style="height:250px;">
+                                        <table>
+                                            <tbody>
+                                                <tr>
+                                                    <th style="width:80px;padding:10px">娴佽浆鍗″彿</th>
+                                                    <td>
+                                                        <input type="text" name="娴佽浆鍗″彿" id="HProcExchBillNo" lay-verify="" autocomplete="off" placeholder="娴佽浆鍗″彿" class="layui-input" style="background-color:#efefef4d" readonly>
+                                                        <input type="hidden" name="娴佽浆鍗D" id="HFbarcodeID">
+                                                    </td>
+                                                    <th style="width:80px;padding:10px">缁勮鏃堕棿</th>
+                                                    <td>
+                                                        <input type="text" name="缁勮鏃堕棿" class="layui-input" id="HDateNow" placeholder="缁勮鏃堕棿" style="background-color:#efefef4d;" readonly>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鍙�</th>
+                                                    <td>
+                                                        <input type="text" name="鐢熶骇璁㈠崟鍙�" id="HSourceBillNo" lay-verify="" autocomplete="off" placeholder="鐢熶骇璁㈠崟鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
+                                                    </td>
+                                                    <th style="width:80px;padding:10px">浜у搧浠g爜</th>
+                                                    <td>
+                                                        <input type="text" name="浜у搧浠g爜" class="layui-input" id="HNumber" placeholder="浜у搧浠g爜" style="background-color:#efefef4d;" readonly>
+                                                        <input type="hidden" name="鐗╂枡鍐呯爜" id="HMaterID">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th style="width:80px;padding:10px">浜у搧鍚嶇О</th>
+                                                    <td>
+                                                        <input type="text" name="浜у搧鍚嶇О" id="HMaterName" lay-verify="" autocomplete="off" placeholder="浜у搧鍚嶇О" class="layui-input" style="background-color:#efefef4d" readonly>
+                                                    </td>
+                                                    <th style="width:80px;padding:10px">瑙勬牸鍨嬪彿</th>
+                                                    <td>
+                                                        <input type="text" name="瑙勬牸鍨嬪彿" class="layui-input" id="HModel" placeholder="瑙勬牸鍨嬪彿" style="background-color:#efefef4d;" readonly>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th style="width:80px;padding:10px">璁¢噺鍗曚綅</th>
+                                                    <td>
+                                                        <input type="text" name="璁¢噺鍗曚綅" id="" lay-verify="" autocomplete="off" placeholder="璁¢噺鍗曚綅" class="layui-input" style="background-color:#efefef4d" readonly>
+                                                    </td>
+                                                    <th style="width:80px;padding:10px">娴佽浆鍗℃暟閲�</th>
+                                                    <td>
+                                                        <input type="text" name="娴佽浆鍗℃暟閲�" class="layui-input" id="" placeholder="娴佽浆鍗℃暟閲�" style="background-color:#efefef4d;" readonly>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鏁伴噺</th>
+                                                    <td>
+                                                        <input type="text" name="鐢熶骇璁㈠崟鏁伴噺" id="" lay-verify="" autocomplete="off" placeholder="鐢熶骇璁㈠崟鏁伴噺" class="layui-input" style="background-color:#efefef4d" readonly>
+                                                    </td>
+                                                    <th style="width:80px;padding:10px">鍗曟嵁鍙�</th>
+                                                    <td>
+                                                        <input type="text" name="鍗曟嵁鍙�" class="layui-input" id="HBillNo2" placeholder="鍗曟嵁鍙�" style="background-color:#efefef4d;" readonly>
+                                                        <input type="hidden" name="鍗曟嵁鍙稩D" id="HInterID">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th style="width:80px;padding:10px">璁㈠崟璺熻釜鍙�</th>
+                                                    <td>
+                                                        <input type="text" name="璁㈠崟璺熻釜鍙�" id="" lay-verify="" autocomplete="off" placeholder="璁㈠崟璺熻釜鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
+                                                    </td>
+                                                    <th style="width:80px;padding:10px">鎵樻潯鐮�</th>
+                                                    <td>
+                                                        <input type="text" name="鎵樻潯鐮�" class="layui-input" id="HBarCode_wym" placeholder="鎵樻潯鐮�" style="background-color:#efefef4d;" readonly>
+                                                        <!--闅愯棌瀛楁-->
+                                                        <input type="hidden" name="HUnitID" id="HUnitID">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th style="width:80px;padding:10px">椤圭洰鍙�</th>
+                                                    <td>
+                                                        <input type="text" name="椤圭洰鍙�" id="HProjectNum" lay-verify="" autocomplete="off" placeholder="椤圭洰鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <div class="layui-tab-item" style="height:250px;">
+                                        <table>
+                                            <tbody>
+                                                <tr>
+                                                    <th style="width:80px;padding:10px">鍒跺崟浜�</th>
+                                                    <td>
+                                                        <input type="text" name="鍒跺崟浜�" id="" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+                                                    </td>
+                                                    <th style="width:80px;padding:10px">鍒跺崟鏃ユ湡</th>
+                                                    <td>
+                                                        <input type="text" name="鍒跺崟鏃ユ湡" class="layui-input" id="" placeholder="鍒跺崟鏃ユ湡" style="background-color:#efefef4d;" readonly>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th style="width:80px;padding:10px">淇敼浜�</th>
+                                                    <td>
+                                                        <input type="text" name="淇敼浜�" id="" lay-verify="" autocomplete="off" placeholder="淇敼浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+                                                    </td>
+                                                    <th style="width:80px;padding:10px">淇敼鏃ユ湡</th>
+                                                    <td>
+                                                        <input type="text" name="淇敼鏃ユ湡" class="layui-input" id="" placeholder="淇敼鏃ユ湡" style="background-color:#efefef4d;" readonly>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <th style="width:80px;padding:10px">瀹℃牳浜�</th>
+                                                    <td>
+                                                        <input type="text" name="瀹℃牳浜�" id="" lay-verify="" autocomplete="off" placeholder="瀹℃牳浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+                                                    </td>
+                                                    <th style="width:80px;padding:10px">瀹℃牳鏃ユ湡</th>
+                                                    <td>
+                                                        <input type="text" name="瀹℃牳鏃ユ湡" class="layui-input" id="" placeholder="瀹℃牳鏃ユ湡" style="background-color:#efefef4d;" readonly>
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <!--澶辫触鎻愮ず闊�-->
+                        <div id="" style="display:none;">
+                            <audio id="cs" hidden controls>
+                                <source src="../../video/jingbao.wav" type="audio/ogg">
+                            </audio>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/html" id="toolBar">
+        <a class="layui-btn layui-btn-xs" lay-event="del" style="background-color: red;">鍒犻櫎</a>
+    </script>
+
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+    <script src="../../CreateControl.js"></script>
+    <script>
+        //CreateReport("Report");
+        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 BillStatusjson = params[params[0]];
+        var InterID = params[params[1]];
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , element = layui.element
+                , layer = layui.layer
+                , laydate = layui.laydate
+                , table = layui.table
+                , form = layui.form
+                , util = layui.util;
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { parent.location.href = "../user/login.html"; });
+                return;
+            }
+            var option = [];
+            set_InitGrid();
+
+            //鍒濆鍖栨槑缁嗚〃鏍�
+            function set_InitGrid() {
+                columns = [
+                    { type: 'numbers', title: '搴忓彿' }
+                    , {
+                        field: time, title: '鎵爜鏃ユ湡', width: 110, templet: function (d) {
+                            return util.toDateString(time, "yyyy-MM-dd");
+                        }
+                    }
+                    //, { field: 'HBarCode_Pack', title: '鏉″舰鐮�', width: 145 }
+                    , { field: 'HSourceBillNo', title: '鏉″舰鐮�', width: 145 }
+                    , { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 125 }
+                    , { field: 'HBarCode', title: '鍞竴鐮�', width: 125 }
+                    , { field: 'HNumber', title: '鐗╂枡缂栫爜', width: 105 }
+                    , { field: 'HName', title: '鐗╂枡鍚嶇О', width: 105 }
+                    , { field: 'HModel', title: '瑙勬牸鍨嬪彿', width: 105 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                    //, { field: 'HWhID', title: '浠撳簱', width: 80 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 80 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 195 }
+                    , { toolbar: '#toolBar', width: 65, fixed: 'right' }
+                ];
+                option = {
+                    id: 'smjl-table'
+                    , elem: '#smjl-table'
+                    //, toolbar: '#toolbarDemo'
+                    , page: false
+                    //, cellMinWidth: 120
+                    //, height: 500
+                    , cols: [columns]
+                    //, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
+            //鍏ㄥ眬鍙橀噺
+            var ZJTMFlag = false;//瀛愪欢鏉$爜杈撳叆鏍囪
+            //鑾峰彇褰撳墠鏃堕棿澶勭悊
+            var data = new Date();
+            var year = data.getFullYear();  //鑾峰彇骞�
+            var month = data.getMonth() + 1;    //鑾峰彇鏈�
+            var day = data.getDate(); //鑾峰彇鏃�
+            var time = year + "-" + month + "-" + day;
+
+            var sMaker = sessionStorage["HMaker"];
+            var zxQty;//杈撳叆鐨勮绠辨暟閲�
+            var zxQtyFlag = 0;
+            var pcmQty;//杈撳叆鐨勬壒娆$爜鏁伴噺
+            var pcmQtyFlag = 0;
+            var icmoQty = 0;//娴佽浆鍗℃暟閲�
+            var icmoQtyNow = 0;//娴佽浆鍗″墿浣欐暟閲�
+            //console.log(sessionStorage);
+
+            //椤甸潰鍒濆鍖栬祴鍊�
+            layer.load(3);
+            //鑾峰彇鍗曟嵁鍙�
+            getBillno();
+         
+            $("#HDateNow").val(time);//鍔犺浇褰撳墠鏃堕棿
+            $("#zxQty").focus();
+            //$("#HFbarcode").css("box-shadow", "0 0 0 1px #00ff00");
+            $("#SubBarcode").attr("readonly", "readonly");//瀛愪欢鏉$爜鍙
+            $("#SubBarcode").css("background-color", "#efefef4d");
+            //$("#zxQty").attr("readonly", "readonly");//鏁伴噺鍙
+            //$("#zxQty").css("background-color", "#efefef4d");
+            $("#HFbarcode").attr("readonly", "readonly");
+            $("#HFbarcode").css("background-color", "#efefef4d");
+            $("#pcmQty").attr("readonly", "readonly");//鏁伴噺鍙
+            $("#pcmQty").css("background-color", "#efefef4d");
+
+
+            //濉啓瑁呯鏁伴噺鍚庡厜鏍囪烦璧�
+            $('#zxQty').on('keydown', function (event) {
+                zxQty = $("#zxQty").val();
+                if (event.keyCode == 13) {
+                    if (!(/(^[1-9]\d*$)/.test(zxQty))) {
+                        playSound();
+                        layer.msg("璇疯緭鍏ユ纭殑鏁存暟锛�");
+                        return;
+                    }
+              
+                    if (zxQty == "" || zxQty <= 0) {
+                        playSound();
+                        layer.msg("璇疯緭鍏ユ纭殑鏁伴噺锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    } else {
+                        $("#zxQty").attr("readonly", "readonly");//鏁伴噺鍙
+                        $("#zxQty").css("background-color", "#efefef4d");
+                        $("#zxQty").css("box-shadow", "none");
+                      
+                        pcmQty = zxQty;
+                        $("#pcmQty").val(zxQty);//瀛愪欢鏉$爜鏁伴噺 榛樿涓� = 瑁呯鏁伴噺
+                        $("#SubBarcode").removeAttr("readonly");//绉婚櫎瀛愪欢鏉$爜鍙
+                        $("#SubBarcode").css("background-color", "white");
+                        $("#SubBarcode").focus();
+                        $("#SubBarcode").css("box-shadow", "0 0 0 1px #00ff00");
+                        HFbarcodeKeydown();
+                    }
+                }
+            });
+
+            //濉啓瀛愪欢鏉$爜鏁伴噺鍚庡厜鏍囪烦璧�
+            $('#pcmQty').on('keydown', function (event) {
+                pcmQty = $("#pcmQty").val();
+                if (event.keyCode == 13) {
+                    if (!(/(^[1-9]\d*$)/.test(pcmQty))) {
+                        playSound();
+                        layer.msg("璇疯緭鍏ユ纭殑鏁存暟锛�");
+                        return;
+                    }
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    if (pcmQty > icmoQty) {
+                        playSound();
+                        layer.msg("瀛愪欢鏉$爜鏁伴噺涓嶅厑璁稿ぇ浜庢祦杞崱鏁伴噺锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    }
+                    if (pcmQty == "" || pcmQty <= 0) {
+                        playSound();
+                        layer.msg("璇疯緭鍏ユ纭殑鏁伴噺锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    } else {
+                        $("#pcmQty").attr("readonly", "readonly");//鏁伴噺鍙
+                        $("#pcmQty").css("background-color", "#efefef4d");
+                        $("#pcmQty").css("box-shadow", "none");
+                        $("#SubBarcode").removeAttr("readonly");//绉婚櫎瀛愪欢鏉$爜鍙
+                        $("#SubBarcode").css("background-color", "white");
+                        $("#SubBarcode").focus();
+                        $("#SubBarcode").css("box-shadow", "0 0 0 1px #00ff00");
+                    }
+                }
+            });
+
+
+            form.on('checkbox(HMixedBox)', function (obj) {
+                if (icmoQtyNow == 0) {
+                    playSound();
+                    layer.msg("鍓╀綑鏁伴噺涓�" + icmoQtyNow + ",涓嶅厑璁告贩绠憋紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    $("input[name='HMixedBox']").prop("checked", false);
+                    form.render('checkbox');
+                    return;
+                }
+                if (obj.value == "") {
+                    $("#HMixedBox").val("1");
+                } else {
+                    $("#HMixedBox").val("");
+                }
+
+            });
+           
+
+            //瀛愪欢鏉$爜鍥炶溅鏂规硶
+            $('#SubBarcode').on('keydown', function (event) {   //鎵潯褰㈢爜
+
+                var SubBarcode = $('#SubBarcode').val();
+                var HBillNo = $('#HFbarcode').val();
+                var HInterID = $("#HInterID").val();
+                var HBillNo2 = $("#HBillNo2").val();
+                var HBillType = "3783";
+                var LDM = $("#LDM").val();//鏉$爜杞﹂棿绫诲瀷 DU3/QDR/鍏跺畠
+                var BBM = $("#BBM").val();//
+                var reg = /[a-z]/;
+
+                if (event.keyCode == 13) {
+                    if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && SubBarcode.length != 29) {
+                        playSound();
+                        layer.alert("瀛愪欢鏉$爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    }
+
+                    if (LDM == "AAA" && SubBarcode.length != 50) {
+                        playSound();
+                        layer.alert("瀛愪欢鏉$爜闀垮害涓嶄负50浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    }
+
+                    if (SubBarcode.match(/[^\x00-\xff]/g) != null) {
+                        playSound();
+                        layer.alert("蹇呴』鏄崐瑙掑瓧绗�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    }
+
+                    if (SubBarcode.length == 50) {
+                        if (LDM != "鍏朵粬" && reg.test(SubBarcode)) {
+                            playSound();
+                            layer.alert("璇锋煡鐪嬪瓙浠舵潯鐮佸ぇ鍐欐槸鍚︽纭�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            return;
+                        }
+                    } else {
+                        if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && reg.test(SubBarcode)) {
+                            playSound();
+                            layer.alert("璇锋煡鐪嬪瓙浠舵潯鐮佸ぇ鍐欐槸鍚︽纭�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            return;
+                        }
+                    }
+
+                    if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && SubBarcode.indexOf(BBM) == -1) {
+                        playSound();
+                        layer.alert("璇锋壂鎻忔纭殑瀛愪欢鏉$爜!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    }
+
+                    if (LDM != "鍏朵粬") {
+                        if (SubBarcode.indexOf(LDM) == -1) {
+                            playSound();
+                            layer.alert("褰撳墠鏉$爜涓嶅睘浜�" + LDM + "杞﹂棿", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            return;
+                        }
+                    }
+                    if (SubBarcode == "") {
+                        playSound();
+                        layer.alert("瀛愪欢鏉$爜涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    }
+                    if (zxQty == zxQtyFlag) {
+                        playSound();
+                        layer.alert("瑁呯鏁伴噺宸叉壂瀹岋紝璇风偣鍑讳繚瀛橈紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        $("#HRemark").attr("readonly", "readonly");//涓嶆弧绠辨爣璇嗗彧璇�
+                        $("#HRemark").css("background-color", "#efefef4d");
+                        return;
+                    }
+                    if (pcmQty == pcmQtyFlag) {
+                        playSound();
+                        layer.alert("瀛愪欢鏉$爜鏁伴噺宸叉壂瀹岋紝璇风偣鍑讳繚瀛橈紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    }
+                    //var a = 0;
+
+                    //$.ajax({//鍒ゆ柇鏉$爜鐨勭姸鎬�
+                    //    url: GetWEBURL() + "/LEMS/HbadStaus",
+                    //    type: "GET",
+                    //    async: false,
+                    //    data: { "SubBarcode": SubBarcode },
+                    //    success: function (result) {
+                    //        if (result.count == 0) {
+                    //            a = 1;
+                    //            playSound();
+                    //            layer.alert(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                    //            return false;
+                    //        }
+                    //    }
+                    //})
+                    //if (a == 1) {
+                    //    a = 0;
+                    //    return false;
+                    //}
+                    //var HProcExchBillNo = $("#HProcExchBillNo").val();
+                    ////鍒ゆ柇鏉$爜涔嬪墠鐨勫伐搴忔槸鍚﹀嚭绔�
+                    //$.ajax({
+                    //    url: GetWEBURL() + "/LEMS/SNBarcodeProcCtrl",
+                    //    type: "GET",
+                    //    async: false,
+                    //    data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo, "HMixedBox": $("#HMixedBox").val(), "HBillNo": HBillNo2 },
+                    //    success: function (result) {
+                    //        if (result.count == 0) {
+                    //            a = 1;
+                    //            playSound();
+                    //            layer.alert(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                    //            return false;
+                    //        }
+                    //    }
+                    //})
+
+                    //if (a == 1) {
+                    //    a = 0;
+                    //    return false;
+                    //}
+
+                    $.ajax({//鏌ヨ瀛愪欢鏉$爜鐨勫悎璁℃暟閲�
+                        url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
+                        type: "GET",
+                        async: false,
+                        data: {
+                            "HBarCode": $("#HBarCode_wym").val()
+                        },
+                        success: function (result) {
+                            var AllHqty = result.data[0].HQty;
+                            if (AllHqty >= icmoQty) {
+                                playSound();
+                                layer.alert("鍖呰鏁伴噺宸茬瓑浜庢祦杞崱鏁伴噺锛佷笉鍏佽鎵爜锛�", { icon: 1 });
+                                return;
+                            } else {
+                                //鍒ゆ柇瑁呯鏁伴噺涓嶈兘澶т簬鍓╀綑鏁伴噺
+                                if (AllHqty > icmoQtyNow && $("#HMixedBox").val() == "") {
+                                    playSound();
+                                    layer.msg("瑁呯鏁伴噺涓嶅厑璁稿ぇ浜庢祦杞崱鍓╀綑鏁伴噺锛佸墿浣欐暟閲忎负" + icmoQtyNow, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                                    return;
+                                } else {
+                                    $.ajax({//琛ㄤ綋瀛榯emp琛�
+                                        url: GetWEBURL() + "/LEMS/SaveSubBarcode_Json_MXG",
+                                        type: "GET",
+                                        async: false,
+                                        data: {
+                                            "HBillNo": HBillNo
+                                            , "SubBarcode": SubBarcode
+                                            , "HInterID": HInterID
+                                            , "HBillNo2": HBillNo2
+                                            , "HBillType": HBillType
+                                            , "sMaker": sMaker
+                                            , "HBarCode": $("#HBarCode_wym").val()
+                                            , "HNumber": $("#HNumber").val()
+                                            , "HName": $("#HMaterName").val()
+                                            , "HModel": $("#HModel").val()
+                                        },
+                                        success: function (result) {
+                                            var data = result.data;
+                                            if (result.Message == "璇ュ瓙浠舵潯鐮佸凡瀛樺湪") {
+                                                playSound();
+                                                layer.alert("璇ュ瓙浠舵潯鐮佸凡瀛樺湪", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                                            } else {
+                                                if (data[0].Column1 == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                                    $('#SubBarcode').val("");
+                                                    $("#SubBarcode").focus();
+                                                    table.reload('smjl-table', {
+                                                        url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
+                                                        , where: {
+                                                            HBillNo: HBillNo2
+                                                            , HBarCode: HBillNo
+                                                        }
+                                                    });
+                                                    zxQtyFlag++;
+                                                    pcmQtyFlag++
+                                                    $("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
+                                                    $("#pcmQty").val("" + pcmQtyFlag + "/" + pcmQty + "");
+                                                    layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+                                                    $.ajax({//鏌ヨ鏉$爜妗f琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
+                                                        url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
+                                                        type: "GET",
+                                                        async: false,
+                                                        data: {
+                                                            "HBarCode": $("#HBarCode_wym").val()
+                                                        },
+                                                        success: function (result) {
+                                                            var HQty = result.data[0].HQty;
+                                                            HQty++;
+                                                            $.ajax({//鏇存柊鏉$爜妗f琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
+                                                                url: GetWEBURL() + "/LEMS/Update_Gy_BarCodeBill_HQty",
+                                                                type: "GET",
+                                                                async: false,
+                                                                data: {
+                                                                    "HBarCode": $("#HBarCode_wym").val(),
+                                                                    "HQty": HQty
+                                                                },
+                                                                success: function (result) {
+                                                                    var HQty = result.data;
+                                                                    ZJTMFlag = true;
+                                                                }, error: function () {
+                                                                    playSound();
+                                                                    layer.alert("鏇存柊鏉$爜妗f琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+                                                                }
+                                                            });
+                                                        }, error: function () {
+                                                            playSound();
+                                                            layer.alert("鏌ヨ鏉$爜妗f琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+                                                        }
+                                                    });
+                                                } else {
+                                                    playSound();
+                                                    // $("#verifycode").click();
+                                                    //layer.msg(result.Message, { icon: 5 });
+                                                    layer.alert("鎻掑叆缂撳瓨琛ㄥけ璐�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                                                }
+                                            }
+                                        }, error: function () {
+                                            playSound();
+                                            layer.alert("瀛愪欢鏉$爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
+                                        }
+                                    });
+                                }
+                            }
+                        }, error: function () {
+                            playSound();
+                            layer.alert("鏌ヨ鏉$爜妗f琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+                        }
+                    });
+                }
+            });
+            //淇濆瓨鎸夐挳
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //debugger;
+                if (parseInt(zxQty) > zxQtyFlag) {
+                    var HRemark = $('#HRemark').val();
+                    if (!HRemark) {
+                        playSound();
+                        layer.alert("瑁呯鏁伴噺鏈壂瀹岋紝璇锋壂瀹岃绠辨暟閲忔垨濉啓涓嶆弧绠辨爣璇嗭紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        return;
+                    }
+                }
+                if (!ZJTMFlag) {
+                    playSound();
+                    layer.alert("瀛愪欢鏉$爜鏈壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                    return;
+                }
+                //澧炲姞鏍¢獙鐧芥爣鍙�
+                var LDM = $("#LDM").val();//
+                var BBM = $("#BBM").val();//
+                var HBarCode_White = $("#HBarCode_White").val();//鐧芥爣鍙�
+
+                if (HBarCode_White == "") {
+                    playSound();
+                    layer.alert("鐧芥爣鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    return;
+                }
+
+                //var BBMs = BBM.replace(/-/g, "");
+                //if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && HBarCode_White.indexOf(BBMs) == -1) {
+                //    playSound();
+                //    layer.alert("璇锋壂鎻忔纭櫧鏍囧彿", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                //    return;
+                //}
+                if ($('#dymb').val() == "鏈�夋嫨") {
+                    playSound();
+                    layer.alert("璇烽�夋嫨鎵撳嵃妯℃澘", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    return;
+                }
+                var sMainStr = JSON.stringify(data.field);
+                var datas = table.cache["smjl-table"];
+                var HBillNo = $('#HBillNo2').val();
+                var lenth = datas.length;
+                var HRemark = $("#HRemark").val();
+                if (!HRemark) {
+                    HRemark = "鏃�";
+                }
+                //var HProjectNum = $("#HProjectNum").val();
+                var HProjectNum = "娴嬭瘯";
+                if (!HProjectNum) {
+                    playSound();
+                    layer.alert("椤圭洰鍙蜂负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    return;
+                }
+                $.ajax({//鎻掑叆涓昏〃
+                    url: GetWEBURL() + "/LEMS/SaveToSc_PackUnionBillMain_MXG",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HBillNo": HBillNo
+                        , "HRemark": HRemark
+                        , "HProjectNum": HProjectNum
+                        , "HBarCode_White": HBarCode_White
+                        , "zxQty": zxQty
+                        , "BBM": BBM
+                        , "LDM": LDM
+                        , "HMaterNumber": $("#HNumber").val()
+                    },
+                    success: function (result) {
+                        var data = result.data;
+                        if (result.count == 1) {
+                            playSound();
+                            layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+                        } else {
+                            playSound();
+                            // $("#verifycode").click();
+                            //layer.msg(result.Message, { icon: 5 });
+                            layer.alert("鎻掑叆涓昏〃澶辫触", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            return;
+                        }
+                    }, error: function () {
+                        playSound();
+                        layer.alert("娴佹按鍙锋柟娉曞彂鐢熼敊璇�!", { icon: 5 });
+                        return;
+                    }
+                });
+                for (var i = 0; i < datas.length; i++) {
+                    var HitemID = datas[i].HitemID;
+                    var HBillType = datas[i].HBillType;
+                    if (HBillType != 3772) {
+                        var HRemark = $("#HRemark").val();
+                        if (!HRemark) {
+                            HRemark = "鏃�";
+                        }
+                        $.ajax({//鎻掑叆瀛愯〃
+                            url: GetWEBURL() + "/LEMS/SaveToSc_PackUnionBillSub",
+                            type: "GET",
+                            async: false,
+                            data: {
+                                "HitemID": HitemID
+                                , "HRemark": HRemark
+                            },
+                            success: function (result) {
+                                var data = result.data;
+                                if (result.count == 1) {
+                                    //layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+                                } else {
+                                    playSound();
+                                    // $("#verifycode").click();
+                                    //layer.msg(result.Message, { icon: 5 });
+                                    layer.alert("鎻掑叆瀛愯〃澶辫触", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                                    return;
+                                }
+                            }, error: function () {
+                                playSound();
+                                layer.alert("鎻掑叆瀛愯〃鏂规硶鍙戠敓閿欒!", { icon: 5 });
+                            }
+                        });
+                    }
+                }
+                for (var i = 0; i < datas.length; i++) {
+                    var HitemID = datas[i].HitemID
+                    $.ajax({//鏇存柊temp琛ㄦ爣璁板瓧娈�
+                        url: GetWEBURL() + "/LEMS/Update_Flag_HRelationInterID",
+                        type: "GET",
+                        async: false,
+                        data: {
+                            "HitemID": HitemID
+                        },
+                        success: function (result) {
+                            var data = result.data;
+                            if (result.count == 1) {
+                                //layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+                            } else {
+                                playSound();
+                                layer.alert("鎻掑叆涓昏〃澶辫触", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            }
+                        }, error: function () {
+                            playSound();
+                            layer.alert("鏇存柊鏍囪鏂规硶鍙戠敓閿欒!", { icon: 5 });
+                        }
+                    });
+                }
+                $("#HBarCode_White").val("");
+                //瀛愪欢鏉$爜鏁伴噺宸叉壂瀹� 鏉$爜鎵畬鍚�
+                if (pcmQty == pcmQtyFlag) {
+                    $.ajax({//鏌ヨ瀛愪欢鏉$爜鐨勫悎璁℃暟閲�
+                        url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
+                        type: "GET",
+                        async: false,
+                        data: {
+                            "HBarCode": $("#HBarCode_wym").val()
+                        },
+                        success: function (result) {
+                            var AllHqty = result.data[0].HQty;
+                            if (AllHqty == icmoQty) {
+                                location.reload();
+                                return;
+                            }
+                        }
+                    })
+                    //娓呯┖鎵弿璁板綍鐨勮绠辨暟閲�
+                    zxQtyFlag = 0;
+                    pcmQtyFlag = 0;
+                    $("#HMixedBox").val("");
+                    $("input[name='HMixedBox']").prop("checked", false);
+                    form.render('checkbox');
+                 
+                    //鍙栨秷娴佽浆鍗″彿鍙(鍙栨秷鍚庝細鏁版嵁閲嶅)
+                    //$("#HFbarcode").removeAttr("readonly", "readonly");//娴佽浆鍗″彿鍙
+                    //$("#HFbarcode").css("background-color", "white");
+                    //$("#HFbarcode").css("box-shadow", "0 0 0 1px #00ff00");
+                    //瑁呯鏁伴噺 鍗曞厓鏍� 鍦ㄦ祦杞崱鍙峰洖杞︽椂鍊� 宸茶鍙栨秷鍙浠ュ強娣诲姞鏍峰紡
+                    //閲嶆柊璧嬪�艰绠辨暟閲忓拰瀛愪欢鏉$爜鏁伴噺 鍊间负鍘熸潵鐨勫��
+                    $("#zxQty").val(pcmQty);
+                    //瀛愪欢鏉$爜鏁伴噺 榛樿涓� = 瑁呯鏁伴噺 鐒跺悗鍏夋爣绉诲姩鍒� "瀛愪欢鏉$爜" 鍗曞厓鏍�
+                    $("#pcmQty").val(pcmQty);//瀛愪欢鏉$爜鏁伴噺 榛樿涓� = 瑁呯鏁伴噺
+                    //绉婚櫎瀛愪欢鏉$爜鍙
+                    $("#SubBarcode").removeAttr("readonly");
+                    $("#SubBarcode").css("background-color", "white");
+                    $("#SubBarcode").focus();
+                    $("#SubBarcode").css("box-shadow", "0 0 0 1px #00ff00");
+                }
+                layer.confirm(
+                    '淇濆瓨鎴愬姛锛佽缁х画閫夋嫨鎿嶄綔锛�',
+                    {
+                        skin: 'layui-layer-lan',
+                        closeBtn: 0,
+                        btn: ['鏂板', '鍏抽棴'],
+                        btn2: function () {//鏂板
+                            parent.layui.admin.events.closeThisTabs();
+                        }
+                    }, function () {//鍏抽棴
+                        window.location.reload();
+                    }
+                );
+            });
+
+            //澶辫触鎻愮ず闊�
+            function playSound() {
+                console.log("playSound");
+                var audio = document.getElementById("cs");
+                audio.play();
+            }
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Close)', function (data) {//閫�鍑�
+                layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    parent.layui.admin.events.closeThisTabs();
+                });
+            });
+
+            //鏂板鎸夐挳
+            form.on('submit(HAddBT)', function (data) {//閫�鍑�
+                layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    window.location.reload();
+                });
+            });
+
+            //鎵撳嵃鎸夐挳
+            form.on('submit(Print2)', function (data) {//閫�鍑�
+                //鎵撳紑鎵撳嵃妯℃澘
+                var linterid = $("#HInterID").val();
+                //var linterid = "28973";
+                //var Type = "HBarCodePrint";
+                //var OpenTmp = "鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)";
+                //var ReportViewer = document.getElementById("ReportViewer");
+                //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+
+                var sWhere = "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by 鐗╂枡浠g爜";
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "sWhere": sWhere },
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                            if (data.data.length != 0) {
+                                var dataPrint = [];
+                                dataPrint.push({ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉$爜缂栧彿": data.data[0]["鏉$爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗$紪鍙�": data.data[0]["娴佽浆鍗$紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
+                                );
+
+                                var Customer = {
+                                    "Table": dataPrint
+                                }
+
+                                var report1 = "";
+                                var parintName = $("#PrintName").val();
+                                if (parintName == "鏂帿灏�") {
+                                    report1 = urlAddRandomNo("../../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf");
+                                } else {
+                                    report1 = urlAddRandomNo("../../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)2.grf");
+                                }
+
+                                var args = {
+                                    type: "print",
+                                    showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                    report: report1,
+                                    data: Customer
+                                };
+                                //var args = {
+                                //    report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
+                                //    data: Customer
+                                //};
+                                webapp_ws_ajax_run(args);
+                            } else {
+                                layer.msg("鏌ユ棤鏁版嵁!");
+                            }
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err, { icon: 5 });
+                    }
+                })
+            });
+
+            //鎵撳嵃鎸夐挳
+            form.on('submit(Print)', function (data) {//閫�鍑�
+                //鎵撳紑鎵撳嵃妯℃澘
+                var linterid = $("#HInterID").val();
+                var Type = "HBarCodePrint";
+                var OpenTmp = "鐧芥爣鎵撳嵃1";
+                //var ReportViewer = document.getElementById("ReportViewer");
+                window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+                $("#Print2").click();
+            });
+
+            //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
+            table.on('tool(smjl-table)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+                    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+                if (layEvent === 'detail') {
+                    layer.msg('鏌ョ湅鎿嶄綔');
+                } else if (layEvent === 'del') {
+                    if (data.HBillType == "3772") {
+                        layer.msg("娴佽浆鍗″彿涓嶅厑璁稿垹闄わ紒");
+                        return;
+                    }
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        $.ajax({
+                            url: GetWEBURL() + '/LEMS/DelProductionLinePackagingTable',
+                            type: "GET",
+                            data: { "sHInterID": data.HInterID, "HSourceBillNo": data.HSourceBillNo },
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    zxQtyFlag--;
+                                    pcmQtyFlag--
+                                    $("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
+                                    $("#pcmQty").val("" + pcmQtyFlag + "/" + pcmQty + "");
+                                    layer.close(index);
+                                    obj.del(); //鍒犻櫎瀵瑰簲琛岋紙tr锛夌殑DOM缁撴瀯
+                                    $.ajax({//鏌ヨ鏉$爜妗f琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
+                                        url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
+                                        type: "GET",
+                                        async: false,
+                                        data: {
+                                            "HBarCode": $("#HBarCode_wym").val()
+                                        },
+                                        success: function (result) {
+                                            var HQty = result.data[0].HQty;
+                                            HQty--;
+                                            $.ajax({//鏇存柊鏉$爜妗f琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
+                                                url: GetWEBURL() + "/LEMS/Update_Gy_BarCodeBill_HQty",
+                                                type: "GET",
+                                                async: false,
+                                                data: {
+                                                    "HBarCode": $("#HBarCode_wym").val(),
+                                                    "HQty": HQty
+                                                },
+                                                success: function (result) {
+                                                    var HQty = result.data;
+                                                }, error: function () {
+                                                    playSound();
+                                                    layer.alert("鏇存柊鏉$爜妗f琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+                                                }
+                                            });
+                                        }, error: function () {
+                                            playSound();
+                                            layer.alert("鏌ヨ鏉$爜妗f琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+                                        }
+                                    });
+                                } else {
+                                    playSound();
+                                    layer.alert(data.code + data.msg, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+                                    icon: 5, btn: ['纭'], time: 100000, offset: 't',
+                                    skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+                                });
+                            }
+                        });
+                    });
+                } else if (layEvent === 'edit') {
+                    layer.msg('缂栬緫鎿嶄綔');
+                }
+            });
+
+            //娴佽浆鍗″彿 鍥炶溅浜嬩欢
+            function HFbarcodeKeydown() {
+                var HFbarcode = $('#HFbarcode').val();
+                var HInterID = $("#HInterID").val();
+                var HBillNo2 = $("#HBillNo2").val();//鍗曟嵁鍙�
+              
+                icmoQty = 20;
+                icmoQtyNow = 20;
+                //
+                $.ajax({//鐢熸垚鍞竴鐮�
+                    url: GetWEBURL() + "/LEMS/SaveBarCode_json",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "sHBarcodeNo": $("#HSourceBillNo").val(),
+                        "sHMaterID": $("#HMaterID").val(),
+                        "sHUnitID": $("#HUnitID").val(),
+                        "sHMaterName": $("#HMaterName").val()
+                    },
+                    success: function (result) {
+                        var data = result.data;
+                        if (data[0].HBarCode) {
+                            $("#HBarCode_wym").val(data[0].HBarCode);
+                        } else {
+                            playSound();
+                            // $("#verifycode").click();
+                            //layer.msg(result.Message, { icon: 5 });
+                            layer.alert("鎻掑叆涓昏〃澶辫触", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        playSound();
+                        layer.alert("鏇存柊鏍囪鏂规硶鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+                //
+                $.ajax({//琛ㄥご瀛榯emp琛�
+                    url: GetWEBURL() + "/LEMS/SaveCirculationCard_Json_MXG",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HBillNo": HFbarcode
+                        , "HInterID": HInterID
+                        , "HBillNo2": HBillNo2
+                        , "HBarCode": $("#HBarCode_wym").val()
+                        , "HNumber": $("#HNumber").val()
+                        , "HName": $("#HMaterName").val()
+                        , "HModel": $("#HModel").val()
+                    },
+                    success: function (result) {
+                        var data = result.data;
+                        if (data[0].Column1 == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            $("#HFbarcode").attr("readonly", "readonly");//娴佽浆鍗″彿鍙
+                            $("#HFbarcode").css("background-color", "#efefef4d");
+                            $("#HFbarcode").css("box-shadow", "none");
+                            $.ajax({
+                                url: GetWEBURL() + '/LEMS/Update_HBillNo_SubBarcodeList_Json',
+                                type: "GET",
+                                data: { "HBillNo": HBillNo2 },
+                                async: false,
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        option.data = result.data;
+                                        table.render(option);
+                                    }
+                                    else {
+                                        playSound();
+                                        layer.alert(result.code + result.Message, { icon: 5 });
+                                    }
+                                }
+                                , error: function () {
+                                    playSound();
+                                    layer.close(index0);
+                                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                }
+                            })
+                        } else {
+                            playSound();
+                            // $("#verifycode").click();
+                            //layer.msg(result.Message, { icon: 5 });
+                            layer.alert("鏃犳娴佽浆鍗″彿锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        playSound();
+                        layer.alert("鎵祦杞崱鍙锋柟娉曞彂鐢熼敊璇�!", { icon: 5 });
+                    }
+                });
+            }
+            //鑾峰彇鍗曟嵁鍙�
+            function getBillno() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    async: false,
+                    data: { "HBillType": '3783' },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo2").val(d.data[0].HBillNo);
+                        layer.closeAll("loading");
+                    }, error: function () {
+                        playSound();
+                        layer.closeAll("loading");
+                        layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
+                    }
+                });
+            }
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        function GetHWorkerValue(obj) {  //杩斿洖鎺ユ敹浜�
+            $("#Operator").val(obj[0].HName);
+            $("#OperatorID").val(obj[0].HNumber);
+            $("#Operator").css("box-shadow", "none");
+            if ($("#ProductionTeam").val()) {
+                $("#ProductionTeam").css("box-shadow", "none");
+            } else {
+                $("#ProductionTeam").css("box-shadow", "0 0 1px 2px #00ff00");
+            }
+        }
+
+        function GetProductionTeamValue(obj) {  //杩斿洖鐢熶骇鐝粍
+            $("#ProductionTeam").val(obj[0].鐝粍);
+            $("#ProductionTeamID").val(obj[0].鐝粍浠g爜);
+            $("#ProductionTeam").css("box-shadow", "none");
+            if ($("#ProductionResources").val()) {
+                $("#ProductionResources").css("box-shadow", "none");
+            } else {
+                $("#ProductionResources").css("box-shadow", "0 0 1px 2px #00ff00");
+            }
+        }
+
+        function GetProductionResourcesValue(obj) {  //杩斿洖鐢熶骇璧勬簮
+            if ($("#ProductionResources").val()) {
+                $("#ProductionResources").css("box-shadow", "none");
+            }
+            $("#ProductionResources").val(obj[0].鐢熶骇璧勬簮);
+            $("#ProductionResourcesID").val(obj[0].鐢熶骇璧勬簮浠g爜);
+            $("#ProductionResources").css("box-shadow", "none");
+        }
+
+
+        function GetOrgValue(obj)  //杩斿洖鐢熶骇缁勭粐
+        {
+            $("#HOrganization").val(obj[0].HName);
+            $("#HOrganizationID").val(obj[0].HNumber);
+        }
+
+
+    </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_WhiteLabelGeneration.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_WhiteLabelGeneration.html"
index ddb0b3d..7b2114a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_WhiteLabelGeneration.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_WhiteLabelGeneration.html"
@@ -49,13 +49,13 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鍐呴儴椤圭洰鍙�</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" name="ProjectNo" id="ProjectNo" lay-verify="ProjectNo" value=""  autocomplete="off" placeholder="" class="layui-input">
+                                                <input type="text" name="ProjectNo" id="ProjectNo" lay-verify="ProjectNo" value="C331015"  autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">Ordering-Code</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" name="OrderingCode" id="OrderingCode" lay-verify="OrderingCode" value=""  autocomplete="off" placeholder="" class="layui-input">
+                                                <input type="text" name="OrderingCode" id="OrderingCode" lay-verify="OrderingCode" value="C331015"  autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">

--
Gitblit v1.9.1