|
|
@@ -530,26 +530,27 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
|
int code = 200;
|
|
|
String returnmessage = "";
|
|
|
- if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '在线' and st_code = '"+FrontSqueegeeSN+"'"))
|
|
|
+ if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+FrontSqueegeeSN+"'"))
|
|
|
{
|
|
|
code = 222;
|
|
|
- returnmessage = returnmessage + "刮刀:"+FrontSqueegeeSN+"未在线,校验失败.\n";
|
|
|
+ returnmessage = returnmessage + "刮刀:"+FrontSqueegeeSN+"未领用出库,校验失败.\n";
|
|
|
}
|
|
|
- if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '在线' and st_code = '"+RearSqueegeeSN+"'"))
|
|
|
+ if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+RearSqueegeeSN+"'"))
|
|
|
{
|
|
|
code = 222;
|
|
|
- returnmessage = returnmessage + "刮刀:"+RearSqueegeeSN+"未在线,校验失败.\n";
|
|
|
+ returnmessage = returnmessage + "刮刀:"+RearSqueegeeSN+"未领用出库,校验失败.\n";
|
|
|
}
|
|
|
- if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '在仓' and st_code = '"+StencilSN+"'"))
|
|
|
+ if(!baseDao.checkIf("Stencil","nvl(st_usestatus,'') = '出库' and st_code = '"+StencilSN+"'"))
|
|
|
{
|
|
|
code = 222;
|
|
|
- returnmessage = returnmessage + "钢网:"+StencilSN+"未清洗领用,校验失败.\n";
|
|
|
+ returnmessage = returnmessage + "钢网:"+StencilSN+"未清洗出库,校验失败.\n";
|
|
|
}
|
|
|
if(!baseDao.checkIf("SPMBARCODE","nvl(SPB_STATUS,'') = '领用' and SPB_BARCODE = '"+PasteSN+"'"))
|
|
|
{
|
|
|
code = 222;
|
|
|
- returnmessage = returnmessage + "锡膏:"+FrontSqueegeeSN+"未领用,校验失败.\n";
|
|
|
+ returnmessage = returnmessage + "锡膏:"+PasteSN+"未领用,校验失败.\n";
|
|
|
}
|
|
|
+
|
|
|
SqlRowList rs=baseDao.queryForRowSet("SELECT st_id FROM stencil WHERE st_kind = '钢网' AND st_code = ?", StencilSN);
|
|
|
if(rs.next()){
|
|
|
baseDao.execute("insert into stenciluse(su_id, su_useman, su_stcode, su_stid, su_status, su_linecode)" +
|
