From ae4a996ce351c55fa466187c74d790efe484dd32 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 18:01:47 +0800
Subject: [PATCH] 解bug
---
inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java | 3 ++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java | 20 ++++++++++++++++++--
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto.java | 11 +++++++++++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
index af1bd3e..471c89c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.mapper.ImportRepertoryMapper;
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
import com.yuanchu.mom.mapper.RepertoryMapper;
import com.yuanchu.mom.pojo.FinishedInspect;
import com.yuanchu.mom.mapper.FinishedInspectMapper;
+import com.yuanchu.mom.pojo.ImportRepertory;
import com.yuanchu.mom.pojo.InspectUnaccepted;
import com.yuanchu.mom.pojo.Repertory;
import com.yuanchu.mom.service.FinishedInspectService;
@@ -48,6 +50,9 @@
@Resource
RepertoryMapper repertoryMapper;
+ @Resource
+ ImportRepertoryMapper importRepertoryMapper;
+
@Override
public Integer addProcessInspectionSheet(FinishedInspect finishedInspect) {
finishedInspect.setType(0);
@@ -69,8 +74,8 @@
updateWrapper.eq(FinishedInspect::getId, finishedInspectId);
updateWrapper.set(FinishedInspect::getResult, result);
finishedInspectMapper.update(new FinishedInspect(), updateWrapper);
- //濡傛灉妫�楠岀粨璁轰负涓嶅悎鏍�,鍒欓渶瑕佹柊澧炰笉鍚堟牸妫�楠屽崟,杩橀渶瑕佹柊澧炲崐鎴愬搧搴撳瓨
FinishedInspect finishedInspect = finishedInspectMapper.selectById(finishedInspectId);
+ //濡傛灉妫�楠岀粨璁轰负涓嶅悎鏍�,鍒欓渶瑕佹柊澧炰笉鍚堟牸妫�楠屽崟,杩橀渶瑕佹柊澧炲崐鎴愬搧搴撳瓨
if (result == 0) {
/*鏂板涓嶅悎鏍兼楠屽崟*/
InspectUnaccepted inspectUnaccepted = InspectUnaccepted.builder()
@@ -109,8 +114,19 @@
repertoryMapper.insert(repertory);
}
}
- //濡傛灉妫�楠屽悎鏍�,闇�瑕佹柊澧炴垚鍝�(0)搴撳瓨
+ //濡傛灉妫�楠屽悎鏍�,闇�瑕佹柊澧炴垚鍝�(0)搴撳瓨鍜屽叆搴撹褰�
if (result == 1) {
+ /*鏂板鎴愬搧鍏ュ簱璁板綍*/
+ ImportRepertory importRepertory = ImportRepertory.builder()
+ .orderCode(finishedInspect.getOrderNumber())
+ .code(finishedInspect.getMaterialCode())
+ .name(finishedInspect.getMaterial())
+ .specifications(finishedInspect.getSpecificationsModel())
+ .unit(finishedInspect.getUnit())
+ .number(finishedInspect.getQuantity())
+ .userName(username)
+ .build();
+ importRepertoryMapper.insert(importRepertory);
/*鏂板鎴愬搧(0)搴撳瓨*/
//濡傛灉鍏ュ簱鐨勪俊鎭竴鏍峰彧鏈夊簱瀛樹笉涓�鏍�,鍒欏湪鍘熸潵鐨勫簱瀛樻暟閲忎笂鍔犱笂鐩稿簲鐨勬暟閲�
LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
index fef686e..28b986f 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
@@ -16,6 +16,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.yuanchu.mom.service.ConsignmentService;
@@ -61,7 +62,7 @@
@ApiOperation(value = "鏂板鎴愬搧鍙戣揣")
@PostMapping("/addCon")
- public Result addCon(@RequestHeader("token") String token, @RequestBody ConsignmentDto consignmentDto) throws Exception {
+ public Result addCon(@RequestHeader("token") String token, @Validated @RequestBody ConsignmentDto consignmentDto) throws Exception {
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
return Result.success(consignmentService.addCon(data.get("name").replaceAll("\"", ""), consignmentDto));
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto.java
index d851e48..edb8963 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto.java
@@ -6,6 +6,7 @@
import lombok.Data;
import lombok.NoArgsConstructor;
+import javax.validation.constraints.NotBlank;
import java.util.List;
@@ -13,41 +14,51 @@
@NoArgsConstructor
@AllArgsConstructor
@Builder
+//鏂板鎴愬搧鍙戣揣
public class ConsignmentDto {
//璁㈠崟缂栧彿
+ @NotBlank(message = "璁㈠崟缂栧彿涓嶈兘涓虹┖")
@JsonSerialize
private String orderCode;
//鍚堝悓缂栧彿
+ @NotBlank(message = "鍚堝悓缂栧彿涓嶈兘涓虹┖")
@JsonSerialize
private String customerCode;
//瀹㈡埛鍚嶇О
+ @NotBlank(message = "瀹㈡埛鍚嶇О涓嶈兘涓虹┖")
@JsonSerialize
private String proname;
//鍒拌揣鍦板潃
+ @NotBlank(message = "鍒拌揣鍦板潃涓嶈兘涓虹┖")
@JsonSerialize
private String adress;
//鏀惰揣鑱旂郴浜�
+ @NotBlank(message = "鏀惰揣鑱旂郴浜轰笉鑳戒负绌�")
@JsonSerialize
private String username;
//鎵嬫満鍙�
+ @NotBlank(message = "鎵嬫満鍙蜂笉鑳戒负绌�")
@JsonSerialize
private String phone ;
//浜у搧淇℃伅
+ @NotBlank(message = "浜у搧淇℃伅涓嶈兘涓虹┖")
@JsonSerialize
private List<ConsignmentDto2> messages;
//妫�鏌ヤ汉鍛�
+ @NotBlank(message = "妫�鏌ヤ汉鍛樹笉鑳戒负绌�")
@JsonSerialize
private String checkName;
//瑁呴厤浜哄憳
+ @NotBlank(message = "瑁呴厤浜哄憳涓嶈兘涓虹┖")
@JsonSerialize
private String fitName;
}
--
Gitblit v1.9.3