Commit 90cd18ad hc

UID出库列表接口添加返回值:labelId

1 个父辈 daac07a5
...@@ -285,4 +285,7 @@ public class BarcodeDto implements Serializable { ...@@ -285,4 +285,7 @@ public class BarcodeDto implements Serializable {
@ApiModelProperty("栈板id") @ApiModelProperty("栈板id")
private String palletId; private String palletId;
@ApiModelProperty("标签id")
private String labelId;
} }
...@@ -481,10 +481,16 @@ public class StoragePosController { ...@@ -481,10 +481,16 @@ public class StoragePosController {
PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable); PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent()); List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());
for (StoragePosDto storagePosDto : StoragePosDtos) { for (StoragePosDto storagePosDto : StoragePosDtos) {
BarcodeDto barcode = storagePosDto.getBarcode(); BarcodeDto barcodeDto = storagePosDto.getBarcode();
if (barcode != null && barcode.getPutInTime() == -1){ if (barcodeDto != null) {
barcode.setFirstPutInDate(barcode.getCreateDate()); if (barcodeDto.getPutInTime() == -1) {
//storagePosDto.setBarcode(barcode); barcodeDto.setFirstPutInDate(barcodeDto.getCreateDate());
//storagePosDto.setBarcode(barcode);
}
Barcode barcode = barcodeManager.findByBarcode(barcodeDto.getBarcode());
if (ObjectUtil.isNotNull(barcode)) {
barcodeDto.setLabelId(barcode.getLabelId());
}
} }
} }
// for (StoragePosDto storagePosDto : StoragePosDtos) { // for (StoragePosDto storagePosDto : StoragePosDtos) {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!