From 618157586dce4bf17cb777bbae8f907f20531506 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 1 Nov 2023 09:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BB=BB=E5=8A=A1=E8=A1=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/quality/QcCheckTaskIncomeDto.java | 374 ++++++++++++++++++ .../QcCheckTaskProduceController.java | 12 +- .../op/quality/controller/QuaController.java | 76 +++- .../op/quality/domain/QcCheckTaskProduce.java | 61 +-- .../op/quality/service/QcProCheckService.java | 3 + .../impl/QcCheckTaskIncomeServiceImpl.java | 14 +- .../impl/QcCheckTaskProduceServiceImpl.java | 7 +- .../QcCheckTaskWarehousingServiceImpl.java | 8 + .../serviceImpl/QcProCheckServiceImpl.java | 7 + .../quality/QcCheckTaskDetailMapper.xml | 2 +- .../quality/QcCheckTaskIncomeMapper.xml | 21 +- .../quality/QcCheckTaskProduceMapper.xml | 49 +-- .../quality/QcCheckTaskWarehousingMapper.xml | 24 +- .../quality/QcCheckUnqualifiedMapper.xml | 6 +- 14 files changed, 585 insertions(+), 79 deletions(-) create mode 100644 op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/quality/QcCheckTaskIncomeDto.java diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/quality/QcCheckTaskIncomeDto.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/quality/QcCheckTaskIncomeDto.java new file mode 100644 index 000000000..a6cd94bda --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/quality/QcCheckTaskIncomeDto.java @@ -0,0 +1,374 @@ +package com.op.system.api.domain.dto.quality; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 来料检验对象 qc_check_task_income + * + * @author Open Platform + * @date 2023-10-19 + */ +public class QcCheckTaskIncomeDto extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + private String recordId; + + /** 检验任务编号 */ + @Excel(name = "检验任务编号") + private String checkNo; + + /** 来料批次号 */ + @Excel(name = "来料批次号") + private String incomeBatchNo; + + /** 订单号 */ + @Excel(name = "订单号") + private String orderNo; + + /** 物料号 */ + @Excel(name = "物料号") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 收货数量 */ + @Excel(name = "收货数量") + private BigDecimal quality; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 供应商编码 */ + @Excel(name = "供应商编码") + private String supplierCode; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String supplierName; + + /** 来料时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "来料时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date incomeTime; + + /** 检测地点 */ + @Excel(name = "检测地点") + private String checkLoc; + + /** 检测状态 */ + @Excel(name = "检测状态") + private String checkStatus; + + /** 检测人工号 */ + @Excel(name = "检测人工号") + private String checkManCode; + + /** 检测人姓名 */ + @Excel(name = "检测人姓名") + private String checkManName; + + /** 检验时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date checkTime; + + /** 检验结果Y合格 */ + @Excel(name = "检验结果Y合格") + private String checkResult; + + /** 是否启用1启用0停用 */ + @Excel(name = "是否启用1启用0停用") + private String status; + + /** 预留字段1 */ + //@Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + //@Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + //@Excel(name = "预留字段3") + private String attr3; + + /** 预留字段4 */ + //@Excel(name = "预留字段4") + private String attr4; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + private String incomeTimeStart; + private String incomeTimeEnd; + private String checkTimeStart; + private String checkTimeEnd; + private String typeCode; + private String checkType; + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public String getIncomeTimeStart() { + return incomeTimeStart; + } + + public void setIncomeTimeStart(String incomeTimeStart) { + this.incomeTimeStart = incomeTimeStart; + } + + public String getIncomeTimeEnd() { + return incomeTimeEnd; + } + + public void setIncomeTimeEnd(String incomeTimeEnd) { + this.incomeTimeEnd = incomeTimeEnd; + } + + public String getCheckTimeStart() { + return checkTimeStart; + } + + public void setCheckTimeStart(String checkTimeStart) { + this.checkTimeStart = checkTimeStart; + } + + public String getCheckTimeEnd() { + return checkTimeEnd; + } + + public void setCheckTimeEnd(String checkTimeEnd) { + this.checkTimeEnd = checkTimeEnd; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getRecordId() { + return recordId; + } + public void setCheckNo(String checkNo) { + this.checkNo = checkNo; + } + + public String getCheckNo() { + return checkNo; + } + public void setIncomeBatchNo(String incomeBatchNo) { + this.incomeBatchNo = incomeBatchNo; + } + + public String getIncomeBatchNo() { + return incomeBatchNo; + } + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getOrderNo() { + return orderNo; + } + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getMaterialName() { + return materialName; + } + public void setQuality(BigDecimal quality) { + this.quality = quality; + } + + public BigDecimal getQuality() { + return quality; + } + public void setUnit(String unit) { + this.unit = unit; + } + + public String getUnit() { + return unit; + } + public void setSupplierCode(String supplierCode) { + this.supplierCode = supplierCode; + } + + public String getSupplierCode() { + return supplierCode; + } + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + + public String getSupplierName() { + return supplierName; + } + public void setIncomeTime(Date incomeTime) { + this.incomeTime = incomeTime; + } + + public Date getIncomeTime() { + return incomeTime; + } + public void setCheckLoc(String checkLoc) { + this.checkLoc = checkLoc; + } + + public String getCheckLoc() { + return checkLoc; + } + public void setCheckStatus(String checkStatus) { + this.checkStatus = checkStatus; + } + + public String getCheckStatus() { + return checkStatus; + } + public void setCheckManCode(String checkManCode) { + this.checkManCode = checkManCode; + } + + public String getCheckManCode() { + return checkManCode; + } + public void setCheckManName(String checkManName) { + this.checkManName = checkManName; + } + + public String getCheckManName() { + return checkManName; + } + public void setCheckTime(Date checkTime) { + this.checkTime = checkTime; + } + + public Date getCheckTime() { + return checkTime; + } + public void setCheckResult(String checkResult) { + this.checkResult = checkResult; + } + + public String getCheckResult() { + return checkResult; + } + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr2() { + return attr2; + } + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recordId", getRecordId()) + .append("checkNo", getCheckNo()) + .append("incomeBatchNo", getIncomeBatchNo()) + .append("orderNo", getOrderNo()) + .append("materialCode", getMaterialCode()) + .append("materialName", getMaterialName()) + .append("quality", getQuality()) + .append("unit", getUnit()) + .append("supplierCode", getSupplierCode()) + .append("supplierName", getSupplierName()) + .append("incomeTime", getIncomeTime()) + .append("checkLoc", getCheckLoc()) + .append("checkStatus", getCheckStatus()) + .append("checkManCode", getCheckManCode()) + .append("checkManName", getCheckManName()) + .append("checkTime", getCheckTime()) + .append("checkResult", getCheckResult()) + .append("status", getStatus()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java index 59c729200..2547c67e6 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java @@ -49,13 +49,13 @@ public class QcCheckTaskProduceController extends BaseController { public TableDataInfo list(QcCheckTaskProduce qcCheckTaskProduce) { //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckTaskProduce.getProduceDateStart())){ - qcCheckTaskProduce.setProduceDateStart(DateUtils.getDate()+" 00:00:00");//start + if(StringUtils.isEmpty(qcCheckTaskProduce.getIncomeTimeStart())){ + qcCheckTaskProduce.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"; - qcCheckTaskProduce.setProduceDateEnd(dateEndStr);//end + qcCheckTaskProduce.setIncomeTimeEnd(dateEndStr);//end } // if(StringUtils.isEmpty(qcCheckTaskProduce.getCheckTimeStart())){ @@ -77,13 +77,13 @@ public class QcCheckTaskProduceController extends BaseController { public void export(HttpServletResponse response, QcCheckTaskProduce qcCheckTaskProduce) { //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckTaskProduce.getProduceDateStart())){ - qcCheckTaskProduce.setProduceDateStart(DateUtils.getDate()+" 00:00:00");//start + if(StringUtils.isEmpty(qcCheckTaskProduce.getIncomeTimeStart())){ + qcCheckTaskProduce.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"; - qcCheckTaskProduce.setProduceDateEnd(dateEndStr);//end + qcCheckTaskProduce.setIncomeTimeEnd(dateEndStr);//end } // if(StringUtils.isEmpty(qcCheckTaskProduce.getCheckTimeStart())){ 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 96ca9c7ea..b63b4cb21 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 @@ -2,10 +2,15 @@ package com.op.quality.controller; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; +import com.op.common.core.utils.StringUtils; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; import com.op.common.core.web.page.TableDataInfo; +import com.op.quality.domain.QcCheckTaskProduce; +import com.op.quality.domain.QcCheckTaskWarehousing; import com.op.quality.domain.QcProCheck; +import com.op.quality.service.IQcCheckTaskProduceService; +import com.op.quality.service.IQcCheckTaskWarehousingService; import com.op.quality.service.QcProCheckService; import com.op.system.api.RemoteMesService; import com.op.system.api.domain.dto.WCSDTO; @@ -15,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** + * 手持、上位机：接口 * @ClassName : quaController * @Description : * @Author : @@ -29,6 +35,12 @@ public class QuaController extends BaseController { @Autowired private RemoteMesService remoteMesService; + @Autowired + private IQcCheckTaskProduceService qcCheckTaskProduceService; + + @Autowired + private IQcCheckTaskWarehousingService qcCheckTaskWarehousingService; + @PostMapping("/saveQcProCheck") public R saveQcProCheck(@RequestBody QcProCheck qcProCheck) { DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode()); @@ -53,7 +65,7 @@ public class QuaController extends BaseController { return getDataTable(list); } /** - * 获取【请填写功能名称】详细信息 + * 根据rfid获取检测项信息 */ @GetMapping(value = "getInfoByRfid") public AjaxResult getInfo(QcProCheck qcProCheck) { @@ -75,4 +87,66 @@ public class QuaController extends BaseController { public AjaxResult getDictList(QcProCheck qcProCheck) { return success(qcProCheckService.getDictList(qcProCheck)); } + + /**创建生产过程(烘房 首检)检验*/ + @PostMapping(value = "createCheckProduceTask") + public AjaxResult createCheckProduceTask(@RequestBody QcCheckTaskProduce qcCheckTaskProduce) { + if(StringUtils.isBlank(qcCheckTaskProduce.getBatchNo())){ + return error("[batchNo]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskProduce.getOrderNo())){ + return error("[orderNo]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialName())){ + return error("[materialName]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialCode())){ + return error("[materialCode]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskProduce.getCheckType())){ + return error("[checkType:produce]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskProduce.getFactoryCode())){ + return error("[factoryCode]不能为空"); + } + + //添加检测任务 + return success(qcCheckTaskProduceService.insertQcCheckTaskProduce(qcCheckTaskProduce)); + } + + /**创建成品入库检验*/ + @PostMapping(value = "createCheckProductTask") + public AjaxResult createCheckProductTask(@RequestBody QcCheckTaskWarehousing qcCheckTaskWarehousing) { + if(StringUtils.isBlank(qcCheckTaskWarehousing.getBatchNo())){ + return error("[batchNo]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskWarehousing.getOrderNo())){ + return error("[orderNo]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskWarehousing.getMaterialName())){ + return error("[materialName]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskWarehousing.getMaterialCode())){ + return error("[materialCode]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskWarehousing.getCheckType())){ + return error("[checkType:produce]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskWarehousing.getFactoryCode())){ + return error("[factoryCode]不能为空"); + } + + //添加检测任务 + return success(qcCheckTaskWarehousingService.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing)); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java index 82ab5ca7f..6fbc6f004 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java @@ -50,16 +50,16 @@ public class QcCheckTaskProduce extends BaseEntity { /** 所属车间编码 */ @Excel(name = "所属车间编码") - private String carCode; + private String supplierCode; /** 所属车间名称 */ @Excel(name = "所属车间名称") - private String carName; + private String supplierName; /** 生产时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date produceDate; + private Date incomeTime; /** 检测地点 */ @Excel(name = "检测地点") @@ -113,8 +113,8 @@ public class QcCheckTaskProduce extends BaseEntity { /** 删除标识1删除0正常 */ private String delFlag; - private String produceDateStart; - private String produceDateEnd; + private String incomeTimeStart; + private String incomeTimeEnd; private String checkTimeStart; private String checkTimeEnd; @@ -128,20 +128,20 @@ public class QcCheckTaskProduce extends BaseEntity { this.checkType = checkType; } - public String getProduceDateStart() { - return produceDateStart; + public String getIncomeTimeStart() { + return incomeTimeStart; } - public void setProduceDateStart(String produceDateStart) { - this.produceDateStart = produceDateStart; + public void setIncomeTimeStart(String incomeTimeStart) { + this.incomeTimeStart = incomeTimeStart; } - public String getProduceDateEnd() { - return produceDateEnd; + public String getIncomeTimeEnd() { + return incomeTimeEnd; } - public void setProduceDateEnd(String produceDateEnd) { - this.produceDateEnd = produceDateEnd; + public void setIncomeTimeEnd(String incomeTimeEnd) { + this.incomeTimeEnd = incomeTimeEnd; } public String getCheckTimeStart() { @@ -216,27 +216,31 @@ public class QcCheckTaskProduce extends BaseEntity { public String getUnit() { return unit; } - public void setCarCode(String carCode) { - this.carCode = carCode; + + public String getSupplierCode() { + return supplierCode; } - public String getCarCode() { - return carCode; - } - public void setCarName(String carName) { - this.carName = carName; + public void setSupplierCode(String supplierCode) { + this.supplierCode = supplierCode; } - public String getCarName() { - return carName; - } - public void setProduceDate(Date produceDate) { - this.produceDate = produceDate; + public String getSupplierName() { + return supplierName; } - public Date getProduceDate() { - return produceDate; + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; } + + public Date getIncomeTime() { + return incomeTime; + } + + public void setIncomeTime(Date incomeTime) { + this.incomeTime = incomeTime; + } + public void setCheckLoc(String checkLoc) { this.checkLoc = checkLoc; } @@ -340,9 +344,6 @@ public class QcCheckTaskProduce extends BaseEntity { .append("materialName", getMaterialName()) .append("quality", getQuality()) .append("unit", getUnit()) - .append("carCode", getCarCode()) - .append("carName", getCarName()) - .append("produceDate", getProduceDate()) .append("checkLoc", getCheckLoc()) .append("checkStatus", getCheckStatus()) .append("checkManCode", getCheckManCode()) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java index 79e9f724b..ca4bf2491 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java @@ -2,6 +2,8 @@ package com.op.quality.service; import com.op.common.core.domain.R; //import com.op.quality.domain.BaseFile; +import com.op.quality.domain.QcCheckTaskDetail; +import com.op.quality.domain.QcCheckTypeProject; import com.op.quality.domain.QcProCheck; import java.util.List; @@ -27,4 +29,5 @@ public interface QcProCheckService { List getEquipmentList(QcProCheck qcProCheck); List getDictList(QcProCheck qcProCheck); + } 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 ba2388917..dbf6ab7f9 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 @@ -222,6 +222,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { @Override @DS("#header.poolName") public int commitCheckResult(QcCheckTaskIncome qcCheckTaskIncome) { + + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_",""); + //遍历检测项目 List projects= qcCheckTaskDetailMapper.getProjectStatus(qcCheckTaskIncome.getRecordId()); String result = "N"; @@ -232,14 +238,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { } int n = 0; - String unQuaType = ""; String recordId = qcCheckTaskIncome.getRecordId(); if("material".equals(qcCheckTaskIncome.getTypeCode())){ qcCheckTaskIncome.setCheckStatus("2"); qcCheckTaskIncome.setCheckResult(result); qcCheckTaskIncome.setCheckTime(DateUtils.getNowDate()); n = qcCheckTaskIncomeMapper.updateQcCheckTaskIncome(qcCheckTaskIncome); - unQuaType = "material"; }else if("produce".equals(qcCheckTaskIncome.getTypeCode())){ QcCheckTaskProduce qcCheckTaskProduce = new QcCheckTaskProduce(); qcCheckTaskProduce.setCheckStatus("2"); @@ -247,7 +251,6 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckTaskProduce.setCheckResult(result); qcCheckTaskProduce.setCheckTime(DateUtils.getNowDate()); n = qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce); - unQuaType = "produce"; }else if("product".equals(qcCheckTaskIncome.getTypeCode())){ QcCheckTaskWarehousing warehousing = new QcCheckTaskWarehousing(); warehousing.setCheckStatus("2"); @@ -255,16 +258,17 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { warehousing.setCheckResult(result); warehousing.setCheckTime(DateUtils.getNowDate()); n = qcCheckTaskWarehousingMapper.updateQcCheckTaskWarehousing(warehousing); - unQuaType = "product"; } //不合格处理 if("N".equals(result)){ QcCheckUnqualified unqualified = new QcCheckUnqualified(); + unqualified.setId(IdUtils.fastSimpleUUID()); unqualified.setTaskId(qcCheckTaskIncome.getRecordId()); unqualified.setCreateTime(DateUtils.getNowDate()); unqualified.setCreateBy(qcCheckTaskIncome.getUpdateBy()); - unqualified.setType(unQuaType); + unqualified.setFactoryCode(factoryCode); + unqualified.setType(qcCheckTaskIncome.getCheckType()); /**qc_check_unqualified**/ qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); } 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 daf08c016..8c21e88b6 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 @@ -4,7 +4,9 @@ import java.util.Date; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; @@ -78,8 +80,11 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService @Override @DS("#header.poolName") public int insertQcCheckTaskProduce(QcCheckTaskProduce qcCheckTaskProduce) { - qcCheckTaskProduce.setCreateTime(DateUtils.getNowDate()); + if(StringUtils.isNotBlank(qcCheckTaskProduce.getFactoryCode())){ + DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskProduce.getFactoryCode()); + } + qcCheckTaskProduce.setCreateTime(DateUtils.getNowDate()); String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); int liushuiNum = qcCheckTaskProduceMapper.getTodayMaxNum(qcCheckTaskProduce); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java index 3521a8093..c278f5ddc 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java @@ -4,7 +4,9 @@ import java.util.Date; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; import com.op.quality.domain.QcCheckTaskDetail; @@ -18,6 +20,7 @@ import org.springframework.stereotype.Service; import com.op.quality.mapper.QcCheckTaskWarehousingMapper; import com.op.quality.domain.QcCheckTaskWarehousing; import com.op.quality.service.IQcCheckTaskWarehousingService; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -77,8 +80,13 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin */ @Override @DS("#header.poolName") + @Transactional(rollbackFor = Exception.class) public int insertQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing) { + if(StringUtils.isNotBlank(qcCheckTaskWarehousing.getFactoryCode())){ + DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskWarehousing.getFactoryCode()); + } + String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); int liushuiNum = qcCheckTaskWarehousingMapper.getTodayMaxNum(qcCheckTaskWarehousing); String liushuiStr = String.format("%04d", liushuiNum); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java index ad1b37ecd..037557f32 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java @@ -7,7 +7,10 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; +import com.op.quality.domain.QcCheckTaskDetail; +import com.op.quality.domain.QcCheckTypeProject; import com.op.quality.domain.QcProCheck; +import com.op.quality.mapper.QcCheckTaskIncomeMapper; import com.op.quality.mapper.QcProCheckMapper; import com.op.quality.service.QcProCheckService; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +32,9 @@ public class QcProCheckServiceImpl implements QcProCheckService { @Autowired private QcProCheckMapper qcProCheckMapper; + @Autowired + private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; + @Override public R saveQcProCheck(QcProCheck qcProCheck) { DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode()); @@ -107,4 +113,5 @@ public class QcProCheckServiceImpl implements QcProCheckService { //qcProCheck.setEquipmentTypeCode("equ_type"); return qcProCheckMapper.getDictList(qcProCheck); } + } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml index 6888d4f50..d218245c9 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml @@ -136,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item.propertyCode},#{item.checkMode}, #{item.checkTool},#{item.unitCode}, #{item.standardValue},#{item.actualValue}, - #{item.status},,#{item.createBy},#{item.createTime}, + #{item.status},#{item.createBy},#{item.createTime}, #{item.factoryCode},'0',#{item.typeProjectId} ) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index 4215a82aa..5e8e7fa5c 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -33,10 +33,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_task_income + select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, + supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, + check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, + create_time, update_by, update_time, factory_code, del_flag , check_type + from qc_check_task @@ -103,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into qc_check_task_income + insert into qc_check_task record_id, check_no, @@ -162,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, factory_code, del_flag, + check_type, #{recordId}, @@ -192,11 +199,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{factoryCode}, #{delFlag}, + #{checkType}, - update qc_check_task_income + update qc_check_task check_no = #{checkNo}, income_batch_no = #{incomeBatchNo}, @@ -225,16 +233,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, factory_code = #{factoryCode}, del_flag = #{delFlag}, + check_type = #{checkType}, where record_id = #{recordId} - delete from qc_check_task_income where record_id = #{recordId} + delete from qc_check_task where record_id = #{recordId} - delete from qc_check_task_income where record_id in + delete from qc_check_task where record_id in #{recordId} 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 58a50f9a0..0a2f42479 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 @@ -13,9 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + + + @@ -33,14 +33,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select record_id, check_no, batch_no, order_no, material_code, material_name, - quality, unit, car_code, car_name, produce_date, check_loc, check_status, + quality, unit, supplier_code, supplier_name, produce_date, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, - factory_code, del_flag from qc_check_task_produce + factory_code, del_flag , check_type + from qc_check_task @@ -82,14 +85,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into qc_check_task_produce + insert into qc_check_task record_id, check_no, @@ -110,8 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_name, quality, unit, - car_code, - car_name, + supplier_code, + supplier_name, produce_date, check_loc, check_status, @@ -130,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, factory_code, del_flag, + check_type, #{recordId}, @@ -140,8 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{materialName}, #{quality}, #{unit}, - #{carCode}, - #{carName}, + #{supplierCode}, + #{supplierName}, #{produceDate}, #{checkLoc}, #{checkStatus}, @@ -160,11 +164,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{factoryCode}, #{delFlag}, + #{checkType}, - update qc_check_task_produce + update qc_check_task check_no = #{checkNo}, batch_no = #{batchNo}, @@ -173,8 +178,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_name = #{materialName}, quality = #{quality}, unit = #{unit}, - car_code = #{carCode}, - car_name = #{carName}, + supplier_code = #{supplierCode}, + supplier_name = #{supplierName}, produce_date = #{produceDate}, check_loc = #{checkLoc}, check_status = #{checkStatus}, @@ -198,11 +203,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from qc_check_task_produce where record_id = #{recordId} + delete from qc_check_task where record_id = #{recordId} - delete from qc_check_task_produce where record_id in + delete from qc_check_task where record_id in #{recordId} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml index 4487a86b5..05e4a7a2a 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml @@ -33,10 +33,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select record_id, check_no, batch_no, order_no, material_code, material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_task_warehousing + select record_id, check_no, batch_no, order_no, material_code, + material_name, quality, unit, supplier_code, supplier_name, + income_time, check_loc, check_status, check_man_code, check_man_name, + check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, + create_time, update_by, update_time, factory_code, del_flag , check_type + from qc_check_task @@ -74,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into qc_check_task_warehousing + insert into qc_check_task record_id, check_no, @@ -115,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, factory_code, del_flag, + check_type, #{recordId}, @@ -145,11 +156,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{factoryCode}, #{delFlag}, + #{checkType}, - update qc_check_task_warehousing + update qc_check_task check_no = #{checkNo}, batch_no = #{batchNo}, @@ -183,11 +195,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from qc_check_task_warehousing where record_id = #{recordId} + delete from qc_check_task where record_id = #{recordId} - delete from qc_check_task_warehousing where record_id in + delete from qc_check_task where record_id in #{recordId} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml index 763ace6ac..020febbbe 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml @@ -30,7 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"