Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

9 天以前 2d03ec79e1892248b520cf097e8a58dd82a4892f

Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java

@@ -35,6 +35,9 @@
    @ApiModelProperty("报修内容")
    private String remark;

    @ApiModelProperty("报修项目")
    private String repairProject;

    @ApiModelProperty("维修人")
    private String maintenanceName;


 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java

@@ -35,6 +35,9 @@
    @ApiModelProperty("报修内容")
    private String remark;

    @ApiModelProperty("报修项目")
    private String repairProject;

    @ApiModelProperty("维修人")
    private String maintenanceName;


 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java

@@ -38,6 +38,18 @@
    @Excel(name = "报废数量")
    private BigDecimal scrapQty = BigDecimal.ZERO;

    /**
     * 补产数量
     */
    @Excel(name = "补产数量")
    private BigDecimal replenishQty;

    /**
     * 加放数
     */
    @Excel(name = "加放数")
    private BigDecimal addQty;

    //产品名称
    @Excel(name = "产品名称")
    private String productName;
@@ -74,10 +86,9 @@

    private List<Team> teamList;

    /**
     * 补产数量
     */
    private BigDecimal replenishQty;




    @Data
    @AllArgsConstructor

 src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java

@@ -47,4 +47,10 @@
    @TableField(value = "replenish_qty")
    private BigDecimal replenishQty;

    /**
     * 加放数
     */
    @TableField(value = "add_qty")
    private BigDecimal addQty;

}

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

@@ -200,6 +200,7 @@
        productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
        productionProductOutput.setScrapQty(dto.getScrapQty() != null ? dto.getScrapQty() : BigDecimal.ZERO);
        productionProductOutput.setReplenishQty(dto.getReplenishQty());
        productionProductOutput.setAddQty(dto.getAddQty() != null ? dto.getAddQty() : BigDecimal.ZERO);
        productionProductOutputMapper.insert(productionProductOutput);
        //合格数量=报工数量-报废数量
        BigDecimal productQty = productionProductOutput.getQuantity().subtract(productionProductOutput.getScrapQty());
@@ -211,7 +212,7 @@
            if (ObjectUtils.isNull(productWorkOrder.getActualStartTime())) {
                productWorkOrder.setActualStartTime(LocalDate.now());//实际开始时间
            }
            if (productWorkOrder.getCompleteQuantity().compareTo(productWorkOrder.getPlanQuantity()) == 0) {
            if (productWorkOrder.getCompleteQuantity().compareTo(productWorkOrder.getPlanQuantity()) >= 0) {
                productWorkOrder.setActualEndTime(LocalDate.now());//实际结束时间
            }
            productWorkOrder.setEndProductTime(now);
@@ -224,7 +225,7 @@
            if (productProcessRouteItem.getDragSort() == productProcessRouteItems.size()) {
                //如果是最后一道工序报工之后生产订单完成数量+
                productOrder.setCompleteQuantity(productOrder.getCompleteQuantity().add(productQty));
                if (productOrder.getCompleteQuantity().compareTo(productOrder.getQuantity()) == 0) {
                if (productOrder.getCompleteQuantity().compareTo(productOrder.getQuantity()) >= 0) {
                    productOrder.setEndTime(now);//结束时间
                }
            }

 src/main/java/com/ruoyi/project/system/domain/SysUser.java

@@ -84,6 +84,10 @@
    @TableField(exist = false)

    private Long[] roleIds;



    /** 角色ID字符串（用于SQL拼接接收） */

    @TableField(exist = false)

    private String roleIdsStr;



    /** 岗位组 */

    @TableField(exist = false)

    private Long[] postIds;

@@ -382,4 +386,12 @@
            .append("remark", getRemark())

            .toString();

    }



    public String getRoleIdsStr() {

        return roleIdsStr;

    }



    public void setRoleIdsStr(String roleIdsStr) {

        this.roleIdsStr = roleIdsStr;

    }

}


 src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -75,7 +75,19 @@
    @DataScope(deptAlias = "d", userAlias = "u")

    public List<SysUser> selectUserList(SysUser user)

    {

        return userMapper.selectUserList(user);

        List<SysUser> userList = userMapper.selectUserList(user);

        // 将角色ID字符串转换为数组

        userList.forEach(u -> {

            if (u.getRoleIdsStr() != null && !u.getRoleIdsStr().isEmpty()) {

                String[] strIds = u.getRoleIdsStr().split(",");

                Long[] roleIds = new Long[strIds.length];

                for (int i = 0; i < strIds.length; i++) {

                    roleIds[i] = Long.parseLong(strIds[i]);

                }

                u.setRoleIds(roleIds);

            }

        });

        return userList;

    }



    /**

@@ -558,7 +570,18 @@
     */

    @Override

    public List<SysUser> userListNoPage(SysUser user) {

        return userMapper.selectUserList(user);

        List<SysUser> userList = userMapper.selectUserList(user);

        userList.forEach(u -> {

            if (u.getRoleIdsStr() != null && !u.getRoleIdsStr().isEmpty()) {

                String[] strIds = u.getRoleIdsStr().split(",");

                Long[] roleIds = new Long[strIds.length];

                for (int i = 0; i < strIds.length; i++) {

                    roleIds[i] = Long.parseLong(strIds[i]);

                }

                u.setRoleIds(roleIds);

            }

        });

        return userList;

    }



    /**


 src/main/resources/mapper/device/DeviceRepairMapper.xml

@@ -11,6 +11,7 @@
                dr.repair_time,
                dr.repair_name,
                dr.remark,
                dr.repair_project,
                dr.maintenance_name,
                dr.maintenance_time,
                dr.maintenance_result,
@@ -38,6 +39,9 @@
            <if test="deviceRepairDto.remark != null">
                and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
            </if>
            <if test="deviceRepairDto.repairProject != null">
                and dr.repair_project like concat('%',#{deviceRepairDto.repairProject},'%')
            </if>
            <if test="deviceRepairDto.maintenanceName != null">
                and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
            </if>
@@ -56,6 +60,7 @@
               dr.repair_time,
               dr.repair_name,
               dr.remark,
               dr.repair_project,
               dr.maintenance_name,
               dr.maintenance_time,
               dr.maintenance_result,

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

@@ -39,7 +39,7 @@
                END AS work_order_type,
            pp.device_name,
            pp.user_ids as process_user_ids,
            t7.model as final_product_model
            t8.product_name as final_product_model
        FROM
            product_work_order pwo
                LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -48,6 +48,7 @@
                LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
                LEFT JOIN product p ON p.id = pm.product_id
                left join product_model t7 on t7.id = po.product_model_id
                left join product as t8 on t7.product_id = t8.id
        <where>
            <if test="c.workOrderNo != null and c.workOrderNo != ''">
                pwo.work_order_no like concat('%', #{c.workOrderNo}, '%')

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

@@ -22,6 +22,7 @@
        pm.model as productModelName,
        ppo.quantity,
        ppo.scrap_qty,
        ppo.add_qty,
        pm.unit,
        sl.sales_contract_no salesContractNo
        from
@@ -83,7 +84,10 @@
        IFNULL(
        TIMESTAMPDIFF(MINUTE, ppm.start_time, ppm.end_time),
        0
        ) AS work_minutes
        ) AS work_minutes,
        ppo.add_qty,
        ppo.scrap_qty,
        ppo.replenish_qty
        FROM
        production_product_main ppm
        LEFT JOIN sales_ledger_production_accounting slpa ON slpa.product_main_id = ppm.id

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

@@ -22,7 +22,7 @@
        FROM
        sales_ledger_production_accounting t4
        LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
        left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id and slp.type = 1
        left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id and t3.type = 1
        <where>
            t3.type = 1
            <if test="salesLedgerDto.schedulingUserName != null and salesLedgerDto.schedulingUserName != '' ">

 src/main/resources/mapper/system/SysUserMapper.xml

@@ -24,6 +24,7 @@
        <result property="remark"       column="remark"       />
        <result property="deptNames"       column="dept_names"       />
        <result property="tenantId"       column="tenant_id"       />
        <result property="roleIdsStr"    column="role_ids_str"    />
        <association property="dept"    javaType="com.ruoyi.project.system.domain.SysDept"         resultMap="deptResult" />
        <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
    </resultMap>
@@ -56,7 +57,7 @@
    </sql>

    <select id="selectUserList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
        select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,T2.dept_names from sys_user u
        select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.tenant_id, T2.dept_names, T3.role_ids_str from sys_user u
        left join
        (    SELECT T1.user_id,GROUP_CONCAT(T2.dept_name SEPARATOR ', ') AS dept_names
            FROM
@@ -69,6 +70,11 @@
        </where>
            GROUP BY T1.user_id
        ) T2 on T2.user_id = u.user_id
        left join
        (    SELECT ur.user_id, GROUP_CONCAT(ur.role_id) AS role_ids_str
            FROM sys_user_role ur
            GROUP BY ur.user_id
        ) T3 on T3.user_id = u.user_id
        where u.del_flag = '0'
        <if test="userId != null and userId != 0">
            AND u.user_id = #{userId}