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/车间管理/报表分析/Sc_WorkShopProcessWIPSumReport.html | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 270 insertions(+), 17 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html"
index f70e663..acd8fdf 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -87,29 +88,113 @@
</div>
<div class="layui-row">
<!--<div class="layui-inline">
- <label class="layui-form-label">鐢熶骇璁㈠崟</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="txtHICMOBillNo" style="width:190px;">
- </div>
- </div>-->
+ <label class="layui-form-label">鐢熶骇璁㈠崟</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="txtHICMOBillNo" style="width:190px;">
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">宸ュ簭</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="txtHProcName" style="width:190px;">
</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" id="txtHEmpNumber">
+
+ <!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</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" id="txtHEmpName">
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</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" id="txtHEmpNumber">
+ </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" id="txtHEmpName">
+ </div>
+ </div>-->
</div>
</div>
</div>
@@ -118,7 +203,9 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-return"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
</div>
</script>
</form>
@@ -128,6 +215,7 @@
</div>
<script>
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -147,6 +235,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var ins = "";
var HModName = "Sc_WorkShopProcessWIPSumReport";
//#endregion
@@ -168,6 +257,27 @@
case 'HideColumn':
get_HideColumn();
break;
+ //闅愯棌鍒楄缃�
+ case 'btn-Print':
+ get_Print();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',', '锛�'); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ break;
+
};
});
//閲嶇疆鎸夐挳
@@ -205,6 +315,7 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
//DisPlay_HideColumn();
+/* ColFilter();*/
}
//鍒濆鍖栬〃鏍�
@@ -213,7 +324,10 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , totalRow: true
+ , limit: 50 // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , limits:[50,200,500,1000]
+ , page: true
, height: 'full-70'
};
}
@@ -224,10 +338,11 @@
$.ajax({
url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/WorkShopProcessWIPSumReport',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
var col = [];
if (data1.count == 1) {
+ var totalArray = ["璁″垝鏁伴噺", "鍚堟牸鏁�", "涓嶅悎鏍兼暟", "鍦ㄥ埗鏁�"];
var data = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -238,6 +353,9 @@
for (var i = 0; i < data.length; i++) {
if (!patrn.test(data[i].name)) {
col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
}
else {
switch (data[i].Type) {
@@ -251,7 +369,7 @@
}
option.cols = [col];
option.data = data1.data;
- table.render(option);
+ ins = table.render(option);
layer.close(wait);
} else {
layer.close(wait);
@@ -274,6 +392,79 @@
var txtHMaterModel = $("#txtHMaterModel").val();
var txtHProcName = $("#txtHProcName").val();
//var txtHICMOBillNo = $("#txtHICMOBillNo").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
sWhere = "'%" + txtHDeptName + "%','%" + txtHMaterNumber + "%','%" + txtHMaterName + "%','%" + txtHMaterModel + "%','%" + txtHProcName + "%'"
@@ -292,6 +483,16 @@
$("#txtHMaterModel").val("");
$("#txtHProcName").val("");
//$("#txtHICMOBillNo").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ form.render('select');
sWhere = " ";
get_FastQuery();
}
@@ -375,6 +576,54 @@
})
}
+ //鎵撳嵃鎶ヨ〃
+ function get_Print() {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=0&MyMsg=0&Type=Sc_WorkShopProcessWIPSumReport', 'yes']
+ , resize: false
+ , end: function () {
+ console.log(OptionData);
+ if (OptionData.length > 0) {
+ var GrfName = OptionData[0].HName;
+ if (option.data.length != 0) {
+ var dataPrint = [];
+ for (var i = 0; i < option.data.length; i++) {
+ option.data[i]["鏃ユ湡"] = "2320-12-11";
+ option.data[i]["鏌撴枡鎬婚噺"] = "11237";
+ option.data[i]["鍔╁墏鎬婚噺"] = "1321414";
+ dataPrint.push(option.data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint,
+ }
+
+
+ var args = {
+ type: "preview",
+ //showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/" + GrfName + ".grf"),
+ data: Customer
+ };
+
+ console.log(option.data[0].鍗曟嵁鍙�);
+ //var args = {
+ // report: urlAddRandomNo("../../grf/cs10.grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+ }
+ }
+ }
+ })
+ }
+
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
@@ -451,9 +700,13 @@
})
}
-
//#endregion
});
+
+ //鍙屽嚮杩斿洖鐢熶骇璧勬簮
+ function ReportPrint(data) {
+ OptionData = data
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1