From 9f1c4e5ef6f82e111400fe2f292453583aa2155e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 三月 2025 12:12:47 +0800
Subject: [PATCH] 报告分页查询新增委托编号和样品编号
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 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..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
@@ -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,8 +181,17 @@
}
@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())
+ .select(InsSample::getId,InsSample::getCellId));
if(samples.size()!=1){
throw new ErrorException("鏍峰搧缂栧彿杈撳叆鏈夎");
}
@@ -221,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