diff --git a/op-common/op-common-datascope/op-common-datascope.iml b/op-common/op-common-datascope/op-common-datascope.iml index 3df02a46..dab4c8af 100644 --- a/op-common/op-common-datascope/op-common-datascope.iml +++ b/op-common/op-common-datascope/op-common-datascope.iml @@ -21,6 +21,7 @@ + @@ -30,7 +31,7 @@ - + @@ -125,4 +126,4 @@ - \ No newline at end of file + diff --git a/op-common/op-common-log/op-common-log.iml b/op-common/op-common-log/op-common-log.iml index 3df02a46..dab4c8af 100644 --- a/op-common/op-common-log/op-common-log.iml +++ b/op-common/op-common-log/op-common-log.iml @@ -21,6 +21,7 @@ + @@ -30,7 +31,7 @@ - + @@ -125,4 +126,4 @@ - \ No newline at end of file + diff --git a/op-common/op-common-security/op-common-security.iml b/op-common/op-common-security/op-common-security.iml index 5f28b4a0..5422c64f 100644 --- a/op-common/op-common-security/op-common-security.iml +++ b/op-common/op-common-security/op-common-security.iml @@ -21,6 +21,7 @@ + @@ -29,7 +30,7 @@ - + @@ -124,4 +125,4 @@ - \ No newline at end of file + diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java index 8d49d1a7..94571128 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java @@ -170,7 +170,7 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer @Override @DS("#header.poolName") - @Transactional(rollbackFor = IllegalArgumentException.class) + //@Transactional(rollbackFor = IllegalArgumentException.class) public int submitConsumePS(List mesReportWorkConsumes) { //根据belong_work_order找到sap工单(子子母) @@ -249,9 +249,10 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer logger.info(workorder.getWorkorderCode() + "报工损耗物料组件修改请求：" + JSONObject.toJSONString(mapList)); - R bomUpdateR = remoteSapService.shopOrderBomUpdate(mapList); - logger.info(workorder.getWorkorderCode() - + "报工损耗物料组件修改结果：" + JSONObject.toJSONString(bomUpdateR)); + R bomUpdateR = R.ok();// +// R bomUpdateR = remoteSapService.shopOrderBomUpdate(mapList); +// logger.info(workorder.getWorkorderCode() +// + "报工损耗物料组件修改结果：" + JSONObject.toJSONString(bomUpdateR)); if(bomUpdateR.getCode() == 200){ //attr2 0->1组件完成修改 int f = mesReportWorkMapper.updateAttr2(workorder); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java index 7516fb5c..74325722 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java @@ -68,15 +68,15 @@ public class QcCheckReportIncomeController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, QcCheckReportIncome qcCheckReportIncome) { - //默认时间范围T 00:00:00~T+1 00:00:00 - if (StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())) { - qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start - LocalDate date = LocalDate.now(); - LocalDate dateEnd = date.plusDays(1); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; - qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// if (StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())) { +// qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start +// LocalDate date = LocalDate.now(); +// LocalDate dateEnd = date.plusDays(1); +// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; +// qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end +// } // if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ // qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java index d93a13a3..0813b453 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java @@ -71,15 +71,15 @@ public class QcCheckReportProductController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, QcCheckReportIncome qcCheckReportIncome) { - //默认时间范围T 00:00:00~T+1 00:00:00 - if (StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())) { - qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start - LocalDate date = LocalDate.now(); - LocalDate dateEnd = date.plusDays(1); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; - qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// if (StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())) { +// qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start +// LocalDate date = LocalDate.now(); +// LocalDate dateEnd = date.plusDays(1); +// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; +// qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end +// } // if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ // qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index f3a49d2d..c81f2d18 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -225,6 +225,20 @@ public class QuaController extends BaseController { } return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome)); } + @PostMapping(value = "commitCheckResultsCg") + public AjaxResult commitCheckResultsCg(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) { + DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode()); +// if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){ +// return error("[List]不能为空"); +// } + if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateBy())){ + return error("[updateBy]不能为空"); + } + if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateByName())){ + return error("[updateByName]不能为空"); + } + return toAjax(qcCheckTaskIncomeService.commitCheckResultsCg(qcCheckTaskIncome)); + } @PostMapping(value = "getUserIdList") public List getUserIdList(@RequestBody SysUser sysUser) { diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java index 0f0487bf..c121d5b5 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java @@ -109,4 +109,6 @@ public interface IQcCheckTaskIncomeService { List getUserIdList(SysUser sysUser); SysUser getOaUserId(SysUser sysUser); + + int commitCheckResultsCg(QcCheckTaskIncome qcCheckTaskIncome); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 6b471a58..bc79d244 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -642,8 +642,8 @@ public class QcCheckTaskIncomeServiceImpl implements @Override //@Transactional(rollbackFor = Exception.class) - public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) { - logger.info("质检提交参数："+JSONObject.toJSONString(qcCheckTaskIncome)); + public int commitCheckResultsCg(QcCheckTaskIncome qcCheckTaskIncome) { + logger.info("草稿质检提交参数："+JSONObject.toJSONString(qcCheckTaskIncome)); List details = qcCheckTaskIncome.getQcCheckTaskDetails(); Date nowTime = DateUtils.getNowDate(); @@ -668,6 +668,118 @@ public class QcCheckTaskIncomeServiceImpl implements result = qcCheckTaskIncome.getCheckResult(); } + int n = 0; + QcCheckTaskIncome qcCheckTask = new QcCheckTaskIncome(); + //qcCheckTask.setSampleQuality(sampleQua); + qcCheckTask.setUpdateBy(updateBy); + qcCheckTask.setRecordId(belongId); + qcCheckTask.setCheckStatus("2");//检测状态0待检测1检测中2检测完成 + qcCheckTask.setUpdateTime(nowTime); + qcCheckTask.setCheckTime(nowTime); + qcCheckTask.setRemark(qcCheckTaskIncome.getRemark()); + qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格 + qcCheckTask.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo()); + BigDecimal noOkQquality = new BigDecimal("0"); + List defects0 = qcCheckTaskIncome.getDefects(); + for(QcCheckTaskDefect defect0:defects0){ + noOkQquality = noOkQquality.add(defect0.getNoOkQuality()); + } + qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数 + qcCheckTask.setCheckManCode(qcCheckTaskIncome.getUpdateBy()); + qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName()); + qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); + qcCheckTask.setReason(qcCheckTaskIncome.getReason()); + qcCheckTask.setBz(qcCheckTaskIncome.getAttr3());//备注 + /**qc_check_task_cg**/ + n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);//updateQcCheckTaskCG + logger.info("qc_check_task:"+n); + /**更新qc_check_task_detail**/ + for(QcCheckTaskDetail detail:details){ + detail.setUpdateTime(nowTime); + //上传附件 + if (StringUtils.isNotEmpty(detail.getFileListStr())) { + String[] ids = detail.getFileListStr().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id.split("&fileName=")[1]); + file.setFileAddress(id); + file.setSourceId(detail.getRecordId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(nowTime); + files.add(file); + } + /**base_file**/ + n = qmsFileMapper.insertBaseFileBatch(files); + System.out.println("base_file:"+n); + } + + } + n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details); + logger.info("更新qc_check_task_detail:"+n); + + /**qc_check_task_defect**/ + n=qcCheckTaskIncomeMapper.deleteQcCheckTaskDefects(belongId); + logger.info("清理qc_check_task_defect:"+n); + List defects = new ArrayList<>(); + QcCheckTaskDefect defect = null; + for(QcCheckTaskDetail detail:details){ + if(StringUtils.isNotBlank(detail.getDefectCodes())){ + String[] defectCodes = detail.getDefectCodes().split(","); + String[] defectNames = detail.getDefectNames().split(","); + String[] defectQualitys = detail.getDefectQualitys().split(","); + for(int d=0;d details = qcCheckTaskIncome.getQcCheckTaskDetails(); + + Date nowTime = DateUtils.getNowDate(); + String factoryCode = qcCheckTaskIncome.getFactoryCode(); + String updateBy = qcCheckTaskIncome.getUpdateBy(); + String belongId = details.get(0).getBelongTo(); + String checkType = qcCheckTaskIncome.getCheckType(); + qcCheckTaskIncome.setFactoryCode(qcCheckTaskIncome.getFactoryCode().replace("ds_","")); + //默认合格 + + String result=null; + if(StringUtils.isBlank(qcCheckTaskIncome.getCheckResult())){ + result = "Y"; + for(QcCheckTaskDetail detail:details){ + if("N".equals(detail.getStatus())){ + result = "N";//不合格 + break; + } + } + }else{ + //有最终判定的情况 + result = qcCheckTaskIncome.getCheckResult(); + } + int n = 0; QcCheckTaskIncome qcCheckTask = new QcCheckTaskIncome(); //qcCheckTask.setSampleQuality(sampleQua); @@ -784,7 +896,7 @@ public class QcCheckTaskIncomeServiceImpl implements } }else if("product".equals(qcCheckTaskIncome.getTypeCode())){ - /**wms_product_put-->check_status->1**/ + /**wms_product_put-->check_status->1**/ qcCheckTaskIncome.setStatus("2"); qcCheckUnqualifiedMapper.updatePutStatus(qcCheckTaskIncome); } @@ -800,14 +912,15 @@ public class QcCheckTaskIncomeServiceImpl implements unqualified.setType(checkType); n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); logger.info("qc_check_unqualified:" + n); - if("1".equals(qcCheckTaskIncome.getStartOA())){ - this.setOaFunc(unqualified,qcCheckTaskIncome); + if("1".equals(qcCheckTaskIncome.getStartOA())){ + this.setOaFunc(unqualified,qcCheckTaskIncome); } - //发送企业微信 - this.sendWX(qcCheckTaskIncome); + //发送企业微信 + this.sendWX(qcCheckTaskIncome); } return 1 ; } + /* 首检巡检都是品质异常流程 * 成品的是成品检验控制流程 * 来料的是来料检验不合格流程*/