rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch '南方路机/master'

This commit is contained in:
曹鹏飞 2026-06-23 11:02:52 +08:00
parent 2ddaedeb99 29b5881f39
commit 9e5dc9de36
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
View File

@ -13,6 +13,7 @@ import com.alibaba.excel.metadata.data.ImageData;
import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.data.WriteCellData;
import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.metadata.fill.FillConfig; import com.alibaba.excel.write.metadata.fill.FillConfig;
import com.google.common.collect.Maps;
import com.nflg.wms.admin.pojo.dto.*; import com.nflg.wms.admin.pojo.dto.*;
import com.nflg.wms.admin.repository.PackageMaterialScanRecordRepository; import com.nflg.wms.admin.repository.PackageMaterialScanRecordRepository;
import com.nflg.wms.admin.service.BasdeSerialNumberControllerService; import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
@ -449,6 +450,12 @@ public class StructuralPackageOrderController extends BaseController {
.setMaterialDesc(orderVO.getPackageDesc())).toList() .setMaterialDesc(orderVO.getPackageDesc())).toList()
); );
List<WmsStructuralPackageOrderTrayItem> items = structuralPackageOrderTrayItemService.getList(id); List<WmsStructuralPackageOrderTrayItem> items = structuralPackageOrderTrayItemService.getList(id);
List<DeliverStructuralPackageOrderTrayItemVO> itemVOs = structuralPackageOrderTrayItemService.getListVOByOrderId(id);
Map<Long, DeliverStructuralPackageOrderTrayItemVO> deliverStructuralPackageOrderTrayItemMap = CollectionUtil.isNotEmpty(itemVOs) ?
itemVOs.stream().filter(d -> d.getId() != null).collect(Collectors.toMap(DeliverStructuralPackageOrderTrayItemVO::getId, d -> d))
: Maps.newHashMap();
vo.setItems(items.stream().map(item -> { vo.setItems(items.stream().map(item -> {
TrayItemVO ivo = Convert.convert(TrayItemVO.class, item); TrayItemVO ivo = Convert.convert(TrayItemVO.class, item);
// 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空 // 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空
@ -472,6 +479,12 @@ public class StructuralPackageOrderController extends BaseController {
ivo.setStoreNum(item.getStoreNum()); ivo.setStoreNum(item.getStoreNum());
} }
} }
DeliverStructuralPackageOrderTrayItemVO itemVO = deliverStructuralPackageOrderTrayItemMap.get(item.getId());
if (itemVO != null) {
ivo.setDrawingNo(itemVO.getDrawingNo());
}
return ivo; return ivo;
}).toList()); }).toList());
return ApiResult.success(vo); return ApiResult.success(vo);
@ -557,6 +570,7 @@ public class StructuralPackageOrderController extends BaseController {
DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(firstTray.getId()); DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(firstTray.getId());
VUtil.trueThrowBusinessError(Objects.isNull(trayVO)).throwMessage("数据不存在"); VUtil.trueThrowBusinessError(Objects.isNull(trayVO)).throwMessage("数据不存在");
DeliverStructuralPackageOrderVO orderVO = structuralPackageOrderService.getInfo(id);
PackageVO vo = new PackageVO() PackageVO vo = new PackageVO()
.setNo(trayVO.getPackageNo()) .setNo(trayVO.getPackageNo())
.setExternalOrderNo(trayVO.getExternalOrderNo()) .setExternalOrderNo(trayVO.getExternalOrderNo())
@ -567,7 +581,7 @@ public class StructuralPackageOrderController extends BaseController {
.setEco(trayVO.getEco()) .setEco(trayVO.getEco())
.setWorkbenchCode(trayVO.getWorkbenchCode()) .setWorkbenchCode(trayVO.getWorkbenchCode())
.setCate(trayVO.getPackageCate()) .setCate(trayVO.getPackageCate())
.setWeight(trayVO.getWeight()) .setWeight(orderVO.getWeight())
.setDrawingNo(trayVO.getPackageDrawingNo()) .setDrawingNo(trayVO.getPackageDrawingNo())
.setName(trayVO.getPackageDesc()) .setName(trayVO.getPackageDesc())
.setQrCode(QRCodeUtil.generateQRCodeBase64(trayVO.getPackageNo(), 100, 100)); .setQrCode(QRCodeUtil.generateQRCodeBase64(trayVO.getPackageNo(), 100, 100));