报工接口，新增下拉框适配

Houjie

21 小时以前 44b18be16f09b1d934ee7bc98a34d8bcf85d050e

报工接口，新增下拉框适配

 src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java

@@ -209,31 +209,48 @@
        return Collections.emptyList();
    }

    //    @Override
//    public EamEquipment selectByEquipmentCode(String equipmentCode) {
//        if (StringUtils.isBlank(equipmentCode)) {
//            return null;
//        }
//        QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
//        //用户数据权限
//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//        if (sysUser == null) {
//            return null;
//        }
//        if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
//            //选择了设备，根据设备id过滤设备
//            List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
//            queryWrapper.in("equipment_code", equipArr);
//        } else {
//            //没有选择设备，根据车间过滤设备
//            queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=org_id", sysUser.getId());
//        }
//        queryWrapper.eq("equipment_code", equipmentCode);
//        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
//
//        return eamEquipmentMapper.selectOne(queryWrapper);
//    }

    /**
     *
     * @param equipmentCode
     * @return
     */
    @Override
    public EamEquipment selectByEquipmentCode(String equipmentCode) {
        if (StringUtils.isBlank(equipmentCode)) {
            return null;
        }
        QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            return null;
        }
        if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
            //选择了设备，根据设备id过滤设备
            List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
            queryWrapper.in("equipment_code", equipArr);
        } else {
            //没有选择设备，根据车间过滤设备
            queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=org_id", sysUser.getId());
        }
        // 移除用户数据权限过滤，直接根据设备编码查询
        queryWrapper.eq("equipment_code", equipmentCode);
        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);

        return eamEquipmentMapper.selectOne(queryWrapper);
    }

    /**
     * 获取所有的产线id（包含所有上级）
     */

 src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java

@@ -104,6 +104,7 @@
        List<Map<String, Object>> res = orderList.stream().map(order -> {
            Map<String, Object> map = new HashMap<>();
            map.put("title", order.getOrderCode());
            map.put("text", order.getOrderCode());
            map.put("label", order.getOrderCode());
            map.put("value", order.getId());
            return map;

 src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java

@@ -162,4 +162,12 @@
    /**班次名称*/
    @TableField(exist = false)
    private String shiftName;

    /**生产工单*/
    @TableField(exist = false)
    private String text;

    /**生产工单id*/
    @TableField(exist = false)
    private String value;
}

 src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml

@@ -5,6 +5,8 @@
    <select id="queryPageList" resultType="org.jeecg.modules.mes.entity.MesProductionWorkOrder">
        SELECT
            t1.*,
            t1.work_order_code AS text,
            t1.id AS value,
            t2.factory_code factoryCode,
            t3.shift_code shiftCode
        FROM mes_production_work_order t1