From bfe80b32f5d7a8bfda2396b6bb16801748029f6a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 26 一月 2026 10:13:34 +0800
Subject: [PATCH] 制造周期报表优化
---
WebTM/views/生产管理/制造周期报表/Sc_ProductionCycleBillList.html | 161 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 139 insertions(+), 22 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
index 2887155..be3a728 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
@@ -105,13 +105,8 @@
<option value="=">=</option>
<option value=">=">>=</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>
@@ -139,13 +134,8 @@
<option value="=">=</option>
<option value=">=">>=</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>
@@ -174,13 +164,8 @@
<option value="=">=</option>
<option value=">=">>=</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>
@@ -713,7 +698,139 @@
data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- table.exportFile(ins.config.id, option.data, "xls");
+
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+ var HSeOrderBillNo = $("#HSeOrderBillNo").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var HOrgID = "";
+ 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 = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+
+ if (Htype != "") {
+ Htype = decodeURI(Htype);
+ }
+
+ if (HSeOrderBillNo) {
+ sWhere += " and 閿�鍞鍗曞彿 like '%" + HSeOrderBillNo + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鎴愬搧鐗╂枡缂栫爜 like '%" + HMaterNumber + "%'";
+ }
+
+ if (HBeginDate && HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鍒跺崟鏃ユ湡, 23) between '" + HBeginDate + "' and '" + HEndDate + "' and HMaterClsID !=1"
+ }
+ sWhere += addSWhereByOpenType();
+
+ sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
+
+ var sql = "select * from h_v_Sc_ProductionCycleBillList where 1 = 1 " + sWhere;
+ var dataExport = [];
+ sWhere = "";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ dataExport = data.data;
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+
+ dataExport.forEach((item) => {
+ // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+ if (item.瀛愰」鐗╂枡鍚嶇О.length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item.瀛愰」鐗╂枡鍚嶇О = item.瀛愰」鐗╂枡鍚嶇О.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item.瀛愰」鐗╂枡鍚嶇О = item.瀛愰」鐗╂枡鍚嶇О.replace(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ }
+ if (item.瀛愰」瑙勬牸鍨嬪彿.length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item.瀛愰」瑙勬牸鍨嬪彿 = item.瀛愰」瑙勬牸鍨嬪彿.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item.瀛愰」瑙勬牸鍨嬪彿 = item.瀛愰」瑙勬牸鍨嬪彿.replace(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ }
+ });
+
+ table.exportFile(ins.config.id, dataExport, "xls");
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
}
--
Gitblit v1.9.1