diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/PrintParentWoLabelVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/PrintParentWoLabelVO.java index 06612e37..52a33626 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/PrintParentWoLabelVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/PrintParentWoLabelVO.java @@ -16,15 +16,15 @@ import java.util.List; public class PrintParentWoLabelVO { @Schema(description = "第一列") - private PrintWoLabelVO plOne; + private String plOne; @Schema(description = "第二列") - private PrintWoLabelVO plTwo; + private String plTwo; @Schema(description = "第三列") - private PrintWoLabelVO plThree; + private String plThree; @Schema(description = "第四列") - private PrintWoLabelVO plFour; + private String plFour; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProduceMonitorController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProduceMonitorController.java index 7659a839..513779c6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProduceMonitorController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProduceMonitorController.java @@ -14,9 +14,11 @@ import org.springblade.desk.produce.service.IWorkOrderService; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * 生产监控 + * * @author litao */ @RestController @@ -41,11 +43,11 @@ public class ProduceMonitorController extends BladeController { return R.data(workOrderService.getPlanDetail(wpId)); } - @PostMapping("/printWoLabel") + @GetMapping("/printWoLabel") @ApiOperationSupport(order = 3) @Operation(summary = "打印标签") - public R> printWoLabel(@RequestParam String woIds, @RequestParam Short quantity) { - return R.data(workOrderService.printWoLabel(Func.toLongList(woIds), quantity)); + public Map printWoLabel(String woIds, Short quantity) { + return workOrderService.printWoLabel(Func.toLongList(woIds), quantity); } @PostMapping("/generateWorkOrder") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java index e5a4a111..c3be9d79 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java @@ -147,7 +147,7 @@ public interface IWorkOrderService extends BaseService { * @param woIds 订单id * @param quantity 数量 */ - List printWoLabel(List woIds, Short quantity); + Map printWoLabel(List woIds, Short quantity); /** *

方法名: generateWorkOrder

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index fcce0a07..6b0b5f21 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -1212,7 +1212,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl printWoLabel(List woIds, Short quantity) { + public Map printWoLabel(List woIds, Short quantity) { + Map data = new HashMap<>(1); if (CollectionUtils.isEmpty(woIds)) { return null; } @@ -1224,7 +1225,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl list = null; Integer num = 0; int i = 1; - PrintWoLabelVO printWoLabel; + String printWoLabel; PrintParentWoLabelVO printParentWoLabel = null; WorkOrder workOrder; List plList = new ArrayList<>(); @@ -1241,11 +1242,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl