From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java | 152 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 146 insertions(+), 6 deletions(-)
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..83eaf1d 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,18 +1,25 @@
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.HistoryDto;
+import com.yuanchu.mom.dto.WarehouseCellAndSampleDto;
import com.yuanchu.mom.dto.WarehouseDto;
-import com.yuanchu.mom.mapper.WarehouseCellMapper;
-import com.yuanchu.mom.mapper.WarehouseHistoryMapper;
-import com.yuanchu.mom.mapper.WarehouseMapper;
-import com.yuanchu.mom.mapper.WarehouseShelfMapper;
-import com.yuanchu.mom.pojo.Warehouse;
-import com.yuanchu.mom.pojo.WarehouseHistory;
+import com.yuanchu.mom.exception.ErrorException;
+import com.yuanchu.mom.mapper.*;
+import com.yuanchu.mom.pojo.*;
+import com.yuanchu.mom.service.WarehouseCellService;
import com.yuanchu.mom.service.WarehouseService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author Administrator
@@ -32,6 +39,12 @@
private WarehouseHistoryMapper warehouseHistoryMapper;
+ private WarehouseCellService warehouseCellService;
+
+ private InsSampleMapper insSampleMapper;
+
+ private InsProductMapper insProductMapper;
+
@Override
public int addWarehouse(String name) {
Warehouse warehouse = new Warehouse();
@@ -43,6 +56,133 @@
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 (int i = 1; i < warehouseShelf.getRow() + 1; i++) {
+ for (int a = 1; a < warehouseShelf.getCol() + 1; a++) {
+ WarehouseCell cell = new WarehouseCell();
+ cell.setRow(i);
+ cell.setCol(a);
+ cell.setState(1);
+ cell.setShelfId(warehouseShelf.getId());
+ cells.add(cell);
+ }
+ }
+ warehouseCellService.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);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int delShelf(Integer id) {
+ warehouseCellMapper.update(null ,Wrappers.<WarehouseCell>lambdaUpdate().eq(WarehouseCell::getShelfId, id).set(WarehouseCell::getState, 0));
+ return warehouseShelfMapper.deleteById(id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int upShelf(WarehouseShelf warehouseShelf) {
+ warehouseCellMapper.update(null, Wrappers.<WarehouseCell>lambdaUpdate()
+ .eq(WarehouseCell::getShelfId, warehouseShelf.getWarehouseId())
+ .gt(WarehouseCell::getRow, warehouseShelf.getRow())
+ .gt(WarehouseCell::getCol, warehouseShelf.getCol())
+ .set(WarehouseCell::getState, 0));
+ warehouseShelfMapper.updateById(warehouseShelf);
+ return 0;
+ }
+
+ @Override
+ public List<WarehouseCellAndSampleDto> getWarehouse(Integer shelfId) {
+ return warehouseCellMapper.getWarehouse(shelfId);
+ }
+
+ @Override
+ public int inWarehouse(String trees, String sampleCode) {
+ String[] tree = trees.split("-");
+ if(tree.length < 4){
+ throw new ErrorException("搴撲綅閫夋嫨閿欒");
+ }
+ List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode).select(InsSample::getId,InsSample::getCellId));
+ if(samples.size()!=1){
+ throw new ErrorException("鏍峰搧缂栧彿杈撳叆鏈夎");
+ }
+ if(samples.get(0).getCellId()!=null){
+ throw new ErrorException("鏍峰搧 " + sampleCode + " 鏈嚭搴�");
+ }
+ WarehouseCell cell = warehouseCellMapper.selectOne(Wrappers.<WarehouseCell>lambdaQuery().eq(WarehouseCell::getShelfId, tree[1]).eq(WarehouseCell::getRow, tree[2]).eq(WarehouseCell::getCol, tree[3]).eq(WarehouseCell::getState, 1).select(WarehouseCell::getId,WarehouseCell::getRow,WarehouseCell::getCol));
+ WarehouseShelf shelf = warehouseShelfMapper.selectById(tree[1]);
+ Warehouse warehouse = warehouseMapper.selectById(tree[0]);
+ WarehouseHistory history = new WarehouseHistory();
+ history.setCellId(cell.getId());
+ history.setState(1);
+ history.setInsSampleId(samples.get(0).getId());
+ history.setWarehouseCode(warehouse.getName()+"-"+shelf.getName()+"-"+cell.getRow()+"-"+cell.getCol());
+ samples.get(0).setCellId(cell.getId());
+ insSampleMapper.updateById(samples.get(0));
+ return warehouseHistoryMapper.insert(history);
+ }
+
+ @Override
+ public int outWarehouse(String sampleCode) {
+ List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode).select(InsSample::getId,InsSample::getCellId));
+ if(samples.size()!=1){
+ throw new ErrorException("鏍峰搧缂栧彿杈撳叆鏈夎");
+ }
+ if(samples.get(0).getCellId()==null){
+ throw new ErrorException("鏍峰搧 " + sampleCode + " 鏈叆搴�");
+ }
+ WarehouseHistory history = new WarehouseHistory();
+ history.setState(2);
+ history.setInsSampleId(samples.get(0).getId());
+ history.setCellId(samples.get(0).getCellId());
+ history.setWarehouseCode(warehouseHistoryMapper.selectOne(Wrappers.<WarehouseHistory>lambdaQuery().eq(WarehouseHistory::getInsSampleId, samples.get(0).getId()).select(WarehouseHistory::getWarehouseCode).orderByDesc(WarehouseHistory::getId).last("limit 1")).getWarehouseCode());
+ insSampleMapper.update(null, Wrappers.<InsSample>lambdaUpdate().eq(InsSample::getId, samples.get(0).getId()).set(InsSample::getCellId, null));
+ return warehouseHistoryMapper.insert(history);
+ }
+
+ @Override
+ public Map<String, Object> getSampleRecord(Integer id) {
+ InsSample insSample = insSampleMapper.selectById(id);
+ List<HistoryDto> histories = warehouseHistoryMapper.getHistoryListBySampleId(id);
+ Map<String, Object> map = new HashMap<>();
+ Map<String, String> sampleHistory = new HashMap<>();
+ WarehouseHistory history = histories.get(histories.size() - 1);
+ if(history.getState() == 1){
+ sampleHistory.put("date", history.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ sampleHistory.put("user", warehouseHistoryMapper.getUserNameById(history.getCreateUser()));
+ sampleHistory.put("code", history.getWarehouseCode());
+ }
+ map.put("sampleHistory", sampleHistory);
+ map.put("insSample", insSample);
+ map.put("histories", histories);
+ map.put("products", insProductMapper.getProductAndResult(id));
+ return map;
+ }
+
+ @Override
+ public int searchSampleId(String sampleCode) {
+ List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode).select(InsSample::getId));
+ if(samples.size()!=1){
+ throw new ErrorException("鏍峰搧缂栧彿杈撳叆鏈夎");
+ }
+ return samples.get(0).getId();
+ }
}
--
Gitblit v1.9.3