MES-WEB-LayUI.git

			@@ -38,7 +38,7 @@
			</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="btnAssembly" id="btnAssembly" style="padding:0 30px">æ¼è£çæ</button>-->
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAssembly" id="btnAssembly" style="padding:0 30px">æ¼è£çæ</button>
			</div>
			</div>
			</form>
			@@ -112,21 +112,18 @@
			var flag = "ZZ";
			var sSubStr = table.checkStatus('mainTable');
			if (sSubStr.data.length > 0) {
			SavePack(flag, sSubStr);
			SavePack(flag,sSubStr);
			}
			else {
			layer.msg('è¯·æå°éæ©1è¡æ°æ®ï¼');
			return;
			}
			SavePack(flag, sSubStr);
			});
			//æ¼ç®±çæ
			form.on('submit(btnAssembly)', function (data) {
			var flag = "PZ";
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length > 1) {
			var sSubStr = JSON.stringify(table.checkStatus('mainTable').data);
			var sSubStr = table.checkStatus('mainTable');
			if (sSubStr.data.length > 1) {
			SavePack(flag,sSubStr);
			}
			else {
			@@ -142,14 +139,27 @@
			, 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(HPlanQty / value), //çæåè£æ°=æ°é/æå°åè£æ°
			HSpsQty: HPlanQty % value //å©ä½æ°é=æ°é%æå°åè£æ°
			HTotalQty: Math.floor(HSPlanQty / value), //çæåè£æ°=æ°é/æå°åè£æ°
			HSpsQty: HPlanQty-(HSPlanQty - HSPlanQty % value) //å©ä½æ°é=æ°é%æå°åè£æ°
			});
			break;
			default:
			@@ -173,10 +183,12 @@
			, { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
			, { field: 'HUnitName', title: 'è®¡éåä½', edit: 'false', width: 100 }

			, { field: 'HPlanQty', title: 'æ°é', edit: 'false', width: 100 }
			, { field: 'HMinQty', title: 'æå°åè£æ°', edit: 'text', event: 'HMinQty', width: 100 }
			, { field: 'HTotalQty', title: 'çææ¡æ°', edit: 'false', width: 100 }
			, { field: 'HSpsQty', title: 'å©ä½æ°é', edit: 'false', width: 100 }
			, { field: 'HPlanQty', title: 'æ°é', edit: 'false', totalRow: true, width: 100 }
			, { field: 'HSPlanQty', title: 'å¤çæ°é', edit: 'text', totalRow: true, event: 'HSPlanQty', width: 100 }
			, { field: 'HMinQty', title: 'æå°åè£æ°', edit: 'text', totalRow: true, event: 'HMinQty', width: 100 }
			, { field: 'HTotalQty', title: 'çææ¡æ°', edit: 'false', totalRow: true, width: 100 }
			, { field: 'HSpsQty', title: 'å©ä½æ°é', edit: 'false', totalRow: true, width: 100 }
			, { field: 'HXH', title: 'ç®±å·', edit: 'false', width: 100 }

			, { field: 'FBillNo', title: 'éå®è®¢åå·', edit: 'false', width: 100 }
			, { field: 'FLXName', title: 'èç³»äºº', edit: 'text', width: 100 }
			@@ -202,6 +214,7 @@
			, elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: false
			, totalRow: true
			, cellMinWidth: 120
			, height: 500
			, cols: [columns]
			@@ -209,11 +222,11 @@
			, done: function (res, curr, count) {
			}
			};
			option.data = [{ "HMaterID": 0, "HMaterName": "", "HUnitID": 0, "HUnitName": "", "HPlanQty": 0, "HMinQty": 0, "HTotalQty": 0, "HSpsQty": 0, "HCusID": 0, "HCusName": "", "HEmpID": 0, "HEmpName": "", "HDeptID": 0, "HDeptName": "","HPlanEndDate":"" }];
			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, sSubStr) {
			function SavePack(flag,sSubStr) {
			if (!AllowLoadData(sSubStr))//æ°æ®éªè¯
			{
			return false;
			@@ -223,7 +236,7 @@
			type: "POST",
			url: GetWEBURL() + "/Sc_ICMOBill/QK_PackingBillSavePack", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + flag + ";" + sessionStorage["OrganizationID"]},
			data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + flag + ";" + $('#HBillNo').val()},
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			@@ -237,8 +250,8 @@
			else {
			OpenTmp = "åè£æ¹å¼æ¡ç ";
			}
			window.open("../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());

			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());

			}
			else {
			f_alert(data.Message);
			@@ -262,6 +275,10 @@
			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 {