MES-WEB-LayUI.git

			@@ -5,13 +5,14 @@
			<title>çäº§è®¡åæäº§</title>
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<!--<script src="../../../layuiadmin/soulTable.slim.js"></script>-->
			<script src="../../../layuiadmin/SetColumn.js"></script>
			</head>
			<body>
			@@ -22,6 +23,7 @@
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div style="padding: 10px; ">
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">Excelå¯¼å¥</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelDateImport" id="ExcelDateImport">å®å·¥æ¥æå¯¼å¥</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="btnAddICMO" id="btnAddICMO">æ·»å è®¢å</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">ä¿å</button>
			@@ -30,9 +32,9 @@
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">éå®</button>
			<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="btnLockRequest" id="btnLock">éå®ç³è¯·</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockRequest" id="btnUnlock">è§£éç³è¯·</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>-->
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockRequest" id="btnUnlock">è§£éç³è¯·</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>
			<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="btn_Calculate" id="btn_Calculate">æ¬ æè¿ç®</button>-->
			@@ -643,7 +645,10 @@
			form.on('submit(ExcelImport)', function () {
			btnExcelImport();
			});

			//å®å·¥å¯¼å¥
			form.on('submit(ExcelDateImport)', function () {
			btnExcelDateImport();
			});
			//ä¿å
			form.on('submit(btnSave)', function (data) {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			@@ -1382,25 +1387,26 @@
			columns.push({ type: 'checkbox', fixed: 'left'});
			columns.push({ type: 'numbers', field: 'åºå·', title: 'åºå·'});
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true});
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150});
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;'});
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150 });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150});
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150});
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150 });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, edit: 'text' });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150 });//0
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150 });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150 });//0
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150, filter: true, sort: true});
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
			columns.push({ field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, filter: true, sort: true });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150, filter: true, sort: true});
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, filter: true, sort: true});
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150, filter: true, sort: true });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, edit: 'text', filter: true, sort: true });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, filter: true, sort: true });//0
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150, filter: true, sort: true });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, filter: true, sort: true });//0
			columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150 });//0
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate" });
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150 });
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text' });
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é' });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text' });
			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID" });
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID" });
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", filter: true, sort: true });
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150, filter: true, sort: true});
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text', filter: true, sort: true });
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é', filter: true, sort: true });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', filter: true, sort: true });
			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID", filter: true, sort: true });
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID", filter: true, sort: true });

			var dateColumns = setInit_columnsData();
			var HArrangeProductDayQty = $("#HArrangeProductDayQty").val() * 1;
			@@ -1412,7 +1418,7 @@
			columns.push({ field: 'T31', title: 'T31', width: 70 });//0
			columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150 });
			columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150 });
			columns.push({ field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 150 });
			columns.push({ field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 150, filter: true, sort: true });
			columns.push({ field: 'äº§çº¿å¥åºæ°é', title: 'äº§çº¿å¥åºæ°é', width: 150 });
			columns.push({ field: 'æªææ°é', title: 'å¯ææ°é', width: 150 });
			columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150 });
			@@ -1422,6 +1428,7 @@
			columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150 });
			columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'çäº§è®¢åæ¥æ', title: 'çäº§è®¢åæ¥æ', width: 150, templet: "<div>{{d.çäº§è®¢åæ¥æ ==null ?'':layui.util.toDateString(d.çäº§è®¢åæ¥æ, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
			columns.push({ field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 150 });
			columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150 });
			columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150 });
			@@ -1764,6 +1771,21 @@
			}
			})
			}
			//Excelå®å·¥æ¥æå¯¼å¥
			function btnExcelDateImport() {
			layer.open({
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'Excelå¯¼å¥'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../ä¸åæäº§/JIT_DayPlanPlatFormImport_SS.html?OperationType=1'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			}
			})
			}

			//ç©æåè¡¨
			function btnHMaterID() {
			@@ -1982,9 +2004,9 @@
			sWhere_ICMO += " and concat(äº§åä»£ç ,äº§ååç§°,è§æ ¼åå·) like '%" + HMaterName_ICMO + "%'";
			}
			if (HICMOBillNo_ICMO) {
			sWhere_ICMO += " and åæ®å· like '%" + HICMOBillNo_ICMO + "%'";
			sWhere_ICMO += " and (å®¢æ·è®¢åå· like '%" + HICMOBillNo_ICMO + "%' or åæ®å· like '%" + + HICMOBillNo_ICMO + "%')";
			}
			sWhere_ICMO += " and ç¶æ like '%å¼å·¥%'";
			sWhere_ICMO += " and (ç¶æ like '%å¼å·¥%' or ç¶æ like '%è®¡åç¡®è®¤%')";
			get_Display2(sWhere_ICMO);
			sWhere_ICMO = ""//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			@@ -2467,7 +2489,8 @@
			HPlanDay = data1.data[0].DayNum;

			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			//layer.alert(data1.code + data1.Message, { icon: 5 });å»ææ ç¨æç¤º

			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			@@ -2519,7 +2542,7 @@
			//æ¾å°æ¬ä»»å¡å å¯ç¨çäº§èµæº
			lMainID = option.data[i]["HICMOInterID"];
			sICMOBillNo = option.data[i]["çäº§è®¢åå·"];
			dEndDate = Format(option.data[i]["æè¿å®å·¥æ¥æ"], 'yyyy/MM/dd');
			dEndDate = Format(option.data[i]["è®¡åç»ææ¥æ"], 'yyyy/MM/dd');
			sProdTimes = option.data[i]["çäº§å¨æ"];
			sPlanQty = option.data[i]["æåæ°é"];
			lHGroupID = option.data[i]["HGroupID"];