diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 52e46cbc..2424f700 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -319,7 +319,7 @@ public class StructuralPackageOrderController extends BaseController { request.getItems().forEach(orderQO -> { WmsStructuralPackageOrder order = Convert.convert(WmsStructuralPackageOrder.class, orderQO); order.setOrderNo(orderNo); - + if (Objects.isNull(order.getId())) { order.setId(IdUtil.getSnowflakeNextId()); order.setCreateBy(UserUtil.getUserName()); @@ -460,9 +460,9 @@ public class StructuralPackageOrderController extends BaseController { // 获取托盘号:如果物料项有关联的托盘,则使用托盘号;否则为空 if (item.getTrayId() != null) { WmsStructuralPackageOrderTray tray = trays.stream() - .filter(t -> t.getId().equals(item.getTrayId())) - .findFirst() - .orElse(null); + .filter(t -> t.getId().equals(item.getTrayId())) + .findFirst() + .orElse(null); if (tray != null) { ivo.setNo(tray.getNo()); } else { @@ -533,7 +533,6 @@ public class StructuralPackageOrderController extends BaseController { /** * 获取托盘零件列表 - * * @param id 订单id */ @GetMapping("getItems") @@ -1088,10 +1087,10 @@ public class StructuralPackageOrderController extends BaseController { // 只统计已打包的托盘数量(状态为1:已打包、2:在途、3:已收货) it.setTrayNum(Math.toIntExact(structuralPackageOrderTrayService.lambdaQuery() .eq(WmsStructuralPackageOrderTray::getOrderId, it.getId()) - .in(WmsStructuralPackageOrderTray::getState, - OrderState.Packaged.getState(), - OrderState.InTransit.getState(), - OrderState.Received.getState()) + .in(WmsStructuralPackageOrderTray::getState, + OrderState.Packaged.getState(), + OrderState.InTransit.getState(), + OrderState.Received.getState()) .count())); }); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); @@ -1258,6 +1257,11 @@ public class StructuralPackageOrderController extends BaseController { ) ) ); + structuralPackageOrderService.lambdaUpdate() + .set(WmsStructuralPackageOrder::getMatDoc, pair.getValue().getKey()) + .set(WmsStructuralPackageOrder::getDocYear, pair.getValue().getValue()) + .eq(WmsStructuralPackageOrder::getId, request.getId()) + .update(); if (StrUtil.equalsIgnoreCase(dto.getKzkri(), "X")) { sapService.zwm3a18(new ZWM3A18DTO() .setEbeln(order.getExternalOrderNo()) @@ -2124,7 +2128,7 @@ public class StructuralPackageOrderController extends BaseController { * @param ids 托盘id列表 */ @PostMapping("exportPdfByTrayIds") - public void exportPdfByTrayIds(HttpServletResponse response,@RequestBody @NotEmpty List ids) throws Exception { + public void exportPdfByTrayIds(HttpServletResponse response, @RequestBody @NotEmpty List ids) throws Exception { List list = structuralPackageOrderTrayItemService.getListVOByTrayIds(ids); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(list)).throwMessage("数据不存在"); DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(list.get(0).getTrayId()); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index e66d8797..52f16b27 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -706,10 +706,10 @@ public class TransferCompanyController extends BaseController { ).toList() ) ); - transferCompanyTicketService.lambdaUpdate() - .set(WmsTransferCompanyTicket::getMatDoc, vo.getMblnr()) - .set(WmsTransferCompanyTicket::getDocYear, vo.getMjahr()) - .eq(WmsTransferCompanyTicket::getId, ticket.getId()) + transferCompanyService.lambdaUpdate() + .set(WmsTransferCompany::getMatDoc, vo.getMblnr()) + .set(WmsTransferCompany::getDocYear, vo.getMjahr()) + .eq(WmsTransferCompany::getId, order.getId()) .update(); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java index dfd052f5..74c82b6d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java @@ -136,4 +136,14 @@ public class WmsStructuralPackageOrder implements Serializable { * 状态,0:未打包;1:已打包;2-在途;3-已收货 */ private Short state; + + /** + * 凭证号 + */ + private String matDoc; + + /** + * 凭证年份 + */ + private String docYear; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompany.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompany.java index e2421d06..8c916b68 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompany.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompany.java @@ -94,4 +94,14 @@ public class WmsTransferCompany implements Serializable { * 备注 */ private String remark; + + /** + * 凭证号 + */ + private String matDoc; + + /** + * 凭证年份 + */ + private String docYear; }