Browse Source

【思拓微】【思拓微UAS&PDM库存数据对接】

wuyx 7 months ago
parent
commit
bb5b4e9ea5

+ 5 - 0
src/main/java/com/uas/eis/sdk/dto/StockListDTO.java

@@ -26,4 +26,9 @@ public class StockListDTO {
     private String pw_lastdate; // 首次入库日期
     private String pw_lastdate; // 首次入库日期
     private String pr_detail; // 物料名称
     private String pr_detail; // 物料名称
     private Double purc_inprogress; // 采购在途数量
     private Double purc_inprogress; // 采购在途数量
+    private Double po_qty; // 采购在途数量
+    private Double ma_qty; // 采购在途数量
+    private Double pick_qty; // 采购在途数量
+    private Double made_qty; // 采购在途数量
+    private Double wip_qty; // 采购在途数量
 }
 }

+ 3 - 11
src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -56,17 +56,9 @@ public class ERPServiceImpl implements ERPService {
 
 
         //获取总数
         //获取总数
         StringBuffer searchSql = new StringBuffer();
         StringBuffer searchSql = new StringBuffer();
-        searchSql.append("select ")
-                .append("pw_avprice,pr_location,pw_prodcode,pr_orispeccode,pr_brand,pr_spec,pr_specrule pr_spec_rule,pw_prodid,pr_unit,pw_id,pw_whcode,pw_onhand,pw_movedate,pr_buyername,pw_amount,pr_serial,wh_description,pw_lastdate,pr_detail")
-                .append(",nvl(purc_inprogress,0) purc_inprogress  ")
-                .append(" from ")
-                .append("productWH tab left join Product on pw_prodcode=pr_code left join warehouse on pw_whcode=wh_code ")
-                .append(" left join (")
-                .append(" select pd_prodcode ,sum(pd_qty-nvl(pd_acceptqty,0)) purc_inprogress ")
-                .append(" from purchasedetail left join purchase on pu_id = pd_puid ")
-                .append(" where pu_statuscode = 'AUDITED' and pd_qty-nvl(pd_acceptqty,0)>0 and nvl(pd_mrpstatuscode,0) not in('FINISH','NULLIFIED','FREEZE') " )
-                .append(" group by pd_prodcode ")
-                .append(") on pd_prodcode = pw_prodcode " )
+        searchSql.append("select pw_avprice,pr_location,pw_prodcode,pr_orispeccode,pr_brand,pr_spec,pr_specrule pr_spec_rule,pw_prodid,pr_unit,pw_id,pw_whcode,pw_onhand,pw_movedate,pr_buyername,pw_amount,pr_serial,wh_description,pw_lastdate,pr_detail")
+                .append(" ,purc_inprogress, po_qty, ma_qty, pick_qty, made_qty, wip_qty  ")
+                .append(" from productWH tab left join warehouse on pw_whcode=wh_code left join LEFT JOIN USER_PDMAPI_VIEW on pw_prodcode=pr_code " )
                 .append("WHERE nvl(pw_onhand,0) > 0 ").append(cond_sql);
                 .append("WHERE nvl(pw_onhand,0) > 0 ").append(cond_sql);
         StringBuffer countSql = new StringBuffer("select count(1) from ( ");
         StringBuffer countSql = new StringBuffer("select count(1) from ( ");
         countSql.append(searchSql);
         countSql.append(searchSql);