Browse Source

【思拓微】【OA对接】【增加BOM列表接口 加上物料资料表的名称、规格、单位字段做为返回值】

wub 11 months ago
parent
commit
5c01bd7edc

+ 3 - 0
src/main/java/com/uas/eis/convertor/BomConvertor.java

@@ -19,6 +19,9 @@ public class BomConvertor {
         bomResp.setBo_status(bomDTO.getBo_status());
         bomResp.setBo_status(bomDTO.getBo_status());
         bomResp.setBo_level(bomDTO.getBo_level());
         bomResp.setBo_level(bomDTO.getBo_level());
         bomResp.setBo_mothercode(bomDTO.getBo_mothercode());
         bomResp.setBo_mothercode(bomDTO.getBo_mothercode());
+        bomResp.setPr_detail(bomDTO.getPr_detail());
+        bomResp.setPr_spec(bomDTO.getPr_spec());
+        bomResp.setPr_unit(bomDTO.getPr_unit());
         bomResp.setBo_remark(bomDTO.getBo_remark());
         bomResp.setBo_remark(bomDTO.getBo_remark());
         bomResp.setBo_wcname(bomDTO.getBo_wcname());
         bomResp.setBo_wcname(bomDTO.getBo_wcname());
         bomResp.setBo_ispast(bomDTO.getBo_ispast());
         bomResp.setBo_ispast(bomDTO.getBo_ispast());

+ 3 - 0
src/main/java/com/uas/eis/sdk/dto/BomDTO.java

@@ -23,6 +23,9 @@ public class BomDTO {
     private String bo_status;
     private String bo_status;
     private String bo_level;
     private String bo_level;
     private String bo_mothercode;
     private String bo_mothercode;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
     private String bo_remark;
     private String bo_remark;
     private String bo_wcname;
     private String bo_wcname;
     private BigDecimal bo_ispast;
     private BigDecimal bo_ispast;

+ 3 - 0
src/main/java/com/uas/eis/sdk/resp/BomResp.java

@@ -12,6 +12,9 @@ public class BomResp {
     private String bo_status;
     private String bo_status;
     private String bo_level;
     private String bo_level;
     private String bo_mothercode;
     private String bo_mothercode;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
     private String bo_remark;
     private String bo_remark;
     private String bo_wcname;
     private String bo_wcname;
     private BigDecimal bo_ispast;
     private BigDecimal bo_ispast;

+ 4 - 4
src/main/java/com/uas/eis/service/Impl/STKServiceImpl.java

@@ -55,8 +55,8 @@ public class STKServiceImpl implements STKService {
     @Override
     @Override
     public Result getBom(BomReq bomReq) {
     public Result getBom(BomReq bomReq) {
         String bomId = bomReq.getBomId();
         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 ){
         if (bomDTOList.size() == 0 ){
             return Result.error("BOM资料不存在");
             return Result.error("BOM资料不存在");
@@ -93,8 +93,8 @@ public class STKServiceImpl implements STKService {
         int start = ((pageNum - 1) * pageSize + 1);
         int start = ((pageNum - 1) * pageSize + 1);
         int end = pageNum * pageSize;
         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 ){
         if (bomDTOList.size() == 0 ){
             return Result.error("BOM资料无数据!");
             return Result.error("BOM资料无数据!");