|
@@ -264,11 +264,10 @@ public class PdaGetESOPServiceImpl implements PdaGetESOPService {
|
|
|
public List<Map<String, Object>> getSopRelease(String li_code,String sc_code) {
|
|
|
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
|
|
|
//辅料条码通用校验
|
|
|
- SqlRowList rs = baseDao.queryForRowSet("select sr_id,sr_path path ,SR_FILENAME filename from soprelease where sr_linecode='"+li_code+"' " +
|
|
|
+ SqlRowList rs = baseDao.queryForRowSet("select sr_id,sr_path path ,SR_FILENAME filename,sr_ifkeyset from soprelease where sr_linecode='"+li_code+"' " +
|
|
|
"and substr(SR_FILENAME,0,instr(SR_FILENAME,'.')-1)='"+sc_code+"' and nvl(sr_status,0)=0 order by sr_id desc");
|
|
|
- Object keystep=baseDao.getFieldDataByCondition("SOPSOURCE","nvl(ss_keyset,0)","ss_code='"+sc_code+"'");
|
|
|
for (Map<String, Object> map :rs.getResultList()){
|
|
|
- map.put("keystep",keystep);
|
|
|
+ map.put("keystep",map.get("sr_ifkeyset"));
|
|
|
list.add(map);
|
|
|
System.out.println(map.get("sr_id"));
|
|
|
baseDao.execute("update soprelease set sr_status=-1 where sr_id="+map.get("sr_id"));
|