diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index 9e2b8849e..e7b079edc 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -276,25 +276,38 @@ public class OpenServiceImpl implements OpenService { @Override public AjaxResult machineRepair(EquRepairOrderDTO equRepairOrderDTO) { + if (equRepairOrderDTO.getFactory() == null) { + return error("工厂源不可为空!"); + } DynamicDataSourceContextHolder.push("ds_" + equRepairOrderDTO.getFactory());// 这是数据源的key // 创建报修单 DeviceRepairOrder equRepairOrder = new DeviceRepairOrder(); // 获取故障报修流水号 String serialNum = String.format("%03d", openMapper.selectOrderCodeSerialNumber()); + if (equRepairOrderDTO.getEquipmentCode() == null) { + return error("设备信息不可为空!"); + } equRepairOrder.setOrderCode("BX" + DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equRepairOrderDTO.getEquipmentCode() + serialNum);// 报修单号 equRepairOrder.setOrderId(IdUtils.fastSimpleUUID());// id equRepairOrder.setEquipmentCode(equRepairOrderDTO.getEquipmentCode()); equRepairOrder.setOrderSource("上位机");// 故障来源 equRepairOrder.setOrderTime(DateUtils.getNowDate());// 报修时间 equRepairOrder.setOrderBreakdownTime(DateUtils.getNowDate());// 故障时间 - equRepairOrder.setOrderRepairmanCode(equRepairOrderDTO.getUserName());// 用户账号 - equRepairOrder.setOrderRepairmanName(equRepairOrderDTO.getUserNickName());// 用户名称 + if (equRepairOrderDTO.getUserName() != null) { + equRepairOrder.setOrderRepairmanCode(equRepairOrderDTO.getUserName());// 用户账号 + } + if (equRepairOrderDTO.getUserNickName() != null) { + equRepairOrder.setOrderRepairmanName(equRepairOrderDTO.getUserNickName());// 用户名称 + } + equRepairOrder.setCreateTime(DateUtils.getNowDate()); equRepairOrder.setCreateBy(equRepairOrderDTO.getUserName()); equRepairOrder.setOrderStatus("待审核");// 报修单状态 equRepairOrder.setFactoryCode(equRepairOrderDTO.getFactory());// 工厂 - equRepairOrder.setOrderConnection(equRepairOrderDTO.getPhoneNumber());// 联系方式 + if (equRepairOrderDTO.getPhoneNumber() != null) { + equRepairOrder.setOrderConnection(equRepairOrderDTO.getPhoneNumber());// 联系方式 + } openMapper.insertEquRepairOrder(equRepairOrder); 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 efe7536e0..d536705c8 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,15 +49,15 @@ public class QcCheckTaskProduceController extends BaseController { @GetMapping("/list") public TableDataInfo list(QcCheckTaskProduce qcCheckTaskProduce) { - //默认时间范围T 00:00:00~T+1 00:00:00 - 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.setIncomeTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// 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.setIncomeTimeEnd(dateEndStr);//end +// } // if(StringUtils.isEmpty(qcCheckTaskProduce.getCheckTimeStart())){ // qcCheckTaskProduce.setCheckTimeStart(qcCheckTaskProduce.getProduceDateStart());//start @@ -77,15 +77,15 @@ public class QcCheckTaskProduceController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, QcCheckTaskProduce qcCheckTaskProduce) { - //默认时间范围T 00:00:00~T+1 00:00:00 - 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.setIncomeTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// 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.setIncomeTimeEnd(dateEndStr);//end +// } // if(StringUtils.isEmpty(qcCheckTaskProduce.getCheckTimeStart())){ // qcCheckTaskProduce.setCheckTimeStart(qcCheckTaskProduce.getProduceDateStart());//start diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java index 980096f2f..5a0405d26 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java @@ -89,4 +89,10 @@ public class QcDefectTypeController extends BaseController { public AjaxResult remove(@PathVariable String[] defectIds) { return toAjax(qcDefectTypeService.deleteQcDefectTypeByDefectIds(defectIds)); } + + @GetMapping("/getDefectTypeListByDefectType/{defectType}") + public TableDataInfo getDefectTypeListByDefectType(@PathVariable("defectType") String defectType) { + List list = qcDefectTypeService.getDefectTypeListByDefectType(defectType); + return getDataTable(list); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java index 73d670bd1..142d4c26d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java @@ -74,7 +74,13 @@ public class QcMaterialGroupDetailController extends BaseController { @Log(title = "物料组成员", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody QcMaterialGroupDetail qcMaterialGroupDetail) { - return toAjax(qcMaterialGroupDetailService.insertQcMaterialGroupDetail(qcMaterialGroupDetail)); + Boolean isNotUnique = qcMaterialGroupDetailService.validationGroupDetailData(qcMaterialGroupDetail.getMaterialCode()); + if (isNotUnique) { + return AjaxResult.error("此物料已在组中，请重新选择！"); + } else { + return toAjax(qcMaterialGroupDetailService.insertQcMaterialGroupDetail(qcMaterialGroupDetail)); + } + } /** diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java index 8fb6c60dd..a4ab70348 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java @@ -80,7 +80,7 @@ public class QcStaticTableController extends BaseController { /** * 生产过程质量报表 */ - @RequiresPermissions("quality:gcTableProduce:list") + @RequiresPermissions("quality:qcTableProduce:list") @GetMapping("/getProduceChartData") public QcStaticTable getProduceChartData(QcStaticTable qcStaticTable) { QcStaticTable resultdto = new QcStaticTable(); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java index 40ce75663..67d5a108f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java @@ -82,7 +82,7 @@ public class QcCheckTaskDetail extends BaseEntity { /** 删除标识1删除0正常 */ private String delFlag; - + private String remark; private String projectId; private String projectNo; private Integer sort; @@ -99,6 +99,16 @@ public class QcCheckTaskDetail extends BaseEntity { private String fileListStr; private List files; + @Override + public String getRemark() { + return remark; + } + + @Override + public void setRemark(String remark) { + this.remark = remark; + } + public List getFiles() { return files; } 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 eef2a553d..e51f28c60 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 @@ -140,6 +140,24 @@ public class QcCheckTaskIncome extends BaseEntity { private String fileList; private List files; private String remark; + private String belongTo; + private String oldBelongTo; + + public String getOldBelongTo() { + return oldBelongTo; + } + + public void setOldBelongTo(String oldBelongTo) { + this.oldBelongTo = oldBelongTo; + } + + public String getBelongTo() { + return belongTo; + } + + public void setBelongTo(String belongTo) { + this.belongTo = belongTo; + } @Override public String getRemark() { 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 324b3107a..120227d3f 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 @@ -149,6 +149,15 @@ public class QcCheckTaskProduce extends BaseEntity { private BigDecimal cNoOkquality; private String checkName; private List checkInfos; + private List defects; + + public List getDefects() { + return defects; + } + + public void setDefects(List defects) { + this.defects = defects; + } public List getCheckInfos() { return checkInfos; 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 50d0a2071..d23ad5966 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 @@ -88,6 +88,24 @@ public class QcCheckUnqualified extends BaseEntity { private String checkResult; private String requestid; private String typeCode; + private String sampleQuality; + private String noOkQuality; + + public String getSampleQuality() { + return sampleQuality; + } + + public void setSampleQuality(String sampleQuality) { + this.sampleQuality = sampleQuality; + } + + public String getNoOkQuality() { + return noOkQuality; + } + + public void setNoOkQuality(String noOkQuality) { + this.noOkQuality = noOkQuality; + } public String getTypeCode() { return typeCode; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDefectMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDefectMapper.java new file mode 100644 index 000000000..8129434ab --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDefectMapper.java @@ -0,0 +1,69 @@ +package com.op.quality.mapper; + +import java.util.List; + +import com.op.quality.domain.QcCheckTaskDefect; +import org.apache.ibatis.annotations.Mapper; + +/** + * 来料检验任务--不良数量Mapper接口 + * + * @author Open Platform + * @date 2024-01-11 + */ +@Mapper +public interface QcCheckTaskDefectMapper { + /** + * 查询来料检验任务--不良数量 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 来料检验任务--不良数量 + */ + public QcCheckTaskDefect selectQcCheckTaskDefectByRecordId(String recordId); + + /** + * 查询来料检验任务--不良数量列表 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 来料检验任务--不良数量集合 + */ + public List selectQcCheckTaskDefectList(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 新增来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + public int insertQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 修改来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + public int updateQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 删除来料检验任务--不良数量 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 结果 + */ + public int deleteQcCheckTaskDefectByRecordId(String recordId); + + /** + * 批量删除来料检验任务--不良数量 + * + * @param recordIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQcCheckTaskDefectByRecordIds(String[] recordIds); + + public int deleteQcCheckTaskDefectByBelongTo(String belongTo); + + public List selectDefectByBelongTo(String belongTo); + + +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java index 6a1951e71..8e0e0b294 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java @@ -84,4 +84,9 @@ public interface QcCheckUnqualifiedMapper { List getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); void updatePutStatus(QcCheckTaskIncome qcCheckTaskIncome); + + int repeatCheckTask(QcCheckTaskIncome recheck); + int repeatCheckTaskDefect(QcCheckTaskIncome recheck); + int repeatCheckTaskDetail(QcCheckTaskIncome recheck); + int repeatCheckTaskUser(QcCheckTaskIncome recheck); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java index 156516a03..02d99afd8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java @@ -67,4 +67,6 @@ public interface QcDefectTypeMapper { */ int selectSerialNumber(); + public List getDefectTypeListByDefectType(String defectType); + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupDetailMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupDetailMapper.java index 421feea7a..9ea8fe20d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupDetailMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupDetailMapper.java @@ -64,4 +64,6 @@ public interface QcMaterialGroupDetailMapper { public QcMaterialGroupDetail getGroupByMaterial(String materialCode); public List validationData(String materialCode); + + public List validationGroupDetailData(String materialCode); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java new file mode 100644 index 000000000..731fb90dd --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java @@ -0,0 +1,64 @@ +package com.op.quality.service; + +import java.util.List; +import com.op.quality.domain.QcCheckTaskDefect; + +/** + * 来料检验任务--不良数量Service接口 + * + * @author Open Platform + * @date 2024-01-11 + */ +public interface IQcCheckTaskDefectService { + /** + * 查询来料检验任务--不良数量 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 来料检验任务--不良数量 + */ + public QcCheckTaskDefect selectQcCheckTaskDefectByRecordId(String recordId); + + /** + * 查询来料检验任务--不良数量列表 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 来料检验任务--不良数量集合 + */ + public List selectQcCheckTaskDefectList(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 新增来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + public int insertQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 修改来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + public int updateQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 批量删除来料检验任务--不良数量 + * + * @param recordIds 需要删除的来料检验任务--不良数量主键集合 + * @return 结果 + */ + public int deleteQcCheckTaskDefectByRecordIds(String[] recordIds); + + /** + * 删除来料检验任务--不良数量信息 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 结果 + */ + public int deleteQcCheckTaskDefectByRecordId(String recordId); + + public int deleteQcCheckTaskDefectByBelongTo(String belongTo); + + public List selectDefectByBelongTo(String belongTo); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java index e1f4f2d28..1403564cd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java @@ -59,4 +59,6 @@ public interface IQcDefectTypeService { * @return 结果 */ public int deleteQcDefectTypeByDefectId(String defectId); + + public List getDefectTypeListByDefectType(String defectType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupDetailService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupDetailService.java index 6a4c1cce4..e7bf27147 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupDetailService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupDetailService.java @@ -58,5 +58,17 @@ public interface IQcMaterialGroupDetailService { */ public int deleteQcMaterialGroupDetailById(String id); - public boolean validationData(String id); + /** + * 验证此成员下有没有检测规则 + * @param materialCode + * @return + */ + public boolean validationData(String materialCode); + + /** + * 成员的唯一性校验 + * @param materialCode + * @return + */ + public boolean validationGroupDetailData(String materialCode); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java new file mode 100644 index 000000000..3e68774b6 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java @@ -0,0 +1,117 @@ +package com.op.quality.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.quality.mapper.QcCheckTaskDefectMapper; +import com.op.quality.domain.QcCheckTaskDefect; +import com.op.quality.service.IQcCheckTaskDefectService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +/** + * 来料检验任务--不良数量Service业务层处理 + * + * @author Open Platform + * @date 2024-01-11 + */ +@Service +public class QcCheckTaskDefectServiceImpl implements IQcCheckTaskDefectService { + @Autowired + private QcCheckTaskDefectMapper qcCheckTaskDefectMapper; + + /** + * 查询来料检验任务--不良数量 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 来料检验任务--不良数量 + */ + @Override + @DS("#header.poolName") + public QcCheckTaskDefect selectQcCheckTaskDefectByRecordId(String recordId) { + return qcCheckTaskDefectMapper.selectQcCheckTaskDefectByRecordId(recordId); + } + + /** + * 查询来料检验任务--不良数量列表 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 来料检验任务--不良数量 + */ + @Override + @DS("#header.poolName") + public List selectQcCheckTaskDefectList(QcCheckTaskDefect qcCheckTaskDefect) { + return qcCheckTaskDefectMapper.selectQcCheckTaskDefectList(qcCheckTaskDefect); + } + + /** + * 新增来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect) { + qcCheckTaskDefect.setRecordId(IdUtils.fastSimpleUUID()); + qcCheckTaskDefect.setCreateBy(SecurityUtils.getUsername()); + qcCheckTaskDefect.setCreateTime(DateUtils.getNowDate()); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + qcCheckTaskDefect.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); + return qcCheckTaskDefectMapper.insertQcCheckTaskDefect(qcCheckTaskDefect); + } + + /** + * 修改来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect) { + qcCheckTaskDefect.setUpdateTime(DateUtils.getNowDate()); + qcCheckTaskDefect.setUpdateBy(SecurityUtils.getUsername()); + return qcCheckTaskDefectMapper.updateQcCheckTaskDefect(qcCheckTaskDefect); + } + + /** + * 批量删除来料检验任务--不良数量 + * + * @param recordIds 需要删除的来料检验任务--不良数量主键 + * @return 结果 + */ + @Override + public int deleteQcCheckTaskDefectByRecordIds(String[] recordIds) { + return qcCheckTaskDefectMapper.deleteQcCheckTaskDefectByRecordIds(recordIds); + } + + /** + * 删除来料检验任务--不良数量信息 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 结果 + */ + @Override + public int deleteQcCheckTaskDefectByRecordId(String recordId) { + return qcCheckTaskDefectMapper.deleteQcCheckTaskDefectByRecordId(recordId); + } + + @Override + public int deleteQcCheckTaskDefectByBelongTo(String belongTo) { + return qcCheckTaskDefectMapper.deleteQcCheckTaskDefectByBelongTo(belongTo); + } + + @Override + public List selectDefectByBelongTo(String belongTo) { + return qcCheckTaskDefectMapper.selectDefectByBelongTo(belongTo); + } +} 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 8d67f647b..493ca14ea 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 @@ -388,105 +388,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { unqualified.setCreateBy(qcCheckTaskIncome.getUpdateBy()); unqualified.setFactoryCode(factoryCode); unqualified.setType(qcCheckTaskIncome.getCheckType()); - qcCheckTaskIncome.setUpdateBy(SecurityUtils.getUsername()); - AjaxResult oaR = new AjaxResult(); - if("material".equals(qcCheckTaskIncome.getTypeCode())) { - qcCheckTaskIncome.setRecordId(qcCheckTaskIncome.getRecordId());//检验任务主表id - oaR = this.createLLOA(qcCheckTaskIncome); - }else if("produce".equals(qcCheckTaskIncome.getTypeCode())){ - oaR = this.createProduceOA(qcCheckTaskIncome); - }else if("product".equals(qcCheckTaskIncome.getTypeCode())) { - //TODO;不走OA - oaR.put("code","200"); - } - - if((oaR.get("code").toString()).equals("200")){ - /**qc_check_unqualified**/ - qcCheckTaskIncome.setFactoryCode(factoryCode); - unqualified.setRequestid(oaR.get("data").toString()); - qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); - } - + qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); } return n ; } - /*来料检验不良OA流程 - * CQ 厂区、 OEMCM 厂名 、 LLLB 来料类别【0、1】、MATNR 物料编号、MAKTX 物料名称、suppliernum 供应商编码 - * supplier 供应商名称、CHARG 生产批号、comeQty 来料数量、testDate 检验日期 、 JYBH 检验编号、 - * BJY 仓储报检人（OEM产品提报人）、WLLY 物料来源、ZCF 转出方、 ZCOEMCM 转出OEM厂名、 - * memo 不合格情况描述 、PZGLBZG QC主管 - */ - private AjaxResult createLLOA(QcCheckTaskIncome qcCheckTaskIncome){ - QcCheckTaskIncome detailInfo = qcCheckTaskIncomeMapper.getTaskInfo(qcCheckTaskIncome.getRecordId()); - - //发起来料检验OA流程 - Map paramMap = new HashMap<>(); - paramMap.put("user",qcCheckTaskIncome.getUpdateBy());//提交人工号 - paramMap.put("requestLevel",0);//流程紧急度 - paramMap.put("requestName","ZL0020-来料检验不合格审批流程(订单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称 - paramMap.put("workflowId",26235);//该流程对应的唯- workFlowld - - StringBuffer mainObject = new StringBuffer(); - mainObject.append("{"); - mainObject.append("\"CQ\":"+qcCheckTaskIncome.getFactoryCode());//厂区 - mainObject.append(",\"LLLB\":"+0);//来料类别【0、1】 - mainObject.append(",\"MATNR\":"+"\""+detailInfo.getMaterialCode()+"\"");//物料编码 - mainObject.append(",\"MAKTX\":"+"\""+detailInfo.getMaterialName()+"\"");//物料名称 - mainObject.append(",\"suppliernum\":"+"\""+detailInfo.getSupplierCode()+"\"");//供应商编码 - mainObject.append(",\"supplier\":"+"\""+detailInfo.getSupplierName()+"\"");//供应商名称 - mainObject.append(",\"CHARG\":"+"\""+detailInfo.getIncomeBatchNo()+"\"");//生产批号 - mainObject.append(",\"comeQty\":"+"\""+detailInfo.getQuality()+"\"");//来料数量 - mainObject.append(",\"memo\":"+"\""+detailInfo.getRemark()+"\"");//不合格情况描述 - mainObject.append("}"); - - paramMap.put("mainObject",mainObject.toString()); - logger.info("流程Id 26235:"+ JSONObject.toJSONString(paramMap)); - AjaxResult oaR = remoteOpenService.OAInspection(paramMap); - logger.info("流程Id 26235:"+ JSONObject.toJSONString(oaR)); - return oaR; - } - /*生产过程不良OA流程 - * ZL0020-成品检验控制流程:"workflowId": 26234 - * - * --------主表------- - * PGBCJ 申请部门/SSCJ 所属车间/ZRPSN报检人/GJZ关键字/SCLX生产类型/OEM OEM厂名/DH 单号/DW单位/MEMO01 不合格描述/ - * MEMO03 备注/SFXZG 是否需要QC主管审核/PGZG QC主管 - * PGZRJL 品管主任 - * ----------明细表--- - * 请求示例：{"colNames":"PROCODE,PRONAME,SCCODE......","details":[{"PROCODE":"","PRONAME":"",.....},{},{},.....]} - * PROCODE 产品编码、PRONAME 产品名称、SCCODE 批次号、SCTOTAL 数量、 - * BJDATE 报检日期、JYCODE 检验编号、JYDATE 检验日期、JYRESULT检验结果：0合格 2不合格、 - * PROCODEBAK 、BZ 备注、CPCYS 产品抽样数（PC）、JYBHGMS 不合格情况描述*/ - private AjaxResult createProduceOA(QcCheckTaskIncome qcCheckTaskIncome){ - - QcCheckTaskIncome detailInfo = qcCheckTaskIncomeMapper.getTaskInfo(qcCheckTaskIncome.getRecordId()); - - //发起来料检验OA流程 - Map paramMap = new HashMap<>(); - paramMap.put("user",qcCheckTaskIncome.getUpdateBy());//提交人工号qcCheckTaskIncome.getUpdateBy() - paramMap.put("requestLevel",0);//流程紧急度 - paramMap.put("requestName","ZL0010-成品检验控制流程(订单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称 - paramMap.put("workflowId",26234);//该流程对应的唯- workFlowld - - StringBuffer mainObject = new StringBuffer(); - mainObject.append("{"); - mainObject.append("\"SSCJ\":"+detailInfo.getSupplierName());//所属车间 - mainObject.append(",\"ZRPSN\":"+"\""+qcCheckTaskIncome.getUpdateBy()+"\"");//报检人 - mainObject.append(",\"OEM\":"+"\""+qcCheckTaskIncome.getFactoryCode()+"\"");//OEM厂名 - mainObject.append(",\"DH\":"+"\""+qcCheckTaskIncome.getWorkorderCodeSap()+"\"");//单号 - mainObject.append(",\"MEMO01\":"+"\""+detailInfo.getRemark()+"\"");//不合格情况描述 - mainObject.append("}"); - - - - paramMap.put("mainObject",mainObject.toString()); - logger.info("流程Id 26234:"+ JSONObject.toJSONString(paramMap)); - AjaxResult oaR = remoteOpenService.OAInspection(paramMap); - logger.info("流程Id 26234:"+ JSONObject.toJSONString(oaR)); - return oaR; - } @Override @DS("#header.poolName") public List getDefectList(QcDefectType qcDefectType) { @@ -587,7 +494,8 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { noOkQquality = noOkQquality.add(defect.getNoOkQuality()); } qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数 - + qcCheckTask.setCheckManCode(qcCheckTaskIncome.getUpdateBy()); + qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName()); qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); /**qc_check_task**/ n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask); @@ -629,6 +537,28 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { /**pro_order_workorder_batch-->status->w5**/ qcCheckTaskIncome.setStatus("2"); qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome); + if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())&&"N".equals(result)){ + + QcCheckTaskIncome recheck = new QcCheckTaskIncome(); + recheck.setOldBelongTo(belongId); + recheck.setBelongTo(recheck.getRecordId()); + recheck.setCreateBy(updateBy); + recheck.setCreateTime(nowTime); + //首件不合格触发复检 + recheck.setRecordId(IdUtils.fastSimpleUUID()); + n = qcCheckUnqualifiedMapper.repeatCheckTask(recheck); + logger.info("复检表qc_check_task:" + n); + recheck.setRecordId(IdUtils.fastSimpleUUID()); + n = qcCheckUnqualifiedMapper.repeatCheckTaskDefect(recheck); + logger.info("复检表qc_check_task_defect:" + n); + recheck.setRecordId(IdUtils.fastSimpleUUID()); + n = qcCheckUnqualifiedMapper.repeatCheckTaskDetail(recheck); + logger.info("复检表qc_check_task_detail:" + n); + recheck.setRecordId(IdUtils.fastSimpleUUID()); + n = qcCheckUnqualifiedMapper.repeatCheckTaskUser(recheck); + logger.info("复检表qc_check_task_user:" + n); + + } }else if("product".equals(qcCheckTaskIncome.getTypeCode())){ /**wms_product_put-->check_status->1**/ qcCheckTaskIncome.setStatus("2"); @@ -644,23 +574,6 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { unqualified.setCreateBy(updateBy); unqualified.setFactoryCode(factoryCode); unqualified.setType(checkType); - - //发起来料检验OA流程 - AjaxResult oaR = new AjaxResult(); - if("material".equals(qcCheckTaskIncome.getTypeCode())) { - qcCheckTaskIncome.setRecordId(belongId);//检验任务主表id - oaR = this.createLLOA(qcCheckTaskIncome); - }else if("produce".equals(qcCheckTaskIncome.getTypeCode())){ - qcCheckTaskIncome.setRecordId(belongId);//检验任务主表id - oaR = this.createProduceOA(qcCheckTaskIncome); - }else if("product".equals(qcCheckTaskIncome.getTypeCode())) { - //TODO;不走OA - oaR.put("code","500"); - } - if(oaR!=null && (oaR.get("code").toString()).equals("200")){ - /**qc_check_unqualified**/ - unqualified.setRequestid(oaR.get("data").toString()); - } n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); logger.info("qc_check_unqualified:" + n); } 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 99118b52a..b4811f466 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 @@ -1,5 +1,6 @@ package com.op.quality.service.impl; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -21,6 +22,7 @@ import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.quality.domain.*; import com.op.quality.mapper.*; +import com.op.quality.service.IQcCheckTaskDefectService; import com.op.quality.service.IQcCheckTaskUserService; import com.op.system.api.RemoteUserService; import com.op.system.api.domain.SysUser; @@ -74,6 +76,9 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService @Autowired private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; + @Autowired + private IQcCheckTaskDefectService qcCheckTaskDefectService; + /** * 查询生产过程检验任务 * @@ -86,12 +91,18 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService QcCheckTaskProduce qcCheckTaskProduce = qcCheckTaskProduceMapper.selectQcCheckTaskProduceByRecordId(recordId); //获取拼接好的检验人员信息 QcCheckTaskUser qcCheckTaskUser = qcCheckTaskUserService.selectQcCheckTaskUserByBelongTo(recordId); - if (StringUtils.isNotBlank(qcCheckTaskUser.getManNames())) { + if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManNames())) { qcCheckTaskProduce.setCheckManName(qcCheckTaskUser.getManNames()); } - if (StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) { + if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) { qcCheckTaskProduce.setCheckManCode(qcCheckTaskUser.getManCodes()); } + //获取不良品检验信息 + List qcCheckTaskDefectList = qcCheckTaskDefectService.selectDefectByBelongTo(recordId); + if (!CollectionUtils.isEmpty(qcCheckTaskDefectList)) { + qcCheckTaskProduce.setDefects(qcCheckTaskDefectList); + } + return qcCheckTaskProduce; } @@ -204,7 +215,18 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService logger.info("检查人新增"+m+"成功"); } } - /**qc_check_task**/ + /** 不良品数据插入 */ + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskProduce.getDefects(); + if (!CollectionUtils.isEmpty(defectList)) { + for (QcCheckTaskDefect defect : defectList) { + defect.setBelongTo(beLongId); + qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); + } + } + qcCheckTaskProduce.setNoOkQuality(noOkQuality); + /**qc_check_task**/ qcCheckTaskProduceMapper.insertQcCheckTaskProduce(qcCheckTaskProduce); /**qc_check_task_detail**/ @@ -246,6 +268,21 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService qcCheckTaskUserList.add(qcCheckTaskUser); } qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList); + /** 不良品数据修改 **/ + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskProduce.getDefects(); + String belongTo = qcCheckTaskProduce.getRecordId(); + //不是空执行下一步，空不做操作 + if (!CollectionUtils.isEmpty(defectList)) { + qcCheckTaskDefectService.deleteQcCheckTaskDefectByBelongTo(belongTo); + for (QcCheckTaskDefect defect : defectList) { + defect.setBelongTo(belongTo); + qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); + } + } + qcCheckTaskProduce.setNoOkQuality(noOkQuality); + return qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java index 8f69798a4..4a6ed61e7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java @@ -166,4 +166,10 @@ public class QcDefectTypeServiceImpl implements IQcDefectTypeService { public int deleteQcDefectTypeByDefectId(String defectId) { return qcDefectTypeMapper.deleteQcDefectTypeByDefectId(defectId); } + + @Override + @DS("#header.poolName") + public List getDefectTypeListByDefectType(String defectType) { + return qcDefectTypeMapper.getDefectTypeListByDefectType(defectType); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java index 0d8325da1..cd41c9ec3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java @@ -111,4 +111,9 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS public boolean validationData(String materialCode) { return qcMaterialGroupDetailMapper.validationData(materialCode).size() > 0; } + + @Override + public boolean validationGroupDetailData(String materialCode) { + return qcMaterialGroupDetailMapper.validationGroupDetailData(materialCode).size() > 0; + } } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml new file mode 100644 index 000000000..03a3d5609 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select record_id, defect_code, defect_subclass, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag, belong_to, ok_quality, noOk_quality from qc_check_task_defect + + + + + + + + insert into qc_check_task_defect + + record_id, + defect_code, + defect_subclass, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + factory_code, + del_flag, + belong_to, + ok_quality, + noOk_quality, + + + #{recordId}, + #{defectCode}, + #{defectSubclass}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + #{belongTo}, + #{okQuality}, + #{noOkQuality}, + + + + + update qc_check_task_defect + + defect_code = #{defectCode}, + defect_subclass = #{defectSubclass}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + del_flag = #{delFlag}, + belong_to = #{belongTo}, + ok_quality = #{okQuality}, + noOk_quality = #{noOkQuality}, + + where record_id = #{recordId} + + + + delete from qc_check_task_defect where record_id = #{recordId} + + + + delete from qc_check_task_defect where record_id in + + #{recordId} + + + + + delete from qc_check_task_defect where belong_to = #{belongTo} + + + + + \ No newline at end of file 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 7cf02aa3f..7b66cc706 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 @@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select powb.batch_id batchId, powb.batch_code batchCode from pro_order_workorder_batch powb - left join pro_order_workorder pow on powb.workorder_id = pow.workorder_id + left join pro_order_workorder pow on powb.workorder_id = pow.workorder_id where powb.del_flag = '0' and pow.del_flag = '0' and pow.workorder_code = #{workorderCode} @@ -272,8 +272,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update qc_check_task set check_status = #{checkStatus}, - check_man_code = #{updateBy}, - check_man_name =#{updateByName}, + check_man_code = #{checkManCode}, + check_man_name =#{checkManName}, check_time = #{checkTime}, sample_quality = #{sampleQuality}, noOk_quality = #{noOkQuality}, @@ -293,7 +293,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" actual_value = #{item.actualValue}, status = #{item.status}, update_by = #{item.updateBy}, - update_time = #{item.updateTime} + update_time = #{item.updateTime}, + remark = #{item.remark} where record_id = #{item.recordId} @@ -351,7 +352,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.quality, t.remark from qc_check_task qct - left join( + left join( SELECT belong_to, STUFF( 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 f4ed5ecc4..61b02ebda 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 @@ -36,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -90,7 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status, qct.create_by,qct.create_time, qct.update_by, qct.update_time, qct.check_type,qct.sample_quality,qct.noOk_quality, - qct.aNoOkquality,qct.bNoOkquality,qct.cNoOkquality, q.type_code,q.check_name from qc_check_task qct left join qc_check_type q on q.id = qct.check_type @@ -140,7 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id,check_name checkName from qc_check_type - where type_code = #{typeCode} and del_flag='0' + where del_flag='0' + and type_code = #{typeCode} @@ -177,6 +178,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{requestid}, + + insert into qc_check_task( + record_id,check_no,income_batch_no,order_no, + material_code,material_name,quality,unit, + supplier_code,supplier_name,income_time, + check_status, + create_by,create_time,factory_code,del_flag, + check_type,noOk_quality,sample_quality,type_code,order_type + ) + select + #{recordId},check_no,income_batch_no ,order_no , + material_code,material_name,quality ,unit , + supplier_code,supplier_name,income_time, + '0', + #{createBy},#{createTime},factory_code,del_flag, + check_type,noOk_quality,sample_quality,type_code ,'reCheckCS' + from qc_check_task where record_id = #{oldBelongTo} and del_flag = '0' + + + insert qc_check_task_defect( + record_id, + defect_code,defect_subclass, + create_by,create_time, + factory_code,del_flag, + belong_to,noOk_quality) + select + REPLACE(NEWID(), '-',''), + defect_code,defect_subclass, + #{createBy},#{createTime}, + factory_code,del_flag, + #{belongTo},noOk_quality + from qc_check_task_defect where belong_to = #{oldBelongTo} and del_flag = '0' + + + insert into qc_check_task_detail( + record_id,belong_to,order_num,rule_name,property_code, + check_mode,check_tool,unit_code,check_standard,actual_value, + create_by,create_time,factory_code,del_flag, + project_id,project_no,type_project_id,defect_code + ) + select + REPLACE(NEWID(), '-',''),#{belongTo},order_num,rule_name,property_code, + check_mode,check_tool,unit_code,check_standard,actual_value, + #{createBy},#{createTime},factory_code,del_flag, + project_id,project_no,type_project_id,defect_code + from qc_check_task_detail where belong_to = #{oldBelongTo} and del_flag = '0' + + + insert into qc_check_task_user( + record_id,check_no, + check_man_code,check_man_name, + create_by,create_time, + factory_code,del_flag,belong_to + ) + select + REPLACE(NEWID(), '-',''),check_no, + check_man_code,check_man_name, + #{createBy},#{createTime}, + factory_code,del_flag,#{belongTo} + from qc_check_task_user where belong_to = #{oldBelongTo} and del_flag = '0' + update qc_check_unqualified diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml index 9bc55f475..cf33f6354 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml @@ -128,4 +128,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{defectId} + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml index 47207f0f2..38d271865 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml @@ -110,4 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from qc_check_type_project where material_code = #{materialCode} + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml index 95970101a..79812c8ff 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into qc_project_type @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" factory_code, del_flag, standard_no, - version = #{version} + version, #{id}, @@ -68,8 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{factoryCode}, #{delFlag}, - #{standardNo} - #{version} + #{standardNo}, + #{version}, @@ -96,9 +96,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from qc_project_type where id in + delete from qc_project_type where id in #{id} - \ No newline at end of file + diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java index 4be9bf6f3..414a31a0c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java @@ -167,8 +167,8 @@ public class OdsProcureOutOrder extends BaseEntity { private String supplierName; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createDate; /** 最后更新人 */ @@ -191,6 +191,24 @@ public class OdsProcureOutOrder extends BaseEntity { /** 企业编码 */ @Excel(name = "企业编码") private String enterpriseCode; + private String sapMag; + private String sapXMag; + + public String getSapMag() { + return sapMag; + } + + public void setSapMag(String sapMag) { + this.sapMag = sapMag; + } + + public String getSapXMag() { + return sapXMag; + } + + public void setSapXMag(String sapXMag) { + this.sapXMag = sapXMag; + } public void setSiteCode(String siteCode) { this.siteCode = siteCode; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java index 9fc7a7963..b19c56b3a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java @@ -78,4 +78,8 @@ public interface OdsProcureOutOrderMapper { List selectOdsProcureOutOrderListByu1(@Param("list")List orderList); void updateOdsProcureOutOrderByids(@Param("order")OdsProcureOutOrder order,@Param("list") List sapMaterialPostingList); + + List selectOdsProcureOutOrderListZUKEN(OdsProcureOutOrder order); + + List selectOdsProcureOutOrderListZUKENX(OdsProcureOutOrder order); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java index b4e2e0ff8..9b5d2079d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java @@ -96,8 +96,26 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService @Override @DS("#header.poolName") public List selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder) { + List orderList=odsProcureOutOrderMapper.selectOdsProcureOutOrderListZU(odsProcureOutOrder); + for (OdsProcureOutOrder order: + orderList) { + String sapMag=""; + String sapxMag=""; + List sapMags= odsProcureOutOrderMapper.selectOdsProcureOutOrderListZUKEN(order); + for (String mag: + sapMags) { + sapMag=sapMag+mag; + } + List sapxMags= odsProcureOutOrderMapper.selectOdsProcureOutOrderListZUKENX(order); + for (String magx: + sapxMags) { + sapxMag=sapxMag+magx; + } + order.setSapMag(sapMag); + order.setSapXMag(sapxMag); + } - return odsProcureOutOrderMapper.selectOdsProcureOutOrderListZU(odsProcureOutOrder); + return orderList; } @Override diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomMapper.xml index acb447337..f9ccc8263 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomMapper.xml @@ -48,6 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join base_product bp on right(bp.product_code,11) = bbc.component and bbc.bom_code like concat('%', #{bomCode}, '%') + and b1.product_desc_zh like concat('%', #{productDescZh}, '%') + and bbc.product_code like concat('%', #{productCode}, '%') GROUP BY bbc.bom_code,bb.bom_bo,b1.product_desc_zh,bbc.product_code order by bbc.bom_code desc diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 4ec516ffc..794291aca 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -58,6 +58,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and User_Defined1 = #{userDefined1} GROUP BY Produce_Code,User_Defined1 + +