Browse Source

修改除去外箱号也可以查询

章政 6 years ago
parent
commit
46a70dad43
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/com/uas/mes/pm/service/impl/SNBatchServiceImpl.java

+ 2 - 2
src/com/uas/mes/pm/service/impl/SNBatchServiceImpl.java

@@ -116,11 +116,11 @@ public class SNBatchServiceImpl implements SNBatchService {
 					",max(case when pr_detail like '%USB%' then cm_barcode else ' ' end) USB"+
 					",max(case when pr_detail like '%空白贴纸%' then cm_barcode else ' ' end) PCBA序列号"+
 					",max(case when pr_detail like '%BT%' then cm_barcode else ' ' end) PRODUCTKEYID from SNBATCH"+
-					" inner JOIN CraftMaterialSN_view ON ms_sncode=(select max(ms_sncode) from CraftMaterialSN_view where "+stringList1.get(i)+" and ms_outboxcode is not null) "+
+					" inner JOIN CraftMaterialSN_view ON ms_sncode=(select max(ms_sncode) from CraftMaterialSN_view where "+stringList1.get(i)+") "+
 					" left join package on ms_outboxcode=pa_outboxcode left join packagedetail on pd_barcode=ms_sncode left join prodinout"+
 					" on ms_outno= pi_inoutno left join make on ms_makecode=ma_code"+
 					" LEFT JOIN PRODUCT ON (PR_CODE=cm_soncode) left  join SNRELATIONINFORECORD on sir_firstsn=ms_firstsn"+
-					" where sb_emid="+em_id+" and ms_outboxcode is not null group by ms_sncode) left join product on ms_prodcode=pr_code");
+					" where sb_emid="+em_id+" group by ms_sncode) left join product on ms_prodcode=pr_code");
 		}
 
 		baseDao.execute(stringList);