预加工报工处理，删除条码处理

src/com/uas/mes/api/pdashop/service/Impl/PdashopServiceImpl.java

@@ -420,8 +420,9 @@ public class PdashopServiceImpl implements PdashopService{
 	 */
 	@Override
 	public List<Map<String, Object>> getReportData(String ma_code, String sc_code) {
-		SqlRowList rs = baseDao.queryForRowSet("select sp_lotno,sp_qty,sp_ngqty,sp_inman,sp_date from steppassed " +
-				"where SP_SCCODE=? AND SP_TYPE in('OUT','TEST') and trunc(sp_date) = trunc(sysdate) order by sp_date desc",sc_code);
+		SqlRowList rs = baseDao.queryForRowSet("select * from (select sp_lotno,sp_qty,sp_ngqty,sp_inman,sp_date from steppassed  where SP_SCCODE=? AND SP_TYPE in('OUT','TEST') and trunc(sp_date) = trunc(sysdate) " +
+				"union all " +
+				"select BHP_BARCODE,BHP_OUTQTY,0,BHP_INMAN,BHP_INDATE  from BEFOREHANDPROCESS where bhp_indate>trunc(sysdate) and (BHP_INMAN=? or bhp_sccode=?) ) order by sp_date",sc_code,sc_code,sc_code);
 		if(rs.next()){
 			return rs.getResultList();
 		}

src/com/uas/mes/api/pdashop/service/Impl/StartServiceImpl.java

@@ -280,8 +280,8 @@ public class StartServiceImpl implements StartService{
 			}
 			rlist.add(mapr);
 		}
-		baseDao.execute("insert into BEFOREHANDPROCESS(bhp_id,bhp_barcode,bhp_prodcode,bhp_makecode,bhp_inman,bhp_machinecode,bhp_outqty,bhp_remark,BHP_INDATE,bhp_picode,bhp_maqty)" +
-				"values(BEFOREHANDPROCESS_seq.nextval,'"+barcode+"','"+prods+"',"+allmacode+",'"+sc_code+"','"+decode+"','"+reportqty+"','"+remark+"',sysdate,'"+pi_code+"','"+maqty+"')");
+		baseDao.execute("insert into BEFOREHANDPROCESS(bhp_id,bhp_barcode,bhp_prodcode,bhp_makecode,bhp_inman,bhp_machinecode,bhp_outqty,bhp_remark,BHP_INDATE,bhp_picode,bhp_maqty,BHP_SCCODE)" +
+				"values(BEFOREHANDPROCESS_seq.nextval,'"+barcode+"','"+prods+"',"+allmacode+",'"+SystemSession.getUser().getEm_code()+"','"+decode+"','"+reportqty+"','"+remark+"',sysdate,'"+pi_code+"','"+maqty+"','"+sc_code+"')");
 		baseDao.execute("insert into barcode(BAR_ID, BAR_CODE, BAR_PRODCODE, BAR_VENDCODE, BAR_BATCHQTY, BAR_REMAIN, BAR_MADEDATE, BAR_STATUS, BAR_RECORDDATE)" +
 				"values(barcode_seq.nextval,'"+barcode+"','"+ma_prodcode+"','预加工条码',"+reportqty+",'"+reportqty+"',sysdate,'1',sysdate)");
 		return rlist;