feat:库存管理成品/半成品/原材料

liding

2026-04-24 47cbc59169b787e8a5f9c6969e2a0259c06249ca

feat:库存管理成品/半成品/原材料

 src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java

@@ -238,7 +238,7 @@
        BigDecimal productQty = productionProductOutput.getQuantity();
        //只有合格数量>0才能增加相应数据
        ProductWorkOrder pwo = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
        String customer = "长治市轴承制造有限公司";
        String customer = "长治市健齿齿科器材有限公司";
        if (productQty.compareTo(BigDecimal.ZERO) > 0) {
            /*新增质检*/
            List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().eq(ProductProcessRouteItem::getProductRouteId, productProcessRouteItem.getProductRouteId()));

 src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java

@@ -79,7 +79,7 @@
        QualityInspect qualityInspect = new QualityInspect();
        BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
        if (qualityInspectDto.getInspectType() != 0) {
            qualityInspectDto.setCustomer("长治市轴承制造有限公司");
            qualityInspectDto.setCustomer("长治市健齿齿科器材有限公司");
        }
        qualityInspect.setInspectState(0);//默认未提交
        qualityInspectMapper.insert(qualityInspect);
@@ -112,7 +112,7 @@
            ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
            ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
            batchNo = productOrder.getBatchNo();
            customer = "长治市轴承制造有限公司";
            customer = "长治市健齿齿科器材有限公司";
        } else {
            batchNo = qualityInspect.getBatchNo();
            customer = qualityInspect.getSupplier();
@@ -137,7 +137,7 @@
        } else {
            //合格直接入库
            stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(),
                    qualityInspect.getId(), batchNo, customer != null ? customer : "长治市轴承制造有限公司", inspect.getProductionDate()
                    qualityInspect.getId(), batchNo, customer != null ? customer : "长治市健齿齿科器材有限公司", inspect.getProductionDate()
            );
        }
        qualityInspect.setInspectState(1);//已提交

 src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java

@@ -73,13 +73,13 @@
            ProductWorkOrder workOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
            ProductOrder orders = productOrderMapper.selectById(workOrder.getProductOrderId());
            batchNo = orders.getBatchNo();
            customer = "长治市轴承制造有限公司";
            customer = "长治市健齿齿科器材有限公司";
        } else {
            batchNo = qualityInspect.getBatchNo();
            if (qualityInspect.getSupplier() != null) {
                customer = qualityInspect.getCustomer();
            } else {
                customer = "长治市轴承制造有限公司";
                customer = "长治市健齿齿科器材有限公司";
            }
        }
        if (ObjectUtils.isNotNull(qualityInspect) && qualityInspect.getInspectType() != 0) {

 src/main/resources/mapper/stock/StockInventoryMapper.xml

@@ -84,7 +84,7 @@
        p.product_name,
        si.batch_no,
        si.customer,
        rp.product_name AS root_product_name,
        rp.product_type AS productScope,
        si.production_date
        FROM
        stock_inventory si
@@ -108,11 +108,15 @@
            <if test="ew.productScope != null and ew.productScope != ''">
                <choose>
                    <when test="ew.productScope == '成品'">
                        AND rp.product_name = '成品'
                        AND rp.product_type = '成品'
                    </when>
                    <otherwise>
                        AND rp.product_name != '成品'
                    </otherwise>
                    <when test="ew.productScope == '半成品'">
                        AND rp.product_type = '半成品'
                    </when>
                    <when test="ew.productScope == '原材料'">
                        AND (rp.product_type IS NULL
                        OR (rp.product_type != '成品' AND rp.product_type != '半成品'))
                    </when>
                </choose>
            </if>
        </where>