diff --git a/src/main/resources/templates/receipt/receiving/receiving.html b/src/main/resources/templates/receipt/receiving/receiving.html
index e3e8a5b..52b63a0 100644
--- a/src/main/resources/templates/receipt/receiving/receiving.html
+++ b/src/main/resources/templates/receipt/receiving/receiving.html
@@ -23,6 +23,15 @@
font-weight: bold;
color: rgb(28,132,198);
}
+ /* 缩略图 */
+ #my_thumbnail{
+ height: 85px;
+ overflow-x: auto;
+ border: 1px solid blue;
+ }
+ #my_thumbnail img{
+ margin: 0 5px;
+ }
</style>
<body class="gray-bg">
<div class="container-div">
@@ -76,35 +85,59 @@
<div id="batteryHidden" hidden>
<li>
<select id="batteryPackType" name="batteryPackType" class="form-control" th:with="batteryPackType=${@dict.getType('batteryPackType')}" placeholder="电池类必填">
- <option value="">请选择电池包类型</option>
+ <option value="">电池包类型</option>
<option th:each="dict : ${batteryPackType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
</select>
<!--电池包类型：<input type="text" id="batteryPackType" placeholder="电池类必填"/></li>-->
+ </li>
<li>
- <select id="batteryTypes" name="batteryTypes" class="form-control" type="text" placeholder="电池类必填">
- <option value="">请选择电池类型</option>
+ <select id="batteryTypes" name="batteryTypes" class="form-control" placeholder="电池类必填">
+ <option value="">电池类型</option>
<option value="2">电池模块</option>
<option value="3">电池单体</option>
</select>
- <li>
+ </li>
<li>
<select id="completeness" name="completeness" class="form-control" th:with="completeness=${@dict.getType('completeness')}">
- <option value="">请选择完整程度</option>
+ <option value="">完整程度</option>
<option th:each="dict : ${completeness}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
</select>
</li>
- <li>电量：<input type="text" id="electricQuantity" placeholder="电池类必填"/></li>
- <li>皮重：<input type="text" id="materialTareWeight" placeholder="电池类必填"/>
- <li>毛重：<input type="text" id="materialGrossWeight" placeholder="电池类必填"/>
- <li>净重：<input type="text" id="materialNetWeight" placeholder="电池类必填"/>
- <li>回收人：<input type="text" id="recycler" placeholder="电池类必填"/>
+ <li>
+ <select id="storageType" name="storageType" class="form-control" placeholder="电池类必填">
+ <option value="">利用类型</option>
+ <option value="0">再生利用</option>
+ <option value="1">梯次利用</option>
+ </select>
+ </li>
+ <li>
+ <select id="type" name="type" class="form-control" placeholder="电池类必填">
+ <option value="">再生利用类型</option>
+ <option value="1">废旧动力蓄电池</option>
+ <option value="2">次品动力蓄电池</option>
+ <option value="3">其他领域废旧电池</option>
+ </select>
+ </li>
+ <li>电量：<input type="text" id="electricQuantity" placeholder="电池类必填"/></li>
+ <li>皮重：<input type="text" id="materialTareWeight" placeholder="电池类必填"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li>
+ <li>毛重：<input type="text" id="materialGrossWeight" placeholder="电池类必填"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li>
+ <li>净重：<input type="text" id="materialNetWeight" placeholder="电池类必填"/></li>
+ <li>回收人：<input type="text" id="recycler" placeholder="电池类必填"/></li>
+ <div class="form-group" style="width:300px;white-space: nowrap">
+ <img id="camera" name="camera" src="" width="300px" height="200px"/>
+ </div>
+ <div class="form-group" style="width:150px;margin: 0 auto;">
+ <button id="plc" name="plc" class="btn btn-danger" type="button">电池拍照</button>
+ </div>
+ <div id="my_thumbnail">
+ </div>
<!--完整程度：<input type="text" id="completeness" placeholder="电池类必填"/></li>-->
<!--<li>电池个数：<input type="text" id="batteryQty"/></li>-->
</div>
<li>
- <button class="btn btn-sm btn-success" onclick="receipt()">组盘</button>
+ <button class="btn btn-sm btn-danger" onclick="receipt()">组盘</button>
</li>
</ul>
<div class="btn-group hidden-xs" id="toolbar1" role="group">
@@ -151,6 +184,7 @@
</div>
</div>
<div th:include="include :: footer"></div>
+<th:block th:include="include :: thumbnail_customized-js" />
<script th:inline="javascript">
var addFlag = [[${@permission.hasPermi('receipt:receiving:add')}]];
var removeFlag = [[${@permission.hasPermi('receipt:receiving:remove')}]];
@@ -311,6 +345,10 @@
contentType: "application/x-www-form-urlencoded",
clickToSelect: true,
modalName: "收货",
+ pagination: true, // 是否显示分页（*）
+ pageNumber: 1, // 初始化加载第一页，默认第一页
+ pageSize: 10, // 每页的记录行数（*）
+ pageList: [10, 25, 50, 100], // 可供选择的每页的行数（*）
onRefresh: function(){
},
@@ -712,6 +750,68 @@
function receipt() {
let containerCode = $("#containerCode").val();
let locationCode = $("#locationCoder").val();
+ }
+ /**
+ * 取重接口
+ * 调用连接称重电脑的接口
+ */
+ function getWeight(){
+ let url='http://10.34.101.77:8888/wms/API/WMS/v2/getWeightForSerial';
+ let type = "POST";
+ let dataType = "json";
+ let data = {};
+ let config = {
+ url: url,
+ type: type,
+ dataType: dataType,
+ data: data,
+ beforeSend: function () {
+ $.modal.loading("正在处理中，请稍后...");
+ },
+ success: function (result) {
+ $("#materialGrossWeight").val(result.data)
+ $.operate.ajaxSuccess(result);
+ }
+ };
+ $.ajax(config)
+ }
+
+ document.getElementById("plc")
+ .addEventListener("click", function() {
+ $.ajax({
+ cache : false,
+ type : "POST",
+ url : ctx + "API/WMS/v2/cameraLogin",
+ dataType: 'json',
+ data : {
+ "cameraId": "3"
+ },
+ async : false,
+ error : function(request) {
+ $.modal.alertError("请求失败！");
+ },
+ success : function(result) {
+ if (result.code == web_status.SUCCESS) {
+ getData();
+ $.modal.msgSuccess(result.msg);
+ }else{
+ $.modal.alertError(result.data);
+ }
+ }
+ });
+ });
+ function getData(){
+ let url = "/wms/img/Capture/material.jpg?" + Date.parse(new Date());
+ $("#camera").attr('src',url);
+ // setTimeout(getData,5000)
+ }
+
+ /**
+ * 组盘
+ */
+ function receipt() {
+ let containerCode = $("#containerCode").val();
+ let locationCode = $("#locationCoder").val();
let barCodeHeaderCode = $("#barCodeHeaderCode").val();
Receiving(locationCode, containerCode,barCodeHeaderCode);
}