MES-WEB-LayUI.git

			@@ -17,7 +17,7 @@
			<body>
			<div class="layui-fluid" style="padding:0">
			<div class="layui-card">
			<div class="layui-card-body" style="padding: 5px; height:800px;">
			<div class="layui-card-body" style="padding: 0px; height:800px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div style="background-color:#0085E8;">
			<span style="color: white;"><i class="layui-icon layui-icon-form"></i>çäº§éæå</span>
			@@ -63,6 +63,7 @@
			<div class="layui-col-xs8">
			<select name=" HBillType" id="HBillType">
			<option value="3720">çäº§ä»»å¡å-ææ</option>
			<option value="1204">çäº§é¢æå</option>
			<option value="-1">æå·¥å½å¥</option>
			</select>
			</div>
			@@ -85,7 +86,7 @@
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:40px;padding-left:0px;">éå¥æ°é</label>
			<label class="layui-form-label" style="width:60px;padding-left:0px;">éå¥æ°é</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HPPQty" id="HPPQty" lay-verify="HPPQty" autocomplete="off" class="layui-input">
			@@ -95,13 +96,13 @@
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">åè¿ååºä»åº</label>
			<label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--åè¿ååºä»åº-->
			</div>
			<div class="layui-col-xs6">
			<div class="layui-col-xs8">
			<input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
			<input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT">...</button>
			</div>
			</div>
			@@ -502,7 +503,7 @@
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			url: GetWEBURL() + "/Web/GetMAXNumPDA",
			type: "GET",
			data: { "HBillType": '1244' },
			success: function (d) {
			@@ -565,6 +566,8 @@
			}
			})
			});


			//éæ©ä¾åºå
			form.on('submit(HSupID-BT)', function () {
			layer.open({
			@@ -645,10 +648,19 @@
			});

			//éåº
			//form.on('submit(Cancel)', function () {
			// sessionStorage["SourceFlag"] = false;
			// //parent.location.href = "../../../views/index.html"
			// //window.close();//å³éå½åé¡µ
			// layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			// window.close();
			// });
			//})

			form.on('submit(Cancel)', function () {
			sessionStorage["SourceFlag"] = false;
			parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html";
			});
			})
			//ç¼è¾
			form.on('submit(cmdModify)', function () {//ç¼è¾
			@@ -771,7 +783,8 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.confirm("çæéæåºåºå" + data.Message + $("#HBillNo").val(), {
			layer.confirm(data.Message, {
			//layer.confirm("çæéæåºåºå" + data.Message + $("#HBillNo").val(), {
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			@@ -947,10 +960,11 @@
			}
			}
			$.ajax({
			url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
			//url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
			type: "GET",
			//data: { "sCode": '1001456360', "sInterID": 122554, "HBillType": '1204', "sBillNo": 'MATO00000055', "sMaker": sessionStorage["HUserName"], "WhID": 484080, "SPID": 0, "sQty": 0, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": 'PPBOM202112226', "sSourceType": '3720', "HOWNERID": sessionStorage["OrganizationID"] },
			data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
			data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": true, "SourceFlag": sessionStorage["SourceFlag"], "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
			success: function (result) {
			if (result.count == 1) {

			@@ -1038,22 +1052,22 @@
			layer.load(3)

			$.ajax({
			url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
			url: GetWEBURL() + '/MateOutBackBill/DisBillEntryList',
			type: "GET",
			data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1244', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			data: { HBillID: sInterID, HBillType: '1244', sWhere: '' },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.list;
			table.render(listOption);
			$("#HBarCode_B").val(result.data.list2[0].HBarCode);
			$("#HMaterName_B").val(result.data.list2[0].HMaterName);
			$("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
			$("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
			$("#HUnitName_B").val(result.data.list2[0].HUnitName);
			$("#HQty_B").val(result.data.list2[0].HQty);
			$("#HTMQty_B").val(result.data.list2[0].HTMQty);
			$("#HWHName_B").val(result.data.list2[0].HWHName);
			$("#HSPName_B").val(result.data.list2[0].HSPName);
			//$("#HBarCode_B").val(result.data.list2[0].HBarCode);
			//$("#HMaterName_B").val(result.data.list2[0].HMaterName);
			//$("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
			//$("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
			//$("#HUnitName_B").val(result.data.list2[0].HUnitName);
			//$("#HQty_B").val(result.data.list2[0].HQty);
			//$("#HTMQty_B").val(result.data.list2[0].HTMQty);
			//$("#HWHName_B").val(result.data.list2[0].HWHName);
			//$("#HSPName_B").val(result.data.list2[0].HSPName);
			}
			else {
			layer.msg(result.Message);
			@@ -1075,13 +1089,15 @@
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, limit: 50
			, totalRow: true
			, limits: [50, 500, 5000, 20000]
			, page: true
			, cols: [[
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { type: 'numbers', title: 'åºå·', totalRow: true }
			, { field: 'HSNO', title: 'åºå·', width: 60, totalRow: true }
			, { field: 'HQty', title: 'æ°é', width: 80, totalRow: true}
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80, totalRow: true }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			@@ -1089,6 +1105,7 @@
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150 }
			]]
			, height: 500
			, done: function () {
			@@ -1115,14 +1132,18 @@
			if (HPPQty == "") {
			HPPQty = 0;
			}
			var sRedBlue = "çº¢å";
			var sMouldManagerCtl = "N"; //æ¯å¦å¯ç¨å¨å·ç®¡ç
			var sFIFOCtl = "N"; //æ¯å¦å¯ç¨åè¿ååºç®¡ç
			$.ajax({
			url: GetWEBURL() + "/MateOut/set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json",
			url: GetWEBURL() + "/MateOut/set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json_Back",
			type: "GET",
			data: { "sInterID": sInterID, "sBillNo": sBillNo, "HBillType": '1244', "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "sMaker": sessionStorage["HUserName"], "sPPQty": HPPQty, "sPlanMode": HPlanMode, "sFIFOWHID": HFIFOWHID, "HOWNERID": sessionStorage["OrganizationID"] },
			data: {
			"sInterID": sInterID, "sBillNo": sBillNo, "HBillType": '1244', "sSourceBillNo": HSourceBillNo, "sSourceType": HSourceBillType, "sRedBlue": sRedBlue
			},
			success: function (result) {
			HSourceFlag = true;
			sessionStorage["SourceFlag"] = true;
			$("#HPlanMode").attr("disabled", "true");
			$("#HBillType").attr("disabled", "true");
			element.tabChange('tab-MateOutBill', '2');
			@@ -1180,6 +1201,8 @@
			function GetHSpValue(obj) { //è¿åè°å¥ä»ä½
			$("#HStockPlaceName").val(obj[0].HName);
			$("#HStockPlaceID").val(obj[0].HItemID);
			$("#HWHNAME").val(obj[0].HWhName);
			$("#HWHID").val(obj[0].HWHID);
			}
			function GetHSupValue(obj) { //è¿åä¾åºå
			$("#HSupName").val(obj[0].HName);
			@@ -1198,6 +1221,13 @@
			$("#HDeptID").val(obj[0].HItemID);
			}
			function AllowLoadData(sSubStr) { //éç©ºéªè¯
			//æ°åæ£å(åå«å°æ°)
			var reg = /^\d+(\.\d+)?$/;
			//if (reg.test($("#HQty_B").val()) == false \|\| $("#HQty").val() == '') {
			// layer.msg("æ°éå¿é¡»ä¸ºæ°éæå°æ°", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}

			if ($("#HBillNo").val() == '') {
			layer.msg("éè¯¯çåæ®å·!", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;