|
@@ -343,7 +343,7 @@ public class PdashopServiceImpl implements PdashopService{
|
|
|
if(baseDao.getFieldDataByCondition("employee","nvl(eM_allowprint,0)","em_code='"+SystemSession.getUser().getEm_code()+"'").toString().equals("0")){
|
|
|
throw new APIErrorException(APIErrorCode.BUSINESS_FAILED, "该账号没有打印条码的权限");
|
|
|
}
|
|
|
- SqlRowList rs= baseDao.queryForRowSet("select SOURCECODE,pr_spec3_user,ma_pocode,pr_orispeccode,QTY,remark,makecode,OUTQTY,pr_code,pr_detail,pr_spec,to_char(sysdate,'yyyy-mm-dd hh24:Mi:ss')printdate from wip_lot left join make on ma_code=makecode left join product on pr_code=ma_prodcode where LOTNO='"+lotno+"'");
|
|
|
+ SqlRowList rs= baseDao.queryForRowSet("select WLS_SOURCECODE,pr_spec3_user,ma_pocode,pr_orispeccode,QTY,remark,makecode,OUTQTY,pr_code,pr_detail,pr_spec,to_char(sysdate,'yyyy-mm-dd hh24:Mi:ss')printdate from wip_lot left join make on ma_code=makecode left join product on pr_code=ma_prodcode left join WIP_LOT_SOURCE on wls_lotno=lotno where LOTNO='"+lotno+"'");
|
|
|
if(rs.next()){
|
|
|
Map<String,Object> mapr = new HashMap<String, Object>();
|
|
|
mapr.put("BAR_CODE", lotno);
|
|
@@ -355,12 +355,18 @@ public class PdashopServiceImpl implements PdashopService{
|
|
|
mapr.put("SALECODE","PI号:"+ rs.getString("ma_pocode"));
|
|
|
mapr.put("MA_QTY","工单数量:"+ rs.getString("MA_QTY"));
|
|
|
mapr.put("EM_CODE","报工人:"+ SystemSession.getUser().getEm_name());
|
|
|
- mapr.put("SC_CODE","工位:"+ rs.getString("SOURCECODE"));
|
|
|
+ mapr.put("SC_CODE","工位:"+ rs.getString("WLS_SOURCECODE"));
|
|
|
mapr.put("PRINTDATE","时间:"+ rs.getString("printdate"));
|
|
|
mapr.put("PR_SPEC","规格型号:"+ rs.getString("pr_spec"));
|
|
|
mapr.put("PR_ORISPECCODE","规格1:"+ rs.getString("pr_orispeccode"));
|
|
|
mapr.put("PR_SPEC3_USER","规格3:"+ rs.getString("pr_spec3_user"));
|
|
|
mapr.put("OK","测试合格 口");
|
|
|
+ if(baseDao.getFieldDataByCondition("source","sc_wccode","sc_code='"+rs.getString("WLS_SOURCECODE")+"'").toString().equals("SMT车间")){
|
|
|
+ mapr.put("PCB","PCB:"+ baseDao.getFieldDataByCondition("makematerial left join product on " +
|
|
|
+ "pr_code=mm_prodcode","wm_concat(mm_prodcode)","mm_code='"+rs.getString("makecode")+"' and nvl(mm_oneuseqty,0)>0 and pr_detail like '%PCB%'"));
|
|
|
+ mapr.put("LED","LED:"+ baseDao.getFieldDataByCondition("makematerial left join product on " +
|
|
|
+ "pr_code=mm_prodcode","wm_concat(mm_prodcode)","mm_code='"+rs.getString("makecode")+"' and nvl(mm_oneuseqty,0)>0 and pr_detail like '%LED%'"));
|
|
|
+ }
|
|
|
rlist.add(mapr);
|
|
|
}
|
|
|
rs=baseDao.queryForRowSet("select * from beforehandprocess left join source on BHP_INMAN=sc_code where bhp_barcode='"+lotno+"'");
|