|
|
@@ -1726,8 +1726,8 @@ public class MESServiceImpl implements MESService {
|
|
|
String msclass = "生产报废单";
|
|
|
Employee employee = baseDao.getJdbcTemplate().queryForObject("select * from employee where em_code=?", new BeanPropertyRowMapper<Employee>(Employee.class), "mes");
|
|
|
String msId = StringUtil.nvl(data.get("scrapid"), "");
|
|
|
- if (baseDao.checkIf("MakeScrap","ms_statuscode='CONFIRMED' and ms_id="+msId)){
|
|
|
- return ApiResponse.failRsp("10075",requestId,"生产报废单已确认！");
|
|
|
+ if (baseDao.checkIf("MakeScrap","ms_statuscode<>'UNCONFIRMED' and ms_id="+msId)){
|
|
|
+ return ApiResponse.failRsp("10076",requestId,"生产报废单不是待确认状态！");
|
|
|
}
|
|
|
baseDao.updateByCondition("MakeScrapdetail", "md_status=99", "md_msid=" + msId);
|
|
|
List<Object[]> objects = baseDao.getFieldsDatasByCondition("MakeScrapdetail left join make on ma_code=md_mmcode ", new String[]{
|
koul