From ba7168283fadf8e13761de353c51998fee09bd81 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 07 四月 2024 00:09:10 +0800
Subject: [PATCH] 新增仓库删除和仓库修改；修复检验保存功能
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 6 ++
inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java | 33 ++++++++++++++--
inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java | 35 +++++++++++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 3 +
inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseCellMapper.java | 3 +
inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java | 7 +++
6 files changed, 80 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
index 73f113a..8bf6106 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
@@ -1,14 +1,15 @@
package com.yuanchu.mom.controller;
+import com.yuanchu.mom.pojo.Warehouse;
+import com.yuanchu.mom.pojo.WarehouseShelf;
import com.yuanchu.mom.service.WarehouseService;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RequestMapping("/warehouse")
@RestController
@@ -30,4 +31,28 @@
return Result.success(warehouseService.selectWarehouse());
}
+ @PostMapping("/addShelf")
+ @ApiOperation("娣诲姞璐ф灦")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "name", name = "鍚嶇О"),
+ @ApiImplicitParam(value = "row", name = "琛�"),
+ @ApiImplicitParam(value = "col", name = "鍒�"),
+ @ApiImplicitParam(value = "warehouseId", name = "浠撳簱id")
+ })
+ public Result addShelf(@RequestBody WarehouseShelf warehouseShelf) {
+ return Result.success(warehouseService.addShelf(warehouseShelf));
+ }
+
+ @PostMapping("/delWarehouse")
+ @ApiOperation("鍒犻櫎浠撳簱")
+ public Result delWarehouse(Integer id) {
+ return Result.success(warehouseService.delWarehouse(id));
+ }
+
+ @PostMapping("/upWarehouse")
+ @ApiOperation("淇敼浠撳簱")
+ public Result upWarehouse(@RequestBody Warehouse warehouse) {
+ return Result.success(warehouseService.upWarehouse(warehouse));
+ }
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseCellMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseCellMapper.java
index 4227dcb..93ddb49 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseCellMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseCellMapper.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.mapper;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.WarehouseCell;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,7 +10,7 @@
* @createDate 2024-04-06 12:12:12
* @Entity com.yuanchu.mom.pojo.WarehouseCell
*/
-public interface WarehouseCellMapper extends BaseMapper<WarehouseCell> {
+public interface WarehouseCellMapper extends IService<WarehouseCell> {
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java
index f2b3f10..435f1e5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java
@@ -3,6 +3,7 @@
import com.yuanchu.mom.dto.WarehouseDto;
import com.yuanchu.mom.pojo.Warehouse;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.pojo.WarehouseShelf;
import java.util.List;
@@ -16,4 +17,10 @@
int addWarehouse(String name);
List<WarehouseDto> selectWarehouse();
+
+ int addShelf(WarehouseShelf warehouseShelf);
+
+ int delWarehouse(Integer id);
+
+ int upWarehouse(Warehouse warehouse);
}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 78981e5..eea8eed 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -76,6 +76,7 @@
@Resource
private InsReportMapper insReportMapper;
+ @Resource
private InsProductResultMapper insProductResultMapper;
@Override
@@ -190,7 +191,7 @@
JSONObject insValue = JSON.parseObject(JSON.toJSONString(o));
Map<String, Object> map = new HashMap<>();
map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
- if (insValue.get("u") == null && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
+ if ((insValue.get("u") == null || insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
map.put("u", userId);
}else {
map.put("u", insValue.get("u"));
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java
index 77b514b..3fb7e19 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.WarehouseDto;
import com.yuanchu.mom.mapper.WarehouseCellMapper;
@@ -7,11 +8,15 @@
import com.yuanchu.mom.mapper.WarehouseMapper;
import com.yuanchu.mom.mapper.WarehouseShelfMapper;
import com.yuanchu.mom.pojo.Warehouse;
+import com.yuanchu.mom.pojo.WarehouseCell;
import com.yuanchu.mom.pojo.WarehouseHistory;
+import com.yuanchu.mom.pojo.WarehouseShelf;
import com.yuanchu.mom.service.WarehouseService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -43,6 +48,36 @@
public List<WarehouseDto> selectWarehouse() {
return warehouseMapper.selectWarehouseList();
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int addShelf(WarehouseShelf warehouseShelf) {
+ warehouseShelfMapper.insert(warehouseShelf);
+ List<WarehouseCell> cells = new ArrayList<>();
+ for (Integer i = 0; i < warehouseShelf.getRow(); i++) {
+ for (Integer a = 0; a < warehouseShelf.getCol(); a++) {
+ WarehouseCell cell = new WarehouseCell();
+ cell.setRow(i);
+ cell.setCol(a);
+ cell.setState(1);
+ cells.add(cell);
+ }
+ }
+ warehouseCellMapper.saveBatch(cells);
+ return 1;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int delWarehouse(Integer id) {
+ warehouseShelfMapper.delete(Wrappers.<WarehouseShelf>lambdaUpdate().eq(WarehouseShelf::getWarehouseId, id));
+ return warehouseMapper.deleteById(id);
+ }
+
+ @Override
+ public int upWarehouse(Warehouse warehouse) {
+ return warehouseMapper.updateById(warehouse);
+ }
}
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index e87d717..5045af2 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -145,9 +145,13 @@
ip.update_user ip_update_user,
ip.create_time ip_create_time,
ip.update_time ip_update_time,
- template_id
+ template_id,
+ ipr.ins_value,
+ ipr.com_value,
+ ipr.equip_value
from ins_sample isa
left join ins_product ip on isa.id = ip.ins_sample_id
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
where ins_order_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
--
Gitblit v1.9.3