wms / wms_wuhangelinmei · Commits

Commit 66b7b19ddba7d2b17672f3c62c938407808d7f7a

Authored by tongzhonghao
1 parent eb77b593

调整组盘页面

Inline Side-by-side
Showing 1 changed file with 111 additions and 11 deletions
src/main/resources/templates/receipt/receiving/receiving.html
  View file @66b7b19
... ... @@ -23,6 +23,15 @@
23 23 font-weight: bold;
24 24 color: rgb(28,132,198);
25 25 }
  26 + /* 缩略图 */
  27 + #my_thumbnail{
  28 + height: 85px;
  29 + overflow-x: auto;
  30 + border: 1px solid blue;
  31 + }
  32 + #my_thumbnail img{
  33 + margin: 0 5px;
  34 + }
26 35 </style>
27 36 <body class="gray-bg">
28 37 <div class="container-div">
... ... @@ -76,35 +85,59 @@
76 85 <div id="batteryHidden" hidden>
77 86 <li>
78 87 <select id="batteryPackType" name="batteryPackType" class="form-control" th:with="batteryPackType=${@dict.getType('batteryPackType')}" placeholder="电池类必填">
79   - <option value="">请选择电池包类型</option>
  88 + <option value="">电池包类型</option>
80 89 <option th:each="dict : ${batteryPackType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
81 90 </select>
82 91 <!--电池包类型：<input type="text" id="batteryPackType" placeholder="电池类必填"/></li>-->
  92 + </li>
83 93 <li>
84   - <select id="batteryTypes" name="batteryTypes" class="form-control" type="text" placeholder="电池类必填">
85   - <option value="">请选择电池类型</option>
  94 + <select id="batteryTypes" name="batteryTypes" class="form-control" placeholder="电池类必填">
  95 + <option value="">电池类型</option>
86 96 <option value="2">电池模块</option>
87 97 <option value="3">电池单体</option>
88 98 </select>
89   - <li>
  99 + </li>
90 100 <li>
91 101 <select id="completeness" name="completeness" class="form-control" th:with="completeness=${@dict.getType('completeness')}">
92   - <option value="">请选择完整程度</option>
  102 + <option value="">完整程度</option>
93 103 <option th:each="dict : ${completeness}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
94 104 </select>
95 105 </li>
96   - <li>电量：<input type="text" id="electricQuantity" placeholder="电池类必填"/></li>
97   - <li>皮重：<input type="text" id="materialTareWeight" placeholder="电池类必填"/>
98   - <li>毛重：<input type="text" id="materialGrossWeight" placeholder="电池类必填"/>
99   - <li>净重：<input type="text" id="materialNetWeight" placeholder="电池类必填"/>
100   - <li>回收人：<input type="text" id="recycler" placeholder="电池类必填"/>
  106 + <li>
  107 + <select id="storageType" name="storageType" class="form-control" placeholder="电池类必填">
  108 + <option value="">利用类型</option>
  109 + <option value="0">再生利用</option>
  110 + <option value="1">梯次利用</option>
  111 + </select>
  112 + </li>
  113 + <li>
  114 + <select id="type" name="type" class="form-control" placeholder="电池类必填">
  115 + <option value="">再生利用类型</option>
  116 + <option value="1">废旧动力蓄电池</option>
  117 + <option value="2">次品动力蓄电池</option>
  118 + <option value="3">其他领域废旧电池</option>
  119 + </select>
  120 + </li>
101 121  
  122 + <li>电量：<input type="text" id="electricQuantity" placeholder="电池类必填"/></li>
  123 + <li>皮重：<input type="text" id="materialTareWeight" placeholder="电池类必填"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li>
  124 + <li>毛重：<input type="text" id="materialGrossWeight" placeholder="电池类必填"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li>
  125 + <li>净重：<input type="text" id="materialNetWeight" placeholder="电池类必填"/></li>
  126 + <li>回收人：<input type="text" id="recycler" placeholder="电池类必填"/></li>
  127 + <div class="form-group" style="width:300px;white-space: nowrap">
  128 + <img id="camera" name="camera" src="" width="300px" height="200px"/>
  129 + </div>
  130 + <div class="form-group" style="width:150px;margin: 0 auto;">
  131 + <button id="plc" name="plc" class="btn btn-danger" type="button">电池拍照</button>
  132 + </div>
  133 + <div id="my_thumbnail">
  134 + </div>
102 135 <!--完整程度：<input type="text" id="completeness" placeholder="电池类必填"/></li>-->
103 136 <!--<li>电池个数：<input type="text" id="batteryQty"/></li>-->
104 137  
105 138 </div>
106 139 <li>
107   - <button class="btn btn-sm btn-success" onclick="receipt()">组盘</button>
  140 + <button class="btn btn-sm btn-danger" onclick="receipt()">组盘</button>
108 141 </li>
109 142 </ul>
110 143 <div class="btn-group hidden-xs" id="toolbar1" role="group">
... ... @@ -151,6 +184,7 @@
151 184 </div>
152 185 </div>
153 186 <div th:include="include :: footer"></div>
  187 +<th:block th:include="include :: thumbnail_customized-js" />
154 188 <script th:inline="javascript">
155 189 var addFlag = [[${@permission.hasPermi('receipt:receiving:add')}]];
156 190 var removeFlag = [[${@permission.hasPermi('receipt:receiving:remove')}]];
... ... @@ -311,6 +345,10 @@
311 345 contentType: "application/x-www-form-urlencoded",
312 346 clickToSelect: true,
313 347 modalName: "收货",
  348 + pagination: true, // 是否显示分页（*）
  349 + pageNumber: 1, // 初始化加载第一页，默认第一页
  350 + pageSize: 10, // 每页的记录行数（*）
  351 + pageList: [10, 25, 50, 100], // 可供选择的每页的行数（*）
314 352 onRefresh: function(){
315 353  
316 354 },
... ... @@ -712,6 +750,68 @@
712 750 function receipt() {
713 751 let containerCode = $("#containerCode").val();
714 752 let locationCode = $("#locationCoder").val();
  753 + }
  754 + /**
  755 + * 取重接口
  756 + * 调用连接称重电脑的接口
  757 + */
  758 + function getWeight(){
  759 + let url='http://10.34.101.77:8888/wms/API/WMS/v2/getWeightForSerial';
  760 + let type = "POST";
  761 + let dataType = "json";
  762 + let data = {};
  763 + let config = {
  764 + url: url,
  765 + type: type,
  766 + dataType: dataType,
  767 + data: data,
  768 + beforeSend: function () {
  769 + $.modal.loading("正在处理中，请稍后...");
  770 + },
  771 + success: function (result) {
  772 + $("#materialGrossWeight").val(result.data)
  773 + $.operate.ajaxSuccess(result);
  774 + }
  775 + };
  776 + $.ajax(config)
  777 + }
  778 +
  779 + document.getElementById("plc")
  780 + .addEventListener("click", function() {
  781 + $.ajax({
  782 + cache : false,
  783 + type : "POST",
  784 + url : ctx + "API/WMS/v2/cameraLogin",
  785 + dataType: 'json',
  786 + data : {
  787 + "cameraId": "3"
  788 + },
  789 + async : false,
  790 + error : function(request) {
  791 + $.modal.alertError("请求失败！");
  792 + },
  793 + success : function(result) {
  794 + if (result.code == web_status.SUCCESS) {
  795 + getData();
  796 + $.modal.msgSuccess(result.msg);
  797 + }else{
  798 + $.modal.alertError(result.data);
  799 + }
  800 + }
  801 + });
  802 + });
  803 + function getData(){
  804 + let url = "/wms/img/Capture/material.jpg?" + Date.parse(new Date());
  805 + $("#camera").attr('src',url);
  806 + // setTimeout(getData,5000)
  807 + }
  808 +
  809 + /**
  810 + * 组盘
  811 + */
  812 + function receipt() {
  813 + let containerCode = $("#containerCode").val();
  814 + let locationCode = $("#locationCoder").val();
715 815 let barCodeHeaderCode = $("#barCodeHeaderCode").val();
716 816 Receiving(locationCode, containerCode,barCodeHeaderCode);
717 817 }
... ...