MES-WEB-LayUI.git

			@@ -17,8 +17,8 @@
			</head>
			<body>
			<div class="layui-fluid" style="padding:0">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 5px; height:800px;">
			<div class="layui-card">
			<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>
			@@ -60,8 +60,7 @@
			</div>
			<div class="layui-col-xs8">
			<select name="HBillType" id="HBillType">
			<option value="1103">æ¶æéç¥å</option>
			<option value="1102">éè´è®¢å</option>
			<option value="3710">çäº§è®¢å</option>
			</select>
			</div>
			</div>
			@@ -101,14 +100,14 @@
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" >...</button>
			</div>
			</div>
			</div>
			<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:45px;padding-left:0px;">çç»</label>
			<label class="layui-form-label" style="width:30px;padding-left:0px;">çç»</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HGroupName" id="HGroupName" lay-verify="HGroupName" autocomplete="off" class="layui-input" disabled="disabled">
			@@ -123,20 +122,6 @@
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">è½¦é´</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
			<input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">...</button>
			</div>
			</div>
			</div>
			<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>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
			@@ -171,7 +156,7 @@
			<label class="layui-form-label" style="width:40px;padding-left:0px;">æ°é</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
			<input type="text" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d?\.?\d?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
			</div>
			</div>
			</div>
			@@ -307,7 +292,7 @@
			//$("#HDeptID").val(d.data[0].HDeptID);
			//$("#HBarCode").val(d.data[0].HBarCode);
			//$("#HQty").val(d.data[0].HQty);
			RoadSup();
			//RoadSup();
			}
			})
			}
			@@ -353,7 +338,7 @@
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
			, where: { HBillID: linterid, HBillType: '1201', sWhere: '' }
			, where: { HBillID: linterid, HBillType: '3711', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', sort: true }
			@@ -381,10 +366,9 @@
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			//url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/Web/GetMAXNumPDA",
			type: "GET",
			data: { "HBillType": '1201' },
			data: { "HBillType": '3711' },
			success: function (d) {
			//console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			@@ -442,21 +426,6 @@
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			});
			form.on('submit(HSupID-BT)', function () {//éæ©ä¾åºå
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ä¾åºååè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_SupplierList.html', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -581,8 +550,11 @@

			form.on('submit(Cancel)', function () {
			sessionStorage["SourceFlag"] = false;
			parent.location.href = "../../../views/index.html"
			//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 () {//ç¼è¾
			@@ -767,9 +739,9 @@
			//}
			//if (AllowLoadData(sSubStr, 'HBarCode') != false) {//éç©ºéªè¯
			$.ajax({
			url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/ICMOReportBill/get_CheckTypeByBarCode_Json1",
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": '3710', "HOWNERID": sessionStorage["OrganizationID"] },
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": '3710', "HOWNERID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) {
			if (result.data.HBarType == 'ä»åºæ¡ç ') {
			@@ -801,12 +773,9 @@
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			sessionStorage["SourceFlag"] = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.HSourceBillType == "1102") {
			$("#HBillType").val("1102");
			if (result.data.HSourceBillType == "3710") {
			$("#HBillType").val("3710");

			}
			else if (result.data.HSourceBillType == "1103") {
			$("#HBillType").val("1103");
			}
			else {
			$("#HBillType").val("æå·¥å½å¥");
			@@ -820,19 +789,16 @@
			}
			else
			{
			$("#HSupName").val(result.data.hSupNameField);
			$("#HSupID").val(result.data.hSupIDField);
			//$("#HSupName").val(result.data.hSupNameField);
			//$("#HSupID").val(result.data.hSupIDField);
			//$("#HDeptName").val(result.data.HDept);
			//$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			sessionStorage["SourceFlag"] = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.hSourceBillTypeField == "1102") {
			$("#HBillType").val("1102");
			if (result.data.hSourceBillTypeField == "3710") {
			$("#HBillType").val("3710");

			}
			else if (result.data.hSourceBillTypeField == "1103") {
			$("#HBillType").val("1103");
			}
			else {
			$("#HBillType").val("æå·¥å½å¥");
			@@ -848,13 +814,14 @@
			layer.load(3)
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
			, where: { HBillID: sInterID, HBillType: '3711', sWhere: '' }
			, cellMinWidth : 115
			, cellMinWidth: 115
			, totalRow: true
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', sort: true }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', sort: true }
			, { field: 'HQty', title: 'æ°é', sort: true, totalRow: true}
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', sort: true, totalRow: true}
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', sort: true }
			, { field: 'HMaterName', title: 'ç©æåç§°', sort: true }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', sort: true }
			@@ -900,8 +867,7 @@
			}
			//
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
			url: GetWEBURL() + "/ICMOReportBill/set_SaveICMOReportBill",
			url: GetWEBURL() + "/ICMOReportBill/set_SavePonderationBillMain_Temp_Source_Fast_Json_New",
			type: "GET",
			data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
			success: function (result) {
			@@ -916,21 +882,23 @@
			table.render({
			elem: '#wl-table'
			, cellMinWidth: 80
			, totalRow: true
			//, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/ICMOReportBill/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
			//, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
			, where: { HBillID: sInterID, HBillType: '3711', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', sort: true }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', sort: true }
			, { field: 'HQty', title: 'æ°é', sort: true, totalRow: true}
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', sort: true, totalRow: true}
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', sort: true }
			, { field: 'HMaterName', title: 'ç©æåç§°', sort: true }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', sort: true }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', sort: true }
			, { field: 'HSourceEntryID', title: 'æºåååç ', sort: true }
			, { field: 'HSourceBillNo', title: 'æºååå·', sort: true }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡'}
			, { field: 'HBatchNo', title: 'æ¹æ¬¡' }
			, { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			@@ -1043,11 +1011,13 @@
			$("#HWHNAME").val(obj[0].HName);
			//sessionStorage["HWHID"] = obj[0].HItemID;
			$("#HWHID").val(obj[0].HItemID);
			}
			function GetHSpValue(obj) { //è¿åè°å¥ä»ä½
			$("#HStockPlaceName").val(obj[0].HName);
			$("#HStockPlaceID").val(obj[0].HItemID);
			}
			}
			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);
			$("#HSupID").val(obj[0].HItemID);
			@@ -1069,6 +1039,20 @@
			// layer.msg("è¯·åæ«æºå!", { icon: 5 });
			// return false;
			//}
			//æ°åæ£å(åå«å°æ°)
			var reg = /^\d+(\.\d+)?$/;
			//if (reg.test($("#HQty").val()) == false \|\| $("#HQty").val() == '') {
			// layer.msg("æ°éå¿é¡»ä¸ºæ°éæå°æ°", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			//if (reg.test($("#HBarcodeQtys").val()) == false \|\| $("#HBarcodeQtys").val() == '') {
			// layer.msg("æ¡ç æ°éå¿é¡»ä¸ºæ°éæå°æ°", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			//if (reg.test($("#HSumQtys").val()) == false \|\| $("#HSumQtys").val() == '') {
			// layer.msg("æ»æ°éå¿é¡»ä¸ºæ°éæå°æ°", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			if($("#HDeptName").val()=='')
			{
			layer.msg("é¨é¨æ²¡æéæ©", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });