MES-WEB-LayUI.git

			@@ -139,6 +139,16 @@
			<div class="layui-inline">
			<button class="layui-btn layui-btn-normal" style="margin-left: 45px" type="button" lay-submit="" lay-filter="btnFj" id="btnFj">åè§£</button>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">éå®è®¢åç±»å</label>
			<div class="layui-input-inline">
			<select name="HMainSourceBillSubType" id="HMainSourceBillSubType" lay-filter="HMainSourceBillSubType" disabled="disabled" style="width: 180px; ">
			<option style="color:blue;" selected="selected" value=""></option>
			<option style="color:blue;" value="0">æ®éåæ®</option>
			<option style="color:blue;" value="1">è¿ä¿®åæ®</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			@@ -174,25 +184,57 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§å¹å®½</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åé</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" lay-verify="HWeight" name="HWeight" id="HWeight" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§åé</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HWeight_New" lay-verify="HWeight_New" id="HWeight_New" value="0" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<!--<div class="layui-inline" >
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">è¾å©åä½</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HAuxUnitName" id="HAuxUnitName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" class="layui-input" name="HAuxUnit" id="HAuxUnit" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" 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: 85px;padding: 9px 18px;">è¾å©åä½</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HAuxUnitName" id="HAuxUnitName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" class="layui-input" name="HAuxUnit" id="HAuxUnit" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" 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-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="HRemark2" id="HRemark2" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width: 610px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§è§æ ¼</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HRemark_New" lay-verify="HRemark_New" id="HRemark_New" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ææè§æ ¼ </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel">
			</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="HColorRemark" id="HColorRemark">
			</div>
			</div>
			</div>
			@@ -221,8 +263,8 @@
			<input type="text" hidden lay-verify="HUnitID" name="HUnitID" id="HUnitID" /><!--è®¡éåä½-->
			<input type="text" hidden lay-verify="HUnitNumber" name="HUnitNumber" id="HUnitNumber" /><!--è®¡éåä½ä»£ç -->
			<input type="text" hidden lay-verify="HRemark3" name="HRemark3" id="HRemark3" /><!--åºé¨å¤æ³¨-->
			<input type="text" hidden lay-verify="HRemark2" name="HRemark2" id="HRemark2" /><!--ç½å¯è¦æ±-->
			<input type="text" hidden lay-verify="HColorRemark" name="HColorRemark" id="HColorRemark" /><!--æè²è¦æ±-->
			<!--<input type="text" hidden lay-verify="HRemark2" name="HRemark2" id="HRemark2" />--><!--ç½å¯è¦æ±-->
			<!--<input type="text" hidden lay-verify="HColorRemark" name="HColorRemark" id="HColorRemark" />--><!--æè²è¦æ±-->
			<input type="text" hidden lay-verify="HCusID" name="HCusID" id="HCusID" /><!--å®¢æ·-->
			<input type="text" hidden lay-verify="HEmpID" name="HEmpID" id="HEmpID" /><!--ä¸å¡å-->
			</form>
			@@ -706,6 +748,7 @@
			$("#HICMOBillNo").val(data1.data[0].åæ®å·);
			$("#HICMOInterID").val(linterid);
			$("#HICMOEntryID").val(HEntryID);
			$("#HMainSourceBillSubType").val(data1.data[0].HMainSourceBillSubType);
			$("#HWorkShopName").val(data1.data[0].çäº§è½¦é´);
			$("#HWorkShopID").val(data1.data[0].HDeptID);
			$("#HMaterNumber2").val(data1.data[0].äº§åä»£ç );
			@@ -720,8 +763,11 @@
			$("#HUnitNumber").val(data1.data[0].è®¡éåä½ä»£ç );
			$("#HWidth").val(data1.data[0].HWidth);
			$("#HWeight").val(data1.data[0].HWeight);
			$("#HWidth_New").val(data1.data[0].çäº§å¹å®½);
			$("#HWeight_New").val(data1.data[0].çäº§åé);
			$("#HRemark3").val(data1.data[0].åºé¨å¤æ³¨);
			$("#HRemark2").val(data1.data[0].è¡¨å¤´å¤æ³¨);
			$("#HRemark_New").val(data1.data[0].çäº§è§æ ¼);
			$("#HColorRemark").val(data1.data[0].æè²è¦æ±);
			$("#HCusID").val(data1.data[0].HCusID);
			$("#HEmpID").val(data1.data[0].HEmpID);
			@@ -734,7 +780,7 @@
			url: GetWEBURL() + "LEMS/Gy_RoutingBillList",
			async: true,
			data: {
			"sWhere": "and HMaterID=" + $("#HMaterID2").val() + " and HOrgID = " + sessionStorage["OrganizationID"]
			"sWhere": "and HMaterID=" + $("#HMaterID2").val() + " and HOrgID = " + sessionStorage["OrganizationID"] + " and HMainProcID=0 "
			, "user": sessionStorage["HUserName"]
			},
			success: function (result) {
			@@ -763,6 +809,7 @@
			data: {
			"sWhere": " and hicmointerid=" + linterid + " and HICMOEntryID=" + HEntryID + " and HPRDORGID=" + sessionStorage["OrganizationID"]
			, "user": sessionStorage["HUserName"]
			, "HBillSubType":"3772"
			},
			success: function (data1) {
			if (data1.count == 1) {
			@@ -785,7 +832,7 @@
			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":"3301"},
			success: function (result) {
			var data = result.data;
			var Tablerow = [];