|
|
@@ -1726,6 +1726,9 @@ 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,"生产报废单已确认！");
|
|
|
+ }
|
|
|
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[]{
|
|
|
"ma_id", "md_mmdetno", "md_qty", "md_prodcode"}, " md_msid=" + msId);
|
|
|
@@ -1745,7 +1748,7 @@ public class MESServiceImpl implements MESService {
|
|
|
int apId = baseDao.getSeqId("APPLICATION_SEQ");
|
|
|
apCode = baseDao.sGetMaxNumber("Application", 2);
|
|
|
Object dpcode = baseDao.getFieldDataByCondition("MakeScrapDetail", "min(md_department)", "md_msid=" + msId);
|
|
|
- baseDao.execute("insert into Application (ap_id,ap_code,ap_kind,ap_date,ap_statuscode,ap_status,ap_pleamanname,ap_pleamanid,ap_recorder,ap_recorderid,ap_recorddate,ap_departcode,ap_departname,ap_source,ap_sourceid,ap_printstatuscode,ap_printstatus,ap_remark,ap_bfcode_user) values " +
|
|
|
+ baseDao.execute("insert into Application (ap_id,ap_code,ap_kind,ap_date,ap_statuscode,ap_status,ap_pleamanname,ap_pleamanid,ap_recorder,ap_recorderid,ap_recorddate,ap_departcode,ap_departname,ap_source,ap_sourceid,ap_printstatuscode,ap_printstatus,ap_remark,ap_bfcode_user) " +
|
|
|
" select " + apId + ",'" + apCode + "','超损请购',sysdate,'ENTERING','在录入','" + employee.getEm_name() + "'," + employee.getEm_id() + ",'" + employee.getEm_name() + "'," + employee.getEm_id() + ",sysdate,'" + dpcode + "',dp_name,'" + msclass + "',ms_id,'UNPRINT','未打印','MES生产报废单确认生成',ms_code from MakeScrap,department where dp_code='" + dpcode + "' and ms_id=" + msId);
|
|
|
baseDao.execute("insert into applicationdetail (ad_id,ad_apid,ad_code,ad_detno,ad_prodcode,ad_qty,ad_use,ad_statuscode,ad_status,ad_source,ad_sourcecode,ad_remark,ad_zzcode_user,ad_zzxh_user,ad_sacode,ad_sadetno) " +
|
|
|
"select APPLICATIONDETAIL_SEQ.nextval," + apId + ",'" + apCode + "',md_detno,md_prodcode,md_qty,md_reason,'ENTERING','在录入','" + msclass + "',md_code,'MES生产报废单审核生成',md_mmcode,md_mmdetno,ma_salecode,ma_saledetno from MakeScrapdetail left join make on md_mmcode=ma_code where md_msid=" + msId);
|
koul