MES-WEB-LayUI.git

			@@ -44,7 +44,6 @@
			.layui-form-label {
			width: 25%;
			}

			</style>
			</head>
			<body>
			@@ -90,21 +89,21 @@
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æè²è¦æ±</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HColorRemark" id="HColorRemark" >
			<input type="text" class="layui-input" name="HColorRemark" id="HColorRemark">
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">å¾å·çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">å¾å·çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			@@ -113,8 +112,8 @@
			<input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
			<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater2" id="btnSearchMater2" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			@@ -130,11 +129,11 @@
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ»è£å¾å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">æ»è£å¾å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			@@ -158,33 +157,33 @@
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æè´¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
			</div>
			</div>-->
			<label class="layui-form-label">æè´¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¡åå¼å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¡åå®å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
			</div>
			</div>-->
			<label class="layui-form-label">è®¡åå¼å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¡åå®å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
			</div>
			</div>-->

			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
			<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			@@ -200,34 +199,34 @@
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">å¹å®½</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left;" >
			<input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left;">
			</div>
			</div>

			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æåç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
			</div>
			</div>-->
			<label class="layui-form-label">æåç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
			</div>
			</div>-->
			</div>

			<div class="layui-row">
			<!--<div class="layui-col-xs6 layui-inline">
			<label class="layui-form-label" style="width:12.5%">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width:610px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<label class="layui-form-label" style="width:12.5%">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width:610px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¾æ°é</label>
			<div class="layui-input-inline">
			@@ -266,24 +265,24 @@
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¡¥æåå </label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>-->
			<label class="layui-form-label">è¡¥æåå </label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>-->
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¡¥ææ è®°</label>
			<div class="layui-input-block">
			<input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
			</div>
			</div>-->
			<label class="layui-form-label">è¡¥ææ è®°</label>
			<div class="layui-input-block">
			<input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
			</div>
			</div>-->
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">åé</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left;">
			</div>
			</div>


			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			@@ -513,15 +512,15 @@
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æµè½¬å¡ç±»å</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<label class="layui-form-label">æµè½¬å¡ç±»å</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			@@ -531,17 +530,17 @@
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¯ä½ç©æä»£ç </label>
			<div class="layui-input-inline">
			@@ -587,7 +586,7 @@
			</button>
			</div>
			</div>



			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>
			@@ -643,7 +642,7 @@
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
			<!--<input type="hidden" class="layui-input" name="HSeOrderEntryID" id="HSeOrderEntryID">
			<input type="hidden" class="layui-input" name="HSeOrderInterID" id="HSeOrderInterID">-->
			<input type="hidden" class="layui-input" name="HSeOrderInterID" id="HSeOrderInterID">-->
			</div>
			</div>
			<div class="layui-inline">
			@@ -923,7 +922,8 @@
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HEntryID = params[params[2]];//æºååid
			var HSouceBillType = params[params[3]];//æºåç±»å å¨ç±»å 5 å·¥åºid
			var HSouceBillType = params[params[3]];//æºåç±»å å¨ç±»å 5 å·¥åºid
			var HproID = params[params[4]];//æºåç±»å å¨ç±»å 5 å·¥åºid
			}

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -938,7 +938,7 @@
			DisPlay_HideColumn();

			//å¤ææä½ç±»å
			if (OperationType == 1 ) {//æ æºåæ°å¢
			if (OperationType == 1 ) {//æ æºåæ°å¢
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			@@ -1025,7 +1025,7 @@
			set_EditFromGrid();

			}
			else if (OperationType == 4) {//å¤å¶
			else if (OperationType == 4) {//å¤å¶
			set_EditFromGrid();
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			@@ -1044,9 +1044,11 @@
			else if (OperationType == 5) {//5 æ°å¢åæµè½¬å¡
			$("#HMainSourceInterID").val(linterid);
			$("#HMainSourceEntryID").val(HEntryID);
			$("#btnRoutingBill").addClass("layui-btn-disabled").attr("disabled", true);

			set_EditForm(linterid);

			var sWhere = "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"] + " and HMainProcID=" + HSouceBillType;

			var sWhere = "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"] + " and HMainProcID=" + HproID +" and é»è®¤å·¥èº='1'";
			getRoutingBillList(sWhere);
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			@@ -1054,9 +1056,9 @@
			async: false,
			data: { "HBillType": '3772' },
			success: function (d) {
			//console.log(d.data);
			var HBillNo = d.data[0].HBillNo.replace('GXLX', 'ZYK0');
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HBillNo").val(HBillNo);
			$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
			$("#HMaker").val(sessionStorage["HUserName"]);
			}
			@@ -1220,7 +1222,7 @@
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			}
			obj.update({
			HProcName: checkStatus.data[0].å·¥åº
			, HProcID: checkStatus.data[0].HItemID
			@@ -1457,7 +1459,7 @@
			$.ajax({
			url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": HSouceBillType},
			success: function (data1) {
			if (data1.count == 1) {
			var hinterid = "";
			@@ -1510,7 +1512,7 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});


			});

			//éæ©åä»¶å¼¹çªPartInformation.html
			@@ -1722,13 +1724,17 @@

			//éæ©å·¥èºè·¯çº¿
			form.on('submit(btnRoutingBill)', function () {
			var HProID = 0;
			if (OperationType == 5) {
			HProID = HproID;
			}
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '70%']//å¤§å°
			, title: 'å·¥èºè·¯çº¿åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_RoutingBillList.html?HMaterID=' + btnHMaterID, 'yes']
			, content: ['../../Baseset/åºç¡èµæ/Gy_RoutingBillList.html?HMaterID=' + btnHMaterID + '&HProID=' + HProID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1745,36 +1751,46 @@
			});

			function getRoutingBill(HBillNo) {
			var HRoutType = "";
			if (HSouceBillType == "3772") {
			HRoutType = "3301";
			} else {
			HRoutType = "SUB";
			}
			$.ajax({
			type: "get",
			url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
			async: true,
			data: { "sWhere": " and åæ®å·='" + HBillNo + "'" + " and å·¥åºä»£ç !='" + 9999 + "'", "user": sessionStorage["HUserName"] },
			data: { "sWhere": " and åæ®å·='" + HBillNo + "'" + " and å·¥åºä»£ç !='" + 9999 + "'", "user": sessionStorage["HUserName"], "HBillSubType": HRoutType },
			success: function (result) {
			var data = result.data;
			var Tablerow = [];
			var Tablerow = [];

			$("#RoutingBill").val(data[0].åæ®å·)
			$("#HRoutingBillID").val(data[0].hmainid)
			if (result.data.length == 0) {
			return layer.msg("è¯·ç»å®å¯¹åºçå·¥èºè·¯çº¿!");
			}

			for (var i = 0; i < data.length; i++) {
			Tablerow.push({
			"HProcNo": data[i].å·¥åºå·, "HProcID": data[i].hprocid, "HProcNumber": data[i].å·¥åºä»£ç , "HProcName": data[i].å·¥åº, "HWorkRemark": data[i].è¡¨ä½å¤æ³¨,
			"HCenterID": data[i].HCenterID, "HCenterNumber": data[i].å·¥ä½ä¸å¿ä»£ç , "HCenterName": data[i].å·¥ä½ä¸å¿åç§°,
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": data[i].HSupID, "HSupNumber": data[i].ä¾åºåä»£ç , "HSupName": data[i].ä¾åºå, "HSupFlag": data[i].å§å¤æ è®° == 0 ? "false" : "true",
			"HQty": HLZQty, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].å·¥èºåæ°, "HPicNum": data[i].å¾çº¸ç¼å·, "HProcCheckNote": data[i].æ¬å·¥åºç¡®è®¤è®°å½,
			"HRelationQty_OutBad":"0"
			});
			}
			option.data = Tablerow;
			table.render(option);
			for (var i = 1; i <= data.length; i++) {
			$('#HSupFlag' + i + '').find("option[value='" + (data[i - 1].å§å¤æ è®° == "0" ? "false" : "true") + "']").attr("selected", true);
			}
			form.render('select');
			$("#RoutingBill").val(data[0].åæ®å·)
			$("#HRoutingBillID").val(data[0].hmainid)

			for (var i = 0; i < data.length; i++) {
			Tablerow.push({
			"HProcNo": data[i].å·¥åºå·, "HProcID": data[i].hprocid, "HProcNumber": data[i].å·¥åºä»£ç , "HProcName": data[i].å·¥åº, "HWorkRemark": data[i].è¡¨ä½å¤æ³¨,
			"HCenterID": data[i].HCenterID, "HCenterNumber": data[i].å·¥ä½ä¸å¿ä»£ç , "HCenterName": data[i].å·¥ä½ä¸å¿åç§°,
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": data[i].HSupID, "HSupNumber": data[i].ä¾åºåä»£ç , "HSupName": data[i].ä¾åºå, "HSupFlag": data[i].å§å¤æ è®° == 0 ? "false" : "true",
			"HQty": HLZQty, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].å·¥èºåæ°, "HPicNum": data[i].å¾çº¸ç¼å·, "HProcCheckNote": data[i].æ¬å·¥åºç¡®è®¤è®°å½,
			"HRelationQty_OutBad": "0"
			});
			}
			option.data = Tablerow;
			table.render(option);
			for (var i = 1; i <= data.length; i++) {
			$('#HSupFlag' + i + '').find("option[value='" + (data[i - 1].å§å¤æ è®° == "0" ? "false" : "true") + "']").attr("selected", true);
			}
			form.render('select');
			},
			error: function (result) {
			layer.close(index);
			@@ -1876,7 +1892,7 @@
			}
			}




			//å é¤åè¡¨æ°æ®æ¶ ä¼å ç¨æ°ç»çä½ç½®,éè¦éæ°æä¸ä¸é¡ºåº
			var sSubTable = [];
			@@ -1924,7 +1940,7 @@
			if (OperationType == 3) {
			flag = "xg";
			}
			var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + flag + ";" + OperationType;
			var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + flag + ";" + HSouceBillType;
			var index = layer.load();

			$.ajax({
			@@ -1977,7 +1993,7 @@
			}
			})
			}



			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			@@ -2140,7 +2156,7 @@
			, "HColorRemark": data.æè²è¦æ±
			, "HSplitSumQty": data.æåæ»é
			, "HSplitColorQty": data.åç¼¸å·


			, "HProjectNum": data.é¡¹ç®ç¼å·
			, "HVerNum": data.çæ¬
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			@@ -2217,6 +2233,9 @@
			, "HPickLabel": data.åè£æ è¯
			, "HPickLabelNumber": data.åè£æ è¯ç¼ç
			});
			if (data.HBillSubType == "SUB") {
			$("#btnRoutingBill").addClass("layui-btn-disabled").attr("disabled", true);
			}
			btnHMaterID = data.HMaterID2;
			HLZQty = data.æµè½¬å¡æ°é;
			$("#HBLFlag").val(data.è¡¥ææ è®° ? "true" : "false");
			@@ -2483,10 +2502,10 @@

			HLZQty = data.æµè½¬å¡æ°é;

			var sWhere = "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"];
			var sWhere = "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"] +" and é»è®¤å·¥èº='1' and HMainProcID=0 ";

			getRoutingBillList(sWhere);


			}
			else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			@@ -2508,9 +2527,10 @@
			success: function (result) {
			if (result.data.length != 0) {
			var hbillno = result.data[0].åæ®å·


			getRoutingBill(hbillno);
			} else {
			layer.msg("æ²¡æé»è®¤å·¥èºè·¯çº¿!");
			option.data = [{
			"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
			"HCenterID": 0, "HCenterNumber": "", "HCenterName": "",