MES-WEB-LayUI.git

			@@ -2,7 +2,7 @@
			<html>
			<head>
			<meta charset="utf-8" />
			<title>çäº§è®¡åå¹³å°</title>
			<title>çäº§è®¡åæäº§</title>
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			@@ -26,12 +26,15 @@
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">è§£é</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">é½å¥åæ</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">ææè¿ç®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">è¦æè¿ç®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">çäº§è®¢åéå</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">åå¤</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">æäº§</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">å·¥èºè·¯çº¿</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">éå®å·¥å</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">è§£éå·¥å</button>
			</div>
			<div class="layui-collapse">
			<div class="layui-collapse resizable-container">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			@@ -178,6 +181,61 @@
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</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="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>
			</div>
			</div>
			@@ -185,10 +243,11 @@
			<div class="layui-row" style="padding:10px 0">
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>
			<div class="layui-tab layui-tab-card" style="margin-top:40px;">
			<div class="resizable-container layui-tab layui-tab-card" style="margin-top:40px;">
			<ul class="layui-tab-title">
			<li class="layui-this">çäº§è®¢å</li>
			</ul>
			<li class="layui-this">çäº§è®¢å</li>
			<li>ç¼ºæåæ</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<div class="layui-inline">
			@@ -224,8 +283,11 @@
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch_ICMO" id="btnSearch_ICMO">æ¥è¯¢</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch_ICMO" id="btnReSearch_ICMO">éç½®</button>
			<!--å¾æè®¢å-->
			<table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
			</div>
			<table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
			</div>
			<div class="layui-tab-item">
			<table class="layui-hide" id="mainTable_Material" lay-filter="mainTable_Material"></table>
			</div>
			</div>
			</div>
			<script type="text/html" id="toolbarDemo">
			@@ -239,15 +301,23 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>ä¼åçº§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>åå¤æåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>éäº§çº¿</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><i class="layui-icon layui-icon-delete"></i>éæä½å·¥</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>å·¥èºè·¯çº¿</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><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>
			<script type="text/html" id="toolbarDemo2">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>æäº§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn_ICMO"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			<script type="text/html" id="toolbarDemo3">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn_Material"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			@@ -264,11 +334,12 @@
			</script>
			<script>
			var OptionData = [];
			var OptionData_Emp = [];
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable','jquery'], function () {
			//#region å¬ç¨åé

			var $ = layui.$
			@@ -280,28 +351,32 @@
			, excel = layui.excel
			, soulTable = layui.soulTable
			, element = layui.element;

			var ins;
			var sWhere = "";
			var sWhere_ICMO = "";
			var option = [];
			var option2 = [];
			var option3 = [];
			var option_columns = [];
			var HModName = "JIT_DayPlanPlatForm";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = [];
			var titleData_ICMO = ["hmainid", "HEntryID", "HEmpID", "HPRDORGID", "hsubid", "HMaterID", "HUnitID", "HDeptID", "HEntryCusID", "HCenterID","HSourceID"];
			var titleData_ICMO = ["hmainid", "HEntryID", "HEmpID", "HPRDORGID", "hsubid", "HMaterID", "HUnitID", "HDeptID", "HEntryCusID", "HCenterID", "HSourceID"];
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½

			//åå§åçé¢
			$(document).ready(function () {
			set_InitGrid();
			});
			set_ClearBill();

			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//è¡åé¼ æ ç¦»å¼äºä»¶
			//è¡åé¼ æ ç¦»å¼äºä»¶
			table.on('edit(mainTable)', function (obj) {
			var myDate = new Date();
			var yyyy = myDate.getFullYear();
			@@ -351,7 +426,7 @@
			});
			return layer.msg("æäº§æ°éå¤§äºè®¢åæ°é!")
			}


			if (Date.parse(obj.field) > Date.parse(obj.data.è®¡åç»ææ¥æ)) {
			return layer.msg("æäº§æ¥æè¶åºè®¡åç»ææ¥æ!");
			}
			@@ -495,6 +570,10 @@
			case 'set_Souce':
			set_Souce(data);
			break;
			//éæä½å·¥
			case 'set_Emp':
			set_Emp(data);
			break;
			//æ¥çå·¥èºè·¯çº¿
			case 'set_Routing':
			set_Routing();
			@@ -503,10 +582,15 @@
			case 'set_Calendar':
			set_Calendar();
			break;
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			}
			});


			//çäº§è®¢å
			table.on('toolbar(mainTable_ICMO)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);
			switch (obj.event) {
			@@ -524,6 +608,20 @@
			break;
			};
			});
			//ç¼ºæåæ
			table.on('toolbar(mainTable_Material)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);
			switch (obj.event) {
			//éåºæé®
			case 'btn-Close':
			parent.layui.admin.events.closeThisTabs();
			break;
			//åè®¾ç½®
			case 'set_HideColumn_Material':
			get_HideColumn_Material();
			break;
			};
			});

			//å¯¼å¥
			form.on('submit(ExcelImport)', function () {
			@@ -532,7 +630,7 @@

			//ä¿å
			form.on('submit(btnSave)', function (data) {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else if (table.cache["mainTable"].length == 0) {
			@@ -540,11 +638,11 @@
			} else {
			var HYxjQty = 0;
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			if (parseFloat(table.cache["mainTable"][i]["ä¼åçº§"]) == 0) {
			HYxjQty++
			}
			}
			if (table.cache["mainTable"][i] != "") {
			if (parseFloat(table.cache["mainTable"][i]["ä¼åçº§"]) == 0) {
			HYxjQty++
			}
			}
			}
			if (HYxjQty > 0) {
			layer.confirm('å½åæäº§é¡µé¢åå¨ä¼åçº§ä¸º0ççäº§è®¢åï¼æ¯å¦ç»§ç»è¿è¡æäº§ï¼', {
			@@ -560,7 +658,7 @@
			});
			} else {
			set_AddNew();
			}
			}
			}
			});

			@@ -602,6 +700,11 @@
			//ææè¿ç®
			form.on('submit(btnTLYS)', function (data) {
			get_btnTLYS();
			})

			//è¦æè¿ç®
			form.on('submit(btnYLYS)', function (data) {
			get_btnYLYS();
			})

			//çäº§è®¢åéå
			@@ -689,6 +792,16 @@
			}
			})

			//éå®å·¥å
			form.on('submit(btnLockOrder)', function (data) {
			get_btnLockOrder();
			})

			//è§£éå·¥å
			form.on('submit(btnUnlockOrder)', function (data) {
			get_btnUnlockOrder();
			})

			//#endregion

			//#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³
			@@ -712,7 +825,7 @@
			DisPlay_HideColumn();
			get_Display2(sWhere_ICMO);
			}
			//#endregion
			//#endregion

			//è·åç»ç»
			function Organ() {
			@@ -743,153 +856,184 @@
			var oneday = 1000 * 60 * 60 * 24;

			columns.push({ type: 'checkbox', fixed: 'left', sort: true });
			columns.push({ type: 'numbers', title: 'åºå·', sort: true });
			columns.push({ type: 'numbers', field: 'åºå·', title: 'åºå·', sort: true });
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true, sort: true });
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', sort: true });
			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150, sort: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, sort: true });
			columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150, sort: true });
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, sort: true });
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150, sort: true });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, sort: true, edit: 'text' });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, sort: true });//0
			columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true });
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150});
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150 });
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text' });
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é'});
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é' });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', sort: true });
			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID" });
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID" });

			columns.push({
			field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')],d,Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'));
			} })//0
			return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'));
			} })//0
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
			} })//0

			}
			})//0
			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150, sort: true });
			columns.push({ field: 'T31', title: 'T31', width: 70 });//0
			columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150, sort: true });
			@@ -900,7 +1044,6 @@
			columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150, sort: true });
			columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150, sort: true });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, sort: true, edit: 'text' });
			columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150, sort: true });
			columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true });
			@@ -912,16 +1055,18 @@
			columns.push({ field: 'è®¡éåä½', title: 'è®¡éåä½', width: 150, sort: true });
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150 });//0
			columns.push({ field: 'æªå¥åºæ°é', title: 'æªå¥åºæ°é', width: 150 });//0
			columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide:true });
			columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide:true });
			columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
			columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide: true });
			columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide: true });
			columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide: true });
			columns.push({ field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ', width: 150, hide: true });
			columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });

			columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
			columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
			columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
			columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
			columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
			columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text', sort: true });
			columns.push({ field: 'éå®å·¥å', title: 'éå®å·¥å', width: 150, sort: true, filter: true });//0
			columns.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });
			option_columns = columns;
			option = {
			@@ -933,6 +1078,18 @@
			, cols: [columns]
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, done: function (res, page, count) {
			soulTable.render(this);
			$('.layui-table thead').on('click', 'th', function () {
			// è·åç¹å»çè¡¨å¤´ç field å¼
			var field = $(this).data('field');
			set_InitGrid1(field);
			sWhere = {
			HORGID: sessionStorage["OrganizationID"]
			, HBEGINDATE: field
			, HENDDATE: field
			}
			get_Display_3(JSON.stringify(sWhere));
			});
			//res.data.forEach(function (item, index) {
			// if (data1.data.DataColor != undefined) {
			// var sj = data1.data.DataColor;
			@@ -950,6 +1107,34 @@
			// }
			//})
			}
			}
			}

			//ç¼ºæåæè¡¨æ ¼æ°æ®
			function set_InitGrid1(field) {
			var columns = [];
			columns.push({ field: 'HOrgName', title: 'éè´ç»ç»', sort: true });
			columns.push({ field: 'FNUMBER', title: 'ç©æç¼ç ', sort: true });
			columns.push({ field: 'HMaterName', title: 'ç©æåç§°', sort: true });
			columns.push({ field: 'HMaterModel', title: 'ç©æè§æ ¼', sort: true });
			columns.push({ field: 'å¨éæ°é', title: 'å¨éæ°é', totalRow: true });
			columns.push({ field: 'CountHQty', title: 'åè®¡', sort: true });
			columns.push({ field: 'FBASEQTY', title: 'å³æ¶åºåæ°é', sort: true, totalRow: true });
			columns.push({ field: Format(field, 'yyyy-MM-dd'), title: Format(field, 'MM.dd'), width: 70 })

			option_columns = columns;
			option3 = {
			elem: '#mainTable_Material'
			, toolbar: '#toolbarDemo3'
			, height: 'full-120'
			, page: false
			, cellMinWidth: 90
			, cols: [columns]
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, done: function (res, page, count) {
			soulTable.render(this);

			}
			};
			}

			@@ -964,7 +1149,7 @@
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			ins = table.render(option);
			var HinterID_S = [];
			for (var i = 0; i < data1.data.length; i++) {
			HinterID_S.push(data1.data[i]["hmainid"]);
			@@ -1113,6 +1298,31 @@
			});
			}

			//æ¥è¯¢ è¡¨æ ¼æ°æ® ç¼ºæåæ
			function get_Display_3(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHDateTimeList',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere },
			success: function (result) {
			if (result.count == 1) {
			option3.data = result.data;
			table.render(option3);
			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//æ°éæ è®°é¢è²
			function DayColor(DaySate, DayHQty,Data,NowData) {
			if (DaySate == "é½å¥" \|\| DaySate == "æªé½å¥") {
			@@ -1252,6 +1462,12 @@
			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) {
			@@ -1276,6 +1492,48 @@
			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;
			}
			sWhere = {
			HPlanBeginDate: HPlanBeginDate
			, HProdORGID: HProdORGID
			@@ -1359,6 +1617,12 @@
			$("#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 = "";
			}
			@@ -1439,6 +1703,34 @@
			});
			}

			//è¦æè¿ç®
			function get_btnYLYS() {
			sWhere = {
			HProdORGID: $("#HProdORGID").val()
			, HWorkShopID: $("#HWorkShopID").val()
			}
			sWhere = JSON.stringify(sWhere);
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_YLYS',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			get_FastQuery(2);
			layer.msg(data1.Message);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//çäº§è®¢åéå
			function get_btnICMOBill() {
			var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();
			@@ -1487,6 +1779,7 @@
			}
			HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
			}

			$('#HProgressBar').html(`
			<div class="layui-progress" lay-filter="demo-filter-progress">
			<div class="layui-progress-bar" lay-percent="40%"></div>
			@@ -1547,6 +1840,13 @@
			$('#HProgressBar').html('')

			table.render(option);
			set_Priority();
			data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			if (parseFloat(data[i]["å°æ¶äº§è½"]) == 0 \|\| parseFloat(data[i]["å°æ¶äº§è½"]) == null \|\| parseFloat(data[i]["å°æ¶äº§è½"]) == undefined) {
			return layer.alert("ç¬¬" + (i + 1) + 'è¡ï¼å°æ¶äº§è½æªè®¾ç½®ï¼è¯·æ ¸å¯¹æ°æ®ã' + '</br>' + '1.ç©ææªæ·»å å·¥èºè·¯çº¿' + '</br>' + '2.å·¥èºè·¯çº¿ä¸æªè®¾ç½®å°æ¶äº§è½' + '</br>' + '3.çäº§èµæºæªè®¾ç½®åçå·¥æ¶' + '</br>' + '4.çäº§èµæºä¸ç»å®å·¥ä½ä¸å¿ä¸å·¥èºè·¯çº¿ä¸è®¾ç½®çå·¥ä½ä¸å¿ä¸ä¸è´');
			}
			}

			} else {
			//layer.close(ajaxLoad);
			@@ -1646,6 +1946,7 @@
			}
			HinterID_S.push(option.data[i]["hmainid"]);
			}
			//è·åè®¡åéå®çå¤©æ°
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
			type: "GET",
			@@ -1664,7 +1965,7 @@
			});

			//æ ¹æ®è½¦é´å é¤æ²¡æéå®çæ°æ®
			var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + ")";
			var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
			$.ajax({
			url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
			type: "GET",
			@@ -1680,10 +1981,11 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			//å°è¡¨æ ¼æ°æ®å è½½å°TableDataéé¢
			get_HFData(0, 0);

			//åå§åè¡¨æ ¼æ°æ®
			//æ¸ç©ºéå®æ¥æä»¥å¤çæ°æ®
			for (var i = 0; i < option.data.length; i++) {
			for (var j = (22 + HPlanDay); j < 53; j++) {
			if (option.data[i][option.cols[0][j].field] != null) {
			@@ -1719,9 +2021,9 @@
			sWorkQty = option.data[i]["å°æ¶äº§è½"];
			sYX = option.data[i]["ä¼åçº§"];
			HReportQty = option.data[i]["æåæ±æ¥æ°é"];

			//æåæ°éåå»æ±æ¥æ°ééå®æ°é
			if (SDSum > 0) {
			sPlanQty = sPlanQty - SDSum - HReportQty;
			sPlanQty = sPlanQty - SDSum;
			}
			//å©ä½éæ±å·¥æ¶
			iLeftQty = sPlanQty - HReportQty;
			@@ -2480,12 +2782,59 @@
			return layer.msg("è¯·éæ©æ°æ®!")
			}
			}

			//éæä½å·¥
			function set_Emp(data) {
			if (data != 0) {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "èååè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Htype=HEmp", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			OptionData_Emp[0] = checkStatus.data[0];
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (OptionData_Emp.length > 0) {
			var num = 0;
			for (var i = 0; i < option.data.length; i++) {
			if (num >= data.length) {
			break;
			}
			if (option.data[i]["LAY_CHECKED"] == true) {
			option.data[i]["HEmpID"] = OptionData_Emp[0].HItemID;
			option.data[i]["æä½å·¥"] = OptionData_Emp[0].èååç§°;
			num += 1;
			}
			}
			table.render(option);
			}
			}
			})
			}
			else {
			return layer.msg("è¯·éæ©æ°æ®!")
			}
			}

			//ä¿å
			function set_AddNew() {

			//å é¤åè¡¨æ°æ® ä¼å ç¨æ°ç»çä½ç½®,éè¦éæ°æä¸ä¸é¡ºåº
			var num = [];
			var num = [];
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			if (parseFloat(table.cache["mainTable"][i]["æåæ°é"]) == 0) {
			@@ -2497,7 +2846,7 @@
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
			num.push(table.cache["mainTable"][i])
			}
			}
			}

			//var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(num);
			@@ -2606,6 +2955,47 @@
			}
			})
			}

			//æä½å·¥
			if (obj.event == "HEmpID") {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "åå·¥åè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Htype=HEmp", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			OptionData_Emp[0] = checkStatus.data[0];
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "æä½å·¥": checkStatus.data[0].èååç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (OptionData_Emp.length > 0) {
			obj.update({
			"HEmpID": OptionData_Emp[0].HItemID
			, "æä½å·¥": OptionData_Emp[0].èååç§°
			})
			OptionData_Emp = [];
			}
			}
			})
			}

			obj.event = "";
			return false;
			} else if (event.key == "F8") {
			@@ -2710,6 +3100,80 @@
			}
			}

			//éå®å·¥å
			function get_btnLockOrder() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;

			if (data.length > 0) {
			var HInterIDArr = [];

			for (var i = 0; i < data.length; i++) {
			HInterIDArr.push(data[i].hmainid);
			}

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedOrder',
			type: "GET",
			data: { "HInterIDs": HInterIDArr.toString() },
			success: function (data1) {
			if (data1.count == 1) {
			layer.msg("å·¥åå·²éå®");
			get_FastQuery(2);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			} else {
			layer.msg('è¯·éæ©ä½ è¦éå®çå·¥åï¼');
			}
			}

			//è§£éå·¥å
			function get_btnUnlockOrder() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;

			if (data.length > 0) {
			var HInterIDArr = [];

			for (var i = 0; i < data.length; i++) {
			HInterIDArr.push(data[i].hmainid);
			}

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHUnlockOrder',
			type: "GET",
			data: { "HInterIDs": HInterIDArr.toString() },
			success: function (data1) {
			if (data1.count == 1) {
			layer.msg("å·¥åå·²è§£é");
			get_FastQuery(2);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			} else {
			layer.msg('è¯·éæ©ä½ è¦è§£éçå·¥åï¼');
			}
			}

			//æ¥è¯¢æªæäº§ççäº§è®¢å
			function get_Display2(sWhere_ICMO) {
			var ajaxLoad = layer.load();
			@@ -2752,7 +3216,7 @@
			, data: data1.data
			, height: 400
			, page: true
			, limits: [200, 500, 5000, 50000]
			, limits: [200, 500, 5000, 20000]
			, limit: 200
			, cellMinWidth: 90
			}
			@@ -2890,6 +3354,18 @@
			})
			}

			function get_Export() {
			var data = option.data
			data.forEach((item) => {
			// å¦ææä¸ªåæ®µçå¼å¤ªé¿ï¼éè¦å»é¤æ¢è¡ç¬¦
			if (item.è§æ ¼åå·.length > 0) { // åè®¾åæ®µåä¸ºfield
			item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[,]+/g, 'ï¼'); // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			});
			table.exportFile(ins.config.id, data, "xls");
			}

			//æäº§åè½
			function set_Arrangement() {
			var checkStatus = table.checkStatus('mainTable_ICMO')
			@@ -2958,8 +3434,8 @@
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			@@ -2968,7 +3444,7 @@
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

			layer.open({
			type: 2
			@@ -2997,69 +3473,82 @@
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


			titleData = [];
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["åæ®å·", "HProdORGID", "HMaterID", "HUnitID", "HWorkShopID", "HSourceID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] += ";font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] += ";font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			if (dataCol.length == option.cols[0].length - 1) {
			//éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			for (var j = 0; j < option.cols[0].length - 1; j++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[j].split('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[5]) {
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			if (dataCol.length == newCols[0].length - 1) {
			option.cols = newCols;
			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			}
			}
			table.render(option);
			@@ -3190,6 +3679,105 @@
			})
			}

			function get_HideColumn_Material() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option3.cols[0].length; i++) {
			colName += option3.cols[0][i]["title"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			for (var i = 0; i < urlLen.length - 4; i++) {
			contentUrl += "../";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + "Main" + '&colName=' + colName;

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn_Material();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			function DisPlay_HideColumn_Material() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			data: { "HModName": HModName + "Main", "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option3.cols[0].length - 1; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option3.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option3.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option3.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option3.cols[0][i + 1]["style"] = "font-size:100%";
			}

			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option3.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option3.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option3.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option3.cols[0].length - 1; i++) {
			if (option3.cols[0][i]["fixed"] != null) {
			option3.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			table.render(option3);
			} else {
			table.render(option3);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}

			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			@@ -3199,7 +3787,9 @@
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName").append(Organization);$("#ColName1").empty();
			$("#ColName1").append(Organization);$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion
			@@ -3208,7 +3798,12 @@

			//åå»è¿åçäº§èµæº
			function GetGySource(data) {
			OptionData[0] = data
			OptionData = data
			}

			//åå»è¿åæä½å·¥
			function GetHEmpValue(data) {
			OptionData_Emp = data
			}

			</script>