MES-WEB-LayUI.git

			@@ -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));

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html	274 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -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>