diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java index c0211d86..fe307253 100644 --- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java +++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java @@ -88,9 +88,7 @@ public class OpenController extends BaseController { /**创建生产过程(烘房 首检)检验*/ @PostMapping(value = "/createCheckProduceTask") public AjaxResult createCheckProduceTask(@RequestBody QcCheckTaskProduceDTO qcCheckTaskProduce) { - if(StringUtils.isBlank(qcCheckTaskProduce.getIncomeBatchNo())){ - return error("[IncomeBatchNo]不能为空"); - } + if(StringUtils.isBlank(qcCheckTaskProduce.getOrderNo())){ return error("[orderNo]不能为空"); @@ -105,7 +103,7 @@ public class OpenController extends BaseController { } if(StringUtils.isBlank(qcCheckTaskProduce.getCheckType())){ - return error("[checkType:produce]不能为空"); + return error("[checkType]不能为空"); } if(StringUtils.isBlank(qcCheckTaskProduce.getFactoryCode())){ @@ -116,7 +114,6 @@ public class OpenController extends BaseController { return success(openService.insertQcCheckTaskProduce(qcCheckTaskProduce)); } - /** * ZL0010-来料检验不合格控制流程提交 * CQ 厂区、 OEMCM 厂名 、 LLLB 来料类别【0、1】、MATNR 物料编号、MAKTX 物料名称、suppliernum 供应商编码 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 2562bccc..7e814e29 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 @@ -108,9 +108,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { String createBy = SecurityUtils.getUsername(); Date nowDate= DateUtils.getNowDate(); //获取当前所选工厂 - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String key = "#header.poolName"; - String factoryCode = request.getHeader(key.substring(8)).replace("ds_",""); + String factoryCode = qcCheckTaskIncome.getFactoryCode(); qcCheckTaskIncome.setCheckNo(bpDD+liushuiStr); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index f609dcfd..d9ee5c67 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -215,7 +215,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService int m=qcCheckTaskIncomeMapper.addCheckUsers(users); logger.info("检查人新增"+m+"成功"); } - + /**qc_check_task**/ qcCheckTaskProduceMapper.insertQcCheckTaskProduce(qcCheckTaskProduce); /**qc_check_task_detail**/ @@ -343,6 +343,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService List works = qcCheckTaskProduceMapper.getOrderWorks(qoWork); for(QcCheckTaskProduce productTask:works){ productTask.setCheckType("checkTypeSCXJ");//过程检验-巡检 + productTask.setOrderNo(productTask.getWorkorderCode()); Date nowTime = DateUtils.getNowDate(); Date startTime = productTask.getCreateTime(); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 7bf0cd55..77edb220 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -110,33 +110,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where type_code = #{typeCode} and del_flag='0'