~admin/igds-v4.git

			@@ -7,16 +7,28 @@
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="renderer" content="webkit">
			<title>出入库管理-入库称重</title>

			<link rel="stylesheet" type="text/css"
			th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
			<link rel="stylesheet" type="text/css"
			th:href="@{../../static/admin/inout/style.css}">

			<!--使用打印插件隐藏当前插件 -->
			<script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>

			<style>
			.kccz-r-btnbox {
			width: 86px !important;
			}

			.kccz-r-btn {
			width: 86px !important;
			}

			#text-param {
			font-size: 14px;
			color: red;
			padding-left: 10px;
			}

			.display-none {
			display: none;
			}
			@@ -33,7 +45,7 @@
			}

			.kccz-left-box2 {
			height: 500px;
			height: 555px;
			}

			.color-red {
			@@ -114,7 +126,12 @@
			width: 130px;
			height: 28px;
			}

			.layui-table, .layui-table-view {
			margin: 0 0;
			}
			.layui-table-body {
			max-height: 350px;
			}
			</style>

			</head>
			@@ -126,25 +143,20 @@
			<div class="qyzj-btnbox layui-clear">

			<div class="rkbk-quick fl">
			<button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
			<i><img th:src="@{../../static/images/icon-hyd.png}"/></i>化验单
			</button>
			<button id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
			onclick="weight()">
			<i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>称重确认
			<i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>步骤1：称重确认
			</button>
			<button id="btn-submit"
			class="rkbk-quick-btn layui-btn btn-green layui-btn-disabled"
			disabled=true onclick="submit()">
			<i><img th:src="@{../../static/images/icon-ok.png}"/></i>完成称重
			class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
			<i><img th:src="@{../../static/images/icon-ok.png}"/></i>步骤2：完成称重
			</button>
			<button id="btn-printBill"
			class="rkbk-quick-btn layui-btn btn-blue layui-btn-disabled"
			disabled=true onclick="printBill()">
			<i><img th:src="@{../../static/images/icon-dayin.png}"/></i>打印过磅单
			class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
			<i><img th:src="@{../../static/images/icon-dayin.png}"/></i>步骤3：打印过磅单
			</button>
			<button class="rkbk-quick-btn layui-btn" onclick="gateCtrl()">
			<i><img th:src="@{../../static/images/icon-hyd.png}"/></i>道闸操作
			<button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
			<i><img th:src="@{../../static/images/icon-hyd.png}"/></i>质检详细
			</button>
			<button class="rkbk-quick-btn layui-btn btn-violet"
			onclick="flushPage()">
			@@ -241,70 +253,58 @@
			<!--kccz-left-box1 end-->

			<div class="kccz-left-box2 mt-10 radius-6">

			<div class="rkbk-tit">
			<i></i>
			<h3>业务数据</h3>
			<h3>业务数据<span id="text-param"></span></h3>
			<div>
			<input type="button" value="读智慧卡"
			class="rkbk-search-btn layui-btn r-240"
			onclick="flushICCard()">

			<input type="button" value="读身份证"
			class="rkbk-search-btn layui-btn r-120"
			onclick="flushIdCard()">

			<input type="button" value="手动查询"
			class="rkbk-search-btn layui-btn" onclick="flushData()">

			class="rkbk-search-btn layui-btn" onclick="flushByHand()">
			</div>
			</div>

			<div class="kccz-data-form layui-row">
			<form class="layui-form" action="" id="form-data"
			lay-filter="form-data">

			<div class="layui-form-item display-none">
			<label class="layui-form-label">隐藏字段-ID</label>
			<input type="text" name="id">
			</div>
			<div class="layui-form-item display-none">
			<label class="layui-form-label">隐藏字段-流程节点</label>
			<input type="text" name="progress">
			</div>
			<div class="layui-form-item display-none">
			<label class="layui-form-label">隐藏字段-业务类型</label>
			<input type="text" name="type">
			</div>
			<div class="layui-form-item display-none">
			<label class="layui-form-label">隐藏字段-客户编码Id</label>
			<input type="text" name="customerId">
			<input type="text" name="foodLocationId">
			</div>
			<div class="layui-form-item display-none">
			<label class="layui-form-label">隐藏字段-通知单ID</label>
			<input type="text" name="noticeId">
			</div>
			<div class="layui-form-item display-none">
			<label class="layui-form-label">隐藏字段-粮食性质</label>
			<input type="text" name="foodType">
			</div>


			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">智慧卡号</label>
			<label class="layui-form-label color-red">智慧卡号</label>
			<div class="layui-input-block">
			<input type="text" name="intelCard" id="intelCard"
			placeholder="智慧卡号" autocomplete="off" class="layui-input">
			placeholder="刷卡/手动录入" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">车牌号</label>
			<label class="layui-form-label color-red">车牌号</label>
			<div class="layui-input-block">
			<input type="text" name="plateNum" id="plateNum" placeholder="车牌号"
			<input type="text" name="plateNum" id="plateNum" placeholder="自动带入/手动录入"
			autocomplete="off" class="layui-input">
			</div>
			</div>
			@@ -312,19 +312,9 @@

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">身份证号</label>
			<label class="layui-form-label color-red">承运人</label>
			<div class="layui-input-block">
			<input type="text" name="userId" id="userId"
			placeholder="承运人身份证号" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">承运人</label>
			<div class="layui-input-block">
			<input type="text" name="userName" placeholder="不可编辑" class="layui-input"
			<input type="text" name="userName" placeholder="自动带入，不可编辑" class="layui-input"
			disabled>
			</div>
			</div>
			@@ -336,7 +326,7 @@
			<label class="layui-form-label color-red">毛重(满车)</label>
			<div class="layui-input-block">
			<input type="text" name="fullWeight" id="fullWeight" autocomplete="off"
			placeholder="请输入" class="layui-input weight rkbk-search-input" disabled>
			placeholder="地磅自动带入" class="layui-input rkbk-search-input" disabled>
			<em
			class="kccz-data-dw">KG</em>
			</div>
			@@ -348,23 +338,14 @@
			<label class="layui-form-label color-red">皮重(空车)</label>
			<div class="layui-input-block">
			<input type="text" name="emptyWeight" id="emptyWeight" autocomplete="off"
			placeholder="请输入" class="layui-input weight rkbk-search-input" disabled>
			placeholder="地磅自动带入" class="layui-input weight rkbk-search-input"
			disabled>
			<em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label color-red">客户名称</label>
			<div class="layui-input-block">
			<input type="text" name="customerName" placeholder="请选择，不可手动录入"
			autocomplete="off" class="layui-input" disabled="disabled"> <em
			class="kccz-data-dw cursor" onclick="showNotice()">…</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			@@ -377,28 +358,20 @@
			</div>
			</div>


			<div class="layui-col-xs4">
			<div class="layui-form-item kccz-data-group-md">
			<label class="layui-form-label">杂质扣重</label>
			<div class="posi-r kccz-data-bfb fr">
			<input id="impurity" type="text" name="impurity" placeholder="请输入"
			autocomplete="off" class="layui-input rkbk-search-input" disabled> <em
			class="kccz-data-dw">%</em>
			</div>
			<div class="layui-form-item">
			<label class="layui-form-label color-red">客户信息</label>
			<div class="layui-input-block">
			<div class="posi-r">
			<input id="deImpurity" type="text" name="deImpurity" placeholder="请输入"
			autocomplete="off" class="layui-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			<input type="text" name="customerName" placeholder="请选择"
			autocomplete="off" class="layui-input" disabled="disabled"> <em
			class="kccz-data-dw cursor" onclick="showNotice()">……</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">装卸仓库</label>
			<label class="layui-form-label" id="depotIdLabel">装卸仓库</label>
			<div class="layui-input-block">
			<select name="depotId" id="depotId" lay-filter="select_depotId">
			<option value=""></option>
			@@ -408,6 +381,38 @@
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item kccz-data-group-md">
			<label class="layui-form-label">质检扣重</label>
			<div class="posi-r kccz-data-bfb fr">
			<button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
			<i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细
			</button>
			</div>
			<div class="layui-input-block">
			<div class="posi-r">
			<input id="deCheck" type="text" name="deCheck" placeholder="请输入"
			autocomplete="off" class="layui-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label color-red">粮食品种</label>
			<div class="layui-input-block">
			<select name="foodVariety" id="foodVariety">
			<option value=""></option>
			<option th:each="dic,dicSet:${listFoodVariety}"
			th:value="${dic.code}" th:text="${dic.name}"></option>
			</select>
			</div>
			</div>
			</div>


			<div class="layui-col-xs4">
			<div class="layui-form-item">
			@@ -422,30 +427,29 @@

			<div class="layui-col-xs4">
			<div class="layui-form-item kccz-data-group-md">
			<label class="layui-form-label">水分扣重</label>
			<label class="layui-form-label">质检增重</label>
			<div class="posi-r kccz-data-bfb fr">
			<input id="wet" type="text" name="wet" placeholder="请输入"
			autocomplete="off" class="layui-input rkbk-search-input" disabled> <em
			class="kccz-data-dw">%</em>
			<button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
			<i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细
			</button>
			</div>
			<div class="layui-input-block">
			<div class="posi-r">
			<input id="deWet" type="text" name="deWet" placeholder="请输入"
			<input id="addCheck" type="text" name="addCheck" placeholder="请输入"
			autocomplete="off" class="layui-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">粮食品种</label>
			<label class="layui-form-label color-red">粮食产地</label>
			<div class="layui-input-block">
			<select name="foodVariety" id="foodVariety">
			<option value=""></option>
			<option th:each="dic,dicSet:${listFoodVariety}"
			th:value="${dic.code}" th:text="${dic.name}"></option>
			</select>
			<input type="text" name="foodLocation" placeholder="请选择"
			autocomplete="off" class="layui-input" disabled="disabled"> <em
			class="kccz-data-dw cursor" onclick="showFoodLocation()">……</em>
			</div>
			</div>
			</div>
			@@ -463,41 +467,10 @@

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">总 扣 重</label>
			<label class="layui-form-label">其他说明</label>
			<div class="layui-input-block">
			<input type="text" name="deSum" placeholder="自动计算"
			autocomplete="off" class="layui-input rkbk-search-input"
			disabled> <em class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">规      格</label>
			<div class="layui-input-block">
			<select name="specType" id="specType">
			<option value="散粮">散粮</option>
			<option value="25kg">25kg</option>
			<option value="50kg">50kg</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">粮食产地</label>
			<div class="layui-input-block">
			<input type="text" name="foodLocation" placeholder="请输入"
			autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">单价</label>
			<div class="layui-input-block">
			<input type="text" name="price" placeholder="请输入单价"
			class="layui-input"> <em class="kccz-data-dw">元/公斤</em>
			<input type="text" name="deOtherInfo" autocomplete="off"
			placeholder="其他扣重说明" class="layui-input">
			</div>
			</div>
			</div>
			@@ -511,30 +484,10 @@
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label color-red">结算重量</label>
			<div class="layui-input-block">
			<input type="text" name="settleWeight" placeholder="自动计算"
			autocomplete="off" class="layui-input rkbk-search-input"
			disabled> <em class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>
			<div class="layui-col-xs8">
			<span style="padding-left: 50px;color: blue;">
			注意：1、水杂增扣重根据化验结果自动计算，正数=扣重，负数=增重 <br>
			</span>
			<span style="padding-left: 93px;color: blue;">
			2、净重 = 毛重 - 皮重；总扣重 = 扣水杂（大于0） + 现场扣重 + 其他扣重<br>
			</span>
			<span style="padding-left: 93px;color: blue;">
			3、结算重量 = 净重 - 总扣重 + 水杂增重；入库重量 = 净重 - 总扣重
			</span>
			</div>
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label color-red">入库重量</label>
			<label class="layui-form-label">入库重量</label>
			<div class="layui-input-block">
			<input type="text" name="recordWeight" placeholder="自动计算"
			autocomplete="off" class="layui-input rkbk-search-input"
			@@ -542,6 +495,88 @@
			</div>
			</div>
			</div>
			<div class="layui-col-xs8">
			<span style="padding-left: 50px;color: #2ab5ad;">
			说明：净重=毛重-皮重；质检增扣重根据质检详细填写；入库重量=净重-扣重；结算重量=入库重量+质检增重<br>
			</span>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">结算重量</label>
			<div class="layui-input-block">
			<input type="text" name="settleWeight" placeholder="自动计算"
			autocomplete="off" class="layui-input rkbk-search-input"
			disabled> <em class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs12">
			<div class="line-container">
			<div class="line"></div>
			<div class="line-text">以下根据库区称重作业要求填写</div>
			<div class="line"></div>
			</div>
			</div>

			<!-- 补充字段默认隐藏 -->
			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">包装物</label>
			<div class="layui-input-block">
			<input type="radio" name="bzw" value="1" title="麻袋">
			<input type="radio" name="bzw"
			value="2" title="编织袋">
			<input type="radio" name="bzw"
			value="3" title="散装" checked>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">包装扣重</label>
			<div class="layui-input-block">
			<input type="text" name="dePackage" autocomplete="off"
			placeholder="请输入" class="layui-input weight"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">单价</label>
			<div class="layui-input-block">
			<input type="text" name="price" placeholder="请输入"
			class="layui-input"> <em class="kccz-data-dw">元/公斤</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">标准包重</label>
			<div class="layui-input-block">
			<input type="text" name="dbz" autocomplete="off"
			placeholder="请输入" class="layui-input"> <em
			class="kccz-data-dw">KG</em>
			</div>
			</div>
			</div>

			<div class="layui-col-xs4">
			<div class="layui-form-item">
			<label class="layui-form-label">包件总数</label>
			<div class="layui-input-block">
			<input type="text" name="bzbjs" autocomplete="off"
			placeholder="请输入" class="layui-input"> <em
			class="kccz-data-dw">件</em>
			</div>
			</div>
			</div>

			</form>
			</div>
			</div>
			@@ -558,8 +593,6 @@
			</div>
			<div class="kccz-r-con">
			<div class="kccz-r-vedio" id="kccz-r-video1">


			</div>
			<div class="kccz-r-btnbox">
			<a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">
			@@ -653,19 +686,14 @@
			var weightEditTag = [[${weightEditTag}]];
			//userId
			var userId = [[${loginUser.username}]];

			//出入库类型
			var type = [[${type}]];

			var companyId = [[${loginUser.companyId}]];
			//品种
			var listFoodVariety = [[${listFoodVariety}]];

			//地磅信息
			var weightDto = [[${weightDto}]];

			//车牌识别信息
			//var lprDto = [[${lprDto}]];

			//过程摄像头
			var snapDto1 = [[${snapDto1}]];
			@@ -684,6 +712,7 @@
			<script th:src="@{../../static/js/igds-common.js}"></script>
			<script th:src="@{../../static/admin/inout/inout-print.js}"></script>
			<script th:src="@{../../static/admin/inout/video-play.js}"></script>
			<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
			<script th:src="@{../../static/admin/inout/weight.js}"></script>
			<script th:src="@{../../static/admin/inout/in-weight.js}"></script>

			@@ -702,6 +731,42 @@
			lay-filter="tableFoodLoaction" style="margin: 0px;"></table>
			</div>

			<!-- 质检信息 -->
			<div class="layui-tab-content" id="checkDetail" style="display: none;">
			<!-- 化验结果信息 -->
			<table class="layui-table tableCheckItem" id="tableCheckItem"
			lay-filter="tableCheckItem">
			<colgroup>
			<col width="10%">
			<col width="10%">
			<col width="10%">
			<col width="10%">
			<col width="10%">
			<col width="10%">
			<col width="10%">
			<col width="10%">
			<col width="10%">
			<col width="">
			</colgroup>
			<thead>
			<tr class="qyzj-table-tit">
			<th>检验项目</th>
			<th>检验值</th>
			<th>标准值</th>
			<th>单位</th>
			<th>扣重</th>
			<th>增重</th>
			<th>扣价</th>
			<th>增价</th>
			<th>检验结果</th>
			<th>备注</th>
			</tr>
			</thead>
			<tbody>
			</tbody>
			</table>

			</div>

			<!-- 弹出框的信息 -->
			<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
			@@ -732,21 +797,6 @@
			</tr>
			</tbody>
			</table>
			</div>
			<!-- 弹出框-道闸操作-->
			<div class="layui-tab-content areation-center" id="control-gate"
			style="display: none;">
			<div class="layui-btn-container m10">
			<button class="rkbk-quick-btn layui-btn btn-violet"
			onClick="controlGate('OPEN')">
			<i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>开道闸
			</button>
			<button class="rkbk-quick-btn layui-btn btn-red"
			onClick="controlGate('CLOSE')">
			<i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>关道闸
			</button>
			</div>

			</div>

			<script type="text/html" id="toolbarFoodLocaton">