fix: 供应商与客户往来修改

gongchunyi

5 天以前 5ed564bddc6aecb049509d9524190b3704f87d3d

fix: 供应商与客户往来修改

 src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java

@@ -401,7 +401,7 @@
                vo.setShippedAmount(outboundAmount);
                BigDecimal contractAmounts = vo.getContractAmounts() == null ? BigDecimal.ZERO : vo.getContractAmounts();
                BigDecimal unshippedAmount = contractAmounts.subtract(outboundAmount);
                if (unshippedAmount.compareTo(BigDecimal.ZERO) < 0) {
                if (unshippedAmount.compareTo(BigDecimal.ONE) < 0) {
                    unshippedAmount = BigDecimal.ZERO;
                }
                vo.setUnshippedAmount(unshippedAmount);
@@ -429,7 +429,7 @@
                vo.setShippedAmount(outboundAmount);
                BigDecimal contractAmount = vo.getContractAmount() == null ? BigDecimal.ZERO : vo.getContractAmount();
                BigDecimal unshippedAmount = contractAmount.subtract(outboundAmount);
                if (unshippedAmount.compareTo(BigDecimal.ZERO) < 0) {
                if (unshippedAmount.compareTo(BigDecimal.ONE) < 0) {
                    unshippedAmount = BigDecimal.ZERO;
                }
                vo.setUnshippedAmount(unshippedAmount);

 src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java

@@ -186,7 +186,7 @@
        //  不质检直接入库的 - 7
        List<StockInRecord> directInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
                .eq(StockInRecord::getRecordType, "7")
                .eq(StockInRecord::getApprovalStatus, 1)
                .in(StockInRecord::getApprovalStatus, 0, 1)
                .in(StockInRecord::getRecordId, ledgerIds));

        //  通过质检入库的
@@ -200,7 +200,7 @@
        if (!inspectIds.isEmpty()) {
            qualifiedInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
                    .eq(StockInRecord::getRecordType, "10")
                    .eq(StockInRecord::getApprovalStatus, 1)
                    .in(StockInRecord::getApprovalStatus, 0, 1)
                    .in(StockInRecord::getRecordId, inspectIds));

            qualityUnqualifieds = qualityUnqualifiedMapper.selectList(new LambdaQueryWrapper<QualityUnqualified>()
@@ -213,7 +213,7 @@
        if (!unqualifiedIds.isEmpty()) {
            unqualifiedInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
                    .eq(StockInRecord::getRecordType, "11")
                    .eq(StockInRecord::getApprovalStatus, 1)
                    .in(StockInRecord::getApprovalStatus, 0, 1)
                    .in(StockInRecord::getRecordId, unqualifiedIds));
        }

@@ -287,7 +287,7 @@
        //  不质检直接入库的 - 7
        List<StockInRecord> directInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
                .eq(StockInRecord::getRecordType, "7")
                .eq(StockInRecord::getApprovalStatus, 1)
                .in(StockInRecord::getApprovalStatus, 0, 1)
                .in(StockInRecord::getRecordId, ledgerIds));

        //  通过质检入库的
@@ -301,7 +301,7 @@
        if (!inspectIds.isEmpty()) {
            qualifiedInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
                    .eq(StockInRecord::getRecordType, "10")
                    .eq(StockInRecord::getApprovalStatus, 1)
                    .in(StockInRecord::getApprovalStatus, 0, 1)
                    .in(StockInRecord::getRecordId, inspectIds));

            qualityUnqualifieds = qualityUnqualifiedMapper.selectList(new LambdaQueryWrapper<QualityUnqualified>()
@@ -314,7 +314,7 @@
        if (!unqualifiedIds.isEmpty()) {
            unqualifiedInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
                    .eq(StockInRecord::getRecordType, "11")
                    .eq(StockInRecord::getApprovalStatus, 1)
                    .in(StockInRecord::getApprovalStatus, 0, 1)
                    .in(StockInRecord::getRecordId, unqualifiedIds));
        }