From 929c6698f4d7598997fc233e09c39c3bdce9fcf8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 八月 2025 10:23:15 +0800
Subject: [PATCH] 判断合格绝对值的问题
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 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 d480b47..e37c5f2 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
@@ -50,6 +50,8 @@
private InsProductMapper insProductMapper;
+ private InsOrderMapper insOrderMapper;
+
@Override
public int addWarehouse(String name) {
Warehouse warehouse = new Warehouse();
@@ -139,17 +141,26 @@
}
@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("鏍峰搧缂栧彿杈撳叆鏈夎");
}
@@ -170,28 +181,21 @@
}
@Override
- public int outWarehouse(String sampleCode, boolean a) {
- 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()));
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);
@@ -199,6 +203,10 @@
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));
+ //璇ヨ鍗曢棴鐜�
+ InsOrder insOrder = insOrders.get(0);
+ insOrder.setState(4);
+ insOrderMapper.updateById(insOrder);
return warehouseHistoryMapper.insert(history);
}
@@ -221,14 +229,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