feat(productionPrintOrderExcel) 生产工单查询添加排序

buhuazhen

2026-04-27 6df2d854ea7d8b0d8200dd6572f1c3b5aabecc16

feat(productionPrintOrderExcel) 生产工单查询添加排序

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

@@ -167,8 +167,8 @@
            productionProductMain.setStartTime(productWorkOrder.getStartProductTime());
            productionProductMain.setEndTime(now);
        }
//        productionProductMain.setDeviceId(productProcess.getDeviceId());
//        productionProductMain.setDeviceName(productProcess.getDeviceName());
        productionProductMain.setDeviceId(dto.getDeviceId());
        productionProductMain.setDeviceName(dto.getDeviceName());
        productionProductMainMapper.insert(productionProductMain);
        /*新增报工投入表*/
        List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomAndProcess(productProcessRoute.getBomId(), productProcess.getId());

 src/main/resources/mapper/production/ProductionProductMainMapper.xml

@@ -51,11 +51,11 @@
            <if test="c.auditStatus != null">
                and ppm.audit_status = #{c.auditStatus}
            </if>
            <if test="c.workOrderId != ''">
            <if test="c.workOrderId != null">
                and ppm.work_order_id = #{c.workOrderId}
            </if>
        </where>
        order by pwo.id desc, ppm.id asc
        order by  ppm.id desc

    </select>
    <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">