From bcc80a6833abe9f24abdb978f7c7f01b664a574f Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 18 二月 2025 14:48:45 +0800 Subject: [PATCH] 优化调整 --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 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 8d2ab9d..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 @@ -151,9 +151,11 @@ if(tree.length < 4){ throw new ErrorException("搴撲綅閫夋嫨閿欒"); } - List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getEntrustCode, entrustCode)); + List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery() + .ne(InsOrder::getState,3)//鎺掗櫎鎾ら攢鐨勮鍗� + .eq(InsOrder::getEntrustCode, entrustCode)); if(insOrders.size()!=1){ - throw new ErrorException("璁㈠崟缂栧彿杈撳叆鏈夎"); + throw new ErrorException("璁㈠崟缂栧彿杈撳叆鏈夎,鎴栬�呰璁㈠崟缂栧彿宸茬粡鎾ら攢"); } List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery() .eq(InsSample::getSampleCode, sampleCode) @@ -180,9 +182,11 @@ @Override public int outWarehouse(String sampleCode, boolean a,String entrustCode) { - List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getEntrustCode, entrustCode)); + List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery() + .ne(InsOrder::getState,3)//鎺掗櫎鎾ら攢鐨勮鍗� + .eq(InsOrder::getEntrustCode, entrustCode)); if(insOrders.size()!=1){ - throw new ErrorException("璁㈠崟缂栧彿杈撳叆鏈夎"); + throw new ErrorException("璁㈠崟缂栧彿杈撳叆鏈夎,鎴栬�呰璁㈠崟缂栧彿宸茬粡鎾ら攢"); } List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery() .eq(InsSample::getSampleCode, sampleCode) -- Gitblit v1.9.3