|
|
@@ -55,8 +55,8 @@ public class STKServiceImpl implements STKService {
|
|
|
@Override
|
|
|
public Result getBom(BomReq bomReq) {
|
|
|
String bomId = bomReq.getBomId();
|
|
|
- List<BomDTO> bomDTOList = baseDao.query("select * from ( SELECT bo_id,bo_version,bo_status,bo_level,bo_mothercode,bo_remark,bo_wcname,bo_ispast,bo_cop,bo_recorder,bo_date,bo_auditman,bo_auditdate,bo_isextend,bo_refbomid,bo_refcode,bo_refname,bo_refspec,bo_style,bo_flowstyle " +
|
|
|
- " from Bom WHERE bo_id in ("+bomId+") order by bo_id desc)" , BomDTO.class);
|
|
|
+ List<BomDTO> bomDTOList = baseDao.query("select * from ( SELECT bo_id,bo_version,bo_status,bo_level,bo_mothercode,pr_detail,pr_spec,pr_unit,bo_remark,bo_wcname,bo_ispast,bo_cop,bo_recorder,bo_date,bo_auditman,bo_auditdate,bo_isextend,bo_refbomid,bo_refcode,bo_refname,bo_refspec,bo_style,bo_flowstyle " +
|
|
|
+ " from Bom LEFT JOIN Product ON bo_mothercode=pr_code WHERE bo_id in ("+bomId+") order by bo_id desc)" , BomDTO.class);
|
|
|
|
|
|
if (bomDTOList.size() == 0 ){
|
|
|
return Result.error("BOM资料不存在");
|
|
|
@@ -93,8 +93,8 @@ public class STKServiceImpl implements STKService {
|
|
|
int start = ((pageNum - 1) * pageSize + 1);
|
|
|
int end = pageNum * pageSize;
|
|
|
|
|
|
- List<BomDTO> bomDTOList = baseDao.query("select * from (select rownum rn,AA.* from ( SELECT bo_id,bo_version,bo_status,bo_level,bo_mothercode,bo_remark,bo_wcname,bo_ispast,bo_cop,bo_recorder,bo_date,bo_auditman,bo_auditdate,bo_isextend,bo_refbomid,bo_refcode,bo_refname,bo_refspec,bo_style,bo_flowstyle " +
|
|
|
- " from Bom order by bo_id desc) AA ) where rn>="+start+" and rn<="+end , BomDTO.class);
|
|
|
+ List<BomDTO> bomDTOList = baseDao.query("select * from (select rownum rn,AA.* from ( SELECT bo_id,bo_version,bo_status,bo_level,bo_mothercode,pr_detail,pr_spec,pr_unit,bo_remark,bo_wcname,bo_ispast,bo_cop,bo_recorder,bo_date,bo_auditman,bo_auditdate,bo_isextend,bo_refbomid,bo_refcode,bo_refname,bo_refspec,bo_style,bo_flowstyle " +
|
|
|
+ " from Bom LEFT JOIN Product ON bo_mothercode=pr_code order by bo_id desc) AA ) where rn>="+start+" and rn<="+end , BomDTO.class);
|
|
|
|
|
|
if (bomDTOList.size() == 0 ){
|
|
|
return Result.error("BOM资料无数据!");
|