From 277aeae717d8413bbf83e34a2783129e3687ef34 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 13 一月 2025 13:04:09 +0800
Subject: [PATCH] 宝工排产：去掉这个条件，显示所有已排产生产订单未关闭的
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2
WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html | 274 +++++++++++++++++++++++++++---------------------------
2 files changed, 137 insertions(+), 139 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index da81d36..04aa641 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4897,7 +4897,7 @@
<publishTime>09/11/2024 21:05:00</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/瀹濆伐鎺掍骇/JIT_DayPlanPlatForm.html">
- <publishTime>01/13/2025 10:24:27</publishTime>
+ <publishTime>01/13/2025 10:50:50</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/宸ュ崟/Sc_CurrentTicket.html">
<publishTime>06/07/2024 15:42:08</publishTime>
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 8e37159..28f7e20 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"
@@ -41,23 +41,6 @@
</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="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 75px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鎻愭枡绫诲瀷</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HTLType" id="HTLType" lay-verify="HTLType">
- <option value="缂烘枡" selected="selected">缂烘枡</option>
- <option value="鐢熶骇鐢ㄦ枡娓呭崟">鐢熶骇鐢ㄦ枡娓呭崟</option>
- <!--<option value="閲囪喘璁㈠崟">閲囪喘璁㈠崟</option> 鏆傛椂娌℃湁-->
- </select>
- </div>
- </div>
-
- <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -67,44 +50,38 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">寮�宸ユ埅姝㈡棩鏈�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 75px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </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" name="HBillNo" id="HBillNo">
</div>
</div>
- </div>
- <div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍙�</label>
+ <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="HICMOBillNo" id="HICMOBillNo">
+ <input type="text" class="layui-input" name="HLockedDay" id="HLockedDay" value="3">
</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" name="HMaterName" id="HMaterName">
+ <label class="layui-form-label" style="width: 85px;">鎻愭枡绫诲瀷</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HTLType" id="HTLType" lay-verify="HTLType">
+ <option value="缂烘枡" selected="selected">缂烘枡</option>
+ <option value="鐢熶骇鐢ㄦ枡娓呭崟">鐢熶骇鐢ㄦ枡娓呭崟</option>
+ <!--<option value="閲囪喘璁㈠崟">閲囪喘璁㈠崟</option> 鏆傛椂娌℃湁-->
+ </select>
</div>
</div>
<div class="layui-inline">
@@ -117,17 +94,23 @@
</div>
</div>
</div>
- <div class="layui-row" style="margin-top:10px;margin-bottom:10px;">
+ <!--<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閿佸畾澶╂暟</label>
+ <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="HLockedDay" id="HLockedDay" value="3">
+ <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 75px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <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="HMaterModel" id="HMaterModel">
+ <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 75px;">
+ </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="date" class="layui-input" lay-verify="HMastersDate" name="HMastersDate" id="HMastersDate" style="padding-left: 75px;">
</div>
</div>
<div class="layui-inline">
@@ -136,20 +119,34 @@
<input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
</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" name="HICMOBillNo" id="HICMOBillNo">
+ </div>
+ </div>
</div>
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="hmaterid" name="hmaterid" id="hmaterid" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="hmaternumber" name="hmaternumber" id="hmaternumber" value="" style="width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnhmaterid" id="btnhmaterid" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鎺掍骇鏃ユ湡</label>
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HMastersDate" name="HMastersDate" id="HMastersDate" style="padding-left: 75px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ </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" name="HMaterModel" id="HMaterModel">
</div>
</div>
</div>
@@ -207,7 +204,6 @@
<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>
@@ -234,7 +230,7 @@
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
- </div>
+ </div>-->
</div>
</div>
</div>
@@ -1474,96 +1470,98 @@
if (number == 1) {
HProdORGID = sessionStorage["OrganizationID"];//鐢熶骇璁㈠崟缁勭粐
}
- var HPlanBeginDate = $("#HPlanBeginDate").val();//寮�宸ヨ捣濮嬫棩鏈�
- var HPlanEndDate = $("#HPlanEndDate").val();//寮�宸ユ埅姝㈡棩鏈�
- var HMastersDate = $("#HMastersDate").val();//鎺掍骇鏃ユ湡
- var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
- var HMaterID = $("#HMaterID").val();//鐗╂枡缂栫爜id
- var HICMOBillNo = $("#HICMOBillNo").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();
+ //var HPlanBeginDate = $("#HPlanBeginDate").val();//寮�宸ヨ捣濮嬫棩鏈�
+ //var HPlanEndDate = $("#HPlanEndDate").val();//寮�宸ユ埅姝㈡棩鏈�
+ //var HMastersDate = $("#HMastersDate").val();//鎺掍骇鏃ユ湡
+ //var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
+ //var HMaterID = $("#HMaterID").val();//鐗╂枡缂栫爜id
+ //var HICMOBillNo = $("#HICMOBillNo").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();
var sWheres = "";
- 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;
- }
- sWheres += " and [" + ColName + "] " + com;
- }
+ //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;
+ // }
+ // sWheres += " 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;
- }
+ //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 = {
- HPlanBeginDate: HPlanBeginDate
+ HPlanBeginDate: '1900-01-01' //HPlanBeginDate
, HProdORGID: HProdORGID
- , HSeOrderBillNo: HSeOrderBillNo
- , HPlanEndDate: HPlanEndDate
- , HMaterID: HMaterID
- , HICMOBillNo: HICMOBillNo
+ , HSeOrderBillNo: '' //HSeOrderBillNo
+ , HPlanEndDate: '2500-01-01' //HPlanEndDate
+ , HMaterID: 0 //HMaterID
+ , HICMOBillNo: '' //HICMOBillNo
, HWorkShopID: HWorkShopID
- , HMastersDate: HMastersDate
+ , HMastersDate: '' //HMastersDate
, sWheres: sWheres
}
get_Display(JSON.stringify(sWhere));
--
Gitblit v1.9.1