From 1307fd059f3b5195896bec957c6e96016ee57bd4 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 11 二月 2025 14:28:10 +0800
Subject: [PATCH] 排产生产订单过滤
---
WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html | 14 +++++++-------
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 11 +++++++----
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 9e4386c..b697785 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -264,12 +264,12 @@
<input type="date" class="layui-input" id="HEndDate" style="width:120px;">
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">杞﹂棿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HDeptName_ICMO" id="HDeptName_ICMO">
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -874,7 +874,7 @@
get_FastQuery(1);
//闅愯棌鍕鹃�夊瓧娈�
DisPlay_HideColumn();
- get_Display2(sWhere_ICMO);
+ get_FastQuery_ICMO();
}
//#region 鍒濆鍖栦笅鎷夊垪琛� 鎺掍骇鏃堕棿
function setSelect_HArrangeProductDayQty() {
@@ -1693,7 +1693,7 @@
function get_FastQuery_ICMO(number) {
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HDeptName_ICMO = $("#HDeptName_ICMO").val();//鐢熶骇杞﹂棿
+ var HDeptName_ICMO = $("#HWorkShopIDName").val();//鐢熶骇杞﹂棿
var HMaterName_ICMO = $("#HMaterName_ICMO").val();//鐗╂枡鍚嶇О
var HICMOBillNo_ICMO = $("#HICMOBillNo_ICMO").val(); //鐢熶骇璁㈠崟
@@ -1704,7 +1704,7 @@
sWhere_ICMO += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
}
if (HDeptName_ICMO) {
- sWhere_ICMO += " and 鐢熶骇杞﹂棿 like '%" + HDeptName_ICMO + "%'";
+ sWhere_ICMO += " and 鐢熶骇杞﹂棿 = '" + HDeptName_ICMO + "'";
}
if (HMaterName_ICMO) {
sWhere_ICMO += " and concat(浜у搧浠ｇ爜,浜у搧鍚嶇О,瑙勬牸鍨嬪彿) like '%" + HMaterName_ICMO + "%'";
@@ -1771,7 +1771,7 @@
//$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
//$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ユ埅姝㈡棩鏈�
- $("#HDeptName_ICMO").val("");//鐢熶骇杞﹂棿
+ //$("#HDeptName_ICMO").val("");//鐢熶骇杞﹂棿
$("#HMaterName_ICMO").val("");//鐗╂枡鍚嶇О
$("#HICMOBillNo_ICMO").val(""); //鐢熶骇璁㈠崟
@@ -1851,7 +1851,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇璁㈠崟鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?HDeptID=' + HDeptID, 'yes']
+ , content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?Type=2&HDeptID=' + HDeptID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 563a5be..b4dc40a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -2770,12 +2770,15 @@
//鑾峰彇鍙傛暟
var params = getUrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
- var HOrgID = params[params[1]];
-
+ var HSecondID = decodeURI(params[params[1]]);//鑷畾涔変紶鍏ュ弬鏁�
+
var addSWhere = "";
-
+ //鎺掍骇鐢℉Dept杩囨护閮ㄩ棬
+ if (params[1] == "HDeptID") {
+ addSWhere += " and HDeptID = " + HSecondID + " and 鏄惁鎺掍骇 = ''";
+ }
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere += " and 鍗曟嵁鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' ";
}
return addSWhere;
}
--
Gitblit v1.9.1