wms / wms_shandonghaiwang · Commits

Commit d658c65f74f071383d4d5e836a587c729c315b4f

Authored by 易文鹏
1 parent 76631c05

feat:将出库单和历史出库单的母件编码和合并前单号改为文本域

Inline Side-by-side
Showing 4 changed files with 48 additions and 55 deletions
src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
  View file @d658c65
... ... @@ -40,38 +40,30 @@ import java.util.stream.Collectors;
40 40  
41 41 @Service
42 42 public class MesServiceImpl implements IMesService {
43   -
44 43 @Resource
45 44 private ReceiptHeaderService receiptHeaderService;
46   -
47 45 @Resource
48 46 private ShipmentHeaderHistoryService shipmentHeaderHistoryService;
49 47 @Resource
50 48 private ReceiptHeaderHistoryService receiptHeaderHistoryService;
51 49 @Resource
52 50 private ReceiptDetailService receiptDetailService;
53   -
54 51 @Resource
55 52 private ShipmentHeaderService shipmentHeaderService;
56   -
57 53 @Resource
58 54 private ShipmentDetailService shipmentDetailService;
59   -
60 55 @Resource
61 56 private InventoryDetailService inventoryDetailService;
62   -
63 57 @Resource
64 58 private TaskDetailService taskDetailService;
65   -
66 59 @Resource
67 60 private InventoryTransactionService inventoryTransactionService;
68   -
69 61 @Resource
70 62 private MaterialService materialService;
71   -
72 63 @Resource
73 64 private FlatWarehouseMaterialService flatWarehouseMaterialService;
74 65  
  66 +
75 67 @Override
76 68 @Transactional(rollbackFor = Exception.class)
77 69 public AjaxResult receipt(ReceiptDTO receiptDTO) {
... ... @@ -116,7 +108,6 @@ public class MesServiceImpl implements IMesService {
116 108 throw new ServiceException("生成入库单头失败");
117 109 }
118 110  
119   -
120 111 List<ReceiptDetail> shipemtnDetailList = new ArrayList<>();
121 112 for (Detail detail : details) {
122 113 ReceiptDetail receiptDetail = new ReceiptDetail();
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
  View file @d658c65
... ... @@ -97,7 +97,6 @@ public class ShipmentTaskService {
97 97 private ConfigService configService;
98 98 @Resource
99 99 private MesReceiptController mesReceiptController;
100   -
101 100 @Resource
102 101 private MaterialService materialService;
103 102 @Resource
... ...
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
  View file @d658c65
... ... @@ -61,19 +61,6 @@
61 61 th:value="${e['code']}"></option>
62 62 </select>
63 63 </li>
64   - <!-- <li>-->
65   - <!-- 货主：-->
66   - <!-- <select id="companyCode" name="companyCode"-->
67   - <!-- th:with="list=${@companyService.getCode()}">-->
68   - <!-- <option value="">所有</option>-->
69   - <!-- <option th:each="item : ${list}" th:text="${item['name']}"-->
70   - <!-- th:value="${item['code']}"-->
71   - <!-- th:attr=" code = ${item['code']}"></option>-->
72   - <!-- </select>-->
73   - <!-- </li>-->
74   - <!-- <li>-->
75   - <!-- 上游单号：<input type="text" name="referCode"/>-->
76   - <!-- </li>-->
77 64 <li>
78 65 通知单号：<input type="text" name="noticeNo"/>
79 66 </li>
... ... @@ -601,14 +588,7 @@
601 588 field: 'noticeNo',
602 589 title: '通知单号',
603 590 },
604   - {
605   - field: 'superiorCode',
606   - title: '母件编码',
607   - },
608   - {
609   - field: 'superiorName',
610   - title: '母件名称',
611   - },
  591 +
612 592 {
613 593 field: 'projectCode',
614 594 title: '项目号',
... ... @@ -636,16 +616,6 @@
636 616 visible: false
637 617 },
638 618 {
639   - field: 'route',
640   - title: '路线',
641   - visible: false,
642   - },
643   - {
644   - field: 'waveId',
645   - title: '波次号',
646   - visible: false
647   - },
648   - {
649 619 field: 'processType',
650 620 title: '调整单号',
651 621 },
... ... @@ -672,8 +642,32 @@
672 642 visible: true
673 643 },
674 644 {
  645 + field: 'superiorName',
  646 + title: '母件名称',
  647 + },
  648 + {
  649 + field: 'superiorCode',
  650 + title: '母件编码',
  651 + formatter: function (value, row, index) {
  652 + var actions = [];
  653 + if (value == undefined || value == '')
  654 + value = " "
  655 + else
  656 + actions.push('<pre style="max-height:50px; white-space: pre-wrap; width:500px">' + value + '</pre>')
  657 + return actions.join(" ")
  658 + }
  659 + },
  660 + {
675 661 field: 'recordCode',
676 662 title: '合并前单号',
  663 + formatter: function (value, row, index) {
  664 + var actions = [];
  665 + if (value == undefined || value == '')
  666 + value = " "
  667 + else
  668 + actions.push('<pre style="max-height:50px; white-space: pre-wrap; width:500px">' + value + '</pre>')
  669 + return actions.join(" ")
  670 + }
677 671 },
678 672 {
679 673 field: 'materialColor',
... ...
src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
  View file @d658c65
... ... @@ -371,17 +371,6 @@
371 371 formatter: function (value, row, index) {
372 372 var actions = [];
373 373 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> ');
374   - // actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\',\'' + row.code + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
375   - // if (row.lastStatus < 500) {
376   - // actions.push('<a class="btn btn-info btn-xs ' + postFlag + '" href="#" onclick="posting(\'' + row.id + '\')"><i class="fa fa-edit"></i>结束</a> ');
377   - // }
378   - // if (row.firstStatus < 100) {
379   - // // actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
380   - // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
381   - // }
382   - // if (row.firstStatus == 500 && row.lastStatus == 500) {
383   - // actions.push('<a class="btn btn-info btn-xs ' + '" href="#" onclick="backERP(\''+row.id+'\')"><i class="fa fa-upload"></i>回传</a>');
384   - // }
385 374 return actions.join('');
386 375 }
387 376 },
... ... @@ -592,12 +581,32 @@
592 581 visible: true
593 582 },
594 583 {
595   - field: 'completeTime',
596   - title: '任务完成时间',
  584 + field: 'superiorName',
  585 + title: '母件名称',
  586 + },
  587 + {
  588 + field: 'superiorCode',
  589 + title: '母件编码',
  590 + formatter: function (value, row, index) {
  591 + var actions = [];
  592 + if (value == undefined || value == '')
  593 + value = " "
  594 + else
  595 + actions.push('<pre style="max-height:50px; white-space: pre-wrap; width:500px">' + value + '</pre>')
  596 + return actions.join(" ")
  597 + }
597 598 },
598 599 {
599 600 field: 'recordCode',
600 601 title: '合并前单号',
  602 + formatter: function (value, row, index) {
  603 + var actions = [];
  604 + if (value == undefined || value == '')
  605 + value = " "
  606 + else
  607 + actions.push('<pre style="max-height:50px; white-space: pre-wrap; width:500px">' + value + '</pre>')
  608 + return actions.join(" ")
  609 + }
601 610 },
602 611 {
603 612 field: 'materialColor',
... ...