From 9d860f93318914c2edea0ed02216c9b8c1bcb22b Mon Sep 17 00:00:00 2001 From: shaoyong Date: Thu, 18 Jan 2024 13:46:10 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=EF=BC=8C=E4=B8=8D=E8=89=AF=E5=93=81=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/QcCheckTaskWarehousing.java | 11 ++++++ .../impl/QcCheckTaskIncomeServiceImpl.java | 36 +++++++++++++++++++ .../QcCheckTaskWarehousingServiceImpl.java | 35 ++++++++++++++++++ .../quality/QcCheckTaskIncomeMapper.xml | 5 +-- .../quality/QcCheckTaskWarehousingMapper.xml | 10 +++--- 5 files changed, 89 insertions(+), 8 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java index 8d27e1834..00e2f5edf 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.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; @@ -112,6 +114,7 @@ public class QcCheckTaskWarehousing extends BaseEntity { /** 删除标识1删除0正常 */ private String delFlag; + private List defects; private String incomeTimeStart; private String incomeTimeEnd; @@ -123,6 +126,14 @@ public class QcCheckTaskWarehousing extends BaseEntity { private BigDecimal noOkQuality; private BigDecimal sampleQuality; + public List getDefects() { + return defects; + } + + public void setDefects(List defects) { + this.defects = defects; + } + public BigDecimal getSampleQuality() { return sampleQuality; } 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 e799f5ddc..3f0e04bc4 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 @@ -14,6 +14,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.IQcCheckTaskProduceService; import com.op.quality.service.IQcCheckTaskUserService; import com.op.system.api.RemoteOpenService; @@ -73,6 +74,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { @Autowired private QMSFileMapper qmsFileMapper; + @Autowired + private IQcCheckTaskDefectService qcCheckTaskDefectService; + /** * 查询来料检验 * @@ -91,6 +95,11 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) { qcCheckTaskIncome.setCheckManCode(qcCheckTaskUser.getManCodes()); } + //获取不良品检验信息 + List qcCheckTaskDefectList = qcCheckTaskDefectService.selectDefectByBelongTo(recordId); + if (!CollectionUtils.isEmpty(qcCheckTaskDefectList)) { + qcCheckTaskIncome.setDefects(qcCheckTaskDefectList); + } return qcCheckTaskIncome; } @@ -210,6 +219,18 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { int m=qcCheckTaskIncomeMapper.addCheckUsers(users); logger.info("检查人新增"+m+"成功"); } + /** 不良品数据插入 */ + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskIncome.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()); + } + } + qcCheckTaskIncome.setNoOkQuality(noOkQuality); + qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome); /**qc_check_task_detail**/ @@ -252,6 +273,21 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckTaskUserList.add(qcCheckTaskUser); } qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList); + /** 不良品数据修改 **/ + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskIncome.getDefects(); + String belongTo = qcCheckTaskIncome.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()); + } + } + qcCheckTaskIncome.setNoOkQuality(noOkQuality); + return qcCheckTaskIncomeMapper.updateQcCheckTaskIncome(qcCheckTaskIncome); } 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 9f4f7f223..d1af1d7af 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 @@ -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; @@ -13,6 +14,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 +54,8 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin private IQcCheckTaskUserService qcCheckTaskUserService; @Autowired private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; + @Autowired + private IQcCheckTaskDefectService qcCheckTaskDefectService; /** * 查询成品入库检验任务 @@ -71,6 +75,11 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) { checkTaskWarehousing.setCheckManCode(qcCheckTaskUser.getManCodes()); } + //获取不良品检验信息 + List qcCheckTaskDefectList = qcCheckTaskDefectService.selectDefectByBelongTo(recordId); + if (!CollectionUtils.isEmpty(qcCheckTaskDefectList)) { + checkTaskWarehousing.setDefects(qcCheckTaskDefectList); + } return checkTaskWarehousing; } @@ -188,6 +197,18 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin int m=qcCheckTaskIncomeMapper.addCheckUsers(users); logger.info("检查人新增"+m+"成功"); } + /** 不良品数据插入 */ + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskWarehousing.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()); + } + } + qcCheckTaskWarehousing.setNoOkQuality(noOkQuality); + /**qc_check_task**/ int n = qcCheckTaskWarehousingMapper.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing); logger.info("qc_check_task:"+n+"成功"); @@ -231,6 +252,20 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin qcCheckTaskUserList.add(qcCheckTaskUser); } qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList); + /** 不良品数据修改 **/ + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskWarehousing.getDefects(); + String belongTo = qcCheckTaskWarehousing.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()); + } + } + qcCheckTaskWarehousing.setNoOkQuality(noOkQuality); return qcCheckTaskWarehousingMapper.updateQcCheckTaskWarehousing(qcCheckTaskWarehousing); } 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 6b657b7dd..2c46086ef 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 @@ -35,13 +35,14 @@ 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 + create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality from qc_check_task @@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, 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.noOk_quality, - qct.type_code + qct.sample_quality, qct.type_code from qc_check_task qct and qct.check_no = #{checkNo} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml index 9d16ea667..5614c804e 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml @@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -41,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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, create_by, - create_time, update_by, update_time, check_type + create_time, update_by, update_time, check_type, sample_quality, noOk_quality from qc_check_task @@ -50,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, 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, - q.type_code + qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type, qct.sample_quality, + qct.noOk_quality, q.type_code from qc_check_task qct left join qc_check_type q on q.id = qct.check_type @@ -202,9 +203,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" del_flag = #{delFlag}, sample_quality = #{sampleQuality}, noOk_quality = #{noOkQuality}, - aNoOkquality = #{aNoOkquality}, - bNoOkquality = #{bNoOkquality}, - cNoOkquality = #{cNoOkquality}, where record_id = #{recordId} From 3e861ede819733d14fb34cd840cce976caa9ef5a Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 18 Jan 2024 15:15:22 +0800 Subject: [PATCH 02/17] =?UTF-8?q?wms=E5=87=BA=E5=BA=93=E8=BF=87=E8=B4=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B922--sap=E8=BF=87=E8=B4=A6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OdsProcureOrderServiceImpl.java | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index ee166d7ed..71a1c6aee 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -46,7 +46,7 @@ import javax.servlet.http.HttpServletRequest; /** * 包材采购单Service业务层处理 - * + *s * @author Open Platform * @date 2023-07-06 */ @@ -543,7 +543,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsOdsMateStorageNewsSnMapper.updatekdd(wmsOdsEmStorageNews);//库存调整 wmsOdsMateStorageNewsSn.setUserDefined1("1"); wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSn(wmsOdsMateStorageNewsSn);//库存明细 - } return null; } @@ -565,8 +564,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { // List orderList1=odsProcureOutOrderMapper.selectOdsProcureOutOrderListByIds(orderList); List orderList1=odsProcureOutOrderMapper.selectOdsProcureOutOrderListByu1(orderList); //查询这个地方先暂时去掉Order_Status = '3' 条件 - List sapMaterialPostingList=new ArrayList<>(); + //List sapMaterialPostingList=new ArrayList<>(); List orderList2=new ArrayList<>(); + List> mapList=new ArrayList<>(); List sapMaterialPostingFCList=new ArrayList<>();//反冲 List orderList2FC=new ArrayList<>();//反冲 for (OdsProcureOutOrder odsProcureOutOrder: @@ -584,24 +584,23 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { sapMaterialPostingFCList.add(sapBackflushMPQuery); orderList2FC.add(odsProcureOutOrder); }else { - SapMaterialPosting sapMaterialPosting =new SapMaterialPosting(); - sapMaterialPosting.setAufnr(odsProcureOutOrder.getProduceCode());//订单号 - sapMaterialPosting.setBwart("261"); //移动类型 - sapMaterialPosting.setPlant(odsProcureOutOrder.getSiteCode()); //工厂 + Map map=new HashMap<>(); + map.put("AUFNR", odsProcureOutOrder.getProduceCode()); + map.put("PLANT", odsProcureOutOrder.getSiteCode()); String lgort= baseWarehouseMapper.selectByCode(odsProcureOutOrder.getLocCode()); - sapMaterialPosting.setLgort(lgort);//库存地点 - sapMaterialPosting.setMatnr(odsProcureOutOrder.getMaterialCode());//物料号 - sapMaterialPosting.setQuantity(odsProcureOutOrder.getOutNumber().toString()); //数量 - sapMaterialPosting.setMeins(odsProcureOutOrder.getUnit()); //基本计量单位 - sapMaterialPosting.setBatch(odsProcureOutOrder.getUserDefined2()); //批号 - sapMaterialPostingList.add(sapMaterialPosting); + map.put("LGORT", lgort); + map.put("MATNR", odsProcureOutOrder.getMaterialCode()); + map.put("QUANTITY", odsProcureOutOrder.getOutNumber().toString()); + map.put("MEINS", odsProcureOutOrder.getUnit()); + mapList.add(map); orderList2.add(odsProcureOutOrder); } } - - - if (sapMaterialPostingList.size()>0){//非反冲过账 - R result= remoteSapService.sapMaterialPosting(sapMaterialPostingList); + if (mapList.size()>0){//非反冲过账 + SapMaterialPosting sapMaterialPosting =new SapMaterialPosting(); + sapMaterialPosting.setPostingType("261"); + sapMaterialPosting.setMapList(mapList); + R result= remoteSapService.sapMaterialPosting(sapMaterialPosting); OdsProcureOutOrder order =new OdsProcureOutOrder(); int code= result.getCode(); String msg= result.getMsg(); From eb7d0122b28bd28b2c7fab87a95ca479c786fd1b Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 18 Jan 2024 15:58:23 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/system/api/RemoteOpenService.java | 9 +- .../op/system/api/domain/quality/OAInfo.java | 300 ++++++++++++++++++ .../factory/RemoteOpenFallbackFactory.java | 3 +- .../op/open/controller/OpenController.java | 9 +- .../op/open/service/impl/OpenServiceImpl.java | 3 +- .../QcCheckUnqualifiedController.java | 15 +- .../controller/QcMaterialGroupController.java | 10 +- .../domain/QcCheckTaskWarehousing.java | 27 ++ .../service/IQcCheckUnqualifiedService.java | 18 +- .../impl/QcCheckTaskIncomeServiceImpl.java | 18 +- .../impl/QcCheckUnqualifiedServiceImpl.java | 107 ++++++- .../quality/QcCheckTaskIncomeMapper.xml | 4 +- .../quality/QcCheckUnqualifiedMapper.xml | 8 +- 13 files changed, 479 insertions(+), 52 deletions(-) create mode 100644 op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/OAInfo.java diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java index 701246a8b..7259f8bfd 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java @@ -4,10 +4,7 @@ import com.op.common.core.constant.ServiceNameConstants; import com.op.common.core.web.domain.AjaxResult; import com.op.system.api.factory.RemoteOpenFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -24,6 +21,6 @@ public interface RemoteOpenService { /**获取流程信息**/ - @GetMapping("/openInterface/GetOaNodeInfo") - public AjaxResult GetOaNodeInfo(@RequestParam("requestId") String requestId); + @GetMapping("/openInterface/GetOaNodeInfo/{requestid}") + public AjaxResult GetOaNodeInfo(@PathVariable("requestid") String requestId); } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/OAInfo.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/OAInfo.java new file mode 100644 index 000000000..6d55cab77 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/OAInfo.java @@ -0,0 +1,300 @@ +package com.op.system.api.domain.quality; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * oa返回信息 + * + * @author Open Platform + * @date 2023-10-31 + */ +public class OAInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + //请求id + private String REQUESTID; + //工作流id + private String WORKFLOWID; + //操作节点id + private String NODEID; + //签字类型 0：批准
1：保存
2：提交
3：退回
4：重新打开
5：删除
6：激活
7：转发
9：批注
+ // a：意见征询
b：意见征询回复
e：强制归档
h：转办
i：干预
j：转办反馈
s：督办
t：抄送 + private String LOGTYPE; + //操作日期 + private String OPERATEDATE; + //操作时间 + private String OPERATETIME; + //操作者 + private String OPERATOR; + //意见 + private String REMARK1; + //客户端ip + private String CLIENTIP; + //操作者类型1：人力资源，2：客户 + private String OPERATORTYPE; + //下一节点id + private String DESTNODEID; + //接收人 + private String RECEIVEDPERSONS_1; + //显示顺序 + private String SHOWORDER; + //代理人 + private String AGENTORBYAGENTID; + //代理类型 + private String AGENTTYPE; + //日志id + private String LOGID; + //签字信息 + private String REMARK; + //相关附件 + private String ANNEXDOCIDS; + //日志id + private String REQUESTLOGID; + //操作者部门 + private String OPERATORDEPT; + //相关文档 + private String SIGNDOCIDS; + //相关流程 + private String SIGNWORKFLOWIDS; + //接收者名称 + private String RECEIVEDPERSONS; + //是否为手机版本 + private String ISMOBILE; + // 手写签批 + private String HANDWRITTENSIGN; + //语音附件 + private String SPEECHATTACHMENT; + //接收人id + private String RECEIVEDPERSONIDS; + //意见位置 + private String REMARKLOCATION; + + public String getREQUESTID() { + return REQUESTID; + } + + public void setREQUESTID(String REQUESTID) { + this.REQUESTID = REQUESTID; + } + + public String getWORKFLOWID() { + return WORKFLOWID; + } + + public void setWORKFLOWID(String WORKFLOWID) { + this.WORKFLOWID = WORKFLOWID; + } + + public String getNODEID() { + return NODEID; + } + + public void setNODEID(String NODEID) { + this.NODEID = NODEID; + } + + public String getLOGTYPE() { + return LOGTYPE; + } + + public void setLOGTYPE(String LOGTYPE) { + this.LOGTYPE = LOGTYPE; + } + + public String getOPERATEDATE() { + return OPERATEDATE; + } + + public void setOPERATEDATE(String OPERATEDATE) { + this.OPERATEDATE = OPERATEDATE; + } + + public String getOPERATETIME() { + return OPERATETIME; + } + + public void setOPERATETIME(String OPERATETIME) { + this.OPERATETIME = OPERATETIME; + } + + public String getOPERATOR() { + return OPERATOR; + } + + public void setOPERATOR(String OPERATOR) { + this.OPERATOR = OPERATOR; + } + + public String getREMARK1() { + return REMARK1; + } + + public void setREMARK1(String REMARK1) { + this.REMARK1 = REMARK1; + } + + public String getCLIENTIP() { + return CLIENTIP; + } + + public void setCLIENTIP(String CLIENTIP) { + this.CLIENTIP = CLIENTIP; + } + + public String getOPERATORTYPE() { + return OPERATORTYPE; + } + + public void setOPERATORTYPE(String OPERATORTYPE) { + this.OPERATORTYPE = OPERATORTYPE; + } + + public String getDESTNODEID() { + return DESTNODEID; + } + + public void setDESTNODEID(String DESTNODEID) { + this.DESTNODEID = DESTNODEID; + } + + public String getRECEIVEDPERSONS_1() { + return RECEIVEDPERSONS_1; + } + + public void setRECEIVEDPERSONS_1(String RECEIVEDPERSONS_1) { + this.RECEIVEDPERSONS_1 = RECEIVEDPERSONS_1; + } + + public String getSHOWORDER() { + return SHOWORDER; + } + + public void setSHOWORDER(String SHOWORDER) { + this.SHOWORDER = SHOWORDER; + } + + public String getAGENTORBYAGENTID() { + return AGENTORBYAGENTID; + } + + public void setAGENTORBYAGENTID(String AGENTORBYAGENTID) { + this.AGENTORBYAGENTID = AGENTORBYAGENTID; + } + + public String getAGENTTYPE() { + return AGENTTYPE; + } + + public void setAGENTTYPE(String AGENTTYPE) { + this.AGENTTYPE = AGENTTYPE; + } + + public String getLOGID() { + return LOGID; + } + + public void setLOGID(String LOGID) { + this.LOGID = LOGID; + } + + public String getREMARK() { + return REMARK; + } + + public void setREMARK(String REMARK) { + this.REMARK = REMARK; + } + + public String getANNEXDOCIDS() { + return ANNEXDOCIDS; + } + + public void setANNEXDOCIDS(String ANNEXDOCIDS) { + this.ANNEXDOCIDS = ANNEXDOCIDS; + } + + public String getREQUESTLOGID() { + return REQUESTLOGID; + } + + public void setREQUESTLOGID(String REQUESTLOGID) { + this.REQUESTLOGID = REQUESTLOGID; + } + + public String getOPERATORDEPT() { + return OPERATORDEPT; + } + + public void setOPERATORDEPT(String OPERATORDEPT) { + this.OPERATORDEPT = OPERATORDEPT; + } + + public String getSIGNDOCIDS() { + return SIGNDOCIDS; + } + + public void setSIGNDOCIDS(String SIGNDOCIDS) { + this.SIGNDOCIDS = SIGNDOCIDS; + } + + public String getSIGNWORKFLOWIDS() { + return SIGNWORKFLOWIDS; + } + + public void setSIGNWORKFLOWIDS(String SIGNWORKFLOWIDS) { + this.SIGNWORKFLOWIDS = SIGNWORKFLOWIDS; + } + + public String getRECEIVEDPERSONS() { + return RECEIVEDPERSONS; + } + + public void setRECEIVEDPERSONS(String RECEIVEDPERSONS) { + this.RECEIVEDPERSONS = RECEIVEDPERSONS; + } + + public String getISMOBILE() { + return ISMOBILE; + } + + public void setISMOBILE(String ISMOBILE) { + this.ISMOBILE = ISMOBILE; + } + + public String getHANDWRITTENSIGN() { + return HANDWRITTENSIGN; + } + + public void setHANDWRITTENSIGN(String HANDWRITTENSIGN) { + this.HANDWRITTENSIGN = HANDWRITTENSIGN; + } + + public String getSPEECHATTACHMENT() { + return SPEECHATTACHMENT; + } + + public void setSPEECHATTACHMENT(String SPEECHATTACHMENT) { + this.SPEECHATTACHMENT = SPEECHATTACHMENT; + } + + public String getRECEIVEDPERSONIDS() { + return RECEIVEDPERSONIDS; + } + + public void setRECEIVEDPERSONIDS(String RECEIVEDPERSONIDS) { + this.RECEIVEDPERSONIDS = RECEIVEDPERSONIDS; + } + + public String getREMARKLOCATION() { + return REMARKLOCATION; + } + + public void setREMARKLOCATION(String REMARKLOCATION) { + this.REMARKLOCATION = REMARKLOCATION; + } +} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java index 6eef9a1ad..a5b702d52 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java @@ -7,6 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -25,7 +26,7 @@ public class RemoteOpenFallbackFactory implements FallbackFactory getOAInfoList(QcCheckUnqualified qcCheckUnqualified) { + List list = qcCheckUnqualifiedService.getOAInfoList(qcCheckUnqualified); + return list; + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java index d30478830..56be1e531 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java @@ -23,7 +23,7 @@ import com.op.common.core.web.page.TableDataInfo; /** * 物料组Controller - * + * * @author materialGroup * @date 2023-10-16 */ @@ -36,7 +36,7 @@ public class QcMaterialGroupController extends BaseController { /** * 查询物料组列表 */ - @RequiresPermissions("quality:materialGroup:list") + //@RequiresPermissions("quality:materialGroup:list") @GetMapping("/list") public TableDataInfo list(QcMaterialGroup qcMaterialGroup) { startPage(); @@ -55,7 +55,7 @@ public class QcMaterialGroupController extends BaseController { /** * 导出物料组列表 */ - @RequiresPermissions("quality:materialGroup:export") + //@RequiresPermissions("quality:materialGroup:export") @Log(title = "物料组", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, QcMaterialGroup qcMaterialGroup) { @@ -67,7 +67,7 @@ public class QcMaterialGroupController extends BaseController { /** * 获取物料组详细信息 */ - @RequiresPermissions("quality:materialGroup:query") + //@RequiresPermissions("quality:materialGroup:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { return success(qcMaterialGroupService.selectQcMaterialGroupById(id)); @@ -86,7 +86,7 @@ public class QcMaterialGroupController extends BaseController { /** * 修改物料组 */ - @RequiresPermissions("quality:materialGroup:edit") + //@RequiresPermissions("quality:materialGroup:edit") @Log(title = "物料组", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody QcMaterialGroup qcMaterialGroup) { diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java index 00e2f5edf..4a20c460d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java @@ -125,6 +125,33 @@ public class QcCheckTaskWarehousing extends BaseEntity { private String orderType; private BigDecimal noOkQuality; private BigDecimal sampleQuality; + private BigDecimal aNoOkquality; + private BigDecimal bNoOkquality; + private BigDecimal cNoOkquality; + + public BigDecimal getaNoOkquality() { + return aNoOkquality; + } + + public void setaNoOkquality(BigDecimal aNoOkquality) { + this.aNoOkquality = aNoOkquality; + } + + public BigDecimal getbNoOkquality() { + return bNoOkquality; + } + + public void setbNoOkquality(BigDecimal bNoOkquality) { + this.bNoOkquality = bNoOkquality; + } + + public BigDecimal getcNoOkquality() { + return cNoOkquality; + } + + public void setcNoOkquality(BigDecimal cNoOkquality) { + this.cNoOkquality = cNoOkquality; + } public List getDefects() { return defects; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckUnqualifiedService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckUnqualifiedService.java index 962b39e7f..bd40c1980 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckUnqualifiedService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckUnqualifiedService.java @@ -1,18 +1,20 @@ package com.op.quality.service; import java.util.List; + +import com.op.system.api.domain.quality.OAInfo; import com.op.quality.domain.QcCheckUnqualified; /** * 不合格处理Service接口 - * + * * @author Open Platform * @date 2023-10-31 */ public interface IQcCheckUnqualifiedService { /** * 查询不合格处理 - * + * * @param id 不合格处理主键 * @return 不合格处理 */ @@ -20,7 +22,7 @@ public interface IQcCheckUnqualifiedService { /** * 查询不合格处理列表 - * + * * @param qcCheckUnqualified 不合格处理 * @return 不合格处理集合 */ @@ -28,7 +30,7 @@ public interface IQcCheckUnqualifiedService { /** * 新增不合格处理 - * + * * @param qcCheckUnqualified 不合格处理 * @return 结果 */ @@ -36,7 +38,7 @@ public interface IQcCheckUnqualifiedService { /** * 修改不合格处理 - * + * * @param qcCheckUnqualified 不合格处理 * @return 结果 */ @@ -44,7 +46,7 @@ public interface IQcCheckUnqualifiedService { /** * 批量删除不合格处理 - * + * * @param ids 需要删除的不合格处理主键集合 * @return 结果 */ @@ -52,9 +54,11 @@ public interface IQcCheckUnqualifiedService { /** * 删除不合格处理信息 - * + * * @param id 不合格处理主键 * @return 结果 */ public int deleteQcCheckUnqualifiedById(String id); + + List getOAInfoList(QcCheckUnqualified qcCheckUnqualified); } 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 3f0e04bc4..e25fb733e 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 @@ -476,15 +476,15 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { @DS("#header.poolName") public List getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { List dtos = qcCheckUnqualifiedMapper.getWorkOrder(qcCheckTaskIncome); - for(QcCheckTaskIncome dto:dtos){ - String statusName = ""; - if("w5".equals(dto.getStatus())){ - statusName = "质检完成"; - }else{ - statusName = "质检未完成"; - } - dto.setStatus(statusName); - } +// for(QcCheckTaskIncome dto:dtos){ +// String statusName = ""; +// if("w5".equals(dto.getStatus())){ +// statusName = "质检完成"; +// }else{ +// statusName = "质检未完成"; +// } +// dto.setStatus(statusName); +// } return dtos; } 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 6ac690906..c1d1a3ca5 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,16 +1,14 @@ package com.op.quality.service.impl; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import com.alibaba.fastjson2.JSONArray; 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.system.api.domain.quality.OAInfo; import com.op.quality.domain.QcCheckTaskIncome; import com.op.quality.mapper.QcCheckTaskIncomeMapper; import com.op.system.api.RemoteOpenService; @@ -100,6 +98,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService oaR = this.createLLOA(taskIfo); }else if("produce".equals(taskIfo.getTypeCode())){ //ZL0030-品质异常流程 + oaR = this.createProduceOA(taskIfo); }else if("product".equals(taskIfo.getTypeCode())) { //ZL0020-成品检验控制流程 oaR = this.createProductOA(taskIfo); @@ -109,10 +108,13 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService /**qc_check_unqualified**/ qcCheckUnqualified.setRequestid(oaR.get("data").toString()); qcCheckUnqualified.setStartOaStatus("1"); + qcCheckUnqualified.setStatus("1"); + qcCheckUnqualified.setStartTime(nowTime); int m = qcCheckUnqualifiedMapper.updateQcCheckUnqualified(qcCheckUnqualified); return m; }else{ qcCheckUnqualified.setStartOaStatus("2"); + qcCheckUnqualified.setStartTime(nowTime); qcCheckUnqualified.setStartOaMsg(oaR.get("msg").toString()); qcCheckUnqualifiedMapper.updateQcCheckUnqualified(qcCheckUnqualified); return 0; @@ -146,6 +148,20 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService return qcCheckUnqualifiedMapper.deleteQcCheckUnqualifiedById(id); } + @Override + @DS("#header.poolName") + public List getOAInfoList(QcCheckUnqualified qcCheckUnqualified) { + logger.info("查看流程Id"+ qcCheckUnqualified.getTaskId()); + AjaxResult oaR = remoteOpenService.GetOaNodeInfo(qcCheckUnqualified.getTaskId()); + logger.info("流程Id 26235:"+ JSONObject.toJSONString(oaR)); + List infoList = new ArrayList<>(); + if((int)oaR.get("code")==200){ + infoList=JSONArray.parseArray(oaR.get("msg").toString(),OAInfo.class); + } + + return infoList; + } + /*来料检验不良OA流程 * CQ 厂区、 OEMCM 厂名 、 LLLB 来料类别【0、1】、MATNR 物料编号、MAKTX 物料名称、suppliernum 供应商编码 * supplier 供应商名称、CHARG 生产批号、comeQty 来料数量、testDate 检验日期 、 JYBH 检验编号、 @@ -199,14 +215,14 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService //发起来料检验OA流程 Map paramMap = new HashMap<>(); - paramMap.put("user","999999");//提交人工号qcCheckTaskIncome.getUpdateBy() + paramMap.put("user",SecurityUtils.getUsername());//提交人工号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("\"SSCJ\":"+"\""+detailInfo.getSupplierName()+"\"");//所属车间 mainObject.append(",\"ZRPSN\":"+"\""+SecurityUtils.getUsername()+"\"");//报检人 mainObject.append(",\"OEM\":"+"\""+detailInfo.getFactoryCode()+"\"");//OEM厂名 mainObject.append(",\"DH\":"+"\""+detailInfo.getOrderNo()+"\"");//单号 @@ -223,19 +239,90 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService detailObject.append("{\"PRONAME\":\""+detailInfo.getMaterialName()+"\"},");//产品名称 detailObject.append("{\"SCCODE\":\""+detailInfo.getIncomeBatchNo()+"\"},");//批次号 detailObject.append("{\"SCTOTAL\":\""+detailInfo.getQuality()+"\"},");//数量 - detailObject.append("{\"BJDATE\":\""+detailInfo.getCreateTime()+"\"},");//报检日期 + detailObject.append("{\"BJDATE\":\""+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getCreateTime())+"\"},");//报检日期 detailObject.append("{\"JYCODE\":\""+detailInfo.getCheckNo()+"\"},");// 检验编号 - detailObject.append("{\"JYDATE\":\""+detailInfo.getCheckTime()+"\"},");// 检验日期 + detailObject.append("{\"JYDATE\":\""+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",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()); + paramMap.put("details",detailObject.toString()); logger.info("流程Id 26234:"+ JSONObject.toJSONString(paramMap)); AjaxResult oaR = remoteOpenService.OAInspection(paramMap); logger.info("流程Id 26234:"+ JSONObject.toJSONString(oaR)); return oaR; } + + /** + { + "user": "999999", 提交用户账号 + "requestLevel": "0", 紧急程度，默认0 + "requestName": "ZL0030-品质异常流程-智能制造-2024-01-17（产品名称:榄菊高级型蚊香(60装)）", + "workflowId": "26256", + "mainObject": "{ + "CPMC":"榄菊高级型蚊香(60装)", *产品名称 + "CPBM":"10101000115", *产品编码 + "SQBM":"0", *申请部门 0品质保障部 + "SQR":"15930", *申请人:默认当前用户 15930：智能制造 + "SQSJ":"2024-01-17", *申请时间: 默认当前日期 + "SCCJ":"162", *所属车间 162小榄黑蚊香车间 + "SCPH":"240555a", *生产批号 + "SCSL":500, *生产数量 + "FXDD":"测试地点", *发现地点 + "FXRQ":"2024-01-17", *发现日期:默认当前日期，可以选择 + "BH":"202401170002", *编号：流水号 年月日+四位流水号 + "YCFW":"1", *异常范围：下拉框榄菊所有工厂 1代表小榄工厂 + "PZYCMS":"测试异常描述", *品质异常描述 + "Notes":"测试备注", 备注 + "SFXYZG":"1", *是否需要主管审核 1否 0是 + "PGZG":"", QC主管：SFXYZG字段为"是",则此项选择QC主管信息 + "PGZR":"660", *质量主管 660：朱继新 + "SFGYSWT":"1" *是否供应商问题 1非供应商问题 0是供应商问题 + }" + } + * @param task + * @return + */ + private AjaxResult createProduceOA(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","ZL0030-品质异常流程-智能制造-"+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getIncomeTime())+"（产品名称:"+detailInfo.getMaterialName()+"）");//流程名称 + paramMap.put("workflowId",26256);//该流程对应的唯- workFlowld + + StringBuffer mainObject = new StringBuffer(); + mainObject.append("{"); + mainObject.append("\"CPMC\":"+detailInfo.getMaterialName());//产品名称 + mainObject.append(",\"CPBM\":"+detailInfo.getMaterialCode());//产品编码 + //mainObject.append(",\"SQBM\":"+"\"0\"");//0品质保障部 + mainObject.append(",\"SQR\":"+"\""+SecurityUtils.getUsername()+"\"");//申请人:默认当前用户 + mainObject.append(",\"SQSJ\":"+"\""+detailInfo.getSupplierCode()+"\"");//申请时间 + mainObject.append(",\"SCCJ\":"+"\""+detailInfo.getSupplierName()+"\"");//所属车间 + mainObject.append(",\"SCPH\":"+"\""+detailInfo.getIncomeBatchNo()+"\"");//生产批号 + mainObject.append(",\"SCSL\":"+"\""+detailInfo.getQuality()+"\"");//生产数量 + mainObject.append(",\"FXDD\":"+"\""+detailInfo.getCheckLoc()+"\"");//发现地点 + mainObject.append(",\"FXRQ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getCheckTime())+"\"");//发现日期 + mainObject.append(",\"BH\":"+"\""+detailInfo.getCheckNo()+"\"");//编号：流水号 年月日+四位流水号 + mainObject.append(",\"YCFW\":"+"\"1\"");//*异常范围：下拉框榄菊所有工厂 1代表小榄工厂 + mainObject.append(",\"PZYCMS\":"+"\""+detailInfo.getRemark()+"\"");//品质异常描述 + mainObject.append(",\"Notes\":"+"\"\"");//测试备注 + mainObject.append(",\"SFXYZG\":"+"\"1\"");//*是否需要主管审核 1否 0是 + mainObject.append(",\"SFXYZG\":"+"\"1\"");//*是否需要主管审核 1否 0是 + mainObject.append(",\"PGZG\":"+"\""+detailInfo.getRemark()+"\"");//QC主管：SFXYZG字段为"是",则此项选择QC主管信息 + mainObject.append(",\"PGZR\":"+"\"660\"");//质量主管 660：朱继新 + mainObject.append(",\"SFGYSWT\":"+"\"1\"");//*是否供应商问题 1非供应商问题 0是供应商问题 + + mainObject.append("}"); + + paramMap.put("mainObject",mainObject.toString()); + logger.info("流程Id 26256:"+ JSONObject.toJSONString(paramMap)); + AjaxResult oaR = remoteOpenService.OAInspection(paramMap); + logger.info("流程Id 26256:"+ 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 2c46086ef..5f753bf0c 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 @@ -357,7 +357,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.create_time createTime, qct.check_no checkNo, qct.check_time checkTime, - qct.check_result checkResult + qct.check_result checkResult, + qct.income_time incomeTime, + qct.check_loc checkLoc from qc_check_task qct 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 160e1635c..c19a7dd31 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 @@ -31,8 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + and start_value = #{startValue} and end_value = #{endValue} and attr1 = #{attr1} @@ -36,13 +36,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and type_code = #{typeCode} - + - - + + + insert into qc_sample_rule id, @@ -100,9 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from qc_sample_rule where id in + delete from qc_sample_rule where id in #{id} - \ No newline at end of file + From 7b01884a216a0f32c74322c007e650b7f95af7f2 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 19 Jan 2024 09:43:04 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/service/impl/QcMaterialGroupDetailServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 cd41c9ec3..c7a4d7f8d 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 @@ -113,6 +113,7 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS } @Override + @DS("#header.poolName") public boolean validationGroupDetailData(String materialCode) { return qcMaterialGroupDetailMapper.validationGroupDetailData(materialCode).size() > 0; } From 119ad65d1a6684c67af21db7058d8923025df77e Mon Sep 17 00:00:00 2001 From: shaoyong Date: Fri, 19 Jan 2024 10:24:35 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E5=93=81=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=B7=BB=E5=8A=A0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/service/impl/QcCheckTaskDefectServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 index 3e68774b6..8ba607e8a 100644 --- 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 @@ -106,11 +106,13 @@ public class QcCheckTaskDefectServiceImpl implements IQcCheckTaskDefectService { } @Override + @DS("#header.poolName") public int deleteQcCheckTaskDefectByBelongTo(String belongTo) { return qcCheckTaskDefectMapper.deleteQcCheckTaskDefectByBelongTo(belongTo); } @Override + @DS("#header.poolName") public List selectDefectByBelongTo(String belongTo) { return qcCheckTaskDefectMapper.selectDefectByBelongTo(belongTo); } From a8fa036f009d734d39590406bbc92262d510e93c Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 19 Jan 2024 17:17:16 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/open/controller/OpenController.java | 10 +- .../java/com/op/open/service/OpenService.java | 6 +- .../quality/domain/QcCheckReportIncome.java | 18 +++ .../impl/QcCheckReportIncomeServiceImpl.java | 13 +- .../impl/QcCheckReportProduceServiceImpl.java | 3 +- .../impl/QcCheckTaskIncomeServiceImpl.java | 2 + .../impl/QcStaticTableServiceImpl.java | 150 +++++++++++++++--- .../mapper/quality/QcStaticTableMapper.xml | 4 +- 8 files changed, 163 insertions(+), 43 deletions(-) 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 ef0a1bb40..ec06be759 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 @@ -1,16 +1,13 @@ package com.op.open.controller; -import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; import com.op.open.service.OpenService; +import com.op.system.api.RemoteQualityService; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; -import com.op.system.api.domain.mes.MesReportWorkDTO; -import com.op.system.api.domain.quality.QcCheckTaskDTO; import com.op.system.api.domain.quality.QcCheckTaskProduceDTO; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -91,23 +88,18 @@ public class OpenController extends BaseController { if(StringUtils.isBlank(qcCheckTaskProduce.getOrderNo())){ return error("[orderNo]不能为空"); } - if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialName())){ return error("[materialName]不能为空"); } - if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialCode())){ return error("[materialCode]不能为空"); } - if(StringUtils.isBlank(qcCheckTaskProduce.getCheckType())){ return error("[checkType]不能为空"); } - if(StringUtils.isBlank(qcCheckTaskProduce.getFactoryCode())){ return error("[factoryCode]不能为空"); } - //添加检测任务 return toAjax(openService.insertQcCheckTaskProduce(qcCheckTaskProduce)); } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java index 1074fedbb..b3f466a9e 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java @@ -1,11 +1,8 @@ package com.op.open.service; -import com.op.common.core.domain.R; import com.op.common.core.web.domain.AjaxResult; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; -import com.op.system.api.domain.mes.MesReportWorkDTO; -import com.op.system.api.domain.quality.QcCheckTaskDTO; import com.op.system.api.domain.quality.QcCheckTaskProduceDTO; import java.util.List; @@ -21,8 +18,6 @@ public interface OpenService { WCSDTO requestDestinationStations(WCSDTO wcsdto); -// R reportWork(MesReportWorkDTO mesReportWork); - List getLGInfo(WCSDTO wcsDTO); AjaxResult machineRepair(EquRepairOrderDTO equRepairOrderDTO); @@ -32,4 +27,5 @@ public interface OpenService { AjaxResult OAInspection(Map paramMap); AjaxResult GetOaNodeInfo(String requestId); + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java index b117e65e5..d90f8ec57 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java @@ -126,6 +126,24 @@ public class QcCheckReportIncome extends BaseEntity { private String checkType;//小类 private String checkName; private String createTimeStr; + private List files; + private List fileUrls; + + public List getFileUrls() { + return fileUrls; + } + + public void setFileUrls(List fileUrls) { + this.fileUrls = fileUrls; + } + + public List getFiles() { + return files; + } + + public void setFiles(List files) { + this.files = files; + } public String getCreateTimeStr() { return createTimeStr; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java index 48e93eba6..15c8d8537 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java @@ -39,7 +39,8 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi @Autowired private QcCheckTaskDetailMapper qcCheckTaskDetailMapper; - + @Autowired + private QMSFileMapper qmsFileMapper; /** * 查询来料检验 * @@ -192,7 +193,15 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi @Override @DS("#header.poolName") public List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { - return qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); + List dtos = qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); + for(QcCheckTaskDetail dto:dtos){ + List files = qmsFileMapper.getBaseFileBatch(dto.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + dto.setFiles(files); + } + } + + return dtos; } @Override diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java index 139a58d43..9e36663d8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java @@ -51,7 +51,8 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer @Override @DS("#header.poolName") public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) { - return qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId); + QcCheckReportIncome dto= qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId); + return dto; } /** 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 2ece4308e..f2a06539b 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 @@ -591,6 +591,8 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { logger.info("更新qc_check_task_detail:"+n); /**qc_check_task_defect**/ + //qcCheckTaskIncomeMapper.deleteQcCheckTaskDefects() + //////////////////////////// n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects); logger.info("qc_check_task_defect:"+n); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index e01b94484..64b14b6e6 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -8,7 +8,10 @@ import java.util.*; import java.util.stream.Collectors; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.StringUtils; +import com.op.quality.domain.BaseFile; +import com.op.quality.domain.QcCheckTaskDetail; import com.op.quality.domain.QcCheckType; +import com.op.quality.mapper.QMSFileMapper; import com.op.system.api.domain.quality.ChartDTO; import com.op.system.api.domain.quality.ChartSeriesDTO; import com.op.system.api.domain.quality.FactoryDto; @@ -29,7 +32,8 @@ import org.springframework.util.CollectionUtils; public class QcStaticTableServiceImpl implements IQcStaticTableService { @Autowired private QcStaticTableMapper qcStaticTableMapper; - + @Autowired + private QMSFileMapper qmsFileMapper; /** * 查询质量系统报列表 * @@ -172,96 +176,192 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { private void getDataFromMap(Map detailMap,QcStaticTable project){ String keystr = project.getProjectId()+"08"; QcStaticTable detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn080090(detail.getStatus()); + if(detail!=null&&StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn080090(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn080090(project.getColumn080090()+":"+picurls); + } + }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn080090(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn080090("-"); } keystr = project.getProjectId()+"09"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn090100(detail.getStatus()); + if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn090100(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn090100(project.getColumn090100()+":"+picurls); + } + }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn090100(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn090100("-"); } keystr = project.getProjectId()+"10"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn100110(detail.getStatus()); + if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn100110(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn100110(project.getColumn100110()+":"+picurls); + } + }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn100110(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn100110("-"); } keystr = project.getProjectId()+"11"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn110120(detail.getStatus()); + if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn110120(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn110120(project.getColumn110120()+":"+picurls); + } + }else if(detail!=null&&detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn110120(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn110120("-"); } keystr = project.getProjectId()+"12"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn123133(detail.getStatus()); + if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn123133(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn123133(project.getColumn123133()+":"+picurls); + } + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn123133(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn123133("-"); } keystr = project.getProjectId()+"13"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn133143(detail.getStatus()); + if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn133143(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn133143(project.getColumn133143()+":"+picurls); + } + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn133143(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn133143("-"); } keystr = project.getProjectId()+"14"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn143153(detail.getStatus()); + if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn143153(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn143153(project.getColumn143153()+":"+picurls); + } + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn143153(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn143153("-"); } keystr = project.getProjectId()+"15"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn153163(detail.getStatus()); + if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn153163(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn153163(project.getColumn153163()+":"+picurls); + } + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn153163(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn153163("-"); } keystr = project.getProjectId()+"16"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn163173(detail.getStatus()); + if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn163173(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn163173(project.getColumn163173()+":"+picurls); + } + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn163173(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn163173("-"); } keystr = project.getProjectId()+"18"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn180190(detail.getStatus()); + if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn180190(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn180190(project.getColumn180190()+":"+picurls); + } + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn180190(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn180190("-"); } keystr = project.getProjectId()+"19"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn190200(detail.getStatus()); + if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn190200(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn190200(project.getColumn190200()+":"+picurls); + } + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn190200(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn190200("-"); } keystr = project.getProjectId()+"20"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn200210(detail.getStatus()); + if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn200210(detail.getRemark()); + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + String picurls = pics.stream().collect(Collectors.joining(",")); + project.setColumn080090(project.getColumn080090()+":"+picurls); + } + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn200210(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn200210("-"); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index 69a6791bc..8cd539fb4 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -130,8 +130,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by qctp.sort @@ -164,9 +166,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) t left join pro_order_workorder pow on pow.workorder_code = t.orderNo left join base_equipment be on be.equipment_code = pow.workorder_name + where pow.del_flag = '0' and be.del_flag ='0' - - + + + + insert into qc_check_task record_id, @@ -263,8 +314,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where record_id = #{recordId} + + update qc_check_task + set confirm = #{confirm}, + confirm_man_code = #{confirmManCode}, + confirm_man_name = #{confirmManName}, + confirm_remark = #{confirmRemark}, + confirm_time = #{confirmTime} + + + and record_id = #{recordId} + + + and order_no = #{orderNo} + + + - + delete from qc_check_task where record_id = #{recordId} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml index 9b3b47838..903886103 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml @@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and attr3 = #{attr3} and attr4 = #{attr4} and factory_code = #{factoryCode} + and del_flag = '0' 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 5f753bf0c..49734a0d9 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 @@ -311,6 +311,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + + delete from qc_check_task_defect where belong_to = #{belongId} + + - + insert into qc_check_task_user( record_id,belong_to,check_no, check_man_code,check_man_name, 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 61b02ebda..824b38a14 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 @@ -37,7 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + @@ -73,6 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -81,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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,sample_quality,noOk_quality, - aNoOkquality,bNoOkquality,cNoOkquality + aNoOkquality,bNoOkquality,cNoOkquality,reason,product_type from qc_check_task @@ -205,6 +210,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" del_flag, check_type, type_code, + reason, + product_type, + confirm_man_code, + confirm_man_name, #{recordId}, @@ -242,6 +251,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{delFlag}, #{checkType}, #{typeCode}, + #{reason}, + #{productType}, + #{confirmManCode}, + #{confirmManName}, @@ -280,6 +293,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, factory_code = #{factoryCode}, del_flag = #{delFlag}, + reason = #{reason}, + product_type = #{productType}, + confirm_man_code = #{confirmManCode}, + confirm_man_name = #{confirmManName}, where record_id = #{recordId} @@ -307,7 +324,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, qct.check_time, qct.check_result, qct.check_type,'首件检验' check_name, - CONVERT(varchar(10),qct.create_time, 120) createTimeStr + CONVERT(varchar(10),qct.create_time, 120) createTimeStr, + qct.confirm,qct.confirm_man_name from qc_check_task qct and qct.check_no = #{checkNo} @@ -333,7 +351,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" '','','', qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, qct.supplier_code, qct.supplier_name, qct.income_time,'','', - '','', qct.check_type,'巡检检验' check_name,CONVERT(varchar(10),qct.create_time, 120) createTimeStr + '','', qct.check_type,'巡检检验' check_name,CONVERT(varchar(10),qct.create_time, 120) createTimeStr, + qct.confirm,qct.confirm_man_name from qc_check_task qct and qct.check_no = #{checkNo} @@ -355,7 +374,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and qct.check_type = 'checkTypeSCXJ' GROUP BY qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, - qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_type,CONVERT(varchar(10),qct.create_time, 120) + qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_type,CONVERT(varchar(10),qct.create_time, 120), + qct.confirm,qct.confirm_man_name ) t where 1=1 From 724b32dc85201cefa85155349fa8dadbeda492ed Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 23 Jan 2024 14:54:51 +0800 Subject: [PATCH 16/17] =?UTF-8?q?2024-1-23-1=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=A8=A1=E5=9D=97-=E7=BB=91=E5=AE=9A=E8=BE=85?= =?UTF-8?q?=E5=8A=A9=E8=AE=BE=E5=A4=87=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= =?UTF-8?q?-=E4=B8=B4=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/wms/controller/BaseEquipmentController.java | 11 ++++++++++- .../java/com/op/wms/mapper/BaseEquipmentMapper.java | 3 +++ .../com/op/wms/service/IBaseEquipmentService.java | 3 +++ .../wms/service/impl/BaseEquipmentServiceImpl.java | 12 ++++++++++++ .../resources/mapper/wms/BaseEquipmentMapper.xml | 7 +++++++ 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java index ceb07217f..fecad0b34 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java @@ -55,6 +55,16 @@ public class BaseEquipmentController extends BaseController { return getDataTable(list); } + /** + * 查询辅助设备管理列表 + */ + @GetMapping("/getEquipmentListByCategory") + public TableDataInfo selectBaseEquipmentListByCategory(BaseEquipment baseEquipment) { + startPage(); + List list = baseEquipmentService.selectEquipmentListByCategory(baseEquipment); + return getDataTable(list); + } + /** * 导出设备管理列表 */ @@ -267,5 +277,4 @@ public class BaseEquipmentController extends BaseController { List list = baseEquipmentService.selectBYRecordsList(baseEquipment); return getDataTable(list); } - } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java index d58080b39..44a81a8b6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java @@ -126,4 +126,7 @@ public interface BaseEquipmentMapper { //查询保养记录 List selectBYRecordsList(BaseEquipment baseEquipment); + + //查询辅助设备 + List selectEquipmentListByCategory(BaseEquipment baseEquipment); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java index 927b76cc9..45009499e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java @@ -89,4 +89,7 @@ public interface IBaseEquipmentService { //查看保养记录 List selectBYRecordsList(BaseEquipment baseEquipment); + + //辅助设备列表 + List selectEquipmentListByCategory(BaseEquipment baseEquipment); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java index 8451c6f76..b2e39a1d9 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java @@ -130,6 +130,18 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService { return baseEquipmentMapper.selectBaseEquipmentList(baseEquipment); } + /** + * 查询辅助设备列表 + * + * @param baseEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List selectEquipmentListByCategory(BaseEquipment baseEquipment) { + return baseEquipmentMapper.selectEquipmentListByCategory(baseEquipment); + } + /** * 新增设备管理 * diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index 4e90a2db6..9881b929c 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -228,6 +228,13 @@ + +