From 35091697a5421218d31e7e2d2c58b6a5385cc663 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 17 八月 2023 09:58:02 +0800
Subject: [PATCH] 改动

---
 inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java
index c1898ba..e23fda3 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java
@@ -46,13 +46,13 @@
         //濡傛灉鍏ュ簱鐨勪俊鎭竴鏍峰彧鏈夊簱瀛樹笉涓�鏍�,鍒欏湪鍘熸潵鐨勫簱瀛樻暟閲忎笂鍔犱笂鐩稿簲鐨勬暟閲�
         LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Repertory::getOrderCode, importRepertoryDto.getOrderCode())
-                .eq(Repertory::getCode, importRepertoryDto.getCode())
+                .eq(Repertory::getQualityTraceability, importRepertoryDto.getQualityTraceability())
                 .eq(Repertory::getName, importRepertoryDto.getName())
                 .eq(Repertory::getSpecifications, importRepertoryDto.getSpecifications())
                 .eq(Repertory::getUnit, importRepertoryDto.getUnit())
                 .eq(Repertory::getType, 0);
         Repertory rep = repertoryMapper.selectOne(queryWrapper);
-        if (rep != null && rep.getCheckState() == 0) {
+        if (rep != null ) {
             rep.setNumber(rep.getNumber() + importRepertoryDto.getNumber());
             rep.setUserName(name);
             repertoryMapper.updateById(rep);
@@ -62,7 +62,6 @@
             BeanUtils.copyProperties(importRepertoryDto, repertory);
             repertory.setUserName(name);
             repertory.setType(0);
-            repertory.setCheckState(0);
             repertoryMapper.insert(repertory);
         }
     }
@@ -83,12 +82,11 @@
         //搴撳瓨涔熻鍑忓皯
         LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Repertory::getOrderCode, importRepertory.getOrderCode())
-                .eq(Repertory::getCode, importRepertory.getCode())
+                .eq(Repertory::getQualityTraceability, importRepertory.getQualityTraceability())
                 .eq(Repertory::getName, importRepertory.getName())
                 .eq(Repertory::getSpecifications, importRepertory.getSpecifications())
                 .eq(Repertory::getUnit, importRepertory.getUnit())
-                .eq(Repertory::getType, 0)
-                .eq(Repertory::getCheckState, 0);
+                .eq(Repertory::getType, 0);
         Repertory rep = repertoryMapper.selectOne(queryWrapper);
         rep.setNumber(rep.getNumber() - importRepertory.getNumber());
         repertoryMapper.updateById(rep);
@@ -105,12 +103,11 @@
             //鍑忓皯搴撳瓨
             LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Repertory::getOrderCode, importRepertory.getOrderCode())
-                    .eq(Repertory::getCode, importRepertory.getCode())
+                    .eq(Repertory::getQualityTraceability, importRepertory.getQualityTraceability())
                     .eq(Repertory::getName, importRepertory.getName())
                     .eq(Repertory::getSpecifications, importRepertory.getSpecifications())
                     .eq(Repertory::getUnit, importRepertory.getUnit())
-                    .eq(Repertory::getType, 0)
-                    .eq(Repertory::getCheckState, 0);
+                    .eq(Repertory::getType, 0);
             Repertory rep = repertoryMapper.selectOne(queryWrapper);
             rep.setNumber(rep.getNumber() - importRepertory.getNumber());
             repertoryMapper.updateById(rep);

--
Gitblit v1.9.3