Commit ca9ab891823b3bb1f73ebb97fa10a57ef4a4796c
1 parent
0278108d
页面调整
Showing
4 changed files
with
43 additions
and
18 deletions
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
| ... | ... | @@ -42,6 +42,8 @@ import javax.swing.text.Keymap; |
| 42 | 42 | import java.util.ArrayList; |
| 43 | 43 | import java.util.Arrays; |
| 44 | 44 | import java.util.List; |
| 45 | +import java.util.Set; | |
| 46 | +import java.util.stream.Collectors; | |
| 45 | 47 | |
| 46 | 48 | @Api(tags = "入库单") |
| 47 | 49 | @Controller |
| ... | ... | @@ -89,15 +91,23 @@ public class ReceiptHeaderController extends BaseController { |
| 89 | 91 | Integer pageSize = pageDomain.getPageSize(); |
| 90 | 92 | List<ReceiptHeader> list = new ArrayList<>(); |
| 91 | 93 | |
| 92 | - if(StringUtils.isNotEmpty(receiptHeader.getSNNO())){ | |
| 94 | + if(StringUtils.isNotEmpty(receiptHeader.getSNNO()) || StringUtils.isNotEmpty(receiptHeader.getNoticeNo())){ | |
| 93 | 95 | LambdaQueryWrapper<ReceiptDetail> receiptDetailLambdaQuery = Wrappers.lambdaQuery(); |
| 94 | - receiptDetailLambdaQuery.eq(ReceiptDetail::getSNNO, receiptHeader.getSNNO()); | |
| 95 | - ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailLambdaQuery); | |
| 96 | - ReceiptHeader receiptHeaderData = new ReceiptHeader(); | |
| 97 | - if (StringUtils.isNotNull(receiptDetail)) | |
| 98 | - receiptHeaderData = receiptHeaderService.getById(receiptDetail.getReceiptId()); | |
| 96 | + receiptDetailLambdaQuery.eq(StringUtils.isNotNull(receiptHeader.getNoticeNo()) && StringUtils.isNotEmpty(receiptHeader.getNoticeNo()),ReceiptDetail::getNoticeNo, receiptHeader.getNoticeNo()); | |
| 97 | + receiptDetailLambdaQuery.eq(StringUtils.isNotNull(receiptHeader.getSNNO()) && StringUtils.isNotEmpty(receiptHeader.getSNNO()),ReceiptDetail::getSNNO, receiptHeader.getSNNO()); | |
| 98 | + List<ReceiptDetail> receiptDetails = receiptDetailService.list(receiptDetailLambdaQuery); | |
| 99 | + | |
| 100 | + List<ReceiptHeader> receiptHeaderData = new ArrayList<>(); | |
| 101 | + if (receiptDetails != null && !receiptDetails.isEmpty()){ | |
| 102 | + Set<Integer> ids = receiptDetails.stream().distinct().map(ReceiptDetail::getReceiptId).collect(Collectors.toSet()); | |
| 103 | + for (Integer id : ids) { | |
| 104 | + ReceiptHeader header = receiptHeaderService.getById(id); | |
| 105 | + receiptHeaderData.add(header); | |
| 106 | + } | |
| 107 | + } | |
| 108 | + | |
| 99 | 109 | if (StringUtils.isNotNull(receiptHeaderData)){ |
| 100 | - list.add(receiptHeaderData); | |
| 110 | + list.addAll(receiptHeaderData); | |
| 101 | 111 | return getDataTable(list); |
| 102 | 112 | } |
| 103 | 113 | return getDataTable(list); |
| ... | ... | @@ -140,7 +150,7 @@ public class ReceiptHeaderController extends BaseController { |
| 140 | 150 | } |
| 141 | 151 | |
| 142 | 152 | |
| 143 | - /** | |
| 153 | + /**r | |
| 144 | 154 | * 查询PDA入库单 |
| 145 | 155 | */ |
| 146 | 156 | @Log(title = "入库-PDA入库单头表", operating = "查看PDA入库单列表", action = BusinessType.GRANT) |
| ... | ... | @@ -153,14 +163,21 @@ public class ReceiptHeaderController extends BaseController { |
| 153 | 163 | Integer statusFirst, Integer statusLast) { |
| 154 | 164 | List<ReceiptHeader> list = new ArrayList<>(); |
| 155 | 165 | LambdaQueryWrapper<ReceiptDetail> receiptDetailLambdaQuery = Wrappers.lambdaQuery(); |
| 156 | - receiptDetailLambdaQuery.eq(ReceiptDetail::getSNNO, receiptHeader.getSNNO()) | |
| 157 | - .last("and qty > taskQty"); | |
| 158 | - ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailLambdaQuery); | |
| 159 | - ReceiptHeader receiptHeaderData = new ReceiptHeader(); | |
| 160 | - if (StringUtils.isNotNull(receiptDetail)){ | |
| 161 | - receiptHeaderData = receiptHeaderService.getById(receiptDetail.getReceiptId()); | |
| 166 | + receiptDetailLambdaQuery.eq(StringUtils.isNotNull(receiptHeader.getNoticeNo()) && StringUtils.isNotEmpty(receiptHeader.getNoticeNo()),ReceiptDetail::getNoticeNo, receiptHeader.getNoticeNo()); | |
| 167 | + receiptDetailLambdaQuery.eq(StringUtils.isNotNull(receiptHeader.getSNNO()) && StringUtils.isNotEmpty(receiptHeader.getSNNO()),ReceiptDetail::getSNNO, receiptHeader.getSNNO()) | |
| 168 | + .last(StringUtils.isNotEmpty(receiptHeader.getNoticeNo()) || StringUtils.isNotEmpty(receiptHeader.getSNNO()),"and qty > taskQty") | |
| 169 | + .last(StringUtils.isEmpty(receiptHeader.getNoticeNo()) && StringUtils.isEmpty(receiptHeader.getSNNO())," where qty > taskQty"); | |
| 170 | + List<ReceiptDetail> receiptDetails = receiptDetailService.list(receiptDetailLambdaQuery); | |
| 171 | + List<ReceiptHeader> receiptHeaderData = new ArrayList<>(); | |
| 172 | + if (receiptDetails != null && !receiptDetails.isEmpty()){ | |
| 173 | + Set<Integer> ids = receiptDetails.stream().distinct().map(ReceiptDetail::getReceiptId).collect(Collectors.toSet()); | |
| 174 | + for (Integer id : ids) { | |
| 175 | + ReceiptHeader header = receiptHeaderService.getById(id); | |
| 176 | + receiptHeaderData.add(header); | |
| 177 | + } | |
| 178 | + | |
| 162 | 179 | if (StringUtils.isNotNull(receiptHeaderData)){ |
| 163 | - list.add(receiptHeaderData); | |
| 180 | + list.addAll(receiptHeaderData); | |
| 164 | 181 | return getDataTable(list); |
| 165 | 182 | }else{ |
| 166 | 183 | return getDataTable(list); |
| ... | ... |
src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
| ... | ... | @@ -350,4 +350,10 @@ public class ReceiptHeader implements Serializable { |
| 350 | 350 | @TableField(value = "creatorName") |
| 351 | 351 | @ApiModelProperty(value = "操作人名称") |
| 352 | 352 | private String creatorName; |
| 353 | + | |
| 354 | + /** | |
| 355 | + * 通知单号 | |
| 356 | + */ | |
| 357 | + @TableField(exist = false) | |
| 358 | + private String noticeNo; | |
| 353 | 359 | } |
| ... | ... |
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
| ... | ... | @@ -54,8 +54,9 @@ |
| 54 | 54 | <li> |
| 55 | 55 | 是否查询呆滞库存： |
| 56 | 56 | <select name="deadTime"> |
| 57 | - <option value="">否</option> | |
| 58 | - <option value="1">是</option> | |
| 57 | + <option value="">全部查询</option> | |
| 58 | + <option value="0">非呆滞库存</option> | |
| 59 | + <option value="1">呆滞库存</option> | |
| 59 | 60 | </select> |
| 60 | 61 | </li> |
| 61 | 62 | <li class="time2" style="height:30px"> |
| ... | ... |
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
| ... | ... | @@ -50,6 +50,7 @@ |
| 50 | 50 | <!-- 上游单号：<input type="text" name="referCode" id="referCode"/>--> |
| 51 | 51 | <!-- </li>--> |
| 52 | 52 | <li>条码：<input type="text" name="SNNO" id="SNNO"></li> |
| 53 | + <li>通知单号：<input type="text" name="noticeNo" id="noticeNo"></li> | |
| 53 | 54 | |
| 54 | 55 | <li> |
| 55 | 56 | <!--头 状 态：<input type="text" name="firstStatus"/>--> |
| ... | ... | @@ -225,7 +226,7 @@ |
| 225 | 226 | |
| 226 | 227 | $(function() { |
| 227 | 228 | var options = { |
| 228 | - url: prefix + "/list", | |
| 229 | + url: prefix + "/listPda", | |
| 229 | 230 | createUrl: prefix + "/add", |
| 230 | 231 | updateUrl: prefix + "/edit/{id}", |
| 231 | 232 | removeUrl: prefix + "/remove", |
| ... | ... |