Commit 956bec43ab4fd73b6b10f95d3731cc9fe19a9c7d
Merge remote-tracking branch 'origin/develop' into develop
Showing
20 changed files
with
181 additions
and
201 deletions
src/main/java/com/huaheng/pc/vehicle/vehicleReceipt/controller/VehicelReceiptController.java
... | ... | @@ -15,6 +15,7 @@ import com.huaheng.framework.web.page.TableDataInfo; |
15 | 15 | import com.huaheng.framework.web.page.TableSupport; |
16 | 16 | import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail; |
17 | 17 | import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader; |
18 | +import com.huaheng.pc.task.taskHeader.domain.TaskHeader; | |
18 | 19 | import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt; |
19 | 20 | import com.huaheng.pc.vehicle.vehicleReceipt.service.VehicleReceiptService; |
20 | 21 | import io.swagger.annotations.Api; |
... | ... | @@ -85,6 +86,8 @@ public class VehicelReceiptController extends BaseController { |
85 | 86 | .in(StringUtils.isNotEmpty(vehicleReceipt.getCompanyCode()),VehicleReceipt::getCompanyCode, vehicleReceipt.getCompanyCode()) |
86 | 87 | .in(StringUtils.isEmpty(vehicleReceipt.getCompanyCode()), VehicleReceipt::getCompanyCode, ShiroUtils.getCompanyCodeList()) |
87 | 88 | .eq(VehicleReceipt::getWarehouseCode, ShiroUtils.getWarehouseCode()) |
89 | + .gt(StringUtils.isNotEmpty(createdBegin), VehicleReceipt::getCreated, createdBegin) | |
90 | + .lt(StringUtils.isNotEmpty(createdEnd), VehicleReceipt::getCreated, createdEnd) | |
88 | 91 | .eq(StringUtils.isNotEmpty(vehicleReceipt.getType()), VehicleReceipt::getType, vehicleReceipt.getType()) |
89 | 92 | .eq(StringUtils.isNotEmpty(vehicleReceipt.getMaterialBatch()), VehicleReceipt::getMaterialBatch, vehicleReceipt.getMaterialBatch()) |
90 | 93 | .orderByDesc(VehicleReceipt::getCreated); |
... | ... |
src/main/java/com/huaheng/pc/vehicle/vehicleShipment/controller/VehicelShipmentController.java
... | ... | @@ -15,6 +15,7 @@ import com.huaheng.framework.web.page.TableDataInfo; |
15 | 15 | import com.huaheng.framework.web.page.TableSupport; |
16 | 16 | import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail; |
17 | 17 | import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader; |
18 | +import com.huaheng.pc.task.taskHeader.domain.TaskHeader; | |
18 | 19 | import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt; |
19 | 20 | import com.huaheng.pc.vehicle.vehicleShipment.domain.VehicleShipment; |
20 | 21 | import com.huaheng.pc.vehicle.vehicleShipment.service.VehicleShipmentService; |
... | ... | @@ -80,6 +81,8 @@ public class VehicelShipmentController extends BaseController { |
80 | 81 | .in(StringUtils.isNotEmpty(vehicleShipment.getCompanyCode()),VehicleShipment::getCompanyCode, vehicleShipment.getCompanyCode()) |
81 | 82 | .in(StringUtils.isEmpty(vehicleShipment.getCompanyCode()), VehicleShipment::getCompanyCode, ShiroUtils.getCompanyCodeList()) |
82 | 83 | .eq(VehicleShipment::getWarehouseCode, ShiroUtils.getWarehouseCode()) |
84 | + .gt(StringUtils.isNotEmpty(createdBegin), VehicleShipment::getCreated, createdBegin) | |
85 | + .lt(StringUtils.isNotEmpty(createdEnd), VehicleShipment::getCreated, createdEnd) | |
83 | 86 | .eq(StringUtils.isNotEmpty(vehicleShipment.getType()), |
84 | 87 | VehicleShipment::getType, vehicleShipment.getType()) |
85 | 88 | .orderByDesc(VehicleShipment::getCreated); |
... | ... |
src/main/resources/templates/barcode/barCodeDetail/add.html
... | ... | @@ -46,12 +46,12 @@ |
46 | 46 | <!--<input id="supplierCode" name="supplierCode" class="form-control" type="text">--> |
47 | 47 | <!--</div>--> |
48 | 48 | <!--</div>--> |
49 | - <div class="form-group"> | |
50 | - <label class="col-sm-3 control-label">批次:</label> | |
51 | - <div class="col-sm-8"> | |
52 | - <input id="batch" name="batch" class="form-control" type="text"> | |
53 | - </div> | |
54 | - </div> | |
49 | +<!-- <div class="form-group">--> | |
50 | +<!-- <label class="col-sm-3 control-label">批次:</label>--> | |
51 | +<!-- <div class="col-sm-8">--> | |
52 | +<!-- <input id="batch" name="batch" class="form-control" type="text">--> | |
53 | +<!-- </div>--> | |
54 | +<!-- </div>--> | |
55 | 55 | <!--<div class="form-group"> |
56 | 56 | <label class="col-sm-3 control-label">电池包种类:</label> |
57 | 57 | <div class="col-sm-8"> |
... | ... |
src/main/resources/templates/barcode/barCodeDetail/edit.html
... | ... | @@ -41,12 +41,12 @@ |
41 | 41 | <input id="code" name="code" class="form-control" type="text" th:field="*{code}"> |
42 | 42 | </div> |
43 | 43 | </div> |
44 | - <div class="form-group"> | |
45 | - <label class="col-sm-3 control-label">批次:</label> | |
46 | - <div class="col-sm-8"> | |
47 | - <input id="batch" name="batch" class="form-control" type="text" th:field="*{batch}"> | |
48 | - </div> | |
49 | - </div> | |
44 | +<!-- <div class="form-group">--> | |
45 | +<!-- <label class="col-sm-3 control-label">批次:</label>--> | |
46 | +<!-- <div class="col-sm-8">--> | |
47 | +<!-- <input id="batch" name="batch" class="form-control" type="text" th:field="*{batch}">--> | |
48 | +<!-- </div>--> | |
49 | +<!-- </div>--> | |
50 | 50 | <div class="form-group"> |
51 | 51 | <label class="col-sm-3 control-label">白班夜班:</label> |
52 | 52 | <div class="col-sm-8"> |
... | ... |
src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
... | ... | @@ -368,18 +368,6 @@ |
368 | 368 | visible: false |
369 | 369 | }, |
370 | 370 | { |
371 | - field : 'code', | |
372 | - title : '子条码' | |
373 | - }, | |
374 | - { | |
375 | - field : 'receiptCode', | |
376 | - title : '入库单编码' | |
377 | - }, | |
378 | - { | |
379 | - field : 'weight', | |
380 | - title : '拆解托盘总重量' | |
381 | - }, | |
382 | - { | |
383 | 371 | field : 'totalQty', |
384 | 372 | title : '数量' |
385 | 373 | }, |
... | ... | @@ -400,6 +388,11 @@ |
400 | 388 | title : '物料单位' |
401 | 389 | }, |
402 | 390 | { |
391 | + field : 'weight', | |
392 | + title : '拆解托盘总重量kg' | |
393 | + }, | |
394 | + | |
395 | + { | |
403 | 396 | field : 'regenerationCode', |
404 | 397 | title : '再生编号' |
405 | 398 | }, |
... | ... | @@ -411,6 +404,15 @@ |
411 | 404 | } |
412 | 405 | }, |
413 | 406 | { |
407 | + field : 'code', | |
408 | + title : '子条码' | |
409 | + }, | |
410 | + { | |
411 | + field : 'receiptCode', | |
412 | + title : '入库单编码' | |
413 | + }, | |
414 | + | |
415 | + { | |
414 | 416 | field : 'sn', |
415 | 417 | title : '序列号' |
416 | 418 | }, |
... | ... | @@ -418,10 +420,10 @@ |
418 | 420 | field : 'qty', |
419 | 421 | title : '数量' |
420 | 422 | },*/ |
421 | - { | |
422 | - field : 'batch', | |
423 | - title : '批次' | |
424 | - }, | |
423 | + // { | |
424 | + // field : 'batch', | |
425 | + // title : '批次' | |
426 | + // }, | |
425 | 427 | { |
426 | 428 | field : 'created', |
427 | 429 | title : '创建时间' |
... | ... |
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
... | ... | @@ -275,15 +275,15 @@ |
275 | 275 | }, |
276 | 276 | { |
277 | 277 | field : 'materialGrossWeight', |
278 | - title : '电池毛重' , | |
278 | + title : '电池毛重(kg)' , | |
279 | 279 | }, |
280 | 280 | { |
281 | 281 | field : 'materialTareWeight', |
282 | - title : '电池皮重' , | |
282 | + title : '电池皮重(kg)' , | |
283 | 283 | }, |
284 | 284 | { |
285 | 285 | field : 'materialNetWeight', |
286 | - title : '电池净重' , | |
286 | + title : '电池净重(kg)' , | |
287 | 287 | }, |
288 | 288 | { |
289 | 289 | field : 'countryCode', |
... | ... |
src/main/resources/templates/main.html
... | ... | @@ -63,7 +63,7 @@ |
63 | 63 | </div> |
64 | 64 | </div> |
65 | 65 | |
66 | -<div class="row" style="padding:0 30px;"> | |
66 | +<div class="row" style="padding:0 17px;"> | |
67 | 67 | <div class="col-sm-6" style="padding:5px 5px 10px 5px;"> |
68 | 68 | <div class="float-e-margins"> |
69 | 69 | <div class="ibox-title"><h5>历史每日收发货量</h5></div> |
... | ... | @@ -76,9 +76,9 @@ |
76 | 76 | </div> |
77 | 77 | <div class="col-sm-6" style="padding:5px 5px 10px 5px;"> |
78 | 78 | <div class="float-e-margins"> |
79 | - <div class="ibox-title"><h5>库位利用率</h5></div> | |
79 | + <div class="ibox-title"><h5>库存概况</h5></div> | |
80 | 80 | <div class="ibox-content"> |
81 | - <div id="chart2" class="flot-chart1"> | |
81 | + <div id="chart4" class="flot-chart1"> | |
82 | 82 | 这里放图表 |
83 | 83 | </div> |
84 | 84 | </div> |
... | ... | @@ -96,9 +96,9 @@ |
96 | 96 | </div> |
97 | 97 | <div class="col-sm-6" style="padding:5px 5px 10px 5px;"> |
98 | 98 | <div class="ibox float-e-margins"> |
99 | - <div class="ibox-title"><h5>库存概况</h5></div> | |
99 | + <div class="ibox-title"><h5>库位利用率</h5></div> | |
100 | 100 | <div class="ibox-content"> |
101 | - <div id="chart4" class="flot-chart1"> | |
101 | + <div id="chart2" class="flot-chart1"> | |
102 | 102 | 这里放图表 |
103 | 103 | </div> |
104 | 104 | </div> |
... | ... |
src/main/resources/templates/receipt/receiptDetail/receiptDetail.html
... | ... | @@ -13,9 +13,9 @@ |
13 | 13 | <li> |
14 | 14 | 物料编码:<input type="text" name="materialCode"/> |
15 | 15 | </li> |
16 | - <li> | |
17 | - 物料批次:<input type="text" name="batch"/> | |
18 | - </li> | |
16 | +<!-- <li>--> | |
17 | +<!-- 物料批次:<input type="text" name="batch"/>--> | |
18 | +<!-- </li>--> | |
19 | 19 | <!--<li class="time">--> |
20 | 20 | <!--<label>创建时间: </label>--> |
21 | 21 | <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>--> |
... | ... | @@ -123,10 +123,10 @@ |
123 | 123 | field : 'supplierCode', |
124 | 124 | title : '供应商编码' |
125 | 125 | }, |
126 | - { | |
127 | - field : 'batch', | |
128 | - title : '批次' | |
129 | - }, | |
126 | + // { | |
127 | + // field : 'batch', | |
128 | + // title : '批次' | |
129 | + // }, | |
130 | 130 | { |
131 | 131 | field : 'lot', |
132 | 132 | title : '批号' , |
... | ... |
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
... | ... | @@ -614,15 +614,15 @@ |
614 | 614 | }, |
615 | 615 | { |
616 | 616 | field : 'tareWeight', |
617 | - title : '皮重' | |
617 | + title : '皮重(kg)' | |
618 | 618 | }, |
619 | 619 | { |
620 | 620 | field : 'netWeight', |
621 | - title : '净重' | |
621 | + title : '净重(kg)' | |
622 | 622 | }, |
623 | 623 | { |
624 | 624 | field : 'grossWeight', |
625 | - title : '毛重' | |
625 | + title : '毛重(kg)' | |
626 | 626 | }, |
627 | 627 | { |
628 | 628 | field : 'materialUnit', |
... | ... |
src/main/resources/templates/receipt/receiving/receiving-.html
... | ... | @@ -98,6 +98,13 @@ |
98 | 98 | <ul class="select-list"> |
99 | 99 | <input type="text" id="materialCode" hidden/> |
100 | 100 | <li style="display: none">id:<input type="text" id="detailId"/></li> |
101 | + <!--<select id="area" name="batteryType" class="form-control" type="text"> | |
102 | + <option value="1">库区A</option> | |
103 | + <option value="2">库区B</option> | |
104 | + <option value="3">库区C</option> | |
105 | + <option value="4">库区D</option> | |
106 | + <option value="5">库区E</option> | |
107 | + </select>--> | |
101 | 108 | <li >收货数量:<input type="text" id="receiveNum"/></li> |
102 | 109 | <!-- <li>收货重量:<input type="text" id="receiveWeight"/></li>--> |
103 | 110 | <li hidden>容器编号:<input type="text" id="containerCode"/></li> |
... | ... |
src/main/resources/templates/receipt/receiving/receiving.html
... | ... | @@ -48,7 +48,7 @@ |
48 | 48 | } |
49 | 49 | .table-striped-left .select-list li{ |
50 | 50 | width:47%; |
51 | - float:left; | |
51 | + float:right; | |
52 | 52 | } |
53 | 53 | |
54 | 54 | .select-list li select { |
... | ... | @@ -121,56 +121,43 @@ |
121 | 121 | </li> |
122 | 122 | |
123 | 123 | <div id="batteryHidden" hidden> |
124 | - <li ><span class="selectClass">电池包类型:</span> | |
124 | + <li ><span class="selectClass">电池包类型:</span> | |
125 | 125 | <select id="batteryPackType" name="batteryPackType" class="form-control" th:with="batteryPackType=${@dict.getType('batteryPackType')}" placeholder="电池类必填"> |
126 | 126 | <option value="">--请选择--</option> |
127 | 127 | <option th:each="dict : ${batteryPackType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> |
128 | 128 | </select> |
129 | 129 | </li> |
130 | 130 | <li > |
131 | - <span class="selectClass">电池类型:</span> | |
132 | - <select id="batteryTypes" name="batteryTypes" class="form-control" th:with="batteryTypes=${@dict.getType('batteryTypes')}"> | |
133 | - <option value="">--请选择--</option> | |
134 | - <option th:each="dict : ${batteryTypes}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> | |
135 | - </select> | |
136 | - </li> | |
137 | - <li > | |
138 | - <span class="selectClass">完整程度:</span> | |
139 | - <select id="completeness" name="completeness" class="form-control" th:with="completeness=${@dict.getType('completeness')}"> | |
131 | + <span class="selectClass">质量入库:</span> | |
132 | + <select id="receiptScenes" name="receiptScenes" class="form-control" th:with="receiptScenes=${@dict.getType('receiptScenes')}"> | |
140 | 133 | <option value="">--请选择--</option> |
141 | - <option th:each="dict : ${completeness}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> | |
134 | + <option th:each="dict : ${receiptScenes}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> | |
142 | 135 | </select> |
143 | 136 | </li> |
144 | 137 | <li > |
145 | - <span class="selectClass">利用类型:</span> | |
146 | - <select id="storageType" name="storageType" class="form-control" placeholder="电池类必填"> | |
138 | + <span class="selectClass">电 池 类 型:</span> | |
139 | + <select id="batteryTypes" name="batteryTypes" class="form-control" th:with="batteryTypes=${@dict.getType('batteryTypes')}"> | |
147 | 140 | <option value="">--请选择--</option> |
148 | - <option value="0">再生利用</option> | |
149 | - <option value="1">梯次利用</option> | |
141 | + <option th:each="dict : ${batteryTypes}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> | |
150 | 142 | </select> |
151 | 143 | </li> |
152 | 144 | <li > |
153 | - <span class="selectClass">再生利用类型:</span> | |
154 | - <select id="type" name="type" class="form-control" placeholder="电池类必填"> | |
145 | + <span class="selectClass">完整程度:</span> | |
146 | + <select id="completeness" name="completeness" class="form-control" th:with="completeness=${@dict.getType('completeness')}"> | |
155 | 147 | <option value="">--请选择--</option> |
156 | - <option value="1">废旧动力蓄电池</option> | |
157 | - <option value="2">次品动力蓄电池</option> | |
158 | - <option value="3">其他领域废旧电池</option> | |
148 | + <option th:each="dict : ${completeness}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> | |
159 | 149 | </select> |
160 | 150 | </li> |
161 | - <li>回收人:<select type="text" id="recycler" th:with="completeness=${@UserServiceImpl.getRecover()}"> | |
151 | + <li>回 收 人 :<select type="text" id="recycler" th:with="completeness=${@UserServiceImpl.getRecover()}"> | |
162 | 152 | <option th:each="dict : ${completeness}" th:text="${dict.userName}" th:value="${dict.userName}"></option> |
163 | 153 | </select></li> |
164 | - <li>电量:<input type="text" id="electricQuantity" placeholder="电池类必填"/></li> | |
165 | - <li>皮重:<input type="text" id="materialTareWeight"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li> | |
166 | - <li>毛重:<input type="text" id="materialGrossWeight"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li> | |
167 | - <li>净重:<input type="text" id="materialNetWeight"/></li> | |
154 | + <li>毛 重(kg):<input type="text" id="materialGrossWeight"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li> | |
155 | + <li>皮 重 (kg):<input type="text" id="materialTareWeight"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li> | |
156 | + <li>电 量:<input type="text" id="electricQuantity" placeholder="电池类必填"/></li> | |
157 | + <li>净 重 (kg):<input type="text" id="materialNetWeight"/></li> | |
168 | 158 | <!--<li>回收人:<input type="text" id="recycler"/></li>--> |
169 | 159 | <li>国家编码:<input type="text" id="countryCode" placeholder="请用pda扫码获取"/></li> |
170 | - <li>备注:<input type="text" id="remark" placeholder="备注"/></li> | |
171 | - <!--<li> | |
172 | - | |
173 | - </li>--> | |
160 | + <li>电池包备注:<textarea style="height: 80px;width: 200px" id="remark" placeholder="备注"></textarea></li> | |
174 | 161 | <li><div class="form-group" style="width:80%;white-space: nowrap"> |
175 | 162 | <img id="camera" name="camera" src="" width="250px" height="200px"/> |
176 | 163 | <button id="plc" name="plc" class="btn btn-danger btn-sm" type="button">电池拍照</button> |
... | ... | @@ -658,15 +645,15 @@ |
658 | 645 | }, |
659 | 646 | { |
660 | 647 | field : 'materialGrossWeight', |
661 | - title : '电池毛重' , | |
648 | + title : '电池毛重(kg)' , | |
662 | 649 | }, |
663 | 650 | { |
664 | 651 | field : 'materialTareWeight', |
665 | - title : '电池皮重' , | |
652 | + title : '电池皮重(kg)' , | |
666 | 653 | }, |
667 | 654 | { |
668 | 655 | field : 'materialNetWeight', |
669 | - title : '电池净重' , | |
656 | + title : '电池净重(kg)' , | |
670 | 657 | }, |
671 | 658 | { |
672 | 659 | field : 'remark', |
... | ... |
src/main/resources/templates/shipment/shipmentDetail/edit.html
... | ... | @@ -31,12 +31,12 @@ |
31 | 31 | </div> |
32 | 32 | </div> |
33 | 33 | |
34 | - <div class="form-group" th:if="false"> | |
35 | - <label class="col-sm-3 control-label">批次:</label> | |
36 | - <div class="col-sm-8"> | |
37 | - <input id="batch" name="batch" th:field="*{batch}" class="form-control" type="text"> | |
38 | - </div> | |
39 | - </div> | |
34 | +<!-- <div class="form-group" th:if="false">--> | |
35 | +<!-- <label class="col-sm-3 control-label">批次:</label>--> | |
36 | +<!-- <div class="col-sm-8">--> | |
37 | +<!-- <input id="batch" name="batch" th:field="*{batch}" class="form-control" type="text">--> | |
38 | +<!-- </div>--> | |
39 | +<!-- </div>--> | |
40 | 40 | <div class="form-group" th:if="false"> |
41 | 41 | <label class="col-sm-3 control-label">批号:</label> |
42 | 42 | <div class="col-sm-8"> |
... | ... |
src/main/resources/templates/shipment/shipmentDetail/shipmentDetail.html
... | ... | @@ -52,15 +52,15 @@ |
52 | 52 | }, |
53 | 53 | { |
54 | 54 | field : 'netWeight', |
55 | - title : '净重' | |
55 | + title : '净重(kg)' | |
56 | 56 | }, |
57 | 57 | { |
58 | 58 | field : 'tareWeight', |
59 | - title : '皮重' | |
59 | + title : '皮重(kg)' | |
60 | 60 | }, |
61 | 61 | { |
62 | 62 | field : 'grossWeight', |
63 | - title : '毛重' | |
63 | + title : '毛重(kg)' | |
64 | 64 | }, |
65 | 65 | { |
66 | 66 | field : 'sourceLine', |
... | ... |
src/main/resources/templates/shipment/shipmentDetailHistory/shipmentDetailHistory.html
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
... | ... | @@ -541,15 +541,15 @@ |
541 | 541 | }, |
542 | 542 | { |
543 | 543 | field: 'grossWeight', |
544 | - title: '毛重', | |
544 | + title: '毛重(kg)', | |
545 | 545 | }, |
546 | 546 | { |
547 | 547 | field: 'tareWeight', |
548 | - title: '皮重', | |
548 | + title: '皮重(kg)', | |
549 | 549 | }, |
550 | 550 | { |
551 | 551 | field: 'netWeight', |
552 | - title: '净重', | |
552 | + title: '净重(kg)', | |
553 | 553 | }, |
554 | 554 | { |
555 | 555 | field: 'poundNumber', |
... | ... |
src/main/resources/templates/shipment/shippingCombination/combination.html
src/main/resources/templates/task/taskHeader/taskHeader.html
... | ... | @@ -456,15 +456,15 @@ |
456 | 456 | }, |
457 | 457 | { |
458 | 458 | field : 'materialGrossWeight', |
459 | - title : '电池毛重' , | |
459 | + title : '电池毛重(kg)' , | |
460 | 460 | }, |
461 | 461 | { |
462 | 462 | field : 'materialTareWeight', |
463 | - title : '电池皮重' , | |
463 | + title : '电池皮重(kg)' , | |
464 | 464 | }, |
465 | 465 | { |
466 | 466 | field : 'materialNetWeight', |
467 | - title : '电池净重' , | |
467 | + title : '电池净重(kg)' , | |
468 | 468 | }, |
469 | 469 | { |
470 | 470 | field : 'remark', |
... | ... |
src/main/resources/templates/vehicle/vehicleReceipt/vehicleReceipt.html
... | ... | @@ -30,6 +30,12 @@ |
30 | 30 | <li> |
31 | 31 | 身份证号:<input type="text" name="cardNumber"/> |
32 | 32 | </li> |
33 | + <li class="time" style="height: 30px"> | |
34 | + <label>创建时间: </label> | |
35 | + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/> | |
36 | + <span>-</span> | |
37 | + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/> | |
38 | + </li> | |
33 | 39 | <li> |
34 | 40 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
35 | 41 | <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('warehouse-form')"><i class="fa fa-refresh"></i> 重置</a> |
... | ... | @@ -72,6 +78,7 @@ |
72 | 78 | var prefix = ctx + "vehicle/vehicleReceipt"; |
73 | 79 | var userDef2 = [[${@dict.getType('probablyMaterial')}]]; |
74 | 80 | var vehicleDocumentType = [[${@dict.getType('vehicleDocumentType')}]]; |
81 | + var supplier =[[${@SupplierService.getCode()}]]; | |
75 | 82 | |
76 | 83 | // var datas = [[${@dict.getType('sys_normal_disable')}]]; |
77 | 84 | $(function() { |
... | ... | @@ -97,8 +104,8 @@ |
97 | 104 | }, |
98 | 105 | { |
99 | 106 | field : 'id', |
100 | - title : '车辆入库id', | |
101 | - sortable:true | |
107 | + title : 'id', | |
108 | + // sortable:true | |
102 | 109 | }, |
103 | 110 | { |
104 | 111 | field : 'materialBatch', |
... | ... | @@ -106,7 +113,8 @@ |
106 | 113 | }, |
107 | 114 | { |
108 | 115 | field : 'vehicleType', |
109 | - title : '单据类型' | |
116 | + title : '单据类型', | |
117 | + visible: false | |
110 | 118 | }, |
111 | 119 | { |
112 | 120 | field : 'vehicleDocumentType', |
... | ... | @@ -115,30 +123,27 @@ |
115 | 123 | return $.table.selectDictLabel(vehicleDocumentType, value); |
116 | 124 | } |
117 | 125 | }, |
118 | - // { | |
119 | - // field : 'meterialName', | |
120 | - // title : '物料名称' | |
121 | - // }, | |
122 | 126 | { |
123 | - field : 'grossWeight', | |
124 | - title : '毛重' | |
127 | + field : 'carNumber', | |
128 | + title : '车牌号' | |
125 | 129 | }, |
126 | 130 | { |
127 | - field : 'tareWeight', | |
128 | - title : '皮重' | |
131 | + field : 'vehicleName', | |
132 | + title : '司机姓名' | |
129 | 133 | }, |
130 | 134 | { |
131 | - field : 'netWeight', | |
132 | - title : '净重' | |
135 | + field : 'grossWeight', | |
136 | + title : '毛重(kg)' | |
133 | 137 | }, |
134 | 138 | { |
135 | - field : 'carNumber', | |
136 | - title : '车牌号' | |
139 | + field : 'tareWeight', | |
140 | + title : '皮重(kg)' | |
137 | 141 | }, |
138 | 142 | { |
139 | - field : 'vehicleName', | |
140 | - title : '司机姓名' | |
143 | + field : 'netWeight', | |
144 | + title : '净重(kg)' | |
141 | 145 | }, |
146 | + | |
142 | 147 | { |
143 | 148 | field : 'driverNumber', |
144 | 149 | title : '驾驶证号' |
... | ... | @@ -147,36 +152,25 @@ |
147 | 152 | field : 'cardNumber', |
148 | 153 | title : '身份证号' |
149 | 154 | }, |
150 | - // { | |
151 | - // field : 'incomingTime', | |
152 | - // title : '入厂时间' | |
153 | - // }, | |
154 | - // { | |
155 | - // field : 'type', | |
156 | - // title : '类型' | |
157 | - // }, | |
158 | - // { | |
159 | - // field : 'companyCode', | |
160 | - // title : '货主' | |
161 | - // }, | |
162 | - // { | |
163 | - // field : 'warehouseCode', | |
164 | - // title : '仓库编码' | |
165 | - // }, | |
166 | 155 | { |
167 | - field : 'userDef2', | |
168 | - title : '物料', | |
169 | - formatter: function(value, row, index) { | |
170 | - return $.table.selectDictLabel(userDef2, value); | |
171 | - } | |
156 | + field : 'materialCode', | |
157 | + title : '物料编码' | |
172 | 158 | }, |
173 | - // { | |
174 | - // field : 'type', | |
175 | - // title : '入库类型' | |
176 | - // }, | |
159 | + | |
177 | 160 | { |
178 | 161 | field : 'supplier', |
179 | - title : '供应商' | |
162 | + title : '供应商', | |
163 | + align: 'center', | |
164 | + formatter: function(value, row, index) { | |
165 | + var actions = []; | |
166 | + $.each(supplier, function(index, dict) { | |
167 | + if (dict.code == value) { | |
168 | + actions.push("<span class='badge badge-info'>" + dict.name + "</span>"); | |
169 | + return false; | |
170 | + } | |
171 | + }); | |
172 | + return actions.join(''); | |
173 | + } | |
180 | 174 | }, |
181 | 175 | { |
182 | 176 | field : 'remark', |
... | ... |
src/main/resources/templates/vehicle/vehicleShipment/gemVehicleShipment.html
src/main/resources/templates/vehicle/vehicleShipment/vehicleShipment.html
... | ... | @@ -30,6 +30,12 @@ |
30 | 30 | <li> |
31 | 31 | 身份证号:<input type="text" name="cardNumber"/> |
32 | 32 | </li> |
33 | + <li class="time" style="height: 30px"> | |
34 | + <label>创建时间: </label> | |
35 | + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/> | |
36 | + <span>-</span> | |
37 | + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/> | |
38 | + </li> | |
33 | 39 | <li> |
34 | 40 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
35 | 41 | <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('warehouse-form')"><i class="fa fa-refresh"></i> 重置</a> |
... | ... | @@ -70,19 +76,17 @@ |
70 | 76 | </div> |
71 | 77 | <div th:include="include :: footer"></div> |
72 | 78 | <script th:inline="javascript"> |
73 | - // var editFlag = [[${@permission.hasPermi('config:warehouse:edit')}]]; | |
74 | - // var removeFlag = [[${@permission.hasPermi('config:warehouse:remove')}]]; | |
75 | 79 | var prefix = ctx + "vehicle/vehicleShipment"; |
76 | - var userDef2 = [[${@dict.getType('probablyMaterial')}]]; | |
80 | + var customer = [[${@CustomerService.getCode()}]]; | |
77 | 81 | var vehicleDocumentType = [[${@dict.getType('vehicleDocumentType')}]]; |
78 | - // var datas = [[${@dict.getType('sys_normal_disable')}]]; | |
82 | + | |
79 | 83 | $(function() { |
80 | 84 | var options = { |
81 | 85 | url: prefix + "/list", |
82 | 86 | createUrl: prefix + "/add", |
83 | 87 | updateUrl: prefix + "/edit/{code}", |
84 | 88 | removeUrl: prefix + "/remove", |
85 | - modalName: "车辆入库", | |
89 | + modalName: "车辆出库", | |
86 | 90 | search: false, |
87 | 91 | columns: [ |
88 | 92 | { |
... | ... | @@ -99,10 +103,13 @@ |
99 | 103 | }, |
100 | 104 | { |
101 | 105 | field : 'id', |
102 | - title : '车辆出库id', | |
106 | + title : 'id', | |
103 | 107 | sortable:true |
104 | 108 | }, |
105 | - | |
109 | + { | |
110 | + field : 'poundNumber', | |
111 | + title : '磅单编号' | |
112 | + }, | |
106 | 113 | { |
107 | 114 | field : 'vehicleDocumentType', |
108 | 115 | title : '车辆单据类型', |
... | ... | @@ -111,44 +118,26 @@ |
111 | 118 | } |
112 | 119 | }, |
113 | 120 | { |
114 | - field : 'poundNumber', | |
115 | - title : '榜单编号' | |
116 | - }, | |
117 | - { | |
118 | - field : 'vehicleStatus', | |
119 | - title : '状态' | |
120 | - }, | |
121 | - { | |
122 | - field : 'customerCode', | |
123 | - title : '客户' | |
121 | + field : 'carNumber', | |
122 | + title : '车牌号' | |
124 | 123 | }, |
125 | 124 | { |
126 | - field : 'userDef2', | |
127 | - title : '物料', | |
128 | - formatter: function(value, row, index) { | |
129 | - return $.table.selectDictLabel(userDef2, value); | |
130 | - } | |
125 | + field : 'vehicleName', | |
126 | + title : '司机姓名' | |
131 | 127 | }, |
132 | 128 | { |
133 | 129 | field : 'grossWeight', |
134 | - title : '毛重' | |
130 | + title : '毛重(kg)' | |
135 | 131 | }, |
136 | 132 | { |
137 | 133 | field : 'tareWeight', |
138 | - title : '皮重' | |
134 | + title : '皮重(kg)' | |
139 | 135 | }, |
140 | 136 | { |
141 | 137 | field : 'netWeight', |
142 | - title : '净重量' | |
143 | - }, | |
144 | - { | |
145 | - field : 'carNumber', | |
146 | - title : '车牌号' | |
147 | - }, | |
148 | - { | |
149 | - field : 'vehicleName', | |
150 | - title : '司机姓名' | |
138 | + title : '净重(kg)' | |
151 | 139 | }, |
140 | + | |
152 | 141 | { |
153 | 142 | field : 'driverNumber', |
154 | 143 | title : '驾驶证号' |
... | ... | @@ -158,28 +147,8 @@ |
158 | 147 | title : '身份证号' |
159 | 148 | }, |
160 | 149 | { |
161 | - field : 'incomingTime', | |
162 | - title : '出厂时间' | |
163 | - }, | |
164 | - { | |
165 | - field : 'remark', | |
166 | - title : '备注' | |
167 | - }, | |
168 | - { | |
169 | - field : 'type', | |
170 | - title : '类型' | |
171 | - }, | |
172 | - { | |
173 | - field : 'companyCode', | |
174 | - title : '货主' | |
175 | - }, | |
176 | - { | |
177 | - field : 'warehouseCode', | |
178 | - title : '仓库编码' | |
179 | - }, | |
180 | - { | |
181 | - field : 'type', | |
182 | - title : '出库类型' | |
150 | + field : 'materialCode', | |
151 | + title : '物料编码' | |
183 | 152 | }, |
184 | 153 | // { |
185 | 154 | // field : 'materialCode', |
... | ... | @@ -194,6 +163,21 @@ |
194 | 163 | // title : '物料单位' |
195 | 164 | // }, |
196 | 165 | { |
166 | + field: 'customerCode', | |
167 | + title: '客户', | |
168 | + align: 'center', | |
169 | + formatter: function (value, row, index) { | |
170 | + var actions = []; | |
171 | + $.each(customer, function (index, dict) { | |
172 | + if (dict.code == value) { | |
173 | + actions.push("<span class='badge badge-info'>" + dict.name + "</span>"); | |
174 | + return false; | |
175 | + } | |
176 | + }); | |
177 | + return actions.join(''); | |
178 | + } | |
179 | + }, | |
180 | + { | |
197 | 181 | field : 'remark', |
198 | 182 | title : '备注' |
199 | 183 | }, |
... | ... |