【思拓微】【思拓微UAS&PDM库存数据对接】【物料出入库明细查询】

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -93,8 +93,8 @@ public class ERPServiceImpl implements ERPService {
         StringBuffer cond_sql = new StringBuffer("1=1");
         if(StringUtil.hasText(queryIOListReq.getMaterialNo())){
             cond_sql.append(" and pd_prodcode ='").append(queryIOListReq.getMaterialNo()).append("' ");
-        }else {
-            return Result.success(listResp);
+//        }else {
+//            return Result.success(listResp);
         }
         if(StringUtil.hasText(queryIOListReq.getStartDate())){
             cond_sql.append(" and pi_date >= to_date('").append(queryIOListReq.getStartDate()).append(" 00:00:00','YYYY-MM-DD HH24:mi:ss') ");
@@ -110,8 +110,8 @@ public class ERPServiceImpl implements ERPService {
         searchSql.append("SELECT pi_inoutno,pi_class,to_char(pi_date,'yyyy-mm-dd hh24:mi:ss') pi_date,pd_pdno,pd_prodcode,pr_detail,pr_spec,pr_unit,pd_outqty,pd_inqty,pd_whcode,pd_whname,pd_batchcode,pd_ordercode,pi_status,pi_purpose,pi_type,pi_departmentname,pi_cardcode,pi_title" +
                         ",to_char(pi_date1,'yyyy-mm-dd hh24:mi:ss') pi_date1,pi_recordman" +
                         ",pi_vouchercode,nvl(pd_seller,pi_sellername) sellername,nvl(pd_sellercode,pi_sellercode) sellercode ")
-                .append(" from ProdIODetail left join ProdInOut on pd_piid=pi_id left join Product on pr_code=pd_prodcode " )
-                .append("WHERE ").append(cond_sql).append(" ORDER BY PI_DATE DESC,pi_id desc,pd_pdno");
+                .append(" from ProdInOut inner join ProdIODetail on pd_piid=pi_id left join Product on pr_code=pd_prodcode " )
+                .append("WHERE ").append(cond_sql);
         StringBuffer countSql = new StringBuffer("select count(1) from ( ");
         countSql.append(searchSql);
         countSql.append(" )");
@@ -121,7 +121,7 @@ public class ERPServiceImpl implements ERPService {
         List<IOListDTO> ioListDTOS = new ArrayList<>();
         if(total > 0){
             StringBuffer querySql = new StringBuffer("select * from (select TT.*, ROWNUM rn from ( ");
-            querySql.append(searchSql);
+            querySql.append(searchSql).append(" ORDER BY PI_DATE DESC,pi_id desc,pd_pdno");
             querySql.append(" )TT where ROWNUM <= ");
             querySql.append(end);
             querySql.append(") where rn >= ");