Commit e0ad9d1e17a4145aa01de56259893cb3d118316a
Merge remote-tracking branch 'origin/develop' into develop
Showing
12 changed files
with
195 additions
and
229 deletions
src/main/java/com/huaheng/api/general/service/BarCodeApiService.java
... | ... | @@ -92,9 +92,12 @@ public class BarCodeApiService { |
92 | 92 | barCodeDetail.setCompanyCode(QuantityConstant.DEFAULT_COMPANYCODE); |
93 | 93 | barCodeDetail.setReceiptId(barCodeHeader.getId()); |
94 | 94 | barCodeDetail.setCode(detail.getCode()); |
95 | + barCodeDetail.setDayShift("day"); | |
96 | + AjaxResult ajaxResultCode = barCodeDetailService.createRegenerationCode(1); | |
97 | + String regenerationCode = (String)ajaxResultCode.getData(); | |
98 | + barCodeDetail.setRegenerationCode(regenerationCode); | |
95 | 99 | barCodeDetail.setReceiptCode(barCodeHeader.getCode()); |
96 | 100 | String materialCode = detail.getMaterialCode(); |
97 | - String materialUnit = detail.getMaterialUnit(); | |
98 | 101 | BigDecimal qty = detail.getQty(); |
99 | 102 | BigDecimal weight = detail.getWeight(); |
100 | 103 | BarCodeHeader oneBarCodeHeader = barCodeHeaderService.getOne(new LambdaQueryWrapper<BarCodeHeader>().eq(BarCodeHeader::getId, barCodeHeader.getId())); |
... | ... |
src/main/java/com/huaheng/pc/barcode/barcodeDetail/service/BarCodeDetailService.java
... | ... | @@ -3,7 +3,6 @@ package com.huaheng.pc.barcode.barcodeDetail.service; |
3 | 3 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
4 | 4 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
5 | 5 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
6 | -import com.huaheng.common.constant.QuantityConstant; | |
7 | 6 | import com.huaheng.common.exception.service.ServiceException; |
8 | 7 | import com.huaheng.common.utils.DataUtils; |
9 | 8 | import com.huaheng.common.utils.StringUtils; |
... | ... | @@ -15,8 +14,6 @@ import com.huaheng.pc.barcode.barcodeHeader.domain.BarCodeHeader; |
15 | 14 | import com.huaheng.pc.barcode.barcodeHeader.service.BarCodeHeaderService; |
16 | 15 | import com.huaheng.pc.config.material.domain.Material; |
17 | 16 | import com.huaheng.pc.config.material.service.MaterialService; |
18 | -import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail; | |
19 | -import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader; | |
20 | 17 | import org.springframework.stereotype.Service; |
21 | 18 | import org.springframework.transaction.annotation.Transactional; |
22 | 19 | |
... | ... |
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
... | ... | @@ -977,6 +977,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai |
977 | 977 | receiptContainerDetail.setRecycler(receiptDetail.getRecycler()); |
978 | 978 | receiptContainerDetail.setCountryCode(batteryBean.getCountryCode()); |
979 | 979 | receiptContainerDetail.setRemark(batteryBean.getRemark()); |
980 | + receiptContainerDetail.setMaterialUnit(receiptDetail.getMaterialUnit()); | |
980 | 981 | |
981 | 982 | if (!receiptContainerDetailService.save(receiptContainerDetail)){ |
982 | 983 | return AjaxResult.error("保存入库组盘详情失败"); |
... | ... |
src/main/resources/templates/barcode/barCodeDetail/add.html
src/main/resources/templates/barcode/barCodeHeader/add.html
... | ... | @@ -25,7 +25,7 @@ |
25 | 25 | </div> |
26 | 26 | </div> |
27 | 27 | <div class="form-group"> |
28 | - <label class="col-sm-3 control-label">成品托盘号:</label> | |
28 | + <label class="col-sm-3 control-label">托盘号:</label> | |
29 | 29 | <div class="col-sm-8"> |
30 | 30 | <input id="barCodeHeaderCode" name="barCodeHeaderCode" class="form-control" type="text"> |
31 | 31 | </div> |
... | ... |
src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
... | ... | @@ -276,7 +276,9 @@ |
276 | 276 | align: 'left', |
277 | 277 | formatter: function(value, row, index) { |
278 | 278 | var actions = []; |
279 | - actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> '); | |
279 | + if (row.firstStatus == 800 && row.lastStatus == 800) { | |
280 | + actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> '); | |
281 | + } | |
280 | 282 | actions.push('<a style="background: #b5bdc0" class="btn btn-default btn-xs" onclick="detail(\''+ row.id + '\',\''+ row.code + '\',\''+ row.receiptType + '\',\''+ row.grossWeight + '\',\''+ row.tareWeight + '\',\''+ row.netWeight + '\',\''+ row.materialBatch + '\')"><i class="fa fa-list-ul"></i>列表</a> '); |
281 | 283 | if (row.firstStatus < 100) |
282 | 284 | actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> '); |
... | ... |
src/main/resources/templates/receipt/receiving/receiving-.html
... | ... | @@ -109,7 +109,7 @@ |
109 | 109 | <!-- <li>收货重量:<input type="text" id="receiveWeight"/></li>--> |
110 | 110 | <li hidden>容器编号:<input type="text" id="containerCode"/></li> |
111 | 111 | <li hidden>库位编码:<input type="text" id="locationCoder"/></li> |
112 | - <li id="barhidden"> 成品托盘号:<input type="text" id="barCodeHeaderCode" readonly style="width: 50%"/> | |
112 | + <li id="barhidden"> 托盘号:<input type="text" id="barCodeHeaderCode" readonly style="width: 50%"/> | |
113 | 113 | <input type="hidden" id="barCodeHeaderId" /> |
114 | 114 | <button class="btn btn-sm btn-success" onclick="selectCode()">请选择</button> |
115 | 115 | </li> |
... | ... |
src/main/resources/templates/receipt/receiving/receiving.html
... | ... | @@ -109,23 +109,15 @@ |
109 | 109 | <!--组盘输入区 --> |
110 | 110 | <div> |
111 | 111 | <button class="btn btn-danger" onclick="receipt()">组   盘</button> |
112 | - | |
113 | 112 | </div> |
114 | 113 | <ul class="select-list"> |
115 | 114 | <input type="text" id="materialCode" hidden/> |
116 | 115 | <li style="display: none">id:<input type="text" id="detailId"/></li> |
117 | - <!--<select id="area" name="batteryType" class="form-control" type="text"> | |
118 | - <option value="1">库区A</option> | |
119 | - <option value="2">库区B</option> | |
120 | - <option value="3">库区C</option> | |
121 | - <option value="4">库区D</option> | |
122 | - <option value="5">库区E</option> | |
123 | - </select>--> | |
124 | 116 | <li >收货数量:<input type="text" id="receiveNum"/></li> |
125 | 117 | <!-- <li>收货重量:<input type="text" id="receiveWeight"/></li>--> |
126 | 118 | <li hidden>容器编号:<input type="text" id="containerCode"/></li> |
127 | 119 | <li hidden>库位编码:<input type="text" id="locationCoder"/></li> |
128 | - <li id="barhidden"> 成品托盘号:<input type="text" id="barCodeHeaderCode" readonly style="width: 50%"/> | |
120 | + <li id="barhidden"> 托盘号:<input type="text" id="barCodeHeaderCode" readonly style="width: 50%"/> | |
129 | 121 | <input type="hidden" id="barCodeHeaderId" /> |
130 | 122 | <button class="btn btn-sm btn-success" onclick="selectCode()">请选择</button> |
131 | 123 | </li> |
... | ... | @@ -136,15 +128,12 @@ |
136 | 128 | <option value="">--请选择--</option> |
137 | 129 | <option th:each="dict : ${batteryPackType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> |
138 | 130 | </select> |
139 | - <!--电池包类型:<input type="text" id="batteryPackType" placeholder="电池类必填"/></li>--> | |
140 | 131 | </li> |
141 | 132 | <li > |
142 | 133 | <span class="selectClass">电池类型:</span> |
143 | - <select id="batteryTypes" name="batteryTypes" class="form-control" placeholder="电池类必填"> | |
134 | + <select id="batteryTypes" name="batteryTypes" class="form-control" th:with="batteryTypes=${@dict.getType('batteryTypes')}"> | |
144 | 135 | <option value="">--请选择--</option> |
145 | - <option value="1">电池包</option> | |
146 | - <option value="2">电池模块</option> | |
147 | - <option value="3">电池单体</option> | |
136 | + <option th:each="dict : ${batteryTypes}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> | |
148 | 137 | </select> |
149 | 138 | </li> |
150 | 139 | <li > |
... | ... | @@ -202,21 +191,13 @@ |
202 | 191 | <div id="my_thumbnail" style="width:150px;height:150px;margin-left: 10px;margin-top:5px;"> |
203 | 192 | </div> |
204 | 193 | </li>--> |
205 | - | |
206 | - | |
207 | - <!--完整程度:<input type="text" id="completeness" placeholder="电池类必填"/></li>--> | |
208 | - <!--<li>电池个数:<input type="text" id="batteryQty"/></li>--> | |
209 | - | |
210 | 194 | </div> |
211 | - | |
212 | 195 | </ul> |
213 | - | |
214 | 196 | </div> |
215 | 197 | <div class="col-sm-12 table-striped-right" style="padding-top: 13px;"> |
216 | 198 | <!--需要组盘入库明细 --> |
217 | 199 | <table id="bootstrap-table" style="background: rgb(255, 255, 255);" data-mobile-responsive="true" class="table table-bordered table-hover text-nowrap"></table> |
218 | 200 | |
219 | - | |
220 | 201 | </div> |
221 | 202 | <div class="col-sm-12 select-info table-striped-bottom"> |
222 | 203 | |
... | ... | @@ -239,23 +220,23 @@ |
239 | 220 | |
240 | 221 | <table id="bootstrap-table1" data-mobile-responsive="true" |
241 | 222 | class="table table-bordered table-hover text-nowrap"></table> |
242 | - <ul class="select-list top_text"> | |
243 | - <li><span class="table-title">本物料库存</span></li> | |
244 | - </ul> | |
245 | - <table id="bootstrap-table2" data-mobile-responsive="true" | |
246 | - class="table table-bordered table-hover text-nowrap"></table> | |
223 | +<!-- <ul class="select-list top_text">--> | |
224 | +<!-- <li><span class="table-title">本物料库存</span></li>--> | |
225 | +<!-- </ul>--> | |
226 | +<!-- <table id="bootstrap-table2" data-mobile-responsive="true"--> | |
227 | +<!-- class="table table-bordered table-hover text-nowrap"></table>--> | |
247 | 228 | |
248 | - <ul class="select-list top_text"> | |
249 | - <li>空容器类型:<select name="type" id="containerType" th:with="typeList=${@containerType.getCode()}"> | |
250 | - <option value="">所有</option> | |
251 | - <option th:each="c:${typeList}" th:text="${c['name']}" th:value="${c['code']}"></option> | |
252 | - </select></li> | |
253 | - <li> | |
254 | - <button class="btn btn-sm btn-success" onclick="containerTypeSearch()">搜索</button> | |
255 | - </li> | |
256 | - </ul> | |
257 | - <table id="bootstrap-table3" data-mobile-responsive="true" | |
258 | - class="table table-bordered table-hover text-nowrap"></table> | |
229 | +<!-- <ul class="select-list top_text">--> | |
230 | +<!-- <li>空容器类型:<select name="type" id="containerType" th:with="typeList=${@containerType.getCode()}">--> | |
231 | +<!-- <option value="">所有</option>--> | |
232 | +<!-- <option th:each="c:${typeList}" th:text="${c['name']}" th:value="${c['code']}"></option>--> | |
233 | +<!-- </select></li>--> | |
234 | +<!-- <li>--> | |
235 | +<!-- <button class="btn btn-sm btn-success" onclick="containerTypeSearch()">搜索</button>--> | |
236 | +<!-- </li>--> | |
237 | +<!-- </ul>--> | |
238 | +<!-- <table id="bootstrap-table3" data-mobile-responsive="true"--> | |
239 | +<!-- class="table table-bordered table-hover text-nowrap"></table>--> | |
259 | 240 | </div> |
260 | 241 | </div> |
261 | 242 | |
... | ... | @@ -272,9 +253,10 @@ |
272 | 253 | var Types = [[${@dict.getType('taskType')}]]; |
273 | 254 | var Status=[[${@dict.getType('receiptContainerHeaderStatus')}]]; |
274 | 255 | var inventoryStatus =[[${@dict.getType('inventoryStatus')}]]; |
275 | - var batteryPackType =[[${@dict.getType('batteryPackType')}]]; | |
256 | + var batteryTypes = [[${@dict.getType('batteryTypes')}]]; | |
257 | + var batteryPackType = [[${@dict.getType('batteryPackType')}]]; | |
276 | 258 | var supplier =[[${@SupplierService.getCode()}]]; |
277 | - //var batteryTypes =[[${@dict.getType('batteryTypes')}]]; | |
259 | + var completeness = [[${@dict.getType('completeness')}]]; | |
278 | 260 | |
279 | 261 | connect(); |
280 | 262 | $(function () { |
... | ... | @@ -335,8 +317,7 @@ |
335 | 317 | inventorySts: value.data[i].inventorySts, |
336 | 318 | materialUnit: value.data[i].materialUnit, |
337 | 319 | electricQuantity: value.data[i].electricQuantity, |
338 | - batteryPackageWeight: value.data[i].batteryPackageWeight | |
339 | - | |
320 | + batteryPackageWeight: value.data[i].batteryPackageWeight, | |
340 | 321 | } |
341 | 322 | }); |
342 | 323 | } |
... | ... | @@ -508,22 +489,10 @@ |
508 | 489 | field : 'openQty', |
509 | 490 | title : '已入数量' |
510 | 491 | }, |
511 | - // { | |
512 | - // field : 'totalWeight', | |
513 | - // title : '单据重量' | |
514 | - // }, | |
515 | - /* { | |
516 | - field : 'batteryPackageWeight', | |
517 | - title : '电池包重量' | |
518 | - },*/ | |
519 | 492 | { |
520 | 493 | field : 'electricQuantity', |
521 | 494 | title : '电池包电量' |
522 | 495 | }, |
523 | - // { | |
524 | - // field : 'openWeight', | |
525 | - // title : '已入重量' | |
526 | - // }, | |
527 | 496 | { |
528 | 497 | field : 'inventorySts', |
529 | 498 | title : '库存状态' |
... | ... | @@ -579,6 +548,33 @@ |
579 | 548 | } |
580 | 549 | }, |
581 | 550 | { |
551 | + field : 'status', | |
552 | + title : '组盘状态', | |
553 | + align: 'center', | |
554 | + formatter: function(value, row, index) { | |
555 | + return $.table.selectDictLabel(Status, value); | |
556 | + } | |
557 | + }, | |
558 | + { | |
559 | + field : 'batteryPackTwoCode', | |
560 | + title : '电池包二维码' | |
561 | + }, | |
562 | + { | |
563 | + field : 'containerCode', | |
564 | + title : '容器编号', | |
565 | + visible: false | |
566 | + }, | |
567 | + { | |
568 | + field : 'id', | |
569 | + title : '组盘明细id', | |
570 | + visible: false | |
571 | + }, | |
572 | + { | |
573 | + field : 'receiptContainerId', | |
574 | + title : '组盘头id', | |
575 | + visible: false | |
576 | + }, | |
577 | + { | |
582 | 578 | field : 'materialCode', |
583 | 579 | title : '物料编码' |
584 | 580 | }, |
... | ... | @@ -587,50 +583,32 @@ |
587 | 583 | title:"物料名称" |
588 | 584 | }, |
589 | 585 | |
590 | - // { | |
591 | - // field:"materialSpec", | |
592 | - // title:"物料规格" | |
593 | - // }, | |
594 | 586 | { |
595 | - field : 'qty', | |
596 | - title : '数量' | |
587 | + field:"materialSpec", | |
588 | + title:"物料规格" | |
597 | 589 | }, |
598 | 590 | { |
599 | - field : 'batteryPackTwoCode', | |
600 | - title : '电池二维码' | |
591 | + field: 'materialUnit', | |
592 | + title: '物料单位' | |
601 | 593 | }, |
602 | 594 | { |
603 | - field : 'poundCode', | |
604 | - title : '磅单编号' | |
595 | + field : 'qty', | |
596 | + title : '数量' | |
605 | 597 | }, |
606 | - { | |
607 | - field : 'batteryTypes', | |
608 | - title : '电池类型', | |
609 | - formatter: function(value, row, index) { | |
610 | - var showhtml=''; | |
611 | - if(value!=''&&value!=undefined&&value!=null){ | |
612 | - if(value==1){ | |
613 | - showhtml='电池包'; | |
614 | - }else if (value ==2){ | |
615 | - showhtml='电池模块'; | |
616 | - }else if(value==3){ | |
617 | - showhtml='电池单体'; | |
618 | - } | |
619 | - } | |
620 | - return showhtml; | |
621 | 598 | |
622 | - } | |
599 | + { | |
600 | + field : 'electricQuantity', | |
601 | + title : '电池包电量' | |
623 | 602 | }, |
624 | 603 | { |
625 | - field : 'batteryPackType', | |
626 | - title : '电池种类', | |
604 | + field : 'supplierCode', | |
605 | + title : '供应商', | |
606 | + align: 'center', | |
627 | 607 | formatter: function(value, row, index) { |
628 | - console.log(value) | |
629 | 608 | var actions = []; |
630 | - $.each(batteryPackType, function(index, dict) { | |
631 | - console.log(dict.dictValue) | |
632 | - if (dict.dictValue == value) { | |
633 | - actions.push("<span class='badge badge-info'>" + dict.dictLabel + "</span>"); | |
609 | + $.each(supplier, function(index, dict) { | |
610 | + if (dict.code == value) { | |
611 | + actions.push("<span class='badge badge-info'>" + dict.name + "</span>"); | |
634 | 612 | return false; |
635 | 613 | } |
636 | 614 | }); |
... | ... | @@ -639,76 +617,60 @@ |
639 | 617 | }, |
640 | 618 | { |
641 | 619 | field : 'materialBatch', |
642 | - title : '原料批号' | |
620 | + title : '原料批号', | |
643 | 621 | }, |
644 | 622 | { |
645 | - field : 'batteryPackTwoCode', | |
646 | - title : '供应商', | |
623 | + field : 'completeness', | |
624 | + title : '完整程度', | |
647 | 625 | formatter: function(value, row, index) { |
648 | - var actions = []; | |
649 | - $.each(supplier, function(index, dict) { | |
650 | - if (dict.code == value) { | |
651 | - actions.push("<span class='badge badge-info'>" + dict.name + "</span>"); | |
652 | - return false; | |
653 | - } | |
654 | - }); | |
655 | - return actions.join(''); | |
626 | + return $.table.selectDictLabel(completeness, value); | |
656 | 627 | } |
657 | - | |
658 | 628 | }, |
659 | 629 | { |
660 | - field : 'countryCode', | |
661 | - title : '国家编码' | |
630 | + field : 'batteryTypes', | |
631 | + title : '电池产品类型', | |
632 | + formatter: function(value, row, index) { | |
633 | + return $.table.selectDictLabel(batteryTypes, value); | |
634 | + } | |
635 | + }, | |
636 | + { | |
637 | + field : 'batteryPackType', | |
638 | + title : '电池包种类', | |
639 | + align: 'center', | |
640 | + visible:true, | |
641 | + formatter: function(value, row, index) { | |
642 | + return $.table.selectDictLabel(batteryPackType, value); | |
643 | + } | |
644 | + }, | |
645 | + { | |
646 | + field : 'poundCode', | |
647 | + title : '过磅单号' , | |
662 | 648 | }, |
663 | 649 | { |
664 | 650 | field : 'recycler', |
665 | - title : '回收人' | |
651 | + title : '回收人' , | |
666 | 652 | }, |
667 | 653 | { |
668 | - field : 'containerCode', | |
669 | - title : '容器编号' | |
654 | + field : 'countryCode', | |
655 | + title : '国家编码' , | |
670 | 656 | }, |
671 | 657 | { |
672 | - field : 'id', | |
673 | - title : '组盘明细id', | |
674 | - visible: false | |
658 | + field : 'materialGrossWeight', | |
659 | + title : '电池毛重' , | |
675 | 660 | }, |
676 | 661 | { |
677 | - field : 'receiptContainerId', | |
678 | - title : '组盘头id', | |
679 | - visible: false | |
662 | + field : 'materialTareWeight', | |
663 | + title : '电池皮重' , | |
680 | 664 | }, |
681 | - | |
682 | - | |
683 | 665 | { |
684 | - field : 'electricQuantity', | |
685 | - title : '电池包电量' | |
666 | + field : 'materialNetWeight', | |
667 | + title : '电池净重' , | |
686 | 668 | }, |
687 | - // { | |
688 | - // field : 'batteryPackageWeight', | |
689 | - // title : '电池包重量' | |
690 | - // }, | |
691 | - // { | |
692 | - // field : 'weights', | |
693 | - // title : '重量' | |
694 | - // }, | |
695 | - // { | |
696 | - // field : 'sn', | |
697 | - // title : '序列号' | |
698 | - // }, | |
699 | - // { | |
700 | - // field : 'project', | |
701 | - // title : '项目号', | |
702 | - // visible: false | |
703 | - // }, | |
704 | 669 | { |
705 | - field : 'status', | |
706 | - title : '组盘状态', | |
707 | - align: 'center', | |
708 | - formatter: function(value, row, index) { | |
709 | - return $.table.selectDictLabel(Status, value); | |
710 | - } | |
670 | + field : 'remark', | |
671 | + title : '电池包入库备注' , | |
711 | 672 | }, |
673 | + | |
712 | 674 | { |
713 | 675 | field : 'receiptDetailId', |
714 | 676 | title : '入库单明细id' |
... | ... |
src/main/resources/templates/receipt/receiving/selectBarCodeHeader.html
... | ... | @@ -14,7 +14,7 @@ |
14 | 14 | 入库单号:<input type="text" name="code"/> |
15 | 15 | </li> |
16 | 16 | <li> |
17 | - 成品托盘号:<input type="text" name="barCodeHeaderCode"/> | |
17 | + 托盘号:<input type="text" name="barCodeHeaderCode"/> | |
18 | 18 | </li> |
19 | 19 | <li> |
20 | 20 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
... | ... |
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
... | ... | @@ -108,14 +108,14 @@ |
108 | 108 | shiro:hasPermission="shipment:bill:remove"> |
109 | 109 | <i class="fa fa-trash-o"></i> 删除 |
110 | 110 | </a> |
111 | -<!-- <a class="btn btn-outline btn-success btn-rounded" onclick="review()"--> | |
112 | -<!-- shiro:hasPermission="shipment:bill:edit">--> | |
113 | -<!-- <i class="fa fa-plus"></i> 订单审核--> | |
114 | -<!-- </a>--> | |
115 | -<!-- <a class="btn btn-outline btn-success btn-rounded" onclick="wave()"--> | |
116 | -<!-- shiro:hasPermission="shipment:bill:wave">--> | |
117 | -<!-- <i class="fa fa-plus"></i> 加入波次--> | |
118 | -<!-- </a>--> | |
111 | + <!-- <a class="btn btn-outline btn-success btn-rounded" onclick="review()"--> | |
112 | + <!-- shiro:hasPermission="shipment:bill:edit">--> | |
113 | + <!-- <i class="fa fa-plus"></i> 订单审核--> | |
114 | + <!-- </a>--> | |
115 | + <!-- <a class="btn btn-outline btn-success btn-rounded" onclick="wave()"--> | |
116 | + <!-- shiro:hasPermission="shipment:bill:wave">--> | |
117 | + <!-- <i class="fa fa-plus"></i> 加入波次--> | |
118 | + <!-- </a>--> | |
119 | 119 | </div> |
120 | 120 | <table id="bootstrap-table" data-mobile-responsive="true" |
121 | 121 | class="table table-bordered table-hover text-nowrap"></table> |
... | ... | @@ -146,13 +146,13 @@ |
146 | 146 | <li>上游订单号:<input type="text" name="shipmentSourceCode" |
147 | 147 | id="shipmentSourceCode"></li> |
148 | 148 | <li>毛重:<input type="text" name="grossWeight" |
149 | - id="grossWeight"></li> | |
149 | + id="grossWeight"></li> | |
150 | 150 | <li>皮重:<input type="text" name="tareWeight" |
151 | 151 | id="tareWeight"></li> |
152 | 152 | <li>净重:<input type="text" name="netWeight" |
153 | 153 | id="netWeight"></li> |
154 | 154 | <li>磅单编号:<input type="text" name="poundNumber" |
155 | - id="poundNumber"></li> | |
155 | + id="poundNumber"></li> | |
156 | 156 | <li>订单平台:<input type="text" name="shipmentSourcePlatform" |
157 | 157 | id="shipmentSourcePlatform"></li> |
158 | 158 | <li>出库单类型:<input type="text" name="shipmentType" id="shipmentType"></li> |
... | ... | @@ -250,14 +250,14 @@ |
250 | 250 | shiro:hasPermission="shipment:shippingCombination:combination"> |
251 | 251 | <i class="fa fa-hand-lizard-o"></i> 手动组盘 |
252 | 252 | </a> |
253 | -<!-- <a class="btn btn-outline btn-primary btn-rounded auto-shipment" onclick="Toshipping(1)"--> | |
254 | -<!-- shiro:hasPermission="shipment:shippingCombination:combination">--> | |
255 | -<!-- <i class="fa fa-code-fork"></i> 自动组盘--> | |
256 | -<!-- </a>--> | |
257 | -<!-- <a class="btn btn-outline btn-primary btn-rounded auto-shipment-task" onclick="Toshipping(2)"--> | |
258 | -<!-- shiro:hasPermission="shipment:shippingCombination:combination">--> | |
259 | -<!-- <i class="fa fa-code-fork"></i> 自动组盘并生成任务--> | |
260 | -<!-- </a>--> | |
253 | + <!-- <a class="btn btn-outline btn-primary btn-rounded auto-shipment" onclick="Toshipping(1)"--> | |
254 | + <!-- shiro:hasPermission="shipment:shippingCombination:combination">--> | |
255 | + <!-- <i class="fa fa-code-fork"></i> 自动组盘--> | |
256 | + <!-- </a>--> | |
257 | + <!-- <a class="btn btn-outline btn-primary btn-rounded auto-shipment-task" onclick="Toshipping(2)"--> | |
258 | + <!-- shiro:hasPermission="shipment:shippingCombination:combination">--> | |
259 | + <!-- <i class="fa fa-code-fork"></i> 自动组盘并生成任务--> | |
260 | + <!-- </a>--> | |
261 | 261 | </div> |
262 | 262 | <table id="bootstrap-table-detail" data-row-style="rowStyle" data-mobile-responsive="true" |
263 | 263 | class="table table-bordered table-hover text-nowrap"></table> |
... | ... | @@ -310,19 +310,22 @@ |
310 | 310 | checkbox: true |
311 | 311 | }, |
312 | 312 | { |
313 | - title: '操作1', | |
313 | + title: '操作', | |
314 | 314 | align: 'center', |
315 | 315 | formatter: function (value, row, index) { |
316 | 316 | var actions = []; |
317 | + if (row.firstStatus == 500 && row.lastStatus == 500) { | |
318 | + actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> '); | |
319 | + } | |
317 | 320 | if (row.lastStatus >= 200) |
318 | - actions.push('<a style="background: #b5bdc0" class="btn btn-default btn-xs" onclick="detail(\''+ row.id + '\',\''+ row.code + '\',\''+ row.receiptType + '\',\''+ row.grossWeight + '\',\''+ row.tareWeight + '\',\''+ row.netWeight + '\',\''+ row.materialBatch + '\')"><i class="fa fa-list-ul"></i>列表</a> '); | |
319 | - actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> '); | |
321 | + actions.push('<a style="background: #b5bdc0" class="btn btn-default btn-xs" onclick="detail(\'' + row.id + '\',\'' + row.code + '\',\'' + row.receiptType + '\',\'' + row.grossWeight + '\',\'' + row.tareWeight + '\',\'' + row.netWeight + '\',\'' + row.materialBatch + '\')"><i class="fa fa-list-ul"></i>列表</a> '); | |
322 | + | |
320 | 323 | // actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\',\'' + row.code + '\')"><i class="fa fa-list-ul"></i>列表</a> '); |
321 | 324 | if (row.firstStatus < 100) { |
322 | 325 | actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); |
323 | 326 | } |
324 | 327 | if (row.firstStatus == 500 && row.lastStatus == 500) { |
325 | - actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="receive(\''+row.id+'\')"><i class="fa fa-upload"></i>回传</a>'); | |
328 | + actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="receive(\'' + row.id + '\')"><i class="fa fa-upload"></i>回传</a>'); | |
326 | 329 | } |
327 | 330 | return actions.join(''); |
328 | 331 | } |
... | ... | @@ -376,14 +379,14 @@ |
376 | 379 | // } |
377 | 380 | // }, |
378 | 381 | { |
379 | - field : 'referId', | |
380 | - title : '上游单号fid', | |
381 | - sortable:true | |
382 | + field: 'referId', | |
383 | + title: '上游单号fid', | |
384 | + sortable: true | |
382 | 385 | }, |
383 | 386 | { |
384 | - field : 'referCode', | |
385 | - title : '上游单号fbillno', | |
386 | - sortable:true | |
387 | + field: 'referCode', | |
388 | + title: '上游单号fbillno', | |
389 | + sortable: true | |
387 | 390 | }, |
388 | 391 | // { |
389 | 392 | // field: 'projectCode', |
... | ... | @@ -476,7 +479,7 @@ |
476 | 479 | title: '更新用户', |
477 | 480 | visible: false |
478 | 481 | }, |
479 | -] | |
482 | + ] | |
480 | 483 | }; |
481 | 484 | $.table.init(options); |
482 | 485 | }); |
... | ... | @@ -511,7 +514,7 @@ |
511 | 514 | actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); |
512 | 515 | } |
513 | 516 | if (row.firstStatus == 500 && row.lastStatus == 500) { |
514 | - actions.push('<a class="btn btn-info btn-xs ' + receiveFlag + '" href="#" onclick="receive(\''+row.id+'\')"><i class="fa fa-upload"></i>回传</a>'); | |
517 | + actions.push('<a class="btn btn-info btn-xs ' + receiveFlag + '" href="#" onclick="receive(\'' + row.id + '\')"><i class="fa fa-upload"></i>回传</a>'); | |
515 | 518 | } |
516 | 519 | return actions.join(''); |
517 | 520 | } |
... | ... | @@ -533,24 +536,24 @@ |
533 | 536 | title: '物料名称' |
534 | 537 | }, |
535 | 538 | { |
536 | - field : 'materialUnit', | |
537 | - title : '物料单位' | |
539 | + field: 'materialUnit', | |
540 | + title: '物料单位' | |
538 | 541 | }, |
539 | 542 | { |
540 | - field : 'grossWeight', | |
541 | - title : '毛重', | |
543 | + field: 'grossWeight', | |
544 | + title: '毛重', | |
542 | 545 | }, |
543 | 546 | { |
544 | - field : 'tareWeight', | |
545 | - title : '皮重', | |
547 | + field: 'tareWeight', | |
548 | + title: '皮重', | |
546 | 549 | }, |
547 | 550 | { |
548 | - field : 'netWeight', | |
549 | - title : '净重', | |
551 | + field: 'netWeight', | |
552 | + title: '净重', | |
550 | 553 | }, |
551 | 554 | { |
552 | - field : 'poundNumber', | |
553 | - title : '磅单编号', | |
555 | + field: 'poundNumber', | |
556 | + title: '磅单编号', | |
554 | 557 | }, |
555 | 558 | |
556 | 559 | // { |
... | ... | @@ -656,7 +659,7 @@ |
656 | 659 | field: 'lastUpdatedBy', |
657 | 660 | title: '更新用户' |
658 | 661 | } |
659 | -] | |
662 | + ] | |
660 | 663 | } |
661 | 664 | ); |
662 | 665 | |
... | ... | @@ -694,13 +697,13 @@ |
694 | 697 | |
695 | 698 | |
696 | 699 | /*入库单列表-详细*/ |
697 | - function detail(id, code,grossWeight,netWeight,tareWeight,poundNumber) { | |
700 | + function detail(id, code, grossWeight, netWeight, tareWeight, poundNumber) { | |
698 | 701 | shipmentId = id; |
699 | 702 | shipmentCode = code; |
700 | - grossWeight=grossWeight; | |
701 | - netWeight=netWeight; | |
702 | - tareWeight=tareWeight; | |
703 | - poundNumber=poundNumber; | |
703 | + grossWeight = grossWeight; | |
704 | + netWeight = netWeight; | |
705 | + tareWeight = tareWeight; | |
706 | + poundNumber = poundNumber; | |
704 | 707 | $("#myTab li").removeClass("active"); |
705 | 708 | $("#tabHeader").removeClass("in active"); |
706 | 709 | $("#myTab li:eq(1)").addClass("active"); |
... | ... | @@ -782,7 +785,7 @@ |
782 | 785 | + "&tareWeight=" + $('#tareWeight').val() |
783 | 786 | + "&netWeight=" + $('#netWeight').val() |
784 | 787 | + "£Number=" + $('#poundNumber').val() |
785 | - +"&sourceCode=" + $('#shipmentSourceCode').val(); | |
788 | + + "&sourceCode=" + $('#shipmentSourceCode').val(); | |
786 | 789 | $.modal.open("添加", url); |
787 | 790 | } |
788 | 791 | } |
... | ... | @@ -794,8 +797,8 @@ |
794 | 797 | } |
795 | 798 | |
796 | 799 | function receive(id) { |
797 | - var url = prefix+"/receive"; | |
798 | - var data = { "id": id}; | |
800 | + var url = prefix + "/receive"; | |
801 | + var data = {"id": id}; | |
799 | 802 | $.operate.submit(url, "post", "json", data); |
800 | 803 | } |
801 | 804 | |
... | ... | @@ -921,46 +924,47 @@ |
921 | 924 | }; |
922 | 925 | $.ajax(config) |
923 | 926 | } |
927 | + | |
924 | 928 | /** |
925 | 929 | * 批量绑定车辆信息 |
926 | 930 | */ |
927 | - function bindCar(){ | |
928 | - var rows=$("#bootstrap-table-detail").bootstrapTable('getSelections'); | |
931 | + function bindCar() { | |
932 | + var rows = $("#bootstrap-table-detail").bootstrapTable('getSelections'); | |
929 | 933 | if (rows.length == 0) { |
930 | 934 | $.modal.alertWarning("请至少选择一条记录"); |
931 | 935 | return; |
932 | 936 | } |
933 | - $.modal.confirm("确认要绑定选中的" + rows.length + "条数据吗?", function() { | |
937 | + $.modal.confirm("确认要绑定选中的" + rows.length + "条数据吗?", function () { | |
934 | 938 | var ids = ""; |
935 | - for(var i=0; i<rows.length; i++) { | |
939 | + for (var i = 0; i < rows.length; i++) { | |
936 | 940 | ids = ids + rows[i].id + "," |
937 | 941 | } |
938 | - var url = ctx + "vehicle/vehicleShipment/bindVehicleShipment/"+ids; | |
939 | - var winObj = $.modal.open("绑定车辆" , url); | |
942 | + var url = ctx + "vehicle/vehicleShipment/bindVehicleShipment/" + ids; | |
943 | + var winObj = $.modal.open("绑定车辆", url); | |
940 | 944 | }) |
941 | 945 | } |
942 | 946 | |
943 | 947 | /** |
944 | 948 | * 解绑车辆 |
945 | 949 | */ |
946 | - function unbindCar(){ | |
947 | - var rows=$("#bootstrap-table-detail").bootstrapTable('getSelections'); | |
950 | + function unbindCar() { | |
951 | + var rows = $("#bootstrap-table-detail").bootstrapTable('getSelections'); | |
948 | 952 | if (rows.length == 0) { |
949 | 953 | $.modal.alertWarning("请至少选择一条记录"); |
950 | 954 | return; |
951 | 955 | } |
952 | - $.modal.confirm("确认要解除绑定选中的" + rows.length + "条数据吗?", function() { | |
956 | + $.modal.confirm("确认要解除绑定选中的" + rows.length + "条数据吗?", function () { | |
953 | 957 | var ids = ""; |
954 | - for(var i=0; i<rows.length; i++) { | |
958 | + for (var i = 0; i < rows.length; i++) { | |
955 | 959 | ids = ids + rows[i].id + "," |
956 | 960 | } |
957 | - var url = ctx + "shipment/shipmentDetail/unbindCar/"+ids.substring(0, ids.length-1); | |
961 | + var url = ctx + "shipment/shipmentDetail/unbindCar/" + ids.substring(0, ids.length - 1); | |
958 | 962 | var config = { |
959 | 963 | url: url, |
960 | 964 | type: "post", |
961 | 965 | dataType: "json", |
962 | 966 | success: function (result) { |
963 | - if(result.code==web_status.SUCCESS){ | |
967 | + if (result.code == web_status.SUCCESS) { | |
964 | 968 | $.modal.msgSuccess(result.msg); |
965 | 969 | loadDetail(); |
966 | 970 | } |
... | ... | @@ -986,7 +990,7 @@ |
986 | 990 | type: 'post', |
987 | 991 | data: { |
988 | 992 | shipmentCode, |
989 | - code:$("#code").val() | |
993 | + code: $("#code").val() | |
990 | 994 | }, |
991 | 995 | success: function (res) { |
992 | 996 | if (res.code === 200) { |
... | ... | @@ -997,7 +1001,7 @@ |
997 | 1001 | } |
998 | 1002 | } |
999 | 1003 | }); |
1000 | - }else if(flag == 1){ | |
1004 | + } else if (flag == 1) { | |
1001 | 1005 | storage.auto = flag; |
1002 | 1006 | createMenuItem(url, "出库自动组盘"); |
1003 | 1007 | parent.$('.tabReload').click(); |
... | ... | @@ -1012,7 +1016,7 @@ |
1012 | 1016 | tareWeight = $("#bootstrap-table tr:eq(1) td:eq(2)").text(); |
1013 | 1017 | |
1014 | 1018 | } |
1015 | - detail(shipmentId, shipmentCode,tareWeight); | |
1019 | + detail(shipmentId, shipmentCode, tareWeight); | |
1016 | 1020 | }); |
1017 | 1021 | |
1018 | 1022 | /* 点击主表面板 */ |
... | ... |
src/main/resources/templates/task/taskHeader/taskHeader.html
... | ... | @@ -74,11 +74,11 @@ |
74 | 74 | <a class="btn btn-outline btn-success btn-rounded" onclick="print()" shiro:hasPermission="task:task:execute"> |
75 | 75 | <i class="fa fa-print"></i> 打印 |
76 | 76 | </a> |
77 | -<!-- <a class="btn btn-outline btn-primary btn-rounded" onclick="batchExecute()">--> | |
78 | -<!-- <i class="fa fa-send"></i> 批量执行--> | |
79 | -<!-- </a>--> | |
77 | + <!-- <a class="btn btn-outline btn-primary btn-rounded" onclick="batchExecute()">--> | |
78 | + <!-- <i class="fa fa-send"></i> 批量执行--> | |
79 | + <!-- </a>--> | |
80 | 80 | <a class="btn btn-outline btn-primary btn-rounded" onclick="batchComplete()" shiro:hasPermission="task:task:completeTaskByWMS"> |
81 | - <i class="fa fa-check"></i> 批量完成 | |
81 | + <i class="fa fa-check"></i> 批量完成 | |
82 | 82 | </a> |
83 | 83 | <a class="btn btn-outline btn-danger btn-rounded" onclick="batchRemoveHead()"> |
84 | 84 | <i class="fa fa-remove"></i>批量取消 |
... | ... | @@ -216,7 +216,7 @@ |
216 | 216 | }, |
217 | 217 | { |
218 | 218 | field : 'barCodeHeaderCode', |
219 | - title : '成品托盘号' , | |
219 | + title : '托盘号' , | |
220 | 220 | }, |
221 | 221 | // { |
222 | 222 | // field : 'batteryPackageWeight', |
... | ... | @@ -432,16 +432,16 @@ |
432 | 432 | return $.table.selectDictLabel(batteryPackType, value); |
433 | 433 | } |
434 | 434 | }, |
435 | - { | |
436 | - field : 'fromLocation', | |
437 | - title : '源库位', | |
438 | - sortable:true | |
439 | - }, | |
440 | - { | |
441 | - field : 'toLocation', | |
442 | - title : '目的库位', | |
443 | - sortable:true | |
444 | - }, | |
435 | + // { | |
436 | + // field : 'fromLocation', | |
437 | + // title : '源库位', | |
438 | + // sortable:true | |
439 | + // }, | |
440 | + // { | |
441 | + // field : 'toLocation', | |
442 | + // title : '目的库位', | |
443 | + // sortable:true | |
444 | + // }, | |
445 | 445 | { |
446 | 446 | field : 'poundCode', |
447 | 447 | title : '过磅单号' , |
... | ... | @@ -470,9 +470,6 @@ |
470 | 470 | field : 'remark', |
471 | 471 | title : '电池包入库备注' , |
472 | 472 | }, |
473 | - | |
474 | - | |
475 | - | |
476 | 473 | // { |
477 | 474 | // field : 'weights', |
478 | 475 | // title : '重量' |
... | ... |