diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/StringUtils.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/StringUtils.java index c6b438061..c58179ad3 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/StringUtils.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/StringUtils.java @@ -488,8 +488,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { calendar.setTime(productDate); // Add three years to the current date calendar.add(Calendar.YEAR, 3); - // Subtract one day from the new date - calendar.add(Calendar.DAY_OF_MONTH, -1); // Get the new date Date futureDate = calendar.getTime(); // Format the new date diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index 9b7f1462e..4d678ccc1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -214,6 +214,15 @@ public class QcCheckTaskIncome extends BaseEntity { private String pgzg;//QC主管：SFXYZG字段为"是",则此项选择QC主管信息 private String pgzr;//质量主管 private String oaFactoryF;//异常范围 + private String sccj; + + public String getSccj() { + return sccj; + } + + public void setSccj(String sccj) { + this.sccj = sccj; + } public String getOaFactoryF() { return oaFactoryF; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckUnqualified.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckUnqualified.java index 971a2d159..01fd59684 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckUnqualified.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckUnqualified.java @@ -132,6 +132,15 @@ public class QcCheckUnqualified extends BaseEntity { private String pgzg;//QC主管：SFXYZG字段为"是",则此项选择QC主管信息 private String pgzr;//质量主管 private String oaFactoryF; + private String sccj;//所属车间 + + public String getSccj() { + return sccj; + } + + public void setSccj(String sccj) { + this.sccj = sccj; + } public String getOaFactoryF() { return oaFactoryF; 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 4b0159804..6e099a997 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 @@ -817,9 +817,11 @@ public class QcCheckTaskIncomeServiceImpl implements unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt()); unqualified.setUser(qcCheckTaskIncome.getUpdateBy()); //申请人- - unqualified.setSqr("MSL%23"+qcCheckTaskIncome.getSqr()); + unqualified.setSqr("MSL#"+qcCheckTaskIncome.getSqr()); //申请部门 - unqualified.setSqbm("MSD%23"+qcCheckTaskIncome.getSqbm()); + unqualified.setSqbm(qcCheckTaskIncome.getSqbm()); + //所属车间 + unqualified.setSccj("MSD#"+qcCheckTaskIncome.getSccj()); //实际生产数量 unqualified.setQuality(qcCheckTaskIncome.getQuality().toString()); //发现地点 @@ -828,9 +830,9 @@ public class QcCheckTaskIncomeServiceImpl implements unqualified.setSfxyzg(qcCheckTaskIncome.getSfxyzg()); if(qcCheckTaskIncome.getSfgyswt().equals("0")){//是 //qc主管 - unqualified.setPgzg("MSL%23"+qcCheckTaskIncome.getPgzg()); + unqualified.setPgzg("MSL#"+qcCheckTaskIncome.getPgzg()); //质量主管 - unqualified.setPgzr("MSL%23"+qcCheckTaskIncome.getPgzr()); + unqualified.setPgzr("MSL#"+qcCheckTaskIncome.getPgzr()); } //是否供应商问题 unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt()); @@ -865,15 +867,15 @@ public class QcCheckTaskIncomeServiceImpl implements //检验编号 unqualified.setCheckNo(qcCheckTaskIncome.getCheckNo()); //仓储报检人-李爱娟 - unqualified.setCzbjr("MSL%23"+qcCheckTaskIncome.getCzbjr()); + unqualified.setCzbjr("MSL#"+qcCheckTaskIncome.getCzbjr()); //物料类别 unqualified.setMaterialType(qcCheckTaskIncome.getMaterialType()); //物料来源 unqualified.setMaterialFrom(qcCheckTaskIncome.getMaterialFrom()); //QC主管-朱继新 - unqualified.setQczg("MSL%23"+qcCheckTaskIncome.getQczg()); + unqualified.setQczg("MSL#"+qcCheckTaskIncome.getQczg()); //申请人- - unqualified.setSqr("MSL%23"+qcCheckTaskIncome.getSqr()); + unqualified.setSqr("MSL#"+qcCheckTaskIncome.getSqr()); unqualified.setUser(qcCheckTaskIncome.getUpdateBy()); //转出方 unqualified.setZcf(qcCheckTaskIncome.getZcf()); @@ -913,6 +915,8 @@ public class QcCheckTaskIncomeServiceImpl implements .replace("${quality}", qcCheckTaskIncome.getQuality()+"\n"); if(StringUtils.isNotBlank(qcCheckTaskIncome.getIncomeBatchNo())){ contentInfo = contentInfo.replace("${incomeBatchNo}", qcCheckTaskIncome.getIncomeBatchNo()+"\n"); + }else{ + contentInfo = contentInfo.replace("${incomeBatchNo}", "无"+"\n"); } if(StringUtils.isNotBlank(qcCheckTaskIncome.getOrderNo())){ contentInfo = contentInfo.replace("${orderNo}", qcCheckTaskIncome.getOrderNo()+"\n"); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java index b65c1b963..8f6814295 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java @@ -313,9 +313,9 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService mainObject={"CPMC":"榄菊加大盘野菊花蚊香塑料筒装(18装)(36单圈)", "CPBM":"000000010101046600", "SQBM":"0", - "SQR":"MSL%23999999", + "SQR":"MSL#999999", \"SQR\":\"MSL#002007\", "SQSJ":"2024-07-18", - "SCCJ":"MSD%2310000769", + "SCCJ":"MSD#10000769", \"SCCJ\":\"MSD#10000152\", "SCPH":"LJ20240705ABACEQ", "SCSL":100, "FXDD":"测试发现地点", @@ -348,11 +348,11 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService mainObject.append(",\"SQBM\":"+"\""+task.getSqbm()+"\"");//0品质保障部 mainObject.append(",\"SQR\":"+"\""+task.getSqr()+"\"");//申请人:默认当前用户 mainObject.append(",\"SQSJ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getCheckTime())+"\"");//申请时间 - mainObject.append(",\"SCCJ\":"+"\"162\"");//所属车间 + mainObject.append(",\"SCCJ\":"+"\""+task.getSccj()+"\"");//所属车间 mainObject.append(",\"SCPH\":"+"\""+detailInfo.getIncomeBatchNo()+"\"");//生产批号 mainObject.append(",\"SCSL\":"+task.getQuality());//生产数量 mainObject.append(",\"FXDD\":"+"\""+task.getCheckLoc()+"\"");//发现地点 - mainObject.append(",\"FXRQ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getCheckTime())+"\"");//发现日期 + mainObject.append(",\"FXRQ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getCheckTime())+"\"");//发现日期 mainObject.append(",\"BH\":"+"\""+detailInfo.getCheckNo()+"\"");//编号：流水号 年月日+四位流水号 mainObject.append(",\"YCFW\":"+"\""+task.getOaFactoryF()+"\"");//*异常范围：下拉框榄菊所有工厂 1代表小榄工厂 mainObject.append(",\"PZYCMS\":"+"\""+detailInfo.getRemark()+"\"");//品质异常描述 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcGoalServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcGoalServiceImpl.java index 84fc9a99f..44af39457 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcGoalServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcGoalServiceImpl.java @@ -12,6 +12,7 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; +import com.op.quality.domain.QcCheckTaskIncome; import com.op.quality.domain.QcCheckUnqualified; import com.op.quality.domain.vo.TreeSelect; import com.op.quality.mapper.QcCheckTaskIncomeMapper; @@ -58,6 +59,9 @@ public class QcGoalServiceImpl implements IQcGoalService { @Autowired private RemoteQualityService remoteQualityService; + @Autowired + private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; + /** * 查询质量目标 @@ -124,6 +128,21 @@ public class QcGoalServiceImpl implements IQcGoalService { // qcCheckTaskIncomeDTO.setIncomeTime(new Date()); // remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); +// 品质检验 +// QcCheckUnqualified task = new QcCheckUnqualified(); +// task.setTaskId("3ffb199037ba46a48e39cb148d7ad9e0"); +// task.setUser("002007"); +// task.setSqbm("0"); +// task.setSqr("MSL#002007"); +// task.setSccj("MSD#10000152"); +// task.setQuality("100"); +// task.setCheckLoc("测试发现地点"); +// task.setOaFactoryF("0"); +// task.setSfxyzg("0"); +// task.setPgzg("MSL#019184"); +// task.setPgzr("MSL#019184"); +// task.setSfgyswt("0"); +// this.createProduceOA(task); return qcGoals; } @@ -170,6 +189,46 @@ public class QcGoalServiceImpl implements IQcGoalService { return oaR; } + private AjaxResult createProduceOA(QcCheckUnqualified task){ + + QcCheckTaskIncome detailInfo = qcCheckTaskIncomeMapper.getTaskInfo(task.getTaskId()); + //发起来料检验OA流程 + Map paramMap = new HashMap<>(); + paramMap.put("user",task.getUser());//提交人工号 + paramMap.put("requestLevel",0);//流程紧急度 + paramMap.put("requestName","ZL0030-品质异常流程-智能制造-"+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getIncomeTime())+"（产品名称:"+detailInfo.getMaterialName()+"）");//流程名称 + paramMap.put("workflowId",113455);//该流程对应的唯- workFlowld + + StringBuffer mainObject = new StringBuffer(); + mainObject.append("{"); + mainObject.append("\"CPMC\":"+"\""+detailInfo.getMaterialName()+"\"");//产品名称 + mainObject.append(",\"CPBM\":"+"\""+detailInfo.getMaterialCode()+"\"");//产品编码 + mainObject.append(",\"SQBM\":"+"\""+task.getSqbm()+"\"");//0品质保障部 + mainObject.append(",\"SQR\":"+"\""+task.getSqr()+"\"");//申请人:默认当前用户 + mainObject.append(",\"SQSJ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getCheckTime())+"\"");//申请时间 + mainObject.append(",\"SCCJ\":"+"\""+task.getSccj()+"\"");//所属车间 + mainObject.append(",\"SCPH\":"+"\""+detailInfo.getIncomeBatchNo()+"\"");//生产批号 + mainObject.append(",\"SCSL\":"+task.getQuality());//生产数量 + mainObject.append(",\"FXDD\":"+"\""+task.getCheckLoc()+"\"");//发现地点 + mainObject.append(",\"FXRQ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getCheckTime())+"\"");//发现日期 + mainObject.append(",\"BH\":"+"\""+detailInfo.getCheckNo()+"\"");//编号：流水号 年月日+四位流水号 + mainObject.append(",\"YCFW\":"+"\""+task.getOaFactoryF()+"\"");//*异常范围：下拉框榄菊所有工厂 1代表小榄工厂 + mainObject.append(",\"PZYCMS\":"+"\""+detailInfo.getRemark()+"\"");//品质异常描述 + mainObject.append(",\"Notes\":"+"\"\"");//测试备注 + mainObject.append(",\"SFXYZG\":"+"\""+task.getSfxyzg()+"\"");//*是否需要主管审核 1否 0是 + mainObject.append(",\"PGZG\":"+"\""+task.getPgzg()+"\"");//QC主管：SFXYZG字段为"是",则此项选择QC主管信息 + mainObject.append(",\"PGZR\":"+"\""+task.getPgzr()+"\"");//质量主管 660：朱继新 + mainObject.append(",\"SFGYSWT\":"+"\""+task.getSfgyswt()+"\"");//*是否供应商问题 1非供应商问题 0是供应商问题 + + mainObject.append("}"); + + paramMap.put("mainObject",mainObject.toString()); + logger.info("流程Id 113455:"+ JSONObject.toJSONString(paramMap)); + AjaxResult oaR = remoteOpenService.OAInspection(paramMap); + logger.info("流程Id 113455:"+ JSONObject.toJSONString(oaR)); + return oaR; + } + @Override @DS("#header.poolName") public List selectChildrenByParent(QcGoal goal) {