MES-WEB-LayUI.git

			@@ -9,7 +9,7 @@
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<style>


			.layui-col-xs8 {
			width: 55.666667%;
			}
			@@ -79,6 +79,7 @@
			</div>
			<div class="layui-col-xs8">
			<select name="HBillType" id="HBillType">
			<option value="3714">å·¥åºæ±æ¥å</option>
			<option value="3711">çäº§æ±æ¥å</option>
			<option value="3710">çäº§è®¢å</option>
			</select>
			@@ -99,6 +100,16 @@
			<!--<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">ç¡®å®</button>
			</div>-->
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æ¥æ</label>
			</div>
			<div class="layui-col-xs8">
			<input name="HDate" id="HDate" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			</div>
			@@ -316,9 +327,9 @@
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, laydate = layui.laydate
			, element = layui.element;


			var HStockOrgID = sessionStorage["OrganizationID"]
			var option = [];


			@@ -342,12 +353,24 @@
			$("#HMakerID").hide();
			$("#HBillerID").val(sessionStorage["HBillerID"]);
			$("#HBillerID").hide();
			$("#HDate").val(formatDate(sessionStorage["HDate"]));
			var HSourceFlag = sessionStorage["SourceFlag"];
			//é»è®¤å¸¦å¥çä»åºï¼å¦æå¯ç¨ä»ä½åä»ä½ææï¼å¦ææ²¡æå¯ç¨åä»ä½ç°åº¦ new

			$("#HBarCode").focus();

			// ç¼è¾è·åè¡¨å¤´æ¶æ¶é´æ ¼å¼ç«æ£æ¹å¼
			function formatDate(date) {
			var d = new Date(date),
			month = '' + (d.getMonth() + 1),
			day = '' + d.getDate(),
			year = d.getFullYear();

			if (month.length < 2) month = '0' + month;
			if (day.length < 2) day = '0' + day;

			return [year, month, day].join('-');
			}

			//åå§åæç»è¡¨æ ¼
			function set_InitGrid() {
			@@ -362,7 +385,7 @@
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			//, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HInterID', title: 'åæ®ID', width: 150, hide: true }
			, { field: 'HBilltype', title: 'åæ®ç±»å', width: 150, hide: true }
			, { field: 'Hbarcode', title: 'æ¡ç ç¼å·', width: 150, hide: true }
			@@ -409,6 +432,17 @@
			var linterid = params[params[0]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å

			//åå§åè¡¨åæä»¶
			set_InitFrom();

			//åå§åè¡¨åæä»¶
			function set_InitFrom() {
			//å¸¸è§ç¨æ³
			laydate.render({
			elem: '#HDate'
			});
			}

			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			$.ajax({
			@@ -419,9 +453,41 @@
			// console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HBillType").val(d.data[0].HSourceBillType);
			$("#HBillType").val(d.data[0].HSourceBillType == null ? "3714" : d.data[0].HSourceBillType);
			//è·åæºåç±»åãæºååå·
			if (d.data[0].HSourceBillType == "3711") {
			$("#HBillType").empty();
			$("#HBillType").val("3711");
			var optionHtml = '';
			optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + 'çäº§æ±æ¥å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else if (d.data[0].HSourceBillType == "3710") {
			$("#HBillType").empty();
			$("#HBillType").val("3710");
			var optionHtml = '';
			optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + 'çäº§è®¢å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else if (d.data[0].HSourceBillType == "3714") {
			$("#HBillType").empty();
			$("#HBillType").val("3714");
			var optionHtml = '';
			optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + 'å·¥åºæ±æ¥å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else {
			//$("#HBillType").val("-1");
			}
			$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
			$("#HSourceBillNo").attr("disabled", "true");
			$("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
			//$("#HWHID").val(d.data[0].HWhID);
			//$("#HStockPlaceID").val(d.data[0].HSPID);
			//$("#HKeeperID").val(d.data[0].HKeeperID);
			@@ -433,20 +499,13 @@


			function RoadBillSub(linterid)//å è½½è¡¨ä½
			{
			//var checkStatus = table.checkStatus('wl-table')
			// , data = checkStatus.data;
			//var sInterID = $('#HInterID').val()
			//var sBillNo = $("#HBillNo").val()
			//var sMouldManagerCtl = 'N'
			//var sFIFOCtl = 'N'
			{

			$("#HInterID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			//ç¼è¾å è½½æ°æ®
			var sInterID = $("#HInterID").val();
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			elem: '#wl-table'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			@@ -461,7 +520,7 @@
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			//, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			@@ -517,6 +576,8 @@
			//è·åæå¤§åæ®å· new
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$("#HBillType").val("3714");
			form.render('select');
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNumPDA",
			type: "GET",
			@@ -525,6 +586,7 @@
			//console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
			set_InitGrid();
			}
			});
			@@ -553,7 +615,6 @@
			//
			//

			//éæ©ä»åº
			form.on('submit(HWHID-BT)', function () {//éæ©ä»åº
			layer.open({
			type: 2
			@@ -562,13 +623,28 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			});
			////éæ©ä»åº
			//form.on('submit(HWHID-BT)', function () {//éæ©ä»åº
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'ä»åºåè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});

			//éæ©ä»ä½
			form.on('submit(HSpID-BT)', function () {//éæ©ä»ä½
			@@ -744,7 +820,7 @@
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			//, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HBarcodeQtys', title: 'æ¡ç æ°é', width: 150 }
			]]
			// , data: [linterid]
			@@ -760,7 +836,9 @@
			});

			form.on('submit(Cancel)', function () {
			parent.location.href = "../../../views/index.html"
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html";
			});
			})

			////å é¤
			@@ -929,7 +1007,7 @@
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = table.cache['wl-table'];
			//var sSourceType = $("#HBillType").val();
			var sSourceType = "3711";
			var sSourceType = "3714";
			if (AllowLoadData(sSubStr) != false)//éç©ºéªè¯
			{
			layer.load(3);
			@@ -1120,8 +1198,7 @@
			if (data.count == 1) { // è¯´æéªè¯æåäº
			playSound1();
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			elem: '#wl-table'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			@@ -1136,7 +1213,7 @@
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			//, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HBarcodeQtys', title: 'æ¡ç æ°é', width: 150 }
			]]
			// , data: [linterid]
			@@ -1186,9 +1263,11 @@
			//if (AllowLoadData(sSubStr, 'HBarCode') != false) {//éç©ºéªè¯
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
			//url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json", //æ§
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "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": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": '', "HCustom1": '', "HCustom2": '' },
			//data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] }, //æ§
			success: function (result) {
			//debugger;
			playSound1();
			@@ -1215,10 +1294,14 @@
			element.tabChange('tab-ProductlnBill', '2');//è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'æºåæ¡ç ') {
			$("#HSupName").val(result.data.HSupName);
			$("#HSupID").val(result.data.HSupID);
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			//$("#HSupName").val(result.data.HSupName);
			//$("#HSupID").val(result.data.HSupID);
			//$("#HDeptName").val(result.data.HDeptName);
			//$("#HDeptID").val(result.data.HDeptID);
			if (result.data.hDeptIDField != 0) {
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HDeptName").val(result.data.hDeptNameField);
			}
			$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			@@ -1237,12 +1320,16 @@
			$("#HSourceBillNo").attr("readonly", "readonly");
			}
			else {
			$("#HSupName").val(result.data.HSupName);
			$("#HSupID").val(result.data.HSupID);
			//$("#HSupName").val(result.data.HSupName);
			//$("#HSupID").val(result.data.HSupID);
			//$("#HDeptName").val(result.data.HDept);
			//$("#HDeptID").val(result.data.HDeptID);
			if (result.data.hDeptIDField != 0) {
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HDeptName").val(result.data.hDeptNameField);
			}
			$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			$("#HBillType").val(result.data.hSourceBillTypeField)
			$("#HBillType").val(result.data.hSourceBillTypeField == null ? "3714" : result.data.hSourceBillTypeField);
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.hSourceBillTypeField == "3711") {
			@@ -1254,11 +1341,20 @@
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			if (result.data.hSourceBillTypeField == "3710") {
			else if (result.data.hSourceBillTypeField == "3710") {
			$("#HBillType").empty();
			$("#HBillType").val("3710");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'çäº§è®¢å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else if (result.data.hSourceBillTypeField == "3714") {
			$("#HBillType").empty();
			$("#HBillType").val("3714");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'å·¥åºæ±æ¥å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			@@ -1366,7 +1462,7 @@
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			//, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150 }
			]]
			, height: 500
			@@ -1386,7 +1482,7 @@
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹å·', width: 150 }
			//, { field: 'HBatchNo', title: 'æ¹å·', width: 150 }
			//, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			//, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			@@ -1412,30 +1508,35 @@
			var HSourceBillNo = $('#HSourceBillNo').val()
			var sInterID = $("#HInterID").val()
			var sBillNo = $("#HBillNo").val()
			var sBillType = '1202'
			var HSourceBillType = $("#HBillType").val()
			if (HSourceBillNo == "" \|\| sInterID <= 0) {
			layer.msg("æºåå·ä¸ºç©ºï¼æèåç ä¸åå¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json",
			url: GetWEBURL() + "/ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json",
			$.ajax({
			url: GetWEBURL() + "/WEBSController/Get_SourceBarCode_ProductIn_Json",
			//url: GetWEBURL() + "/ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json", //æ§
			type: "GET",
			data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
			data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": sessionStorage["HUserName"], "HStockOrgID": sessionStorage["OrganizationID"] },
			//data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo }, //æ§
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			if (result.data[0].HDeptID != 0) {
			$("#HDeptID").val(result.data[0].HDeptID);
			$("#HDeptName").val(result.data[0].HDeptName);
			if (result.data.hDeptIDField != 0) {
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HDeptName").val(result.data.hDeptNameField);
			}
			//if (result.data[0].HDeptID != 0) {
			// $("#HDeptID").val(result.data[0].HDeptID);
			// $("#HDeptName").val(result.data[0].HDeptName);
			//}
			playSound1();
			HSourceFlag = true;
			layer.load(3)
			element.tabChange('tab-ProductlnBill', '2');
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			elem: '#wl-table'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			@@ -1452,6 +1553,7 @@
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150 }
			]]
			// , data: [linterid]
			// , page: true