root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:工单强制完成

Browse Source
This commit is contained in:
zhangzq
2023-12-16 17:55:02 +08:00
parent e620dff9b2
commit 1735f6e48c
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
View File

@@ -353,6 +353,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void finish(JSONObject param) { public void finish(JSONObject param) {
//强制完成时修改工单状态 //强制完成时修改工单状态
String now = DateUtil.now();
String workorder_id = param.getJSONObject("row").getString("workorder_id"); String workorder_id = param.getJSONObject("row").getString("workorder_id");
PdmProduceWorkorder pdmProduceWorkorder = this.getOne(new QueryWrapper<PdmProduceWorkorder>().eq("workorder_id", workorder_id)); PdmProduceWorkorder pdmProduceWorkorder = this.getOne(new QueryWrapper<PdmProduceWorkorder>().eq("workorder_id", workorder_id));
//aps排产完成的工单，生成工单编号再下发 //aps排产完成的工单，生成工单编号再下发
@@ -363,23 +364,23 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
if (report_qty == null){ if (report_qty == null){
report_qty = new BigDecimal(0); report_qty = new BigDecimal(0);
} }
try { // try {
//根据计划实际生产时间获取计算对应APS实际生产时间 // //根据计划实际生产时间获取计算对应APS实际生产时间
Date interval2End = getDateEndFromInterval(pdmProduceWorkorder.getRealproducestart_date(), pdmProduceWorkorder.getPlanproduceend_date(), pdmProduceWorkorder.getAps_realproducestart_date()); // Date interval2End = getDateEndFromInterval(pdmProduceWorkorder.getRealproducestart_date(), pdmProduceWorkorder.getPlanproduceend_date(), pdmProduceWorkorder.getAps_realproducestart_date());
pdmProduceWorkorder.setAps_realproduceend_date(interval2End); // pdmProduceWorkorder.setAps_realproduceend_date(getDates(pdmProduceWorkorder.getPlanproduceend_date(),pdmProduceWorkorder.getCreate_type().equals(StatusEnum.APSINTO.getCode())?"yyyy/MM/dd HH:mm:ss":"yyyy-MM-dd HH:mm:ss"));
pdmProduceWorkorder.setAps_realproduceend_date(getDates(pdmProduceWorkorder.getPlanproduceend_date(),pdmProduceWorkorder.getCreate_type().equals(StatusEnum.APSINTO.getCode())?"yyyy/MM/dd HH:mm:ss":"yyyy-MM-dd HH:mm:ss")); // } catch (ParseException e) {
} catch (ParseException e) { // throw new BadRequestException(e.getMessage());
throw new BadRequestException(e.getMessage()); // }
}
pdmProduceWorkorder.setWorkorder_status(WorkerOrderEnum.FORCE_COMPLETE.getCode()); pdmProduceWorkorder.setWorkorder_status(WorkerOrderEnum.FORCE_COMPLETE.getCode());
pdmProduceWorkorder.setConfirm_id(SecurityUtils.getCurrentUserId()); pdmProduceWorkorder.setConfirm_id(SecurityUtils.getCurrentUserId());
pdmProduceWorkorder.setConfirm_name(SecurityUtils.getCurrentNickName()); pdmProduceWorkorder.setConfirm_name(SecurityUtils.getCurrentNickName());
pdmProduceWorkorder.setConfirm_time(DateUtil.now()); pdmProduceWorkorder.setConfirm_time(now);
pdmProduceWorkorder.setAps_workorder_status("B"); pdmProduceWorkorder.setAps_workorder_status("B");
pdmProduceWorkorder.setRealproduceend_date(DateUtil.now().replace("-", "/")); pdmProduceWorkorder.setRealproduceend_date(now);
pdmProduceWorkorder.setAps_realproduceend_date(new Date());
pdmProduceWorkorder.setAps_update_flag("M"); pdmProduceWorkorder.setAps_update_flag("M");
pdmProduceWorkorder.setAps_update_inner_flag("M"); pdmProduceWorkorder.setAps_update_inner_flag("M");
pdmProduceWorkorder.setAps_update_time(DateUtil.now()); pdmProduceWorkorder.setAps_update_time(now);
pdmProduceWorkorder.setUpdate_time(new Date()); pdmProduceWorkorder.setUpdate_time(new Date());
pdmProduceWorkorder.setUpdate_id(SecurityUtils.getCurrentUserId()); pdmProduceWorkorder.setUpdate_id(SecurityUtils.getCurrentUserId());
pdmProduceWorkorder.setUpdate_name(SecurityUtils.getCurrentNickName()); pdmProduceWorkorder.setUpdate_name(SecurityUtils.getCurrentNickName());
@@ -399,7 +400,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
if (!HttpStatus.OK.equals(result.get("status"))) { if (!HttpStatus.OK.equals(result.get("status"))) {
log.error((String) result.get("message")); log.error((String) result.get("message"));
} }
this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE, workorder_id); //this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE, workorder_id);
} }
/** /**
@@ -427,20 +428,21 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
//自动完工 //自动完工
if (workorder.getPlan_qty().doubleValue() <= workorder.getReport_qty().doubleValue()) { if (workorder.getPlan_qty().doubleValue() <= workorder.getReport_qty().doubleValue()) {
workorder.setRealproduceend_date(DateUtil.now().replace("-", "/")); workorder.setRealproduceend_date(DateUtil.now());
workorder.setAps_realproduceend_date(new Date());
workorder.setWorkorder_status(WorkerOrderEnum.COMPLETE.getCode()); workorder.setWorkorder_status(WorkerOrderEnum.COMPLETE.getCode());
workorder.setAps_workorder_status("B"); workorder.setAps_workorder_status("B");
workorder.setConfirm_time(DateUtil.now()); workorder.setConfirm_time(DateUtil.now());
workorder.setConfirm_id(SecurityUtils.getCurrentUserId()); workorder.setConfirm_id(SecurityUtils.getCurrentUserId());
workorder.setConfirm_name(SecurityUtils.getCurrentNickName()); workorder.setConfirm_name(SecurityUtils.getCurrentNickName());
try { // try {
//根据计划实际生产时间获取计算对应APS实际生产时间 // //根据计划实际生产时间获取计算对应APS实际生产时间
Date interval2End = getDateEndFromInterval(workorder.getRealproducestart_date(), workorder.getPlanproduceend_date(), workorder.getAps_realproducestart_date()); // Date interval2End = getDateEndFromInterval(workorder.getRealproducestart_date(), workorder.getPlanproduceend_date(), workorder.getAps_realproducestart_date());
workorder.setAps_realproduceend_date(interval2End); // workorder.setAps_realproduceend_date(interval2End);
workorder.setAps_realproduceend_date(getDates(workorder.getPlanproduceend_date(),workorder.getCreate_type().equals(StatusEnum.APSINTO.getCode())?"yyyy/MM/dd HH:mm:ss":"yyyy-MM-dd HH:mm:ss")); // workorder.setAps_realproduceend_date(getDates(workorder.getPlanproduceend_date(),workorder.getCreate_type().equals(StatusEnum.APSINTO.getCode())?"yyyy/MM/dd HH:mm:ss":"yyyy-MM-dd HH:mm:ss"));
} catch (ParseException e) { // } catch (ParseException e) {
throw new BadRequestException(e.getMessage()); // throw new BadRequestException(e.getMessage());
} // }
} else { } else {
//工单暂停 //工单暂停
workorder.setWorkorder_status(WorkerOrderEnum.STOP.getCode()); workorder.setWorkorder_status(WorkerOrderEnum.STOP.getCode());