From 54c480e3632fbc6fc821786e2b473bceb2f0ae4e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 22 三月 2025 15:35:29 +0800
Subject: [PATCH] 天线的电路总报告保留两位小数
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 77 insertions(+), 19 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 83eaf1d..4c41723 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,7 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.HistoryDto;
@@ -20,6 +22,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author Administrator
@@ -43,7 +46,11 @@
private InsSampleMapper insSampleMapper;
+ private InsOrderStateMapper insOrderStateMapper;
+
private InsProductMapper insProductMapper;
+
+ private InsOrderMapper insOrderMapper;
@Override
public int addWarehouse(String name) {
@@ -98,27 +105,62 @@
@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));
+ WarehouseShelf shelf = warehouseShelfMapper.selectById(warehouseShelf.getId());
+ if (shelf.getCol()>=warehouseShelf.getCol() && shelf.getRow() >= warehouseShelf.getRow()) {
+ //濡傛灉缁存姢鐨勬暟鎹皬浜庡師鏈夌殑琛屽垪鏁板彲浠ヨ繘琛屼慨鏀�
+ warehouseCellMapper.update(null, Wrappers.<WarehouseCell>lambdaUpdate()
+ .eq(WarehouseCell::getShelfId, warehouseShelf.getId())
+ .and(true, wrapper -> wrapper.gt(WarehouseCell::getRow, warehouseShelf.getRow())
+ .or()
+ .gt(WarehouseCell::getCol, warehouseShelf.getCol()))
+ .set(WarehouseCell::getState, 0));
+ }else {
+ //濡傛灉缁存姢鐨勬暟鎹ぇ浜庡師鏈夌殑琛屽垪鏁伴渶瑕佽繘琛岄澶栨坊鍔�
+ 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());
+ WarehouseCell warehouseCell = warehouseCellMapper.selectOne(Wrappers.<WarehouseCell>lambdaQuery()
+ .eq(WarehouseCell::getShelfId, warehouseShelf.getId())
+ .eq(WarehouseCell::getRow, i)
+ .eq(WarehouseCell::getCol, a));
+ if (ObjectUtils.isNotEmpty(warehouseCell)){
+ cell.setId(warehouseCell.getId());
+ }
+ cells.add(cell);
+ }
+ }
+ warehouseCellService.saveOrUpdateBatch(cells);
+ }
warehouseShelfMapper.updateById(warehouseShelf);
return 0;
}
@Override
- public List<WarehouseCellAndSampleDto> getWarehouse(Integer shelfId) {
- return warehouseCellMapper.getWarehouse(shelfId);
+ public List<WarehouseCellAndSampleDto> getWarehouse(Integer shelfId,String sampleCode) {
+ return warehouseCellMapper.getWarehouse(shelfId,sampleCode);
}
@Override
- public int inWarehouse(String trees, String sampleCode) {
+ public int inWarehouse(String trees, String sampleCode,String entrustCode) {
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));
+ List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery()
+ .ne(InsOrder::getState,3)//鎺掗櫎鎾ら攢鐨勮鍗�
+ .eq(InsOrder::getEntrustCode, entrustCode));
+ if(insOrders.size()!=1){
+ throw new ErrorException("璁㈠崟缂栧彿杈撳叆鏈夎,鎴栬�呰璁㈠崟缂栧彿宸茬粡鎾ら攢");
+ }
+ List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
+ .eq(InsSample::getSampleCode, sampleCode)
+ .eq(InsSample::getInsOrderId,insOrders.get(0).getId())
+ .select(InsSample::getId,InsSample::getCellId));
if(samples.size()!=1){
throw new ErrorException("鏍峰搧缂栧彿杈撳叆鏈夎");
}
@@ -139,13 +181,37 @@
}
@Override
- public int outWarehouse(String sampleCode) {
- List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode).select(InsSample::getId,InsSample::getCellId));
+ public int outWarehouse(String sampleCode, boolean a,String entrustCode) {
+ List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery()
+ .ne(InsOrder::getState,3)//鎺掗櫎鎾ら攢鐨勮鍗�
+ .eq(InsOrder::getEntrustCode, entrustCode));
+ if(insOrders.size()!=1){
+ throw new ErrorException("璁㈠崟缂栧彿杈撳叆鏈夎,鎴栬�呰璁㈠崟缂栧彿宸茬粡鎾ら攢");
+ }
+ List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
+ .eq(InsSample::getSampleCode, sampleCode)
+ .eq(InsSample::getInsOrderId,insOrders.get(0).getId())
+ .select(InsSample::getId,InsSample::getCellId));
if(samples.size()!=1){
throw new ErrorException("鏍峰搧缂栧彿杈撳叆鏈夎");
}
if(samples.get(0).getCellId()==null){
throw new ErrorException("鏍峰搧 " + sampleCode + " 鏈叆搴�");
+ }
+ if (!a) {
+ //鍒ゆ柇璇ヨ鍗曟槸鍚︾珯鐐逛换鍔℃湁(缁х画璇曢獙鎴栬�呮槸缁撴潫璇曢獙)
+ List<InsOrderState> orderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery()
+ .eq(InsOrderState::getInsOrderId, samples.get(0).getInsOrderId())
+ .eq(InsOrderState::getInsState, 5));
+ List<Integer> orderIds = new ArrayList<Integer>();
+ orderIds.add(6);
+ if (CollectionUtils.isEmpty(orderStates)) {
+ List<Integer> collect = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery()
+ .eq(InsOrderState::getInsOrderId, samples.get(0).getInsOrderId())).stream().map(InsOrderState::getInsState).distinct().collect(Collectors.toList());
+ if (collect.size()!=0 && !collect.containsAll(orderIds)) {
+ throw new ErrorException("璇ユ牱鍝佺殑妫�楠屼换鍔¤繕娌℃湁缁撴潫璇曢獙鎴栫户缁瘯楠�,鏆傛椂鏃犳硶鍑哄簱!");
+ }
+ }
}
WarehouseHistory history = new WarehouseHistory();
history.setState(2);
@@ -175,14 +241,6 @@
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