From d45d7dc9fbf88167ae6a5c93416c0a6aaa5955e0 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Tue, 16 Jan 2024 15:41:45 +0800 Subject: [PATCH 1/8] =?UTF-8?q?wms=E5=87=BA=E5=BA=93=E8=BF=87=E8=B4=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B921?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/wms/service/impl/WmsProductPutServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 381658416..2c7097b51 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -445,7 +445,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("LGORT",mesReportWork.getWhCode()); map.put("QUANTITY",mesReportWork.getQuantityQualified()); map.put("ERFME",mesReportWork.getUnit()); - String batch= mesReportWork.getBatch().substring(13); + String batch= mesReportWork.getBatch().substring(12); map.put("BATCH",batch); String formattedsDate = mesReportWork.getProductDate().replace("-", ""); map.put("HSDAT",formattedsDate); @@ -480,7 +480,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("LGORT",mesReportWork.getWhCode()); map.put("QUANTITY",mesReportWork.getQuantityQualified()); map.put("ERFME",mesReportWork.getUnit()); - String batch= mesReportWork.getBatch().substring(13); + String batch= mesReportWork.getBatch().substring(12); map.put("BATCH",batch); String formattedsDate = mesReportWork.getProductDate().replace("-", ""); map.put("HSDAT",formattedsDate); From 1b04a3f94e207f4a8e2748d30c4a1d496ae6e89a Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 17 Jan 2024 08:52:00 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=B8=8D=E5=90=88=E8=A7=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86+=E6=8A=A5=E5=B7=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/mes/domain/MesReportWork.java | 12 +- .../op/open/controller/OpenController.java | 2 +- .../op/open/service/impl/OpenServiceImpl.java | 1 + .../QcCheckUnqualifiedController.java | 40 ++--- .../op/quality/domain/QcCheckUnqualified.java | 45 ++++++ .../impl/QcCheckUnqualifiedServiceImpl.java | 148 +++++++++++++++++- .../quality/QcCheckTaskIncomeMapper.xml | 22 +-- .../quality/QcCheckUnqualifiedMapper.xml | 15 +- 8 files changed, 240 insertions(+), 45 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java index 49d5e5bd2..010e2284e 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java @@ -55,7 +55,7 @@ public class MesReportWork extends BaseEntity { /** 工时 */ @Excel(name = "工时") - private Long workTime; + private BigDecimal workTime; @Excel(name = "用人") private Long useMan; @@ -702,13 +702,15 @@ public class MesReportWork extends BaseEntity { public String getStatus() { return status; } - public void setWorkTime(Long workTime) { + + public BigDecimal getWorkTime() { + return workTime; + } + + public void setWorkTime(BigDecimal workTime) { this.workTime = workTime; } - public Long getWorkTime() { - return workTime; - } public void setMachineCode(String machineCode) { this.machineCode = machineCode; } 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 4d09ae019..1971c3bec 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 @@ -108,7 +108,7 @@ public class OpenController extends BaseController { } //添加检测任务 - return success(openService.insertQcCheckTaskProduce(qcCheckTaskProduce)); + return toAjax(openService.insertQcCheckTaskProduce(qcCheckTaskProduce)); } /** 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 e7b079edc..c510be45e 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 @@ -368,6 +368,7 @@ public class OpenServiceImpl implements OpenService { /**qc_material_group_detail**/ QcMaterialGroupDetailDTO group = openMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode()); if (group == null) { + logger.info(qcCheckTaskProduce.getMaterialCode()+"没有维护物料组检测项，检验任务生成失败"); return 0;//没有找到检测项目 } qctp.setGroupId(group.getGroupId());//共性 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckUnqualifiedController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckUnqualifiedController.java index 1c65f21f6..8be779569 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckUnqualifiedController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckUnqualifiedController.java @@ -46,15 +46,15 @@ public class QcCheckUnqualifiedController extends BaseController { public TableDataInfo list(QcCheckUnqualified qcCheckUnqualified) { startPage(); - //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckUnqualified.getCheckTimeStart())){ - qcCheckUnqualified.setCheckTimeStart(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"; - qcCheckUnqualified.setCheckTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// if(StringUtils.isEmpty(qcCheckUnqualified.getCheckTimeStart())){ +// qcCheckUnqualified.setCheckTimeStart(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"; +// qcCheckUnqualified.setCheckTimeEnd(dateEndStr);//end +// } qcCheckUnqualified.setDelFlag("0"); List list = qcCheckUnqualifiedService.selectQcCheckUnqualifiedList(qcCheckUnqualified); return getDataTable(list); @@ -67,15 +67,15 @@ public class QcCheckUnqualifiedController extends BaseController { @Log(title = "不合格处理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, QcCheckUnqualified qcCheckUnqualified) { - //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckUnqualified.getCheckTimeStart())){ - qcCheckUnqualified.setCheckTimeStart(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"; - qcCheckUnqualified.setCheckTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// if(StringUtils.isEmpty(qcCheckUnqualified.getCheckTimeStart())){ +// qcCheckUnqualified.setCheckTimeStart(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"; +// qcCheckUnqualified.setCheckTimeEnd(dateEndStr);//end +// } qcCheckUnqualified.setDelFlag("0"); List list = qcCheckUnqualifiedService.selectQcCheckUnqualifiedList(qcCheckUnqualified); ExcelUtil util = new ExcelUtil(QcCheckUnqualified.class); @@ -102,10 +102,10 @@ public class QcCheckUnqualifiedController extends BaseController { } /** - * 修改不合格处理 + * 不合格处理发起OA流程 */ @RequiresPermissions("quality:unqualified:edit") - @Log(title = "不合格处理", businessType = BusinessType.UPDATE) + @Log(title = "不合格处理发起OA流程", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody QcCheckUnqualified qcCheckUnqualified) { return toAjax(qcCheckUnqualifiedService.updateQcCheckUnqualified(qcCheckUnqualified)); 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 d23ad5966..ef6295865 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 @@ -90,6 +90,51 @@ public class QcCheckUnqualified extends BaseEntity { private String typeCode; private String sampleQuality; private String noOkQuality; + private String startManCode; + private String startManName; + private Date startTime; + private String startOaStatus; + private String startOaMsg; + + public String getStartOaMsg() { + return startOaMsg; + } + + public void setStartOaMsg(String startOaMsg) { + this.startOaMsg = startOaMsg; + } + + public String getStartOaStatus() { + return startOaStatus; + } + + public void setStartOaStatus(String startOaStatus) { + this.startOaStatus = startOaStatus; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public String getStartManCode() { + return startManCode; + } + + public void setStartManCode(String startManCode) { + this.startManCode = startManCode; + } + + public String getStartManName() { + return startManName; + } + + public void setStartManName(String startManName) { + this.startManName = startManName; + } public String getSampleQuality() { return sampleQuality; 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 adb2181bc..6ac690906 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 @@ -1,9 +1,21 @@ package com.op.quality.service.impl; +import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.security.utils.SecurityUtils; +import com.op.quality.domain.QcCheckProject; +import com.op.quality.domain.QcCheckTaskIncome; +import com.op.quality.mapper.QcCheckTaskIncomeMapper; +import com.op.system.api.RemoteOpenService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.quality.mapper.QcCheckUnqualifiedMapper; @@ -18,9 +30,16 @@ import com.op.quality.service.IQcCheckUnqualifiedService; */ @Service public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService { + protected Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private QcCheckUnqualifiedMapper qcCheckUnqualifiedMapper; + @Autowired + private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; + + @Autowired + private RemoteOpenService remoteOpenService; + /** * 查询不合格处理 * @@ -67,8 +86,40 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService @Override @DS("#header.poolName") public int updateQcCheckUnqualified(QcCheckUnqualified qcCheckUnqualified) { - qcCheckUnqualified.setUpdateTime(DateUtils.getNowDate()); - return qcCheckUnqualifiedMapper.updateQcCheckUnqualified(qcCheckUnqualified); + Date nowTime = DateUtils.getNowDate(); + qcCheckUnqualified.setUpdateTime(nowTime); + qcCheckUnqualified.setStartManCode(SecurityUtils.getUsername()); + qcCheckUnqualified.setStartTime(nowTime); + + //发起来料检验OA流程 + AjaxResult oaR = new AjaxResult(); + QcCheckUnqualified taskIfo = qcCheckUnqualifiedMapper.selectQcCheckUnqualifiedById(qcCheckUnqualified.getId()); + taskIfo.setRemark(qcCheckUnqualified.getRemark()); + if("material".equals(taskIfo.getTypeCode())) { + //ZL0010-来料检验不合格控制流程 + oaR = this.createLLOA(taskIfo); + }else if("produce".equals(taskIfo.getTypeCode())){ + //ZL0030-品质异常流程 + }else if("product".equals(taskIfo.getTypeCode())) { + //ZL0020-成品检验控制流程 + oaR = this.createProductOA(taskIfo); + } + if(oaR!=null ){ + if((oaR.get("code").toString()).equals("200")){ + /**qc_check_unqualified**/ + qcCheckUnqualified.setRequestid(oaR.get("data").toString()); + qcCheckUnqualified.setStartOaStatus("1"); + int m = qcCheckUnqualifiedMapper.updateQcCheckUnqualified(qcCheckUnqualified); + return m; + }else{ + qcCheckUnqualified.setStartOaStatus("2"); + qcCheckUnqualified.setStartOaMsg(oaR.get("msg").toString()); + qcCheckUnqualifiedMapper.updateQcCheckUnqualified(qcCheckUnqualified); + return 0; + } + + } + return 0; } /** @@ -94,4 +145,97 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService public int deleteQcCheckUnqualifiedById(String id) { return qcCheckUnqualifiedMapper.deleteQcCheckUnqualifiedById(id); } + + /*来料检验不良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(QcCheckUnqualified task){ + + QcCheckTaskIncome detailInfo = qcCheckTaskIncomeMapper.getTaskInfo(task.getTaskId()); + //发起来料检验OA流程 + Map paramMap = new HashMap<>(); + paramMap.put("user",SecurityUtils.getUsername());//提交人工号 + paramMap.put("requestLevel",0);//流程紧急度 + paramMap.put("requestName","ZL0010-来料检验不合格控制流程");//流程名称 + paramMap.put("workflowId",26235);//该流程对应的唯- workFlowld + + StringBuffer mainObject = new StringBuffer(); + mainObject.append("{"); + mainObject.append("\"CQ\":"+detailInfo.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\":"+"\""+task.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 createProductOA(QcCheckUnqualified task){ + + QcCheckTaskIncome detailInfo = qcCheckTaskIncomeMapper.getTaskInfo(task.getTaskId()); + + //发起来料检验OA流程 + Map paramMap = new HashMap<>(); + paramMap.put("user","999999");//提交人工号qcCheckTaskIncome.getUpdateBy() + paramMap.put("requestLevel",0);//流程紧急度 + paramMap.put("requestName","ZL0020-成品检验控制流程");//流程名称 + paramMap.put("workflowId",26234);//该流程对应的唯- workFlowld + + StringBuffer mainObject = new StringBuffer(); + mainObject.append("{"); + mainObject.append("\"SSCJ\":"+detailInfo.getSupplierName());//所属车间 + mainObject.append(",\"ZRPSN\":"+"\""+SecurityUtils.getUsername()+"\"");//报检人 + mainObject.append(",\"OEM\":"+"\""+detailInfo.getFactoryCode()+"\"");//OEM厂名 + mainObject.append(",\"DH\":"+"\""+detailInfo.getOrderNo()+"\"");//单号 + mainObject.append(",\"MEMO01\":"+"\""+task.getRemark()+"\"");//不合格情况描述 + mainObject.append("}"); + paramMap.put("mainObject",mainObject.toString()); + + StringBuffer detailObject = new StringBuffer(); + detailObject.append("{"); + detailObject.append("\"colNames\":\"PROCODE,PRONAME,SCCODE,SCTOTAL,BJDATE,JYCODE,JYDATE,JYRESULT,CPCYS,JYBHGMS\""); + detailObject.append(",\"details\":["); + + detailObject.append("{\"PROCODE\":\""+detailInfo.getMaterialCode()+"\"},");//产品编码 + detailObject.append("{\"PRONAME\":\""+detailInfo.getMaterialName()+"\"},");//产品名称 + detailObject.append("{\"SCCODE\":\""+detailInfo.getIncomeBatchNo()+"\"},");//批次号 + detailObject.append("{\"SCTOTAL\":\""+detailInfo.getQuality()+"\"},");//数量 + detailObject.append("{\"BJDATE\":\""+detailInfo.getCreateTime()+"\"},");//报检日期 + detailObject.append("{\"JYCODE\":\""+detailInfo.getCheckNo()+"\"},");// 检验编号 + detailObject.append("{\"JYDATE\":\""+detailInfo.getCheckTime()+"\"},");// 检验日期 + detailObject.append("{\"JYRESULT\":\""+(detailInfo.getCheckResult().equals("Y")?"0":"2")+"\"},");//检验结果：0合格 2不合格 + detailObject.append("{\"CPCYS\":\""+detailInfo.getQuality()+"\"},");// 产品抽样数（PC） + detailObject.append("{\"JYBHGMS\":\""+task.getRemark()+"\"}");// 不合格情况描述 + + detailObject.append("]}"); + paramMap.put("mainObject",detailObject.toString()); + + logger.info("流程Id 26234:"+ JSONObject.toJSONString(paramMap)); + AjaxResult oaR = remoteOpenService.OAInspection(paramMap); + logger.info("流程Id 26234:"+ JSONObject.toJSONString(oaR)); + return oaR; + } } 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 7b66cc706..6b657b7dd 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 @@ -350,21 +350,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.supplier_name supplierName, qct.income_batch_no incomeBatchNo, qct.quality, - t.remark + qct.factory_code factoryCode, + case when pow.workorder_code_sap is not null then pow.workorder_code_sap + else qct.order_no end orderNo, + qct.create_time createTime, + qct.check_no checkNo, + qct.check_time checkTime, + qct.check_result checkResult from qc_check_task qct - left join( - SELECT - belong_to, - STUFF( - (SELECT ';' + rule_name+':'+actual_value - FROM qc_check_task_detail - WHERE belong_to = qctd.belong_to - FOR xml path('') - ),1,1,'' - ) remark - FROM qc_check_task_detail qctd where qctd.del_flag = '0' and belong_to=#{recordId} - GROUP by qctd.belong_to - ) t on qct.record_id = t.belong_to + left join pro_order_workorder pow on pow.workorder_code = qct.order_no where qct.record_id = #{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 b31c6fc4d..160e1635c 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 @@ -58,10 +58,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + and check_no = #{checkNo} + and income_batch_no = #{incomeBatchNo} + and order_no = #{orderNo} + and material_code = #{materialCode} + and material_name like concat('%', #{materialName}, '%') + and quality = #{quality} + and unit = #{unit} + and supplier_code = #{supplierCode} + and supplier_name like concat('%', #{supplierName}, '%') + and income_time = #{incomeTime} + and check_loc = #{checkLoc} + and check_status = #{checkStatus} + and check_man_code = #{checkManCode} + and check_man_name like concat('%', #{checkManName}, '%') + and check_time = #{checkTime} + and check_result = #{checkResult} + and status = #{status} + and attr1 = #{attr1} + and attr2 = #{attr2} + and attr3 = #{attr3} + and attr4 = #{attr4} + and factory_code = #{factoryCode} + and check_type = #{checkType} + and noOk_quality = #{nookQuality} + and sample_quality = #{sampleQuality} + and aNoOkquality = #{aNoOkquality} + and bNoOkquality = #{bNoOkquality} + and cNoOkquality = #{cNoOkquality} + and type_code = #{typeCode} + and order_type = #{orderType} + + + + + + + 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_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, + noOk_quality, + sample_quality, + aNoOkquality, + bNoOkquality, + cNoOkquality, + type_code, + order_type, + + + #{recordId}, + #{checkNo}, + #{incomeBatchNo}, + #{orderNo}, + #{materialCode}, + #{materialName}, + #{quality}, + #{unit}, + #{supplierCode}, + #{supplierName}, + #{incomeTime}, + #{checkLoc}, + #{checkStatus}, + #{checkManCode}, + #{checkManName}, + #{checkTime}, + #{checkResult}, + #{status}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + #{checkType}, + #{nookQuality}, + #{sampleQuality}, + #{aNoOkquality}, + #{bNoOkquality}, + #{cNoOkquality}, + #{typeCode}, + #{orderType}, + + + + + update qc_check_task + + check_no = #{checkNo}, + income_batch_no = #{incomeBatchNo}, + order_no = #{orderNo}, + material_code = #{materialCode}, + material_name = #{materialName}, + quality = #{quality}, + unit = #{unit}, + supplier_code = #{supplierCode}, + supplier_name = #{supplierName}, + income_time = #{incomeTime}, + check_loc = #{checkLoc}, + check_status = #{checkStatus}, + check_man_code = #{checkManCode}, + check_man_name = #{checkManName}, + check_time = #{checkTime}, + check_result = #{checkResult}, + status = #{status}, + 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}, + check_type = #{checkType}, + noOk_quality = #{nookQuality}, + sample_quality = #{sampleQuality}, + aNoOkquality = #{aNoOkquality}, + bNoOkquality = #{bNoOkquality}, + cNoOkquality = #{cNoOkquality}, + type_code = #{typeCode}, + order_type = #{orderType}, + + where record_id = #{recordId} + + + + delete from qc_check_task where record_id = #{recordId} + + + + delete from qc_check_task where record_id in + + #{recordId} + + + + + \ No newline at end of file From ae79b64e03af6295b423ca1bb6cbfb72237f56e8 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 17 Jan 2024 11:55:44 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=B8=8D=E5=90=88=E8=A7=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86+=E6=8A=A5=E5=B7=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MesReportWorkController.java | 9 ++++ .../op/mes/mapper/MesReportWorkMapper.java | 2 + .../op/mes/service/IMesReportWorkService.java | 2 + .../op/mes/service/IWCSInterfaceService.java | 1 + .../service/impl/IWCInterfaceServiceImpl.java | 53 ------------------- .../impl/MesReportWorkServiceImpl.java | 8 +++ .../mapper/mes/MesReportWorkMapper.xml | 9 +++- 7 files changed, 30 insertions(+), 54 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 5d01a67da..8e25229d3 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -136,6 +136,15 @@ public class MesReportWorkController extends BaseController { } } + /** + * 报工撤销 + */ + @RequiresPermissions("mes:reportWork:edit") + @PutMapping("/reportSapCancel") + public AjaxResult reportSapCancel(@RequestBody MesReportWork mesReportWork) { + return toAjax(mesReportWorkService.reportSapCancel(mesReportWork)); + } + /** * 删除报工报表 */ diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 35ccd15d5..153d45bb3 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -127,4 +127,6 @@ public interface MesReportWorkMapper { MesReportWork getEndReport(MesReportWork pWork); List selectMesReportWorkList_S(MesReportWork mesReportWork); + + int reportSapCancel(MesReportWork mesReportWork); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java index ae6ff30ef..95d9f2cb2 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java @@ -101,4 +101,6 @@ public interface IMesReportWorkService { List getPrepareList(MesPrepareDetail mesPrepareDetail); List selectMesReportWorkList_S(MesReportWork mesReportWork); + + int reportSapCancel(MesReportWork mesReportWork); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java index 129e6d277..ccad386e3 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java @@ -40,4 +40,5 @@ public interface IWCSInterfaceService { Map dryRoomDataHeader(BoardDTO boardDTO); Map dryRoomDataCarousel(BoardDTO boardDTO); + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 062f43059..f63e76c43 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -536,57 +536,4 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { return map; } - -// public static void main(String[] args) { -// param param=new param(); -// param.setReqCode(IdUtils.fastSimpleUUID()); -// param.setReqTime(DateUtils.dateTimeNow()); -// param.setBufferType("10"); -// param.setFactory("999"); -// try { -// String res= HttpUtils.sendPost("http://192.168.109.36:5001/api/ReceivingAndFeedingMaterials/bufferInfoSync", JSON.toJSONString(param)); -// System.out.println(res); -// }catch (Exception e){ -// System.out.println(e.getMessage()); -// } -// -// } -// static class param{ -// String reqCode; -// String reqTime; -// String factory; -// String bufferType; -// -// public String getReqCode() { -// return reqCode; -// } -// -// public void setReqCode(String reqCode) { -// this.reqCode = reqCode; -// } -// -// public String getReqTime() { -// return reqTime; -// } -// -// public void setReqTime(String reqTime) { -// this.reqTime = reqTime; -// } -// -// public String getFactory() { -// return factory; -// } -// -// public void setFactory(String factory) { -// this.factory = factory; -// } -// -// public String getBufferType() { -// return bufferType; -// } -// -// public void setBufferType(String bufferType) { -// this.bufferType = bufferType; -// } -// } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index 8d1d7fe94..95c6a72c6 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -176,6 +176,14 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { return dtos; } + @Override + @DS("#header.poolName") + public int reportSapCancel(MesReportWork mesReportWork) { + mesReportWork.setFactoryCode(ServletUtils.getRequest().getHeader("PoolName")); + int m = mesReportWorkMapper.reportSapCancel(mesReportWork); + return m; + } + /** * 修改报工报表 * diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 632865c57..fb4dd409d 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -813,8 +813,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" id = #{item.id} + + update mes_report_work set + upload_time = null, + upload_status = '0', + upload_msg = null + where workorder_code = #{workorderCode} + - + update mes_report_work set del_flag = '1' where id = #{id} From d585533008a0939eb7316b47c7c0a817bea94f67 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 17 Jan 2024 14:41:47 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QcCheckTaskWarehousingController.java | 5 ++--- .../service/impl/QcCheckTaskWarehousingServiceImpl.java | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java index f9e69bc69..25df4728e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java @@ -6,6 +6,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.bean.BeanUtils; import com.op.quality.domain.QcCheckTaskIncome; @@ -101,10 +102,8 @@ public class QcCheckTaskWarehousingController extends BaseController { @RequiresPermissions("quality:qcWarehousing:add") @Log(title = "成品入库检验任务", businessType = BusinessType.INSERT) @PostMapping + @DS("#header.poolName") public AjaxResult add(@RequestBody QcCheckTaskWarehousing qcCheckTaskWarehousing) { - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String key = "#header.poolName"; - qcCheckTaskWarehousing.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); int r = qcCheckTaskWarehousingService.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing); if(r>0){ return toAjax(r); 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 af22a9c08..60854da0c 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 @@ -86,10 +86,15 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int insertQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing) { if(StringUtils.isNotBlank(qcCheckTaskWarehousing.getFactoryCode())){ DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskWarehousing.getFactoryCode()); + }else{ + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + qcCheckTaskWarehousing.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); } String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); @@ -145,6 +150,7 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin qcCheckTaskUser.setCheckManCode(splitCodes[i]); qcCheckTaskUser.setCheckNo(qcCheckTaskWarehousing.getCheckNo()); qcCheckTaskUser.setBelongTo(beLongId); + qcCheckTaskUser.setFactoryCode(factoryCode); qcCheckTaskUserList.add(qcCheckTaskUser); } //检验人插入 From 7592451f79de521e6be6487acf86ddf5b43f2833 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Wed, 17 Jan 2024 16:43:19 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E5=8A=A8=E6=80=81=E6=B7=BB=E5=8A=A0=E4=B8=8D=E8=89=AF?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/domain/QcCheckTaskInventory.java | 26 +++++-- .../impl/QcCheckTaskIncomeServiceImpl.java | 11 ++- .../impl/QcCheckTaskInventoryServiceImpl.java | 32 ++++++-- .../QcCheckTaskWarehousingServiceImpl.java | 11 ++- .../quality/QcCheckTaskInventoryMapper.xml | 75 ++++++++++--------- 5 files changed, 104 insertions(+), 51 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskInventory.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskInventory.java index a6c7cd2c3..9663cf943 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskInventory.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskInventory.java @@ -2,6 +2,8 @@ package com.op.quality.domain; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -119,7 +121,7 @@ public class QcCheckTaskInventory extends BaseEntity { /** 不合格数量 */ @Excel(name = "不合格数量") - private BigDecimal nookQuality; + private BigDecimal noOkQuality; /** 抽样数量 */ @Excel(name = "抽样数量") @@ -150,6 +152,8 @@ public class QcCheckTaskInventory extends BaseEntity { private String checkTimeStart; private String checkTimeEnd; + private List defects; + public void setRecordId(String recordId) { this.recordId = recordId; } @@ -325,13 +329,15 @@ public class QcCheckTaskInventory extends BaseEntity { public String getCheckType() { return checkType; } - public void setNookQuality(BigDecimal nookQuality) { - this.nookQuality = nookQuality; + + public BigDecimal getNoOkQuality() { + return noOkQuality; } - public BigDecimal getNookQuality() { - return nookQuality; + public void setNoOkQuality(BigDecimal noOkQuality) { + this.noOkQuality = noOkQuality; } + public void setSampleQuality(BigDecimal sampleQuality) { this.sampleQuality = sampleQuality; } @@ -407,6 +413,14 @@ public class QcCheckTaskInventory extends BaseEntity { this.checkTimeEnd = checkTimeEnd; } + public List getDefects() { + return defects; + } + + public void setDefects(List defects) { + this.defects = defects; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -439,7 +453,7 @@ public class QcCheckTaskInventory extends BaseEntity { .append("factoryCode", getFactoryCode()) .append("delFlag", getDelFlag()) .append("checkType", getCheckType()) - .append("nookQuality", getNookQuality()) + .append("nookQuality", getNoOkQuality()) .append("sampleQuality", getSampleQuality()) .append("aNoOkquality", getaNoOkquality()) .append("bNoOkquality", getbNoOkquality()) 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 9b741d612..e799f5ddc 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 @@ -82,7 +82,16 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { @Override @DS("#header.poolName") public QcCheckTaskIncome selectQcCheckTaskIncomeByRecordId(String recordId) { - return qcCheckTaskIncomeMapper.selectQcCheckTaskIncomeByRecordId(recordId); + QcCheckTaskIncome qcCheckTaskIncome = qcCheckTaskIncomeMapper.selectQcCheckTaskIncomeByRecordId(recordId); + //获取拼接好的检验人员信息 + QcCheckTaskUser qcCheckTaskUser = qcCheckTaskUserService.selectQcCheckTaskUserByBelongTo(recordId); + if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManNames())) { + qcCheckTaskIncome.setCheckManName(qcCheckTaskUser.getManNames()); + } + if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) { + qcCheckTaskIncome.setCheckManCode(qcCheckTaskUser.getManCodes()); + } + return qcCheckTaskIncome; } /** diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java index 96284a071..00a53ae06 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java @@ -13,6 +13,7 @@ import com.op.common.core.utils.uuid.IdUtils; 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.domain.quality.QcUserMaterialDTO; import org.slf4j.Logger; @@ -52,6 +53,9 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer @Autowired private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; + @Autowired + private IQcCheckTaskDefectService qcCheckTaskDefectService; + /** * 查询库存检验任务 * @@ -70,6 +74,11 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) { qcCheckTaskInventory.setCheckManCode(qcCheckTaskUser.getManCodes()); } + //获取不良品检验信息 + List qcCheckTaskDefectList = qcCheckTaskDefectService.selectDefectByBelongTo(recordId); + if (!CollectionUtils.isEmpty(qcCheckTaskDefectList)) { + qcCheckTaskInventory.setDefects(qcCheckTaskDefectList); + } return qcCheckTaskInventory; } @@ -182,6 +191,18 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer logger.info("检查人新增"+m+"成功"); } } + /** 不良品数据插入 */ + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskInventory.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()); + } + } + qcCheckTaskInventory.setNoOkQuality(noOkQuality); + /**qc_check_task**/ qcCheckTaskInventoryMapper.insertQcCheckTaskInventory(qcCheckTaskInventory); @@ -206,7 +227,6 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer @Override @DS("#header.poolName") public int updateQcCheckTaskInventory(QcCheckTaskInventory qcCheckTaskInventory) { - qcCheckTaskInventory.setUpdateTime(DateUtils.getNowDate()); /** qc_task_user**/ String checkManName = qcCheckTaskInventory.getCheckManName(); @@ -226,19 +246,19 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer } qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList); /** 不良品数据修改 **/ - /*BigDecimal noOkQuality = new BigDecimal(0); - List defectList = qcCheckTaskProduce.getDefects(); - String belongTo = qcCheckTaskProduce.getRecordId(); + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskInventory.getDefects(); + String belongTo = qcCheckTaskInventory.getRecordId(); //不是空执行下一步，空不做操作 if (!CollectionUtils.isEmpty(defectList)) { qcCheckTaskDefectService.deleteQcCheckTaskDefectByBelongTo(belongTo); for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(belongTo); qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); - noOkQuality = noOkQuality.add(defect.getNoOkQuality()); + noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); } } - qcCheckTaskProduce.setNoOkQuality(noOkQuality);*/ + qcCheckTaskInventory.setNoOkQuality(noOkQuality); return qcCheckTaskInventoryMapper.updateQcCheckTaskInventory(qcCheckTaskInventory); } 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 60854da0c..9f4f7f223 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 @@ -62,7 +62,16 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin @Override @DS("#header.poolName") public QcCheckTaskWarehousing selectQcCheckTaskWarehousingByRecordId(String recordId) { - return qcCheckTaskWarehousingMapper.selectQcCheckTaskWarehousingByRecordId(recordId); + QcCheckTaskWarehousing checkTaskWarehousing = qcCheckTaskWarehousingMapper.selectQcCheckTaskWarehousingByRecordId(recordId); + //获取拼接好的检验人员信息 + QcCheckTaskUser qcCheckTaskUser = qcCheckTaskUserService.selectQcCheckTaskUserByBelongTo(recordId); + if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManNames())) { + checkTaskWarehousing.setCheckManName(qcCheckTaskUser.getManNames()); + } + if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) { + checkTaskWarehousing.setCheckManCode(qcCheckTaskUser.getManCodes()); + } + return checkTaskWarehousing; } /** diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml index 2482369c4..68d96a54e 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -47,42 +47,43 @@ 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, - check_type, noOk_quality, sample_quality, aNoOkquality, bNoOkquality, cNoOkquality, type_code, order_type from qc_check_task + check_type, noOk_quality, sample_quality, aNoOkquality, bNoOkquality, cNoOkquality, type_code, order_type + from qc_check_task @@ -123,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" factory_code, del_flag, check_type, - noOk_quality, + noOk_quality, sample_quality, aNoOkquality, bNoOkquality, @@ -161,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{factoryCode}, #{delFlag}, #{checkType}, - #{nookQuality}, + #{noOkQuality}, #{sampleQuality}, #{aNoOkquality}, #{bNoOkquality}, @@ -202,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" factory_code = #{factoryCode}, del_flag = #{delFlag}, check_type = #{checkType}, - noOk_quality = #{nookQuality}, + noOk_quality = #{noOkQuality}, sample_quality = #{sampleQuality}, aNoOkquality = #{aNoOkquality}, bNoOkquality = #{bNoOkquality},