From a5e8fb4e50f285538ad6800d5abdb66ea367db00 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 14 一月 2026 10:59:42 +0800
Subject: [PATCH] 添康获取多车间订单排产；小卫彩盒SN校验标题调整；过站解绑列表添加日期区间过滤；香囊标签打印，添加暂停打印，继续打印功能
---
WebTM/views/车间管理/产线/MES_BarcodeWhiteLabelReport.html | 116 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 90 insertions(+), 26 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html"
index c44b355..63ed928 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html"
@@ -9,8 +9,12 @@
<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">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.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/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/MESLanguage.js"></script>
</head>
<body>
@@ -25,22 +29,31 @@
<div class="layui-inline">
<span>鏇村</span>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="padding:9px 5px;width:90px;">鏉＄爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBarcode" id="HBarcode">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="padding:9px 5px;width:90px;">鐧芥爣</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HWhiteBardcode" id="HWhiteBardcode" style="width:800px">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
</div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding:9px 5px;width:90px;" id="BT_HBarCode">鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBarcode" id="HBarcode">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding:9px 5px;width:90px;" id="BT_WhiteLabel">鐧芥爣</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhiteBardcode" id="HWhiteBardcode" style="width:500px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;" id="BT_HOrgName">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
@@ -49,11 +62,7 @@
</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/webConfig2.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -72,13 +81,18 @@
var sWhere = "";
var option = [];
+ var HModName = "MES_BarcodeWhiteLabelReport";
+ initFunction(1, HModName, sessionStorage["HTranSlate"]);
+
+
//鍒濆鍖栫晫闈�
set_ClearBill();
-
+
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
set_InitGrid();
+ Organ();
//鏌ヨ
get_FastQuery();
}
@@ -90,11 +104,13 @@
var HWhiteBardcode = $("#HWhiteBardcode").val();
if (HBarcode != "") {
- sWhere += " and 鏉＄爜 like'%" + HBarcode+"%'";
+ sWhere += " and 鏉＄爜 like'%" + HBarcode +"%'";
}
if (HWhiteBardcode != "") {
- sWhere += " and 鐧芥爣 like'%" + HWhiteBardcode+"%'";
+ sWhere += " and 鐧芥爣 like'%" + HWhiteBardcode + "%'";
}
+
+ sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
get_Display(sWhere);
@@ -139,12 +155,13 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
+ layer.alert(get_MessageError(data1.code + data1.Message, sessionStorage["HTranSlate"]), { icon: 5 });
} else {
layer.closeAll("loading");
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert(get_MessageError(data1.code + data1.Message, sessionStorage["HTranSlate"]), { icon: 5 });
}
}, error: function () {
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
}
});
}
@@ -156,8 +173,55 @@
get_FastQuery();
});
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["Organization"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+ function getOrgIDByUser() {
+ var res = "";
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURlLanguage() + "/Xt_User/getOrgIDListByUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� 浼犲弬 缁勭粐蹇呴』鏄垪琛ㄥご閮ㄦ煡璇㈢殑缁勭粐 涓嶈兘浣跨敤鐢ㄦ埛榛樿
+ data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HOrgID").val() },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data[0].sWhere == "1") {
+ res = " and 鐢熶骇缁勭粐 = '" + $("#HOrgID").val() + "'";
+ } else {
+ res = result.data[0].sWhere;
+ }
+ }
+ }, error: function (err) {
+ res = " and 1 = 0";
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
//浠ヤ笂鏄痩ayui妯″潡
});
--
Gitblit v1.9.1