产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
huminmin
2026-04-28 0268f58a18bfcf061389387ef5322bf11aece154 
 src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java


@@ -136,7 +136,6 @@


        productionProductMain.setUserId(dto.getUserId());


        productionProductMain.setUserName(dto.getUserName());


        productionProductMain.setProductionOperationTaskId(productionOperationTask.getId());


        productionProductMain.setWorkOrderId(productionOperationTask.getId());


        productionProductMain.setStatus(0);


        productionProductMainMapper.insert(productionProductMain);




@@ -169,7 +168,7 @@




        List<ProductionOrderRoutingOperation> routingOperationList = productionOrderRoutingOperationMapper.selectList(


                Wrappers.<ProductionOrderRoutingOperation>lambdaQuery()


                        .eq(ProductionOrderRoutingOperation::getTechnologyRoutingId, routingOperation.getTechnologyRoutingId())


                        .eq(ProductionOrderRoutingOperation::getOrderRoutingId, routingOperation.getOrderRoutingId())


                        .eq(ProductionOrderRoutingOperation::getProductionOrderId, routingOperation.getProductionOrderId()));


        boolean isLastOperation = routingOperation.getDragSort() != null && routingOperation.getDragSort().equals(routingOperationList.size());


        if (productQty.compareTo(BigDecimal.ZERO) > 0) {


@@ -245,8 +244,8 @@


            }


            ProductionAccount productionAccount = new ProductionAccount();


            productionAccount.setProductionProductMainId(productionProductMain.getId());


            productionAccount.setSalesLedgerId(productionOrder.getSalesLedgerId());


            productionAccount.setSalesLedgerProductId(productionOrder.getSalesLedgerProductId() == null ? null : productionOrder.getSalesLedgerProductId().longValue());


//            productionAccount.setSalesLedgerId(productionOrder.getSalesLedgerId());


//            productionAccount.setSalesLedgerProductId(productionOrder.getSalesLedgerProductId() == null ? null : productionOrder.getSalesLedgerProductId().longValue());


            productionAccount.setSchedulingUserId(user == null ? null : user.getUserId());


            productionAccount.setSchedulingUserName(user == null ? dto.getUserName() : user.getNickName());


            productionAccount.setFinishedNum(productQty);


@@ -301,7 +300,7 @@


                // 只有最后一道工序的报工才会影响生产订单完工数量。


                List<ProductionOrderRoutingOperation> routingOperationList = productionOrderRoutingOperationMapper.selectList(


                        Wrappers.<ProductionOrderRoutingOperation>lambdaQuery()


                                .eq(ProductionOrderRoutingOperation::getTechnologyRoutingId, routingOperation.getTechnologyRoutingId())


                                .eq(ProductionOrderRoutingOperation::getOrderRoutingId, routingOperation.getOrderRoutingId())


                                .eq(ProductionOrderRoutingOperation::getProductionOrderId, routingOperation.getProductionOrderId()));


                boolean isLastOperation = routingOperation.getDragSort() != null && routingOperation.getDragSort().equals(routingOperationList.size());


                if (isLastOperation) {