SN批量查询 修改

WebContent/app/controller/pm/mes/SNBatch.js

@@ -111,7 +111,9 @@ Ext.define('erp.controller.pm.mes.SNBatch', {
     			if(localJson.success){
     				showMessage('提示', '操作成功!', 1000);    	
     				//导出
-    				 var con="sb_emid="+Ext.getCmp('em_id').value;
+    				 var con="ms_outboxcode is not null AND (NVL(SB_MAINBOARDCODE,' ')=' ' OR SB_MAINBOARDCODE=主板) " +
+                         "AND (NVL(SB_LCDCODE,' ')=' ' OR SB_LCDCODE=液晶屏) AND (NVL(SB_BATTERYCODE,' ')=' ' OR SB_BATTERYCODE=电池) " +
+						 "AND (NVL(SB_ADAPTERCODE,' ')=' ' OR SB_ADAPTERCODE=适配器条码) and sb_emid="+Ext.getCmp('em_id').value;
 					 me.createExcel('SNBatch!ManyQuery', 'detailgrid', con);
 					 grid.GridUtil.loadNewStore(grid, {
                             caller: caller,

src/com/uas/mes/pm/service/impl/SNBatchServiceImpl.java

@@ -59,7 +59,7 @@ public class SNBatchServiceImpl implements SNBatchService {
 		}
 		baseDao.execute(gridSql);
 		rs0 = baseDao.queryForRowSet("select sum(nn) num from (select sb_sncode,count(1) nn "+
-				" from SNBATCH INNER JOIN MAKESERIAL ON MS_SNCODE LIKE '%'||SB_SNCODE||'%' AND (NVL(SB_IMEI,' ')=' ' OR SB_IMEI=MS_IMEI1) AND (NVL(SB_MAC,' ')=' ' OR SB_MAC=MS_MAC) "+
+				" from SNBATCH INNER JOIN MAKESERIAL ON MS_SNCODE = SB_SNCODE AND (NVL(SB_IMEI,' ')=' ' OR SB_IMEI=MS_IMEI1) AND (NVL(SB_MAC,' ')=' ' OR SB_MAC=MS_MAC) "+
 				" LEFT JOIN MES_CRAFTMATERIAL_VIEW ON MAKESERIAL.MS_FIRSTSN=MES_CRAFTMATERIAL_VIEW.MS_FIRSTSN "+
 				" LEFT JOIN SNRELATIONINFORECORD_VIEW ON MAKESERIAL.MS_SNCODE=SNRELATIONINFORECORD_VIEW.SIR_SNCODE LEFT JOIN PRODUCT ON PR_CODE=MS_PRODCODE "+
 				" where ms_outboxcode is not null AND (NVL(SB_MAINBOARDCODE,' ')=' ' OR SB_MAINBOARDCODE=主板) "+
@@ -72,7 +72,7 @@ public class SNBatchServiceImpl implements SNBatchService {
 		String Sql="insert into SN(SN_ID,SN_SB_SNCODE,SN_MS_SNCODE,SN_MS_PRODCODE,SN_PR_DETAIL,SN_PR_SPEC,SN_MS_MAKECODE,SN_MS_SALECODE,SN_MS_BADTIMES,"+
 				"SN_MS_IMEI1,SN_MS_IMEI2,SN_SIR_SOFTVER,SN_SIR_REMARK,SN_MS_MAC,SN_MS_BT,SN_主板,SN_电池,SN_液晶屏,SN_适配器条码,SN_键盘条码,SN_KEY,SN_MS_INDATE,SN_MS_GROSSW,SN_MS_LINECODE,SN_PR_CUSTMACHINETYPE)"+
 				"select SN_seq.nextval,sb_sncode,ms_sncode,ms_prodcode,pr_detail,pr_spec,ms_makecode,MS_SALECODE,MS_BADTIMES,MS_IMEI1,MS_IMEI2,SIR_SOFTVER,SIR_REMARK,MS_MAC,MS_BT,主板,电池,液晶屏,适配器条码,键盘条码,KEY,MS_INDATE,MS_GROSSW,MS_LINECODE,pr_custmachinetype"+
-				" from SNBATCH INNER JOIN MAKESERIAL ON MS_SNCODE LIKE '%'||SB_SNCODE||'%' AND (NVL(SB_IMEI,' ')=' ' OR SB_IMEI=MS_IMEI1) AND (NVL(SB_MAC,' ')=' ' OR SB_MAC=MS_MAC) "+
+				" from SNBATCH INNER JOIN MAKESERIAL ON MS_SNCODE = SB_SNCODE AND (NVL(SB_IMEI,' ')=' ' OR SB_IMEI=MS_IMEI1) AND (NVL(SB_MAC,' ')=' ' OR SB_MAC=MS_MAC) "+
 				" LEFT JOIN MES_CRAFTMATERIAL_VIEW ON MAKESERIAL.MS_FIRSTSN=MES_CRAFTMATERIAL_VIEW.MS_FIRSTSN LEFT JOIN SNRELATIONINFORECORD_VIEW ON MAKESERIAL.MS_SNCODE=SNRELATIONINFORECORD_VIEW.SIR_SNCODE "+
 				" LEFT JOIN PRODUCT ON PR_CODE=MS_PRODCODE where ms_outboxcode is not null AND (NVL(SB_MAINBOARDCODE,' ')=' ' OR SB_MAINBOARDCODE=主板) "+
 				" AND (NVL(SB_LCDCODE,' ')=' ' OR SB_LCDCODE=液晶屏) AND (NVL(SB_BATTERYCODE,' ')=' ' OR SB_BATTERYCODE=电池) AND (NVL(SB_ADAPTERCODE,' ')=' ' OR SB_ADAPTERCODE=适配器条码) and sb_emid="+em_id;