From 68b2d4f7d3f122a7d6ab075c5455ac1d8ef6d932 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 六月 2024 17:58:55 +0800
Subject: [PATCH] 检验下单标签打印+标准库枚举筛选+报告生成修改+检验下单委托编号生成
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index a038eac..361b748 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -66,11 +66,13 @@
@ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/addInsOrder")
- public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
+ public Result<?> addInsOrder(String str) {
+ Map<String, Object> map = JSON.parseObject(str, Map.class);
JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
- return Result.success(insOrderService.addInsOrder(list, insOrder));
+ List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
+ return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
}
@ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@@ -161,4 +163,11 @@
insProductService.updateInspected(id);
return Result.success();
}
+
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "鏍囩鎵撳嵃")
+ @PostMapping("/labelPrinting")
+ public Result<?> labelPrinting(String ids) {
+ return Result.success(insOrderService.labelPrinting(ids));
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3