|
|
@@ -92,14 +92,14 @@ public class SNBatchServiceImpl implements SNBatchService {
|
|
|
stringList1.add("sb_mainboardcode=cm_barcode");
|
|
|
stringList1.add("sb_lcdcode=cm_barcode");
|
|
|
stringList1.add("sb_batterycode=cm_barcode");
|
|
|
- stringList1.add("sb_adaptercode=cm_barcode");
|
|
|
+ stringList1.add("sb_lasercode=cm_barcode");
|
|
|
for (int i = 0; i <stringList1.size(); i++) {
|
|
|
//String s = stringList1.get(i);
|
|
|
stringList.add("insert into SN(SN_ID,sn_emid,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,SN_MS_CHECKNO, SN_MA_QTY, SN_PA_WEIGHT, SN_PI_RECORDDATE, SN_PD_BUILDDATE, SN_PD_OUTBOXCODE)"+
|
|
|
+ "SN_MS_GROSSW,SN_MS_LINECODE,SN_PR_CUSTMACHINETYPE,SN_MS_CHECKNO, SN_MA_QTY, SN_PA_WEIGHT, SN_PI_RECORDDATE, SN_PD_BUILDDATE, SN_PD_OUTBOXCODE,sn_光机)"+
|
|
|
"select SN_seq.nextval,'"+em_id+"' ,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_machinetype,ms_checkno,ma_qty,pa_weight,pi_recorddate,pd_builddate,pd_outboxcode"+
|
|
|
+ " SIR_REMARK,ms_mac,ms_bt,主板,电池,液晶屏,适配器条码,键盘条码,key,ms_indate,ms_grossw,ms_linecode,pr_machinetype,ms_checkno,ma_qty,pa_weight,pi_recorddate,pd_builddate,pd_outboxcode,光机"+
|
|
|
" from (select max(sb_emid)sb_emid,max(sb_sncode)sb_sncode,ms_sncode,max(ms_linecode)ms_linecode,max(ms_indate)ms_indate,max(ms_grossw)ms_grossw,max(ms_checkno)ms_checkno,max(ma_qty)ma_qty,max(pa_weight)pa_weight,"+
|
|
|
" max(pi_recorddate)pi_recorddate,max(pd_builddate)pd_builddate,max(pd_outboxcode)pd_outboxcode,"+
|
|
|
" max(ms_firstsn)ms_firstsn,max(ms_prodcode)ms_prodcode,max(ms_makecode)ms_makecode,max(MS_SALECODE)MS_SALECODE"+
|
|
|
@@ -116,7 +116,7 @@ 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 "+stringList1.get(i)+
|
|
|
+ " inner JOIN CraftMaterialSN_view ON ms_sncode=(select max(ms_sncode) from CraftMaterialSN_view where "+stringList1.get(i)+" and ms_outboxcode is not null) "+
|
|
|
" 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"+
|
