|
@@ -158,7 +158,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
}
|
|
|
Object stepcode=baseDao.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid","cd_stepcode","CD_STEPNO=(select min (CD_STEPNO) from craft left join craftdetail on cr_id=cd_crid where cr_prodcode='"+ms_prodcode+"' and cr_code='"+ms_craftcode+"') and cr_code='"+ms_craftcode+"' and cr_prodcode='"+ms_prodcode+"'");
|
|
Object stepcode=baseDao.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid","cd_stepcode","CD_STEPNO=(select min (CD_STEPNO) from craft left join craftdetail on cr_id=cd_crid where cr_prodcode='"+ms_prodcode+"' and cr_code='"+ms_craftcode+"') and cr_code='"+ms_craftcode+"' and cr_prodcode='"+ms_prodcode+"'");
|
|
|
baseDao.execute("update craftmaterial set cm_status=-1 where cm_sncode='"+ms_firstsn+"' and cm_makecode='"+ms_makecode+"'");
|
|
baseDao.execute("update craftmaterial set cm_status=-1 where cm_sncode='"+ms_firstsn+"' and cm_makecode='"+ms_makecode+"'");
|
|
|
- baseDao.execute("update makeserial set ms_outboxcode='',ms_nextstepcode='"+stepcode+"' where ms_id='"+ms_id+"'");
|
|
|
|
|
|
|
+ baseDao.execute("update makeserial set ms_outboxcode='',ms_nextstepcode='"+stepcode+"',ms_status=1 where ms_id='"+ms_id+"'");
|
|
|
baseDao.execute("delete from packagedetail where pd_makecode='"+ms_makecode+"' and pd_barcode='"+iSN+"'");
|
|
baseDao.execute("delete from packagedetail where pd_makecode='"+ms_makecode+"' and pd_barcode='"+iSN+"'");
|
|
|
baseDao.execute("update package set PA_PACKAGEQTY=PA_PACKAGEQTY-1, PA_TOTALQTY=PA_TOTALQTY-1, PA_CURRENTQTY=PA_CURRENTQTY-1 where pa_outboxcode='"+ms_outboxcode+"'");
|
|
baseDao.execute("update package set PA_PACKAGEQTY=PA_PACKAGEQTY-1, PA_TOTALQTY=PA_TOTALQTY-1, PA_CURRENTQTY=PA_CURRENTQTY-1 where pa_outboxcode='"+ms_outboxcode+"'");
|
|
|
relist.put("oStatus","Pass");
|
|
relist.put("oStatus","Pass");
|