|
|
@@ -963,11 +963,12 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
if(map.get("iSN")!=null){
|
|
|
iSN=map.get("iSN").toString();
|
|
|
}
|
|
|
- SqlRowList rs=baseDao.queryForRowSet("select ms_sncode,ms_makecode,ms_status from makeserial where ms_sncode='"+iSN+"' order by ms_id desc");
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select ms_sncode,ms_makecode,ms_status,ms_outboxcode from makeserial where ms_sncode='"+iSN+"' order by ms_id desc");
|
|
|
if(rs.next()){
|
|
|
|
|
|
String ms_status=rs.getString("ms_status");
|
|
|
String iMakeCode=rs.getString("ms_makecode");
|
|
|
+ String ms_outboxcode=rs.getString("ms_outboxcode");
|
|
|
if(!ms_status.equals("2")){
|
|
|
oErrMessage = "SN未完工，不允许采集";
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
@@ -990,6 +991,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
//将不良的序列号的状态码设为3
|
|
|
baseDao.execute("update makeserial set ms_status='3',ms_outboxcode='' where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
|
|
|
baseDao.execute("delete from packagedetail where pd_barcode='"+iSN+"' and pd_makecode='"+iMakeCode+"'");
|
|
|
+ baseDao.execute("update package set pa_status=0,PA_PACKAGEQTY=PA_PACKAGEQTY-1, PA_TOTALQTY=PA_TOTALQTY-1, PA_CURRENTQTY=PA_CURRENTQTY-1 where pa_outboxcode='"+ms_outboxcode+"'");
|
|
|
}else {
|
|
|
oErrMessage = "SN不存在";
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
