From 741c74084d213655e7d77260f14c295dcf099690 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 18 八月 2023 08:54:35 +0800
Subject: [PATCH] 8.18修改接口“根据销售单id查看详情”传入值
---
inventory-server/src/main/java/com/yuanchu/mom/pojo/vo/SaleVo.java | 2 ++
standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 2 --
inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java | 2 +-
inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java | 7 ++++---
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
index b443b94..c593771 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
@@ -63,8 +63,8 @@
@ApiOperation(value = "鏂板閿�鍞崟")
@PostMapping("/addSale")
public Result addSale(@RequestHeader("token") String token,@Validated @RequestBody SaleDto saleDto) throws Exception {
- Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
- saleService.addSale(data.get("name").replaceAll("\"", ""), saleDto);
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ saleService.addSale(data.get("name").replaceAll("\"", ""), saleDto);
return Result.success("鏂板鎴愬姛!");
}
@@ -82,7 +82,8 @@
@ApiImplicitParam(name = "id", value = "閿�鍞崟id", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/updateSaleById")
- public Result updateSaleById(@RequestHeader("token") String token, Integer id, @RequestBody SaleVo saleVo) throws Exception {
+ public Result updateSaleById(@RequestHeader("token") String token,Integer id, String str) throws Exception {
+ SaleVo saleVo = JackSonUtil.unmarshal(str, SaleVo.class);
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
saleService.updateSaleById(data.get("name").replaceAll("\"", ""),id, saleVo);
return Result.success("淇敼鎴愬姛!");
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/vo/SaleVo.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/vo/SaleVo.java
index 8290067..7bd14bc 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/vo/SaleVo.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/vo/SaleVo.java
@@ -12,6 +12,8 @@
//閿�鍞崟璇︽儏
public class SaleVo extends SaleDto {
+ private Integer id;
+
//鐘舵��0:涓嶉�氳繃;1:閫氳繃
@JsonSerialize
private Integer type;
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
index 538af0e..1dd3902 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
@@ -73,7 +73,7 @@
.number(saleMaterial.getNumber())
.downtime(sale.getCreateTime())
.deltime(sale.getDelTime())
- .qualityTraceability(MyUtil.getTimeSixNumberCode("GPT"))
+ .qualityTraceability(MyUtil.getTimeSixNumberCode("GPT", "GPT"))
.build();
//鏂板鐢熶骇璁㈠崟
manufactureOrderMapper.insert(manufactureOrder);
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index 3f30914..8d58673 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -36,8 +36,6 @@
Integer deviceDelete(Integer deviceId);
- Integer deviceDeleteIdOrFather(Integer id, String deviceFather);
-
List<Map<String, Object>> getDeviceNameByGroup(String deviceGroup);
Integer deviceDeleteIdOrFather(Integer id, Integer type, String deviceFather);
--
Gitblit v1.9.3