From 088ceb9faf6f1d0d9f57bb9cd65f542337d40b7f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:30:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java | 110 ++++++++++++++++++++++--------------------------------
1 files changed, 45 insertions(+), 65 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
index f64a1f7..3814183 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
@@ -2,8 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.FinishedInspect;
+import com.yuanchu.mom.pojo.ProcessInspect;
+import com.yuanchu.mom.pojo.vo.FinishedInspectVo;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
@@ -18,12 +21,11 @@
import java.util.Date;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -37,88 +39,66 @@
@Autowired
private FinishedInspectService finishedInspectService;
- @Autowired
- private UserService userService;
-
- @Autowired
- private SpecificationsService specificationsService;
-
- @Autowired
- private MaterialService materialService;
@Autowired
Jwt jwt;
- @ApiOperation(value = "鏂板鎸夐挳-->1銆佹柊澧炴垚鍝佹楠屽崟")
- @PostMapping("/add_process_inspection_sheet")
- public Result<?> addProcessInspectionSheet(@Validated @RequestBody FinishedInspect finishedInspect){
- Integer isInsertSuccess = finishedInspectService.addProcessInspectionSheet(finishedInspect);
- if (isInsertSuccess == 1){
- return Result.success("鏂板鎴愬姛锛�", finishedInspect.getId());
- }
- return Result.fail("鏂板澶辫触锛�");
- }
-
- @ApiOperation(value = "鏂板鎸夐挳-->1銆佹柊澧炶繃绋嬫楠屽崟-->涓绘満宸ヤ笅鎷夋")
- @GetMapping("/list_user")
- public Result<?> selectUserIdAndName(){
- List<Map<String, Object>> maps = userService.listUserIdAndName();
- return Result.success(maps);
- }
-
- @ApiOperation(value = "鏂板鎸夐挳-->1銆佹柊澧炶繃绋嬫楠屽崟-->2銆佽鏍煎瀷鍙蜂笅鎷夋锛氭牴鎹」鐩甀D鏌ヨ")
+ @ApiOperation(value = "鏂板鎴愬搧妫�楠屽崟-->鏍规嵁璁㈠崟鍙烽�夋嫨浜у搧淇℃伅鍜屽伐鑹�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "materialId",value = "椤圭洰鍚嶇ОID",dataTypeClass = Integer.class,required = true)
+ @ApiImplicitParam(name = "orderNumber", value = "璁㈠崟缂栧彿", dataTypeClass = String.class, required = true)
})
- @GetMapping("/list_specification")
- public Result<?> selectSpecificationIdAndName(Integer materialId){
- List<Map<String, Object>> maps = specificationsService.selectSpecificationIdAndName(materialId);
- return Result.success(maps);
+ @GetMapping("/chooseMater")
+ public Result<?> chooseMater(String orderNumber) {
+ return Result.success(finishedInspectService.chooseMater(orderNumber));
}
- @ApiOperation(value = "鏂板鎸夐挳-->1銆佹柊澧炶繃绋嬫楠屽崟-->1銆侀」鐩悕绉颁笅鎷夋")
- @GetMapping("/list_material")
- public Result<?> selectMaterialIdAndNameAndCode(){
- List<Map<String, Object>> maps = materialService.selectMaterialIdAndNameAndCode();
- return Result.success(maps);
- }
-
- @ApiOperation(value = "鏂板鎸夐挳-->3銆佹楠岀粨璁�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "finishedInspectId",value = "妫�楠屽崟Id",dataTypeClass = Integer.class,required = true),
- @ApiImplicitParam(name = "result",value = "妫�楠岀粨璁�",dataTypeClass = Integer.class,required = true),
- })
- @PostMapping("/inspection_conclusion")
- public Result<?> inspectionConclusion(@RequestHeader("token") String token,Integer finishedInspectId, Integer result) throws Exception {
+ @ApiOperation(value = "鏂板鎴愬搧妫�楠屽崟")
+ @PostMapping("/addFinish")
+ public Result<?> addFinish(@RequestHeader("token") String token, @Validated @RequestBody FinishedInspectVo finishedInspectVo) throws Exception {
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
- Integer isInsertSuccess = finishedInspectService.inspectionConclusion(data.get("name").replaceAll("\"", ""),finishedInspectId, result);
- if (isInsertSuccess == 1){
- return Result.success("涓婃姤鎴愬姛锛�");
- }
- return Result.fail("涓婃姤澶辫触锛�");
+ return Result.success(finishedInspectService.addProcessInspectionSheet(data.get("id").replaceAll("\"", ""), finishedInspectVo));
}
- @ApiOperation(value = "4銆佷富椤靛垎椤�")
+
+ @ApiOperation(value = "涓婃姤(鏇存柊妫�楠岀姸鎬�)")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/updateFinishInspectsById")
+ public Result updateFinishInspectsById(@RequestHeader("token") String token, Integer id) throws Exception {
+ //濡傛灉宸茬粡涓婃姤浜嗕笉鑳藉啀涓�娆′笂鎶�
+ FinishedInspect finishedInspect = finishedInspectService.getById(id);
+ if (ObjectUtils.isNotEmpty(finishedInspect.getResult())) {
+ return Result.fail("宸茬粡涓婃姤杩囦簡,涓嶈兘鍐嶆涓婃姤!");
+ }
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ return Result.success(finishedInspectService.updateFinishInspectsById(data.get("name").replaceAll("\"", ""), id));
+ }
+
+ @ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ鎴愬搧妫�楠屽崟璇︽儏")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectFinishInspectsListById")
+ public Result selectFinishInspectsListById(Integer id) {
+ return Result.success(finishedInspectService.selectFinishInspectsListById(id));
+ }
+
+ @ApiOperation(value = "鍒嗛〉鏌ヨ鎴愬搧妫�楠屽崟鍒楄〃")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "inspectResult", value = "妫�楠岀粨鏋�", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "inspectDate", value = "妫�楠屾棩鏈�", dataTypeClass = Date.class, dataType = "date"),
- @ApiImplicitParam(name = "inspectUsername", value = "涓绘満宸�", dataTypeClass = String.class)
+ @ApiImplicitParam(name = "result", value = "妫�楠岀粨鏋�(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "material", value = "浜у搧鍚嶇О", dataTypeClass = String.class)
})
@GetMapping("/list_page")
- public Result<?> selectFinishedInspectPage(Integer pageNo, Integer pageSize, Integer inspectResult, String inspectDate, String inspectUsername){
- IPage<Map<String, Object>> page = finishedInspectService.selectFinishedInspectPage(new Page<Object>(pageNo, pageSize), inspectResult, inspectDate, inspectUsername);
+ public Result<?> list_page(Integer pageSize, Integer countSize, Integer result, String material) {
+ IPage<Map<String, Object>> page = finishedInspectService.selectFinishedInspectPage(new Page<Object>(pageSize, countSize), result, material);
Map<String, Object> map = new HashMap<>();
map.put("total", page.getTotal());
map.put("row", page.getRecords());
return Result.success(map);
}
- @ApiOperation(value = "4銆佷富椤靛垎椤�-->涓绘満宸ユ潯浠舵煡璇笅鎷夋")
- @GetMapping("/page_user")
- public Result<?> selectPageUserIdAndName(){
- List<Map<String, Object>> maps = userService.listUserIdAndName();
- return Result.success(maps);
- }
+
}
--
Gitblit v1.9.3