MES-WEB-LayUI.git

			@@ -9,14 +9,13 @@
			<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>-->
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<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>


			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			@@ -35,9 +34,10 @@
			<label class="layui-form-label" style="width: 100px">çäº§ä»»å¡åå·ï¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HBillNo" id="HBillNo" placeholder="è¯·è¾å¥ååè½¦" class="layui-input" value="" style="float:left;width:260px;">
			<input type="text" name="HBillNo1" id="HBillNo1" style="display:none">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnPack" id="btnPack" style="padding: 0 30px; margin-left: 150px">æ´è£çæ</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnPack" id="btnPack" style="padding: 0 30px; margin-left: 150px">æ¡ç çæ</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAssembly" id="btnAssembly" style="padding:0 30px">æ¼è£çæ</button>
			</div>
			</div>
			@@ -110,12 +110,60 @@
			//æ´ç®±çæ
			form.on('submit(btnPack)', function (data) {
			var flag = "ZZ";
			SavePack(flag);
			var sSubStr = table.checkStatus('mainTable');
			if (sSubStr.data.length > 0) {
			SavePack(flag,sSubStr);
			}
			else {
			layer.msg('è¯·æå°éæ©1è¡æ°æ®ï¼');
			return;
			}
			});
			//æ¼ç®±çæ
			form.on('submit(btnAssembly)', function (data) {
			var flag = "PZ";
			SavePack(flag);
			var sSubStr = table.checkStatus('mainTable');
			if (sSubStr.data.length > 1) {
			SavePack(flag,sSubStr);
			}
			else {
			layer.msg('è¯·æå°éæ©2è¡æ°æ®ï¼');
			}
			});
			//çå¬ååæ ¼ç¼è¾ ååæ ¼ç¼è¾å åæ´
			table.on('edit(mainTable)', function (obj) {
			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			, data = obj.data //å¾å°æå¨è¡ææé®å¼
			, field = obj.field; //å¾å°åæ®µ

			switch (field) {
			case "HSPlanQty": //æå°åè£æ°
			var HPlanQty = parseInt(isNaN(data.HPlanQty) ? 0 : data.HPlanQty);
			if (HPlanQty<=0) {
			layer.msg('æ°éä¸ºç©ºï¼æ å¯å¤çæ°é');
			obj.update({
			HSPlanQty: 0,
			HMinQty: 0, //æå°åè£æ°
			HTotalQty:0, //çæåè£æ°=æ°é/æå°åè£æ°
			HSpsQty: 0, //å©ä½æ°é=æ°é%æå°åè£æ°
			});
			}
			break;
			case "HMinQty": //æå°åè£æ°
			value = parseInt(isNaN(value) ? 0 : value);
			var HSPlanQty = parseInt(isNaN(data.HSPlanQty) ? 0 : data.HSPlanQty);
			var HPlanQty = parseInt(isNaN(data.HPlanQty) ? 0 : data.HPlanQty);
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HMinQty: value, //æå°åè£æ°
			HTotalQty: Math.floor(HSPlanQty / value), //çæåè£æ°=æ°é/æå°åè£æ°
			HSpsQty: HPlanQty-(HSPlanQty - HSPlanQty % value) //å©ä½æ°é=æ°é%æå°åè£æ°
			});
			break;
			default:
			}
			});
			//#endregion

			@@ -125,33 +173,41 @@
			function set_InitGrid() {
			columns = [
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', edit: 'text', width: 100, hide: true }
			, { field: 'HInterID', title: 'HInterID', edit: 'text', width: 100, hide: true }
			, { field: 'HEntryID', title: 'HEntryID', edit: 'text', width: 100, hide: true }
			, { field: 'HBillNo', title: 'HBillNo', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterCode', title: 'ç©æä»£ç ', edit: 'text', width: 100 }
			, { field: 'HMaterName', title: 'ç©æåç§°', edit: 'text', width: 100 }
			, { field: 'HMaterNumber', title: 'HMaterNumber', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterName', title: 'ç©æåç§°', edit: 'false', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
			, { field: 'HUnitName', title: 'è®¡éåä½', edit: 'text', width: 100 }

			, { field: 'HWeight', title: 'åé', edit: 'text', width: 100 }
			, { field: 'HMWeight', title: 'æ¯é', edit: 'text', width: 100 }
			, { field: 'HPWeight', title: 'ç®é', edit: 'text', width: 100 }
			, { field: 'HUnitName', title: 'è®¡éåä½', edit: 'false', width: 100 }

			, { field: 'HQty', title: 'æ°é', edit: 'text', width: 100 }
			, { field: 'HPlanQty', title: 'æ°é', edit: 'false', width: 100 }
			, { field: 'HSPlanQty', title: 'å¤çæ°é', edit: 'text', event: 'HSPlanQty', width: 100 }
			, { field: 'HMinQty', title: 'æå°åè£æ°', edit: 'text', event: 'HMinQty', width: 100 }
			, { field: 'HTotalQty', title: 'çææ¡æ°', edit: 'text', width: 100 }
			, { field: 'HSpsQty', title: 'å©ä½æ°é', edit: 'text', width: 100 }
			, { field: 'HAddress', title: 'äº¤è´§å°ç¹', edit: 'text', width: 100 }
			, { field: 'HDate', title: 'äº¤è´§æ¥æ', width: 100, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd')}}</div>"}
			, { field: 'HOutStockQty', title: 'åºåºæ°é', edit: 'text', width: 100 }
			, { field: 'HInvoiceQty', title: 'å¼ç¥¨æ°é', edit: 'text', width: 100 }
			, { field: 'HTaxPrice', title: 'å«ç¨åä»·', edit: 'text', width: 100 }
			, { field: 'HPrice', title: 'ä¸å«ç¨åä»·', edit: 'text', width: 100 }
			, { field: 'HMoney', title: 'éé¢', edit: 'text', width: 100 }
			, { field: 'HTotalQty', title: 'çææ¡æ°', edit: 'false', width: 100 }
			, { field: 'HSpsQty', title: 'å©ä½æ°é', edit: 'false', width: 100 }
			, { field: 'HXH', title: 'ç®±å·', edit: 'false', width: 100 }

			, { field: 'FBillNo', title: 'éå®è®¢åå·', edit: 'false', width: 100 }
			, { field: 'FLXName', title: 'èç³»äºº', edit: 'text', width: 100 }
			, { field: 'FInAddress', title: 'æ¶è´§æ¹å°å', edit: 'false', width: 100 }
			, { field: 'FMaterName', title: 'éå®ç©æåç§°', edit: 'false', width: 100 }
			, { field: 'FBZFS', title: 'åè£æ¹å¼', edit: 'false', width: 100 }
			, { field: 'FHX', title: 'è±å', edit: 'false', width: 100 }
			, { field: 'FQK', title: 'å¢åç¼', edit: 'false', width: 100 }
			, { field: 'FWBBZ', title: 'å¤åå¤æ³¨', edit: 'false', width: 100 }

			, { field: 'HCusID', title: 'HCusID', edit: 'text', width: 100, hide: true }
			, { field: 'HCusName', title: 'å®¢æ·', edit: 'text', width: 100 }
			, { field: 'HEmpID', title: 'HEmpID', edit: 'text', width: 100, hide: true}
			, { field: 'HEmpName', title: 'ä¸å¡å', edit: 'text', width: 100 }
			, { field: 'HCusName', title: 'å®¢æ·', edit: 'false', width: 100 }
			, { field: 'HEmpID', title: 'HEmpID', edit: 'text', width: 100, hide: true }
			, { field: 'HEmpName', title: 'ä¸å¡å', edit: 'false', width: 100 }

			, { field: 'HDeptID', title: 'HDeptID', edit: 'text', width: 100, hide: true }
			, { field: 'HDeptName', title: 'çäº§è½¦é´', edit: 'false', width: 100 }

			, { field: 'HPlanEndDate', title: 'è®¡åå®å·¥æ¥æ', width: 100, templet: "<div>{{d.HPlanEndDate ==null ?'':layui.util.toDateString(d.HPlanEndDate, 'yyyy-MM-dd')}}</div>"}
			];
			option = {
			id: 'mainTable'
			@@ -165,12 +221,11 @@
			, done: function (res, curr, count) {
			}
			};
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HUnitID": 0, "HUnitName": "", "HWeight": 0, "HMWeight": 0,"HPWeight":0,"HQty": 0, "HMinQty": 0, "HTotalQty": 0, "HSpsQty": 0, "HAddress": "", "HDate": "", "HOutStockQty": 0, "HInvoiceQty": 0, "HTaxPrice": 0, "HPrice": 0, "HMoney": 0, "HCusID": 0, "HCusName": "", "HEmpID": 0, "HEmpName": "" }];
			option.data = [{ "HMaterID": 0, "HMaterName": "", "HUnitID": 0, "HUnitName": "", "HPlanQty": 0, "HSPlanQty": 0, "HMinQty": 0, "HTotalQty": 0, "HSpsQty": 0, "HCusID": 0, "HCusName": "", "HEmpID": 0, "HEmpName": "", "HDeptID": 0, "HDeptName": "","HPlanEndDate":"" }];
			table.render(option);
			}
			//æ´ç®±çæ
			function SavePack(flag) {
			var sSubStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + flag;
			//çæ
			function SavePack(flag,sSubStr) {
			if (!AllowLoadData(sSubStr))//æ°æ®éªè¯
			{
			return false;
			@@ -180,15 +235,22 @@
			type: "POST",
			url: GetWEBURL() + "/Sc_ICMOBill/QK_PackingBillSavePack", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sSubStr},
			data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + flag + ";" + $('#HBillNo').val()},
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			parent.layer.close(index); //åæ§è¡å³é
			});
			var PrintIds = data.code;
			PrintIds = PrintIds.substring(0, PrintIds.length - 1);
			var Type = "HQKPackBill";
			var OpenTmp = "";
			if (sSubStr.data[0].FBZFS == "" && (sSubStr.data[0].FHX != "" \|\| sSubStr.data[0].FMaterName != "")) {
			OpenTmp = "è±åæ¡ç ";
			}
			else {
			OpenTmp = "åè£æ¹å¼æ¡ç ";
			}
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());

			}
			else {
			f_alert(data.Message);
			@@ -199,7 +261,6 @@
			error: function (err) {

			f_alert("éè¯¯:" + err);
			console.log("Reason" + sMainStr);
			}
			});
			}
			@@ -208,12 +269,15 @@
			function AllowLoadData(sSubStr) {
			var Result = true;
			if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
			sSubStr = JSON.parse(sSubStr);
			for (var i = 0; i < sSubStr.length; i++) {
			if (sSubStr[i].HMinQty == "") {
			for (var i = 0; i < sSubStr.data.length; i++) {
			if (sSubStr.data[i].HMinQty == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æå°åè£æ°ä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if (sSubStr.data[i].HXH == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,ç®±å·ä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			}
			}
			else {