20231010_qiuyh_计划管理-新增钢筋笼、管片明细

邱宇豪

2023-10-10 8bcc406d63c3f5e31fc12c3cc9cfc11fab7df7c1

20231010_qiuyh_计划管理-新增钢筋笼、管片明细

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TSteelNeedYearController.java

@@ -39,4 +39,24 @@
    public BasicResult needYearUpdate(@RequestBody Map<String,Object> values){
        return yearService.needYearUpdate(values);
    }

    /**
     * 钢筋笼生产计划-钢筋笼明细
     * @param values
     * @return
     */
    @PostMapping("/selectSteelInfo")
    public BasicResult selectSteelInfo(@RequestBody Map<String,Object> values){
        return yearService.selectSteelInfo(values);
    }

    /**
     * 管片生产计划-管片明细
     * @param values
     * @return
     */
    @PostMapping("/selectPipeInfo")
    public BasicResult selectPipeInfo(@RequestBody Map<String,Object> values){
        return yearService.selectPipeInfo(values);
    }
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TSteelNeedYearMapper.java

@@ -36,4 +36,18 @@
    List<Integer> needProSizePipe(@Param("proId") String proId,@Param("sizeId") String sizeId,@Param("reinforcementId") String reinforcementId,@Param("years") String years);

    List<TNeedNum> proIdAndHas(String proId);

    /**
     * 钢筋笼生产计划-钢筋笼明细
     * @param map
     * @return
     */
    List<Map<String,Object>> selectSteelInfo(Map<String,Object> map);

    /**
     * 钢筋笼生产计划-钢筋笼明细
     * @param map
     * @return
     */
    List<Map<String,Object>> selectPipeInfo(Map<String,Object> map);
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TSteelNeedYearService.java

@@ -14,4 +14,8 @@
    BasicResult needYearInfo(String steelNeedId);

    BasicResult needYearUpdate(Map<String, Object> values);

    BasicResult selectSteelInfo(Map<String, Object> values);

    BasicResult selectPipeInfo(Map<String, Object> values);
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TSteelNeedYearServiceImpl.java

@@ -192,4 +192,30 @@
        return BasicResult.success("修改成功");
    }

    @Override
    public BasicResult selectSteelInfo(Map<String, Object> values) {
        SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
        String companyId = sysUserInfo.getCompanyId();
        values.put("companyId",companyId);
        Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
        Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
        PageHelper.startPage(pageNum,pageSize);
        List<Map<String, Object>> list = this.yearMapper.selectSteelInfo(values);
        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
        return BasicResult.success(pageInfo);
    }

    @Override
    public BasicResult selectPipeInfo(Map<String, Object> values) {
        SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
        String companyId = sysUserInfo.getCompanyId();
        values.put("companyId",companyId);
        Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
        Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
        PageHelper.startPage(pageNum,pageSize);
        List<Map<String, Object>> list = this.yearMapper.selectPipeInfo(values);
        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
        return BasicResult.success(pageInfo);
    }

}

 hd/pipe/materialsManage/src/main/resources/mapping/TSteelNeedYearMapper.xml

@@ -232,4 +232,76 @@
    and print_time like concat('%',#{years},'%')
    GROUP BY block_num
  </select>

  <select id="selectSteelInfo" resultType="java.util.Map" parameterType="java.util.Map">
    SELECT
            tsp.produce_number produceNumber,
            sp.pro_name proName,
            sd1.dict_name sizeName,
            sd2.dict_name reinforcementName,
            sd3.dict_name blockName,
            tsp.quality_time,
            su1.real_name checkName,
            su2.real_name createUser,
            CASE tsp.is_qualified
                    WHEN  1 THEN '合格'
                    WHEN  2 THEN '不合格'
                    END isQualified,
            CASE tsp.is_model
                    WHEN  1 THEN '入模'
                    WHEN  2 THEN '未入模'
                    END isModel,
            IFNULL(sg.group_name,'无') groupName
    FROM t_steel_produce tsp
                 LEFT JOIN sys_project sp ON sp.pro_id = tsp.pro_id
                 LEFT JOIN sys_dict sd1 ON sd1.dict_id = tsp.size_id
                 LEFT JOIN sys_dict sd2 ON sd2.dict_id = tsp.reinforcement_id
                 LEFT JOIN sys_dict sd3 ON sd3.dict_id = tsp.block_num
                 LEFT JOIN sys_users su1 ON su1.user_id = tsp.quality_user
                 LEFT JOIN sys_users su2 ON su2.user_id = tsp.create_user
                 LEFT JOIN sys_group_user sgu ON sgu.user_id = tsp.create_user
                 LEFT JOIN sys_group sg ON sg.group_id = sgu.group_id
    WHERE
            tsp.is_use = 1
      AND tsp.is_qualified = 1
      AND tsp.reinforcement_id = #{reinforcementId}
      AND tsp.pro_id = #{proId}
      AND tsp.size_id = #{sizeId}
      AND tsp.print_time like concat(#{years},'%')
      AND sp.company_id=#{companyId}
  </select>
    <select id="selectPipeInfo" resultType="java.util.Map" parameterType="java.util.Map">
        SELECT
                tpi.ring_num,
                tpi.pipe_num,
                sd1.dict_name turn,
                sd2.dict_name reinforcement,
                sd3.dict_name groutingHoles,
                sd4.dict_name blockNum,
                sm.mould_num mouldNum,
                tpi.into_mod_time intoModTime,
                IFNULL(tpi.pouring_time,' ') pouringTime,
                tpi.check_time checkTime,
                IFNULL(sg.group_name,'无') groupName,
                sp.pro_name,
                CASE tpi.check_result
                        WHEN  1 THEN '合格'
                        WHEN  2 THEN '不合格'
                        END checkResult
        FROM t_pipe_info tpi
                     LEFT JOIN sys_project sp ON sp.pro_id = tpi.pro_id
                     LEFT JOIN sys_group_user sgu ON sgu.user_id = tpi.check_user
                     LEFT JOIN sys_group sg ON sg.group_id = sgu.group_id
                     LEFT JOIN sys_dict sd1 ON sd1.dict_id = tpi.turn
                     LEFT JOIN sys_dict sd2 ON sd2.dict_id = tpi.reinforcement
                     LEFT JOIN sys_dict sd3 ON sd3.dict_id = tpi.grouting_holes
                     LEFT JOIN sys_dict sd4 ON sd4.dict_id = tpi.block_num
                     LEFT JOIN sys_mould sm ON sm.mould_id = tpi.mod_id
        WHERE
          tpi.check_result = 1
          AND sp.pro_id = #{proId}
          AND tpi.size= #{sizeId}
          AND tpi.check_time like concat(#{yearAndMonth},'%')
          AND sp.company_id=#{companyId}
    </select>
</mapper>