diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 0c7297da..f4cae594 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -187,6 +187,30 @@ public class NormalPGIController extends BaseController { return ApiResult.success(pdaOrderVO); } + /** + * 获取可无码收货单项列表 + * @param orderId 订单ID + */ + @GetMapping("getListForNoScan") + @ApiMark(moduleName = "送货单管理", apiName = "获取可无码收货单项列表") + public ApiResult> getListForNoScan(@RequestParam Long orderId) { + List items = wmsSrmOrderItemService.lambdaQuery() + .eq(WmsSrmOrderItem::getOrderId, orderId) + .list(); + items.removeIf(item -> item.getDeliveryQty().compareTo(item.getReceiptQty()) <= 0 + || noScanningBaseControllerService.existsQrCode(item.getItemCode())); + return ApiResult.success( + items.stream() + .map(item -> new NoScanItemVO() + .setRowNo(item.getLineNumber()) + .setOrderItemId(item.getId()) + .setMaterialNo(item.getItemCode()) + .setMaterialDesc(item.getItemName()) + .setNum(item.getDeliveryQty().subtract(item.getReceiptQty()))) + .toList() + ); + } + /** * 无码收货确认(质检物料生成待检单;非质检物料:无二维码直接入库,有二维码则生成上架任务) */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/NoScanItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/NoScanItemVO.java new file mode 100644 index 00000000..38457347 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/NoScanItemVO.java @@ -0,0 +1,36 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +@Data +@Accessors(chain = true) +public class NoScanItemVO { + + /** + * 行号 + */ + private String rowNo; + + /** + * 订单项ID + */ + private Long orderItemId; + + /** + * 物料编号 + */ + private String materialNo; + + /** + * 物料描述 + */ + private String materialDesc; + + /** + * 数量 + */ + private BigDecimal num; +}